From 32ce862f20017b3084522a68921f8b07244a9359 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 18 May 2005 13:02:09 +0200 Subject: mysqldump.c: disabling --delayed-insert until BUG#7815 is fixed (need table def cache for that, to easily check the storage engine supports DELAYED). client/mysqldump.c: disabling --delayed-insert until BUG#7815 is fixed (need table def cae) mysql-test/r/mysqldump.result: as we disable --delayed-insert, result changes --- client/mysqldump.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'client') diff --git a/client/mysqldump.c b/client/mysqldump.c index 976a6642ea0..f8314444051 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -203,7 +203,9 @@ static struct my_option my_long_options[] = {"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 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), } 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; } -- cgit v1.2.1