Merge lp:~linuxjedi/drizzle/drizzle-bug-649844 into lp:drizzle/7.0

[Andrew Hutchings]

Clean up and fix some drizzledump options along with some documentation fixes

[lp:~linuxjedi/drizzle/drizzle-bug-649844]

1806. By Andrew Hutchings on 2010-10-02

Accidentally duplicated skip-create which cause build faiure in some platforms

=== modified file 'client/drizzledump.cc'
--- client/drizzledump.cc	2010-09-26 08:33:47 +0000
+++ client/drizzledump.cc	2010-10-02 06:47:41 +0000
@@ -80,28 +80,20 @@
 
 bool  verbose= false;
 static bool use_drizzle_protocol= false;
-static bool quick= true;
-static bool ignore_errors= false;
-static bool flush_logs= false;
-static bool opt_keywords= false;
-static bool opt_compress= false;
-static bool opt_delayed= false; 
+bool ignore_errors= false;
+bool opt_compress= false;
 static bool create_options= true; 
 static bool opt_quoted= false;
 bool opt_databases= false; 
 bool opt_alldbs= false; 
 static bool opt_lock_all_tables= false;
-static bool opt_set_charset= false; 
 static bool opt_dump_date= true;
-static bool opt_autocommit= false; 
+bool opt_autocommit= false; 
 static bool opt_single_transaction= false; 
 static bool opt_comments;
 static bool opt_compact;
-static bool opt_order_by_primary=false; 
 bool opt_ignore= false;
-static bool opt_complete_insert= false;
-static bool opt_drop_database;
-static bool opt_alltspcs= false;
+bool opt_drop_database;
 bool opt_no_create_info;
 bool opt_no_data= false;
 bool opt_create_db= false;
@@ -110,9 +102,7 @@
 bool opt_replace_into= false;
 bool opt_drop= true; 
 uint32_t show_progress_size= 0;
-//static uint64_t total_rows= 0;
 static string insert_pat;
-//static char *order_by= NULL;
 static uint32_t opt_drizzle_port= 0;
 static int first_error= 0;
 static string extended_row;
@@ -141,10 +131,7 @@
   enclosed,
   escaped,
   current_host,
-  opt_enclosed,
-  fields_terminated,
   path,
-  lines_terminated,
   current_user,
   opt_password,
   opt_protocol,
@@ -170,7 +157,7 @@
   std::vector<DrizzleDumpDatabase*>::iterator i;
   for (i= database_store.begin(); i != database_store.end(); ++i)
   {
-    if (not (*i)->populateTables())
+    if ((not (*i)->populateTables()) && (not ignore_errors))
       maybe_exit(EX_DRIZZLEERR);
   }
 }
@@ -178,14 +165,16 @@
 void generate_dump(void)
 {
   std::vector<DrizzleDumpDatabase*>::iterator i;
-  if (opt_set_charset)
-    cout << endl << "SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION;" << endl;
 
   if (path.empty())
   {
     cout << endl << "SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;"
       << endl << "SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;" << endl;
   }
+
+  if (opt_autocommit)
+    cout << "SET AUTOCOMMIT=0;" << endl;
+
   for (i= database_store.begin(); i != database_store.end(); ++i)
   {
     DrizzleDumpDatabase *database= *i;
@@ -197,8 +186,6 @@
     cout << "SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;"
       << endl << "SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;" << endl;
   }
-  if (opt_set_charset)
-    cout << "SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION;" << endl;
 }
 
 void generate_dump_db(void)
@@ -210,8 +197,6 @@
     false);
   sbuf.setConnection(destination_connection);
   std::ostream sout(&sbuf);
-  if (opt_set_charset)
-    sout << "SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION;" << endl;
 
   if (path.empty())
   {
@@ -219,6 +204,9 @@
     sout << "SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;" << endl;
   }
 
+  if (opt_autocommit)
+    cout << "SET AUTOCOMMIT=0;" << endl;
+
   for (i= database_store.begin(); i != database_store.end(); ++i)
   {
     DrizzleDumpDatabase *database= *i;
@@ -230,8 +218,6 @@
     sout << "SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;" << endl;
     sout << "SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;" << endl;
   }
