MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:guilhem Date:May 18 2005 11:02am
Subject:bk commit into 5.0 tree (gbichot:1.1850) BUG#7815
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of gbichot. When gbichot does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1850 05/05/18 13:02:09 gbichot@stripped +2 -0
  mysqldump.c:  disabling --delayed-insert until BUG#7815 is fixed (need table def cache for that,
  to easily check the storage engine supports DELAYED).
  

  mysql-test/r/mysqldump.result
    1.41 05/05/17 23:13:54 gbichot@stripped +3 -1
    as we disable --delayed-insert, result changes

  client/mysqldump.c
    1.178 05/05/16 23:33:22 gbichot@stripped +22 -1
    disabling --delayed-insert until BUG#7815 is fixed (need table def cae)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gbichot
# Host:	quadita2.mysql.com
# Root:	/nfstmp1/guilhem/mysql-5.0-4ita

--- 1.177/client/mysqldump.c	2005-05-09 01:15:48 +02:00
+++ 1.178/client/mysqldump.c	2005-05-16 23:33:22 +02:00
@@ -203,7 +203,9 @@
   {"default-character-set", OPT_DEFAULT_CHARSET,
    "Set the default character set.", (gptr*) &default_charset,
    (gptr*) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"delayed-insert", OPT_DELAYED, "Insert rows with INSERT DELAYED.",
+  {"delayed-insert", OPT_DELAYED, "Insert rows with INSERT DELAYED; "
+   "currently ignored because of http://bugs.mysql.com/bug.php?id=7815 "
+   "but will be re-enabled later",
    (gptr*) &opt_delayed, (gptr*) &opt_delayed, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
    0, 0},
   {"delete-master-logs", OPT_DELETE_MASTER_LOGS,
@@ -708,6 +710,25 @@
       }
       break;
     }
+#ifndef REMOVE_THIS_CODE_WHEN_FIX_BUG_7815
+  case (int) OPT_DELAYED:
+    /*
+      Because of http://bugs.mysql.com/bug.php?id=7815, we disable
+      --delayed-insert; when the bug gets fixed by checking the storage engine
+      (using the table definition cache) before printing INSERT DELAYED, we
+      can correct the option's description and re-enable it again (scheduled
+      for later 5.0 or 5.1 versions).
+      It's ok to do the if() below as get_one_option is called after
+      opt_delayed is set.
+    */
+    if (opt_delayed)
+    {
+      fprintf(stderr, "Warning: ignoring --delayed-insert (as explained "
+	      "in the output of 'mysqldump --help').\n");
+      opt_delayed= 0;
+    }
+    break;
+#endif
   }
   return 0;
 }

--- 1.40/mysql-test/r/mysqldump.result	2005-05-09 14:21:54 +02:00
+++ 1.41/mysql-test/r/mysqldump.result	2005-05-17 23:13:54 +02:00
@@ -679,7 +679,9 @@
 
 
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT  DELAYED IGNORE INTO `t1` VALUES (1),(2),(3),(4),(5),(6);
+LOCK TABLES `t1` WRITE;
+INSERT  IGNORE INTO `t1` VALUES (1),(2),(3),(4),(5),(6);
+UNLOCK TABLES;
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
Thread
bk commit into 5.0 tree (gbichot:1.1850) BUG#7815guilhem18 May