4.1 -> 5.0 merge

2 files changed, 14 insertions, 11 deletions

diff --git a/client/mysql.cc b/client/mysql.cc
index ddfcc5759ae..94b43d030e8 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1084,7 +1084,7 @@ static int read_and_execute(bool interactive)
       (We want to allow help, print and clear anywhere at line start
     */
     if ((named_cmds || glob_buffer.is_empty())
-	&& !in_string && (com=find_command(line,0)))
+	&& !ml_comment && !in_string && (com=find_command(line,0)))
     {
       if ((*com->func)(&glob_buffer,line) > 0)
 	break;
diff --git a/client/mysqldump.c b/client/mysqldump.c
index 53cb06be6f3..a59c6746134 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -2239,15 +2239,16 @@ static void dump_table(char *table, char *db)
       goto err;
     }
 
-    if (opt_disable_keys)
+    if (opt_lock)
     {
-      fprintf(md_result_file, "\n/*!40000 ALTER TABLE %s DISABLE KEYS */;\n",
-              opt_quoted_table);
+      fprintf(md_result_file,"LOCK TABLES %s WRITE;\n", opt_quoted_table);
       check_io(md_result_file);
     }
-    if (opt_lock)
+    /* Moved disable keys to after lock per bug 15977 */
+    if (opt_disable_keys)
     {
-      fprintf(md_result_file,"LOCK TABLES %s WRITE;\n", opt_quoted_table);
+      fprintf(md_result_file, "/*!40000 ALTER TABLE %s DISABLE KEYS */;\n",
+	      opt_quoted_table);
       check_io(md_result_file);
     }
 
@@ -2511,17 +2512,19 @@ static void dump_table(char *table, char *db)
       error= EX_CONSCHECK;
       goto err;
     }
-    if (opt_lock)
-    {
-      fputs("UNLOCK TABLES;\n", md_result_file);
-      check_io(md_result_file);
-    }
+
+    /* Moved enable keys to before unlock per bug 15977 */
     if (opt_disable_keys)
     {
       fprintf(md_result_file,"/*!40000 ALTER TABLE %s ENABLE KEYS */;\n",
               opt_quoted_table);
       check_io(md_result_file);
     }
+    if (opt_lock)
+    {
+      fputs("UNLOCK TABLES;\n", md_result_file);
+      check_io(md_result_file);
+    }
     if (opt_autocommit)
     {
       fprintf(md_result_file, "commit;\n");