-  if (opt_set_charset)
-    sout << "SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION;" << endl;
 }
 
 /*
@@ -288,26 +274,12 @@
 
 static int get_options(void)
 {
-
-  if (path.empty() && (! enclosed.empty() || ! opt_enclosed.empty() || ! escaped.empty() || ! lines_terminated.empty() ||
-                ! fields_terminated.empty()))
-  {
-    fprintf(stderr,
-            _("%s: You must use option --tab with --fields-...\n"), progname.c_str());
-    return(EX_USAGE);
-  }
-
   if (opt_single_transaction && opt_lock_all_tables)
   {
     fprintf(stderr, _("%s: You can't use --single-transaction and "
                       "--lock-all-tables at the same time.\n"), progname.c_str());
     return(EX_USAGE);
   }
-  if (! enclosed.empty() && ! opt_enclosed.empty())
-  {
-    fprintf(stderr, _("%s: You can't use ..enclosed.. and ..optionally-enclosed.. at the same time.\n"), progname.c_str());
-    return(EX_USAGE);
-  }
   if ((opt_databases || opt_alldbs) && ! path.empty())
   {
     fprintf(stderr,
@@ -436,7 +408,8 @@
   if (not database->populateTables(table_names))
   {
     delete database;
-    maybe_exit(EX_DRIZZLEERR);
+    if (not ignore_errors)
+      maybe_exit(EX_DRIZZLEERR);
   }
 
   database_store.push_back(database); 
@@ -484,26 +457,17 @@
   commandline_options.add_options()
   ("all-databases,A", po::value<bool>(&opt_alldbs)->default_value(false)->zero_tokens(),
   N_("Dump all the databases. This will be same as --databases with all databases selected."))
-  ("all-tablespaces,Y", po::value<bool>(&opt_alltspcs)->default_value(false)->zero_tokens(),
-  N_("Dump all the tablespaces."))
-  ("complete-insert,c", po::value<bool>(&opt_complete_insert)->default_value(false)->zero_tokens(),
-  N_("Use complete insert statements."))
   ("compress,C", po::value<bool>(&opt_compress)->default_value(false)->zero_tokens(),
   N_("Use compression in server/client protocol."))
-  ("flush-logs,F", po::value<bool>(&flush_logs)->default_value(false)->zero_tokens(),
-  N_("Flush logs file in server before starting dump. Note that if you dump many databases at once (using the option --databases= or --all-databases), the logs will be flushed for each database dumped. The exception is when using --lock-all-tables in this case the logs will be flushed only once, corresponding to the moment all tables are locked. So if you want your dump and the log flush to happen at the same exact moment you should use --lock-all-tables or --flush-logs"))
   ("force,f", po::value<bool>(&ignore_errors)->default_value(false)->zero_tokens(),
   N_("Continue even if we get an sql-error."))
   ("help,?", N_("Display this help message and exit."))
   ("lock-all-tables,x", po::value<bool>(&opt_lock_all_tables)->default_value(false)->zero_tokens(),
-  N_("Locks all tables across all databases. This is achieved by taking a global read lock for the duration of the whole dump. Automatically turns --single-transaction and --lock-tables off."))
-  ("order-by-primary", po::value<bool>(&opt_order_by_primary)->default_value(false)->zero_tokens(),
-  N_("Sorts each table's rows by primary key, or first unique key, if such a key exists.  Useful when dumping a MyISAM table to be loaded into an InnoDB table, but will make the dump itself take considerably longer."))
+  N_("Locks all tables across all databases. This is achieved by taking a global read lock for the duration of the whole dump. Automatically turns --single-transaction off."))
   ("single-transaction", po::value<bool>(&opt_single_transaction)->default_value(false)->zero_tokens(),
-  N_("Creates a consistent snapshot by dumping all tables in a single transaction. Works ONLY for tables stored in storage engines which support multiversioning (currently only InnoDB does); the dump is NOT guaranteed to be consistent for other storage engines. While a --single-transaction dump is in process, to ensure a valid dump file (correct table contents), no other connection should use the following statements: ALTER TABLE, DROP TABLE, RENAME TABLE, TRUNCATE TABLE, as consistent snapshot is not isolated from them. Option automatically turns off --lock-tables."))
-  ("opt", N_("Same as --add-drop-table, --add-locks, --create-options, --quick, --extended-insert, --lock-tables, --set-charset, and --disable-keys. Enabled by default, disable with --skip-opt.")) 
+  N_("Creates a consistent snapshot by dumping all tables in a single transaction. Works ONLY for tables stored in storage engines which support multiversioning (currently only InnoDB does); the dump is NOT guaranteed to be consistent for other storage engines. While a --single-transaction dump is in process, to ensure a valid dump file (correct table contents), no other connection should use the following statements: ALTER TABLE, DROP TABLE, RENAME TABLE, TRUNCATE TABLE, as consistent snapshot is not isolated from them."))
   ("skip-opt", 
-  N_("Disable --opt. Disables --add-drop-table, --add-locks, --create-options, --quick, --extended-insert, --lock-tables, --set-charset, and --disable-keys."))    
+  N_("Disable --opt. Disables --add-drop-table, --add-locks, --create-options, ---extended-insert and --disable-keys."))    
   ("tables", N_("Overrides option --databases (-B)."))
   ("show-progress-size", po::value<uint32_t>(&show_progress_size)->default_value(10000),
   N_("Number of rows before each output progress report (requires --verbose)."))
@@ -522,38 +486,24 @@
   ("add-drop-database", po::value<bool>(&opt_drop_database)->default_value(false)->zero_tokens(),
   N_("Add a 'DROP DATABASE' before each create."))
   ("skip-drop-table", N_("Do not add a 'drop table' before each create."))
-  ("allow-keywords", po::value<bool>(&opt_keywords)->default_value(false)->zero_tokens(),
-  N_("Allow creation of column names that are keywords."))
   ("compact", po::value<bool>(&opt_compact)->default_value(false)->zero_tokens(),
-  N_("Give less verbose output (useful for debugging). Disables structure comments and header/footer constructs.  Enables options --skip-add-drop-table --no-set-names --skip-disable-keys --skip-add-locks"))
+  N_("Give less verbose output (useful for debugging). Disables structure comments and header/footer constructs.  Enables options --skip-add-drop-table --no-set-names --skip-disable-keys"))
   ("databases,B", po::value<bool>(&opt_databases)->default_value(false)->zero_tokens(),
   N_("To dump several databases. Note the difference in usage; In this case no tables are given. All name arguments are regarded as databasenames. 'USE db_name;' will be included in the output."))
-  ("delayed-insert", po::value<bool>(&opt_delayed)->default_value(false)->zero_tokens(),
-  N_("Insert rows with INSERT DELAYED;"))
   ("skip-disable-keys,K",
   N_("'ALTER TABLE tb_name DISABLE KEYS; and 'ALTER TABLE tb_name ENABLE KEYS; will not be put in the output."))
   ("ignore-table", po::value<string>(),
   N_("Do not dump the specified table. To specify more than one table to ignore, use the directive multiple times, once for each table.  Each table must be specified with both database and table names, e.g. --ignore-table=database.table"))
   ("insert-ignore", po::value<bool>(&opt_ignore)->default_value(false)->zero_tokens(),
   N_("Insert rows with INSERT IGNORE."))
-  ("lines-terminated-by", po::value<string>(&lines_terminated)->default_value(""),
-  N_("Lines in the i.file are terminated by ..."))
   ("no-autocommit", po::value<bool>(&opt_autocommit)->default_value(false)->zero_tokens(),
-  N_("Wrap tables with autocommit/commit statements."))
+  N_("Wrap a table's data in START TRANSACTION/COMMIT statements."))
   ("no-create-db,n", po::value<bool>(&opt_create_db)->default_value(false)->zero_tokens(),
   N_("'CREATE DATABASE IF NOT EXISTS db_name;' will not be put in the output. The above line will be added otherwise, if --databases or --all-databases option was given."))
-  ("no-create-info,t", po::value<bool>(&opt_no_create_info)->default_value(false)->zero_tokens(),
-  N_("Don't write table creation info."))
   ("no-data,d", po::value<bool>(&opt_no_data)->default_value(false)->zero_tokens(),
   N_("No row information."))
-  ("no-set-names,N", N_("Deprecated. Use --skip-set-charset instead."))
-  ("set-charset", po::value<bool>(&opt_set_charset)->default_value(false)->zero_tokens(),
-  N_("Enable set-name"))
-  ("slow", N_("Buffer query instead of dumping directly to stdout."))
   ("replace", po::value<bool>(&opt_replace_into)->default_value(false)->zero_tokens(),
   N_("Use REPLACE INTO instead of INSERT INTO."))
-  ("result-file,r", po::value<string>(),
-  N_("Direct output to a given file. This option should be used in MSDOS, because it prevents new line '\\n' from being converted to '\\r\\n' (carriage return + line feed)."))
   ("destination-type", po::value<string>()->default_value("stdout"),
   N_("Where to send output to (stdout|database"))
   ("destination-host", po::value<string>(&opt_destination_host)->default_value("localhost"),
@@ -669,7 +619,6 @@
   extended_insert= (vm.count("skip-extended-insert")) ? false : true;
   opt_dump_date= (vm.count("skip-dump-date")) ? false : true;
   opt_disable_keys= (vm.count("skip-disable-keys")) ? false : true;
-  quick= (vm.count("slow")) ? false : true;
   opt_quoted= (vm.count("skip-quote-names")) ? false : true;
 
   if (vm.count("protocol"))
@@ -720,17 +669,6 @@
       tty_password= true;
   }
 
-  if (vm.count("result-file"))
-  {
-    if (!(md_result_file= fopen(vm["result-file"].as<string>().c_str(), "w")))
-      exit(1);
-  }
-
-  if (vm.count("no-set-names"))
-  {
-    opt_set_charset= 0;
-  }
- 
   if (! path.empty())
   { 
     opt_disable_keys= 0;
@@ -738,20 +676,19 @@
 
   if (vm.count("skip-opt"))
   {
-    extended_insert= opt_drop= quick= create_options= 0;
-    opt_disable_keys= opt_set_charset= 0;
+    extended_insert= opt_drop= create_options= 0;
+    opt_disable_keys= 0;
   }
 
   if (opt_compact)
   { 
     opt_comments= opt_drop= opt_disable_keys= 0;
-    opt_set_charset= 0;
   }
 
   if (vm.count("opt"))
   {
-    extended_insert= opt_drop= quick= create_options= 1;
-    opt_disable_keys= opt_set_charset= 1;
+    extended_insert= opt_drop= create_options= 1;
+    opt_disable_keys= 1;
   }
 
   if (vm.count("tables"))

=== modified file 'client/drizzledump_data.cc'
--- client/drizzledump_data.cc	2010-09-24 14:56:23 +0000
+++ client/drizzledump_data.cc	2010-10-02 06:47:41 +0000
@@ -39,6 +39,10 @@
 extern bool opt_alldbs;
 extern uint32_t show_progress_size;
 extern bool opt_ignore;
+extern bool opt_compress;
+extern bool opt_drop_database;
+extern bool opt_autocommit;
+extern bool ignore_errors;
 
 extern boost::unordered_set<std::string> ignore_table;
 extern void maybe_exit(int error);
@@ -170,6 +174,9 @@
     /* Love that this variable is the opposite of its name */
     if (not opt_create_db)
     {
+      if (opt_drop_database)
+        os << "DROP DATABASE IF EXISTS `" << obj.databaseName << "`" << std::endl;
+
       os << "CREATE DATABASE IF NOT EXISTS `" << obj.databaseName << "`";
       if (not obj.collate.empty())
        os << " COLLATE = " << obj.collate;
@@ -194,7 +201,10 @@
       if (data == NULL)
       {
         std::cerr << "Error: Could not get data for table " << table->displayName << std::endl;
-        maybe_exit(EX_DRIZZLEERR);
+        if (not ignore_errors)
+          maybe_exit(EX_DRIZZLEERR);
+        else
+          continue;
       }
       os << *data;
       delete data;
@@ -235,6 +245,10 @@
   if (opt_disable_keys)
     os << "ALTER TABLE `" << obj.table->displayName << "` DISABLE KEYS;" << std::endl;
 
+  /* Another option that does the opposite of its name, makes me sad :( */
+  if (opt_autocommit)
+    os << "START TRANSACTION;" << std::endl;
+
   std::streampos out_position= os.tellp();
 
   while((row= drizzle_row_next(obj.result)))
@@ -309,6 +323,9 @@
   }
   os << ");" << std::endl;
 
