# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chuck.bell@oracle.com-20110208194443-fvzm1etwzgg80637 # target_branch: file:///Users/cbell/source/bzr_public/mysql-\ # utilities/ # testament_sha1: a824342fbca033ac0f7891eb8f706e90ed24daca # timestamp: 2011-02-08 14:45:54 -0500 # base_revision_id: chuck.bell@oracle.com-20110203211856-\ # zdf0wk6eo81iyh0b # # Begin patch === modified file 'mysql/utilities/command/dbimport.py' --- mysql/utilities/command/dbimport.py 2010-12-03 21:52:48 +0000 +++ mysql/utilities/command/dbimport.py 2011-02-08 19:44:43 +0000 @@ -279,7 +279,8 @@ if row[0] == "GRANT": db_name = row[1][2] else: - if len(row[1][0]) > 0 and row[1][0].upper() != "NONE": + if len(row[1][0]) > 0 and row[1][0].upper() != "NONE" and \ + row[1][0].upper() != 'DEF': db_name = row[1][0] # --display=BRIEF else: db_name = row[1][1] # --display=FULL === modified file 'mysql/utilities/command/diskusage.py' --- mysql/utilities/command/diskusage.py 2011-02-03 21:18:56 +0000 +++ mysql/utilities/command/diskusage.py 2011-02-08 19:44:43 +0000 @@ -761,6 +761,15 @@ print "# InnoDB is disabled on this server." return True + # Modified check for version 5.5 + res = server.exec_query("USE INFORMATION_SCHEMA") + res = server.exec_query("SELECT engine, support " + "FROM INFORMATION_SCHEMA.ENGINES " + "WHERE engine='InnoDB'") + if res != [] and res[0][1].upper() == "NO": + print "# InnoDB is disabled on this server." + return True + # Check to see if innodb_file_per_table is ON res = server.show_server_variable('innodb_file_per_table') if res != [] and res[0][1].upper() == "ON": === modified file 'mysql/utilities/command/serverclone.py' --- mysql/utilities/command/serverclone.py 2011-01-12 14:39:03 +0000 +++ mysql/utilities/command/serverclone.py 2011-02-08 19:44:43 +0000 @@ -201,6 +201,8 @@ try: server2.connect() i = stop + 1 + except: + pass finally: if verbose and not quiet: print "# trying again..." === modified file 'test/test/diskusage_basic.py' --- test/test/diskusage_basic.py 2011-02-03 21:18:56 +0000 +++ test/test/diskusage_basic.py 2011-02-08 19:44:43 +0000 @@ -14,6 +14,8 @@ # Need at least one server. self.server1 = None self.server2 = None + self.gen_log = None + self.slow_log = None self.error_log = None return self.check_num_servers(1) @@ -31,14 +33,19 @@ "server_id: %s" % e.errmsg) self.s1_serverid = int(res[0][1]) else: + self.gen_log = os.path.join(os.getcwd(), "general.log") + self.slow_log = os.path.join(os.getcwd(), "slow.log") self.error_log = os.path.join(os.getcwd(), "error_log.err") self.s1_serverid = self.servers.get_next_id() res = self.servers.spawn_new_server(self.server0, self.s1_serverid, "diskusage_all", ' --mysqld="--log-bin=mysql-' - 'bin --log --slow-query-log' + 'bin --log --slow-query-log ' + '--slow-query-log-file=%s ' + '--general-log-file=%s ' ' --log-error=%s"' % - self.error_log) + (self.gen_log, self.slow_log, + self.error_log)) if not res: raise MUTException("Cannot spawn diskusage_all server.") self.server1 = res[0] @@ -59,8 +66,8 @@ self.mask_column_result("| util_test ", "|", 3, " XXXXXXX ") self.mask_column_result("ib", ",", 2, "XXXXXXXX") - self.mask_column_result("clone.log", ",", 2, "XXXX") - self.mask_column_result("clone-slow.log", ",", 2, "XXXX") + self.mask_column_result("general.log", ",", 2, "XXXX") + self.mask_column_result("slow.log", ",", 2, "XXXX") self.mask_column_result("mysql-bin", ",", 2, "XXXX") self.mask_column_result("util_test", ",", 2, "XXXXXXX") @@ -90,7 +97,11 @@ "Total size of InnoDB files = XXXXXXXX\n") self.replace_result("InnoDB freespace", "InnoDB freespace = XXXXXXXX\n") + + self.remove_result("performance_schema") + self.replace_result("Tablespace ibdata1:10M:autoextend", + "Tablespace ibdata1:10M:autoextend...\n") def run(self): self.res_fname = self.testdir + "result.txt" @@ -139,5 +150,7 @@ os.unlink(self.res_fname) except: pass + self.servers.add_cleanup_file(self.gen_log) + self.servers.add_cleanup_file(self.slow_log) self.servers.add_cleanup_file(self.error_log) return self.drop_all() === modified file 'test/test/diskusage_errors.py' --- test/test/diskusage_errors.py 2011-02-03 21:18:56 +0000 +++ test/test/diskusage_errors.py 2011-02-08 19:44:43 +0000 @@ -26,7 +26,8 @@ self.port1, self.servers.get_next_id(), "root", "diskusage_none", - ' --mysqld="--innodb=OFF' + ' --mysqld="--skip-innodb ' + '--default-storage-engine=MyISAM ' ' --log-error=%s"' % self.error_log) self.server1 = res[0] if not self.server1: @@ -70,6 +71,9 @@ , "XXXXXXX") self.replace_result("error_log.err", "error_log.err,XXXX\n") + + # Remove this row for 5.5 servers + self.remove_result("performance_schema") return True === modified file 'test/test/diskusage_parameters.result' --- test/test/diskusage_parameters.result 2011-02-03 21:18:56 +0000 +++ test/test/diskusage_parameters.result 2011-02-08 19:44:43 +0000 @@ -59,8 +59,8 @@ # Log information. log_name,size -clone.log,XXXX -clone-slow.log,XXXX +slow.log,XXXX +general.log,XXXX error_log.err,XXXX Total size of logs = XXXX @@ -110,8 +110,8 @@ # Log information. log_name,size -clone.log,XXXX -clone-slow.log,XXXX +slow.log,XXXX +general.log,XXXX error_log.err,XXXX Total size of logs = XXXX @@ -149,8 +149,8 @@ # Log information. log_name,size -clone.log,XXXX -clone-slow.log,XXXX +slow.log,XXXX +general.log,XXXX error_log.err,XXXX Total size of logs = XXXX @@ -172,7 +172,7 @@ Total size of InnoDB files = XXXXXXXX -Tablespace ibdata1:10M:autoextend can be extended by using ibdata1:10M[...] +Tablespace ibdata1:10M:autoextend... InnoDB freespace = XXXXXXXX @@ -185,8 +185,8 @@ mysql,XXXXXXX util_test,XXXXXXX log_name,size -clone.log,XXXX -clone-slow.log,XXXX +slow.log,XXXX +general.log,XXXX error_log.err,XXXX log_file,size mysql-bin.000001,XXXX === modified file 'test/test/export_parameters_def.py' --- test/test/export_parameters_def.py 2010-11-29 20:13:52 +0000 +++ test/test/export_parameters_def.py 2011-02-08 19:44:43 +0000 @@ -167,6 +167,10 @@ self.replace_result("CREATE EVENT `e1` ON SCHEDULE EVERY 1 YEAR", "CREATE EVENT `e1` ON SCHEDULE EVERY 1 YEAR " "STARTS XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n") + self.replace_result("CREATE DEFINER=`root`@`localhost` EVENT `e1`", + "CREATE EVENT `e1` ON SCHEDULE EVERY 1 YEAR " + "STARTS XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n") + self._mask_grid() self._mask_csv() @@ -176,6 +180,11 @@ return True def _mask_grid(self): + self.mask_column_result("| def ", "|", 2, " None ") + self.mask_column_result("| None | util_test | trg", "|", + 2, " None ") + self.mask_column_result("| None | util_test | trg", "|", + 6, " None ") self.mask_column_result("| None | util_test | t", "|", 16, " XXXX-XX-XX XX:XX:XX ") self.mask_column_result("| None | util_test | t", "|", @@ -220,6 +229,8 @@ 10, "XXXX-XX-XX XX:XX:XX") self.mask_column_result("e1,root@localhost,", ",", 13, "XX") + self.mask_column_result("def,util_test,", ",", 1, "") + self.mask_column_result(",util_test,trg", ",", 5, "") self.mask_column_result(",util_test,t", ",", 10, "XXXXXXXXXX") self.mask_column_result(",util_test,t", ",", @@ -259,6 +270,9 @@ 10, "XXXX-XX-XX XX:XX:XX") self.mask_column_result("e1 root@localhost", "\t", 13, "XX") + self.mask_column_result("def util_test t", "\t", 1, "") + self.mask_column_result("def util_test v", "\t", 1, "") + self.mask_column_result(" util_test trg", "\t", 5, "") self.mask_column_result(" util_test t", "\t", 10, "XXXXXX") self.mask_column_result(" util_test t", "\t", @@ -338,7 +352,14 @@ " MAX_DATA_LENGTH: XXXXXXX\n") self.replace_result(" DATA_FREE:", " DATA_FREE: XXXXXXXXXXX\n") - + self.replace_result(" TABLE_CATALOG: def", + " TABLE_CATALOG: None\n") + self.replace_result(" TABLE_CATALOG: def", + " TABLE_CATALOG: None\n") + self.replace_result(" TRIGGER_CATALOG: def", + " TRIGGER_CATALOG: None\n") + self.replace_result(" EVENT_OBJECT_CATALOG: def", + " EVENT_OBJECT_CATALOG: None\n") def get_result(self): return self.compare(__name__, self.results) === modified file 'test/test/mysql_test/mutlib.py' --- test/test/mysql_test/mutlib.py 2011-02-03 21:18:56 +0000 +++ test/test/mysql_test/mutlib.py 2011-02-08 19:44:43 +0000 @@ -333,7 +333,7 @@ res = self.start_new_server(orig_server, port1, server_id, "root", name, mysqld) except MySQLUtilError, e: - raise MUTException("Cannot spawn %s: %s" % (name, e.errmsg)) + raise MySQLUtilError("Cannot spawn %s: %s" % (name, e.errmsg)) return res === modified file 'test/test/replicate_engines.py' --- test/test/replicate_engines.py 2011-02-03 21:18:56 +0000 +++ test/test/replicate_engines.py 2011-02-08 19:44:43 +0000 @@ -12,6 +12,8 @@ """ def check_prerequisites(self): + if self.servers.get_server(0).check_version_compat(5, 5, 0): + raise MUTException("Test requires server version 5.1.") return self.check_num_servers(1) def setup(self): === modified file 'test/test/replicate_innodb.py' --- test/test/replicate_innodb.py 2011-02-03 21:18:56 +0000 +++ test/test/replicate_innodb.py 2011-02-08 19:44:43 +0000 @@ -12,6 +12,8 @@ """ def check_prerequisites(self): + if self.servers.get_server(0).check_version_compat(5, 5, 0): + raise MUTException("Test requires server version 5.5.") return self.check_num_servers(1) def setup(self): @@ -38,7 +40,8 @@ res = self.servers.spawn_new_server(self.server0, self.s5_serverid, "rep_slave_no_innodb", ' --mysqld="--log-bin=mysql-bin ' - ' --skip-innodb"') + ' --skip-innodb --default-' + 'storage-engine=MyISAM"') if not res: raise MUTException("Cannot spawn replication slave server.") self.server5 = res[0] # Begin bundle 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 +A==