Portability fixes.

Improve mysql-test to be more robust.
Fix that GRANT doesn't delete SSL options
Change innobase_flush_log_at_trx_commit to uint.
Don't rotate logs if we read a rotate log entry from the master.

1 files changed, 3 insertions, 4 deletions

diff --git a/sql/log_event.h b/sql/log_event.h
index b69643c366a..5f7aa4ad586 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -522,16 +522,15 @@ class Rotate_log_event: public Log_event
 {
 public:
   const char* new_log_ident;
-  uchar ident_len;
   ulonglong pos;
+  uint ident_len;
   bool alloced;
 #ifndef MYSQL_CLIENT  
   Rotate_log_event(THD* thd_arg, const char* new_log_ident_arg,
 		   uint ident_len_arg = 0,ulonglong pos_arg = 4)
     : Log_event(thd_arg), new_log_ident(new_log_ident_arg),
-    ident_len(ident_len_arg ? ident_len_arg :
-	      (uint) strlen(new_log_ident_arg)), pos(pos_arg),
-    alloced(0)
+    pos(pos_arg),ident_len(ident_len_arg ? ident_len_arg :
+			   (uint) strlen(new_log_ident_arg)), alloced(0)
   {}
   void pack_info(String* packet);
   int exec_event(struct st_relay_log_info* rli);