+  if (opt_autocommit)
+    os << "COMMIT;" << std::endl;
+
   if (opt_disable_keys)
     os << "ALTER TABLE `" << obj.table->tableName << "` ENABLE KEYS;" << std::endl;
 
@@ -531,8 +548,8 @@
   return true;
 }
 
-void DrizzleDumpConnection::errorHandler(drizzle_result_st *res, drizzle_return_t ret,
-                     const char *when)
+void DrizzleDumpConnection::errorHandler(drizzle_result_st *res,
+  drizzle_return_t ret, const char *when)
 {
   if (ret == DRIZZLE_RETURN_ERROR_CODE)
   {

=== modified file 'client/drizzledump_drizzle.cc'
--- client/drizzledump_drizzle.cc	2010-09-24 16:02:02 +0000
+++ client/drizzledump_drizzle.cc	2010-10-02 06:47:41 +0000
@@ -25,7 +25,8 @@
 #include <drizzled/gettext.h>
 #include <boost/lexical_cast.hpp>
 
-extern bool  verbose;
+extern bool verbose;
+extern bool ignore_errors;
 
 bool DrizzleDumpDatabaseDrizzle::populateTables()
 {
@@ -65,7 +66,10 @@
     if ((not table->populateFields()) or (not table->populateIndexes()))
     {
       delete table;
-      return false;
+      if (not ignore_errors)
+        return false;
+      else
+        continue;
     }
     tables.push_back(table);
   }
@@ -121,7 +125,10 @@
         std::cerr  << "Error: Could not get fields and/ot indexes for table " << displayName << std::endl;
         delete table;
         dcon->freeResult(result);
-        return false;
+        if (not ignore_errors)
+          return false;
+        else
+          continue;
       }
       tables.push_back(table);
       dcon->freeResult(result);
@@ -130,7 +137,10 @@
     {
       std::cerr << "Error: Table " << displayName << " not found." << std::endl;
       dcon->freeResult(result);
-      return false;
+      if (not ignore_errors)
+        return false;
+      else
+        continue;
     }
   }
 

