5.3->5.5 merge

3 files changed, 10 insertions, 9 deletions

diff --git a/client/mysql.cc b/client/mysql.cc
index db6f5b83a1b..5debadee26c 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -46,7 +46,7 @@
 #include <locale.h>
 #endif
 
-const char *VER= "15.0";
+const char *VER= "15.1";
 
 /* Don't try to make a nice table if the data is too big */
 #define MAX_COLUMN_LENGTH	     1024
@@ -2250,7 +2250,7 @@ static bool add_line(String &buffer,char *line,char *in_string,
       break;
     }
     else if (!*in_string && inchar == '/' && *(pos+1) == '*' &&
-	     *(pos+2) != '!')
+             !(*(pos+2) == '!' || (*(pos+2) == 'M' && *(pos+3) == '!')))
     {
       if (preserve_comments)
       {
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 71ebd5d4ab7..4de571b546d 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -116,7 +116,7 @@ static ulonglong rec_count= 0;
 static short binlog_flags = 0; 
 static MYSQL* mysql = NULL;
 static const char* dirname_for_local_load= 0;
-static bool opt_skip_annotate_rows_events= 0;
+static bool opt_skip_annotate_row_events= 0;
 
 /**
   Pointer to the Format_description_log_event of the currently active binlog.
@@ -1040,7 +1040,7 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
       break;
     }
     case ANNOTATE_ROWS_EVENT:
-      if (!opt_skip_annotate_rows_events)
+      if (!opt_skip_annotate_row_events)
       {
         /*
           We don't print Annotate event just now because all subsequent
@@ -1348,10 +1348,10 @@ that may lead to an endless loop.",
    "Updates to a database with a different name than the original. \
 Example: rewrite-db='from->to'.",
    0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"skip-annotate-rows-events", OPT_SKIP_ANNOTATE_ROWS_EVENTS,
+  {"skip-annotate-row-events", OPT_SKIP_ANNOTATE_ROWS_EVENTS,
    "Don't print Annotate_rows events stored in the binary log.",
-   (uchar**) &opt_skip_annotate_rows_events,
-   (uchar**) &opt_skip_annotate_rows_events,
+   (uchar**) &opt_skip_annotate_row_events,
+   (uchar**) &opt_skip_annotate_row_events,
    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
@@ -1827,7 +1827,7 @@ static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
     cast to uint32.
   */
   int4store(buf, (uint32)start_position);
-  if (!opt_skip_annotate_rows_events)
+  if (!opt_skip_annotate_row_events)
     binlog_flags|= BINLOG_SEND_ANNOTATE_ROWS_EVENT;
   int2store(buf + BIN_LOG_HEADER_SIZE, binlog_flags);
 
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 2f12ee7f280..29235dbd234 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -5481,7 +5481,8 @@ void do_connect(struct st_command *command)
   int con_port= opt_port;
   char *con_options;
   my_bool con_ssl= 0, con_compress= 0;
-  my_bool con_pipe= 0, con_shm= 0;
+  my_bool con_pipe= 0;
+  my_bool con_shm __attribute__ ((unused))= 0;
   struct st_connection* con_slot;
 
   static DYNAMIC_STRING ds_connection_name;