=== modified file 'client/drizzledump_mysql.cc'
--- client/drizzledump_mysql.cc	2010-09-24 13:38:21 +0000
+++ client/drizzledump_mysql.cc	2010-10-02 06:47:41 +0000
@@ -26,7 +26,8 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <drizzled/gettext.h>
 
-extern bool  verbose;
+extern bool verbose;
+extern bool ignore_errors;
 
 bool DrizzleDumpDatabaseMySQL::populateTables()
 {
@@ -70,7 +71,10 @@
     if ((not table->populateFields()) or (not table->populateIndexes()))
     {
       delete table;
-      return false;
+      if (not ignore_errors)
+        return false;
+      else
+        continue;
     }
     tables.push_back(table);
   }
@@ -125,7 +129,10 @@
       if ((not table->populateFields()) or (not table->populateIndexes()))
       {
         delete table;
-        return false;
+        if (not ignore_errors)
+          return false;
+        else
+          continue;
       }
       tables.push_back(table);
       dcon->freeResult(result);
@@ -133,7 +140,10 @@
     else
     {
       dcon->freeResult(result);
-      return false;
+      if (not ignore_errors)
+        return false;
+      else
+        continue;
     }
   }
 

=== modified file 'docs/clients/drizzledump.rst'
--- docs/clients/drizzledump.rst	2010-09-28 17:34:48 +0000
+++ docs/clients/drizzledump.rst	2010-10-02 06:47:41 +0000
@@ -35,21 +35,15 @@
    *data_dictionary* in Drizzle and *information_schema*, *performance_schema*
    and *mysql* in MySQL.
 
-.. option:: -c, --complete-insert
-
-   Dumps using complete insert statements. *CURRENTLY BROKEN*
-
 .. option:: -C, --compress
 
    Use client/server compression protocol.
 
-.. option:: -F, --flush-logs
-
-   Flush the server logs before commencing with the dump. *CURRENTLY_BROKEN*
+   **NOTE:** this option is not currently implemented.
 
 .. option:: -f, --force
 
-   Continue even if we get an sql-error. *CURRENTLY_BROKEN*
+   Continue even if we get an sql-error.
 
 .. option:: -?, --help
 
@@ -73,13 +67,12 @@
       RENAME TABLE
       TRUNCATE TABLE
 
-   Only works with InnoDB.  Automatically disables :option:`--lock-tables`.
-
-.. option:: --disable-opt
-
-   A shortcut for :option:`--skip-drop-table`, :option:`--skip-locks`,
-   :option:`--skip-create`, :option:`--slow`, :option:`--skip-extended-insert`
-   and :option:`--skip-disable-keys`
+   Only works with InnoDB.
+
+.. option:: --skip-opt
+
+   A shortcut for :option:`--skip-drop-table`, :option:`--skip-create`, 
+   :option:`--skip-extended-insert` and :option:`--skip-disable-keys`
 
 .. option:: --tables t1 t2 ...
 
@@ -120,14 +113,24 @@
 .. option:: --compact
 
    Gives a more compact output by disabling header/footer comments and enabling
-   :option:`--skip-add-drop-table`, :option:`--no-set-names`,
-   :option:`--skip-disable-keys` and :option:`--skip-add-locks`.
+   :option:`--skip-add-drop-table`, :option:`--skip-disable-keys` 
+   and :option:`--skip-add-locks`.
 
 .. option:: -B, --databases
 
    Dump several databases.  The databases do not need to follow on after this
    option, they can be anywhere in the command line.
 
+.. option:: -K, --skip-disable-keys
+
+   Do not dump the statements `ALTER TABLE ... DISABLE KEYS` and
+   `ALTER TABLE ... ENABLE KEYS`
+
+.. option:: --ignore-table table
+
+   Do not dump specified table, needs to be in the format `database.table`.
+   Can be specified multiple times for multiple tables.
+
 .. option:: --insert-ignore
 
    Add the `IGNORE` keyword into every `INSERT` statement.
@@ -139,17 +142,17 @@
 
 .. option:: -n, --no-create-db
 
-   Do not output the `CREATE DATABASE` statements when using
+   Do not dump the `CREATE DATABASE` statements when using
    :option:`--all-databases` or :option:`--databases`.
 
+.. option:: -t, --skip-create
+   
+   Do not dump the `CREATE TABLE` statements.
+
 .. option:: -d, --no-data
 
    Do not dump the data itself, used to dump the schemas only.
 
-.. option:: --slow
-
-   Dump directly from database to destination rather than using a query buffer.
-
 .. option:: --replace
 
    Use `REPLACE INTO` statements instead of `INSERT INTO`

=== modified file 'tests/r/drizzledump.result'
--- tests/r/drizzledump.result	2010-09-24 15:43:43 +0000
+++ tests/r/drizzledump.result	2010-10-02 06:47:41 +0000
@@ -126,20 +126,6 @@
 
 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
-
-SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
-SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
-DROP TABLE IF EXISTS `t1`;
-CREATE TABLE `t1` (
-  `a` INT DEFAULT NULL
-) ENGINE=InnoDB COLLATE = utf8_general_ci;
-
-ALTER TABLE `t1` DISABLE KEYS;
-INSERT IGNORE INTO `t1` VALUES (1),(2),(3),(4),(5),(6);
-ALTER TABLE `t1` ENABLE KEYS;
-
-SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
-SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
 DROP TABLE t1;
 #
 # Bug #10286: mysqldump -c crashes on table that has many fields with long
@@ -829,6 +815,7 @@
 
 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
+DROP DATABASE IF EXISTS `test`
 CREATE DATABASE IF NOT EXISTS `test`;
 
 USE `test`;
@@ -987,6 +974,21 @@
 
 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
+DROP TABLE IF EXISTS `t3`;
+CREATE TABLE `t3` (
+  `a` INT DEFAULT NULL
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
+
+DROP TABLE IF EXISTS `t1`;
+CREATE TABLE `t1` (
+  `a` INT DEFAULT NULL
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
+
+DROP TABLE IF EXISTS `t2`;
+CREATE TABLE `t2` (
+  `a` INT DEFAULT NULL
+) ENGINE=InnoDB COLLATE = utf8_general_ci;
+
 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
 drop table t1, t2, t3;
@@ -1068,18 +1070,14 @@
 use `test-database`;
 create table test (a int);
 
-SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION;
-
 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
-DROP TABLE IF EXISTS `test`;
 CREATE TABLE `test` (
   `a` INT DEFAULT NULL
 ) ENGINE=InnoDB COLLATE = utf8_general_ci;
 
 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
-SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION;
 drop database `test-database`;
 use test;
 CREATE DATABASE mysqldump_30126;

=== modified file 'tests/t/drizzledump-max.test'
--- tests/t/drizzledump-max.test	2010-07-02 15:58:00 +0000
+++ tests/t/drizzledump-max.test	2010-10-02 06:47:41 +0000
@@ -55,8 +55,8 @@
 #select * from t5; 
 select * from t6; 
 
---exec $DRIZZLE_DUMP --skip-comments --delayed-insert --insert-ignore --databases test
---exec $DRIZZLE_DUMP --skip-comments --delayed-insert --databases test
+--exec $DRIZZLE_DUMP --skip-comments --insert-ignore --databases test
+--exec $DRIZZLE_DUMP --skip-comments --databases test
 
 drop table t1; 
 drop table t2; 

=== modified file 'tests/t/drizzledump.test'
--- tests/t/drizzledump.test	2010-09-24 13:38:21 +0000
+++ tests/t/drizzledump.test	2010-10-02 06:47:41 +0000
@@ -74,7 +74,6 @@
 INSERT INTO t1 VALUES (1),(2),(3);
 INSERT INTO t1 VALUES (4),(5),(6);
 --exec $DRIZZLE_DUMP --skip-comments --insert-ignore test t1
---exec $DRIZZLE_DUMP --skip-comments --insert-ignore --delayed-insert test t1
 DROP TABLE t1;
 
 --echo #
@@ -413,7 +412,7 @@
  F_6faa8040da20ef399b63a72d0e4ab575 int,
  F_fe73f687e5bc5280214e0486b273a5f9 int);
 insert into t1 (F_8d3bba7425e7c98c50f52ca1b52d3735) values (1);
---exec $DRIZZLE_DUMP --skip-comments -c test
+--exec $DRIZZLE_DUMP --skip-comments test
 drop table t1;
 
 --echo #
@@ -541,7 +540,6 @@
 create table t1(a int);
 create table t2(a int);
 create table t3(a int);
---error 2
 --exec $DRIZZLE_DUMP --skip-comments --force --no-data test t3 t1 non_existing t2
 drop table t1, t2, t3;
 
@@ -652,7 +650,7 @@
 create database `test-database`;
 use `test-database`;
 create table test (a int);
---exec $DRIZZLE_DUMP --compact --opt test-database
+--exec $DRIZZLE_DUMP --compact test-database
 drop database `test-database`;
 use test;