From d918988baa943a18b17468f7cf2aa73833217f83 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 12 Dec 2007 18:19:24 +0100 Subject: [PATCH 001/705] WL#4189 - dynamic configuration support - safe process - cleanups - create new suite for fedarated --- client/mysqltest.c | 11 + configure.in | 2 +- mysql-test/Makefile.am | 141 +- mysql-test/create-test-result | 65 - mysql-test/extra/binlog_tests/blackhole.test | 4 +- .../extra/binlog_tests/ctype_ucs_binlog.test | 3 +- .../mix_innodb_myisam_side_effects.test | 2 +- mysql-test/extra/rpl_tests/rpl_EE_err.test | 3 +- mysql-test/extra/rpl_tests/rpl_loaddata.test | 16 +- mysql-test/extra/rpl_tests/rpl_log.test | 2 +- mysql-test/extra/rpl_tests/rpl_row_001.test | 2 +- .../extra/rpl_tests/rpl_row_charset.test | 3 +- .../extra/rpl_tests/rpl_stm_000001.test | 2 +- .../extra/rpl_tests/rpl_stm_charset.test | 3 +- mysql-test/fix-result | 22 - mysql-test/include/default_my.cnf | 25 + mysql-test/include/default_mysqld.cnf | 18 + mysql-test/include/default_ndbd.cnf | 27 + mysql-test/include/federated.inc | 28 - mysql-test/include/have_blackhole.inc | 7 +- mysql-test/include/have_bug25714.inc | 7 - mysql-test/include/have_federated_db.inc | 4 - mysql-test/include/have_ndbapi_examples.inc | 2 +- mysql-test/include/loaddata_autocom.inc | 8 +- mysql-test/include/mix1.inc | 3 +- mysql-test/include/ndb_backup.inc | 24 +- mysql-test/include/ndb_restore_master.inc | 4 +- .../include/ndb_restore_slave_eoption.inc | 4 +- mysql-test/include/testdb_only.inc | 12 +- mysql-test/install_test_db.sh | 115 - mysql-test/lib/My/Config.pm | 96 +- mysql-test/lib/My/ConfigFactory.pm | 583 +++ mysql-test/lib/My/File/Path.pm | 83 + mysql-test/lib/My/Find.pm | 171 + mysql-test/lib/My/SafeProcess.pm | 502 ++ mysql-test/lib/My/SafeProcess/Base.pm | 236 + .../lib/My/SafeProcess/safe_kill_win.cc | 56 + mysql-test/lib/My/SafeProcess/safe_process.pl | 141 + .../lib/My/SafeProcess/safe_process_win.cc | 312 ++ mysql-test/lib/{mtr_cases.pl => mtr_cases.pm} | 901 ++-- mysql-test/lib/mtr_diff.pl | 297 -- mysql-test/lib/mtr_im.pl | 775 --- mysql-test/lib/mtr_io.pl | 150 +- mysql-test/lib/mtr_misc.pl | 135 +- mysql-test/lib/mtr_process.pl | 1045 +--- mysql-test/lib/mtr_report.pl | 202 +- mysql-test/lib/mtr_settings.pl | 16 + mysql-test/lib/mtr_stress.pl | 10 +- mysql-test/lib/mtr_timer.pl | 158 - mysql-test/lib/t/Base.t | 27 + mysql-test/lib/t/Find.t | 33 + mysql-test/lib/t/SafeProcess.t | 102 + mysql-test/lib/t/SafeProcessStress.pl | 149 + mysql-test/lib/t/copytree.t | 34 + mysql-test/lib/t/dummyd.pl | 38 + mysql-test/lib/t/rmtree.t | 52 + mysql-test/lib/t/testMyConfig.t | 131 + mysql-test/lib/t/testMyConfigFactory.t | 98 + mysql-test/lib/t/test_child.pl | 21 + mysql-test/misc/kill_master.sh | 4 - mysql-test/misc/mysql-test_V1.9.pl | 1121 ---- mysql-test/mysql-test-run-shell.sh | 2338 --------- mysql-test/mysql-test-run.pl | 4587 ++++++----------- mysql-test/ndb/Makefile.am | 23 - mysql-test/ndb/basic.result | 69 - mysql-test/ndb/basic.test | 17 - mysql-test/ndb/basic_log.result | 0 mysql-test/ndb/ndb_config_1_node.ini | 47 - mysql-test/ndb/ndb_config_2_node.ini | 55 - mysql-test/ndb/ndb_config_4_node.ini | 55 - mysql-test/ndb/ndbcluster.sh | 414 -- mysql-test/ndb/restart.result | 16 - mysql-test/ndb/restart.test | 12 - mysql-test/ndb/restart_log.result | 20 - mysql-test/r/backup.result | 26 +- mysql-test/r/ctype_big5.result | 4 +- mysql-test/r/gis.result | 2 +- mysql-test/r/have_bug25714.require | 2 - mysql-test/r/loaddata.result | 32 +- mysql-test/r/loaddata_autocom_innodb.result | 4 +- mysql-test/r/mysqlbinlog.result | 24 +- mysql-test/r/mysqlbinlog_base64.result | 4 +- mysql-test/r/outfile.result | Bin 2135 -> 2150 bytes mysql-test/r/partition_error.result | 52 +- mysql-test/r/partition_not_windows.result | 6 +- mysql-test/r/partition_symlink.result | 32 +- mysql-test/r/query_cache.result | 2 +- mysql-test/r/sp.result | 8 +- mysql-test/r/symlink.result | 6 +- mysql-test/r/system_mysql_db.result | 1 - mysql-test/r/trigger.result | 12 +- mysql-test/r/type_blob.result | 20 +- mysql-test/r/view.result | 8 +- mysql-test/r/warnings.result | 2 +- mysql-test/resolve-stack | 8 - mysql-test/std_data/ndb_config_config.ini | 55 + .../binlog/r/binlog_killed_simulate.result | 4 +- .../r/binlog_row_mix_innodb_myisam.result | 4 +- .../binlog/r/binlog_stm_blackhole.result | 4 +- .../r/binlog_stm_mix_innodb_myisam.result | 4 +- mysql-test/suite/binlog/t/binlog_killed.test | 7 +- .../binlog/t/binlog_killed_simulate.test | 7 +- .../t/binlog_row_mix_innodb_myisam.test | 3 +- .../t/binlog_stm_mix_innodb_myisam.test | 3 +- mysql-test/suite/federated/disabled.def | 12 + mysql-test/suite/federated/federated.inc | 16 + .../{r => suite/federated}/federated.result | 9 +- .../{t => suite/federated}/federated.test | 8 +- .../federated}/federated_archive.result | 7 - .../federated}/federated_archive.test | 6 +- .../federated}/federated_bug_13118.result | 7 - .../federated}/federated_bug_13118.test | 7 +- .../federated}/federated_bug_25714.result | 7 - .../federated}/federated_bug_25714.test | 10 +- .../federated}/federated_cleanup.inc | 0 .../federated}/federated_innodb-slave.opt | 0 .../federated}/federated_innodb.result | 7 - .../federated}/federated_innodb.test | 4 +- .../federated}/federated_server.result | 7 - .../federated}/federated_server.test | 7 +- .../federated_transactions-slave.opt | 0 .../federated}/federated_transactions.result | 0 .../federated}/federated_transactions.test | 6 +- .../suite/federated/have_federated_db.inc | 4 + mysql-test/suite/federated/my.cnf | 12 + mysql-test/suite/ndb/my.cnf | 20 + .../suite/ndb/r/loaddata_autocom_ndb.result | 4 +- mysql-test/suite/ndb/r/ndb_config.result | 2 +- .../suite/ndb/r/ndb_dd_backuprestore.result | 24 +- mysql-test/suite/ndb/r/ndb_load.result | 4 +- .../suite/ndb/r/ndb_loaddatalocal.result | 16 +- mysql-test/suite/ndb/r/ndb_replace.result | 4 +- mysql-test/suite/ndb/r/ndb_restore.result | 28 +- .../suite/ndb/r/ndb_restore_partition.result | 24 +- .../suite/ndb/r/ndb_restore_print.result | 24 +- mysql-test/suite/ndb/r/ndb_trigger.result | 2 +- mysql-test/suite/ndb/t/ndb_alter_table.test | 9 +- mysql-test/suite/ndb/t/ndb_config.test | 8 +- mysql-test/suite/ndb/t/ndb_load.test | 4 +- mysql-test/suite/ndb/t/ndb_loaddatalocal.test | 41 +- mysql-test/suite/ndb/t/ndb_replace.test | 4 +- mysql-test/suite/ndb/t/ndb_restore.test | 6 +- mysql-test/suite/ndb/t/ndb_single_user.test | 12 +- mysql-test/suite/ndb/t/ndb_trigger.test | 2 +- mysql-test/suite/ndb/t/ndbapi.test | 16 +- .../suite/rpl/include/rpl_mixed_dml.inc | 6 +- mysql-test/suite/rpl/my.cnf | 14 + mysql-test/suite/rpl/r/rpl_LD_INFILE.result | 4 +- .../suite/rpl/r/rpl_flushlog_loop.result | 2 +- mysql-test/suite/rpl/r/rpl_innodb.result | 4 +- .../suite/rpl/r/rpl_innodb_mixed_dml.result | 4 +- .../rpl/r/rpl_load_table_from_master.result | 4 +- mysql-test/suite/rpl/r/rpl_loaddata.result | 18 +- .../suite/rpl/r/rpl_loaddata_charset.result | 14 +- .../suite/rpl/r/rpl_loaddata_fatal.result | 2 +- mysql-test/suite/rpl/r/rpl_loaddata_m.result | 4 +- mysql-test/suite/rpl/r/rpl_loaddata_s.result | 2 +- .../suite/rpl/r/rpl_loaddata_simple.result | 2 +- .../suite/rpl/r/rpl_loaddatalocal.result | 8 +- mysql-test/suite/rpl/r/rpl_loadfile.result | 4 +- .../suite/rpl/r/rpl_misc_functions.result | 6 +- .../suite/rpl/r/rpl_replicate_do.result | 2 +- mysql-test/suite/rpl/r/rpl_rewrt_db.result | 12 +- mysql-test/suite/rpl/r/rpl_row_001.result | 2 +- .../suite/rpl/r/rpl_row_loaddata_m.result | 2 +- mysql-test/suite/rpl/r/rpl_row_log.result | 2 +- .../suite/rpl/r/rpl_row_log_innodb.result | 2 +- .../rpl/r/rpl_row_stop_middle_update.result | 2 +- mysql-test/suite/rpl/r/rpl_stm_000001.result | 2 +- mysql-test/suite/rpl/r/rpl_stm_log.result | 10 +- mysql-test/suite/rpl/r/rpl_timezone.result | 2 +- mysql-test/suite/rpl/rpl_1slave_base.cnf | 56 + mysql-test/suite/rpl/t/disabled.def | 6 +- mysql-test/suite/rpl/t/rpl000017-slave.sh | 4 +- mysql-test/suite/rpl/t/rpl_000015-master.opt | 2 + ...l_000015.slave-mi => rpl_000015-slave.opt} | 0 mysql-test/suite/rpl/t/rpl_LD_INFILE.test | 4 +- mysql-test/suite/rpl/t/rpl_drop_db.test | 3 +- .../suite/rpl/t/rpl_flushlog_loop-master.opt | 2 +- .../suite/rpl/t/rpl_flushlog_loop-slave.opt | 2 +- mysql-test/suite/rpl/t/rpl_flushlog_loop.test | 3 +- mysql-test/suite/rpl/t/rpl_innodb.test | 4 +- .../suite/rpl/t/rpl_innodb_bug30919.test | 1 + .../suite/rpl/t/rpl_load_from_master.test | 5 +- .../rpl/t/rpl_load_table_from_master.test | 4 +- .../suite/rpl/t/rpl_loaddata_charset.test | 14 +- .../suite/rpl/t/rpl_loaddata_fatal.test | 2 +- mysql-test/suite/rpl/t/rpl_loaddata_m.test | 4 +- mysql-test/suite/rpl/t/rpl_loaddata_s.test | 2 +- .../suite/rpl/t/rpl_loaddata_simple.test | 2 +- mysql-test/suite/rpl/t/rpl_loaddatalocal.test | 21 +- mysql-test/suite/rpl/t/rpl_loadfile.test | 4 +- .../suite/rpl/t/rpl_misc_functions.test | 11 +- mysql-test/suite/rpl/t/rpl_replicate_do.test | 2 +- mysql-test/suite/rpl/t/rpl_rewrt_db.test | 12 +- .../suite/rpl/t/rpl_rotate_logs-master.opt | 2 + ...ogs.slave-mi => rpl_rotate_logs-slave.opt} | 0 mysql-test/suite/rpl/t/rpl_rotate_logs.test | 7 +- .../suite/rpl/t/rpl_row_charset_innodb.test | 1 + .../suite/rpl/t/rpl_row_mysqlbinlog.test | 33 +- .../rpl/t/rpl_row_stop_middle_update.test | 2 +- mysql-test/suite/rpl/t/rpl_timezone.test | 2 +- mysql-test/suite/rpl/t/rpl_trigger.test | 4 +- mysql-test/suite/rpl_ndb/my.cnf | 75 + .../suite/rpl_ndb/r/rpl_ndb_dd_advance.result | 10 +- .../rpl_ndb/r/rpl_ndb_innodb_trans.result | 12 +- mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result | 2 +- .../suite/rpl_ndb/r/rpl_ndb_multi.result | 4 +- .../suite/rpl_ndb/r/rpl_ndb_row_001.result | 2 +- .../suite/rpl_ndb/r/rpl_ndb_sync.result | 8 +- mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test | 18 +- .../suite/rpl_ndb/t/rpl_ndb_dd_advance.test | 26 +- .../suite/rpl_ndb/t/rpl_ndb_innodb_trans.test | 12 +- mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test | 4 +- mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test | 8 +- .../suite/rpl_ndb/t/rpl_ndbapi_multi.test | 4 +- mysql-test/t/backup.test | 28 +- mysql-test/t/bootstrap.test | 4 + mysql-test/t/crash_commit_before.test | 2 +- mysql-test/t/create_not_windows.test | 3 +- mysql-test/t/csv.test | 35 +- mysql-test/t/ctype_big5.test | 7 +- mysql-test/t/disabled.def | 8 +- mysql-test/t/distinct.test | 8 +- mysql-test/t/gis.test | 2 +- mysql-test/t/grant_cache_no_prot.test | 2 +- mysql-test/t/grant_cache_ps_prot.test | 2 +- mysql-test/t/information_schema_chmod.test | 5 +- mysql-test/t/loaddata.test | 35 +- mysql-test/t/log_state.test | 3 +- mysql-test/t/myisam-system.test | 7 +- mysql-test/t/mysql_upgrade.test | 7 +- mysql-test/t/mysqlbinlog-cp932.test | 3 +- mysql-test/t/mysqlbinlog.test | 56 +- mysql-test/t/mysqlbinlog2.test | 28 +- mysql-test/t/mysqlbinlog_base64.test | 4 +- mysql-test/t/mysqldump.test | 4 +- mysql-test/t/outfile.test | 26 +- mysql-test/t/partition.test | 6 +- mysql-test/t/partition_error.test | 27 +- mysql-test/t/partition_federated.test | 2 +- mysql-test/t/partition_mgm.test | 21 +- mysql-test/t/partition_not_windows.test | 73 +- mysql-test/t/partition_symlink.test | 44 +- mysql-test/t/query_cache.test | 2 +- mysql-test/t/repair.test | 3 +- mysql-test/t/show_check.test | 5 +- mysql-test/t/sp-destruct.test | 23 +- mysql-test/t/sp.test | 8 +- mysql-test/t/symlink.test | 15 +- mysql-test/t/system_mysql_db.test | 5 - mysql-test/t/system_mysql_db_fix30020.test | 4 - mysql-test/t/system_mysql_db_fix40123.test | 4 - mysql-test/t/system_mysql_db_fix50030.test | 4 - mysql-test/t/system_mysql_db_fix50117.test | 4 - mysql-test/t/trigger-compat.test | 5 +- mysql-test/t/trigger-grant.test | 3 +- mysql-test/t/trigger.test | 21 +- mysql-test/t/type_blob.test | 16 +- mysql-test/t/type_varchar.test | 7 +- mysql-test/t/upgrade.test | 13 +- mysql-test/t/user_var-binlog.test | 4 +- mysql-test/t/varbinary.test | 13 +- mysql-test/t/view.test | 8 +- mysql-test/t/warnings.test | 2 +- 265 files changed, 6164 insertions(+), 11636 deletions(-) delete mode 100755 mysql-test/create-test-result delete mode 100755 mysql-test/fix-result create mode 100644 mysql-test/include/default_my.cnf create mode 100644 mysql-test/include/default_mysqld.cnf create mode 100644 mysql-test/include/default_ndbd.cnf delete mode 100644 mysql-test/include/federated.inc delete mode 100644 mysql-test/include/have_bug25714.inc delete mode 100644 mysql-test/include/have_federated_db.inc delete mode 100644 mysql-test/install_test_db.sh create mode 100644 mysql-test/lib/My/ConfigFactory.pm create mode 100644 mysql-test/lib/My/File/Path.pm create mode 100644 mysql-test/lib/My/Find.pm create mode 100644 mysql-test/lib/My/SafeProcess.pm create mode 100644 mysql-test/lib/My/SafeProcess/Base.pm create mode 100755 mysql-test/lib/My/SafeProcess/safe_kill_win.cc create mode 100644 mysql-test/lib/My/SafeProcess/safe_process.pl create mode 100755 mysql-test/lib/My/SafeProcess/safe_process_win.cc rename mysql-test/lib/{mtr_cases.pl => mtr_cases.pm} (53%) delete mode 100644 mysql-test/lib/mtr_diff.pl delete mode 100644 mysql-test/lib/mtr_im.pl create mode 100644 mysql-test/lib/mtr_settings.pl delete mode 100644 mysql-test/lib/mtr_timer.pl create mode 100644 mysql-test/lib/t/Base.t create mode 100644 mysql-test/lib/t/Find.t create mode 100644 mysql-test/lib/t/SafeProcess.t create mode 100755 mysql-test/lib/t/SafeProcessStress.pl create mode 100644 mysql-test/lib/t/copytree.t create mode 100644 mysql-test/lib/t/dummyd.pl create mode 100644 mysql-test/lib/t/rmtree.t create mode 100755 mysql-test/lib/t/testMyConfig.t create mode 100755 mysql-test/lib/t/testMyConfigFactory.t create mode 100755 mysql-test/lib/t/test_child.pl delete mode 100644 mysql-test/misc/kill_master.sh delete mode 100644 mysql-test/misc/mysql-test_V1.9.pl delete mode 100644 mysql-test/mysql-test-run-shell.sh delete mode 100644 mysql-test/ndb/Makefile.am delete mode 100644 mysql-test/ndb/basic.result delete mode 100644 mysql-test/ndb/basic.test delete mode 100644 mysql-test/ndb/basic_log.result delete mode 100644 mysql-test/ndb/ndb_config_1_node.ini delete mode 100644 mysql-test/ndb/ndb_config_2_node.ini delete mode 100644 mysql-test/ndb/ndb_config_4_node.ini delete mode 100644 mysql-test/ndb/ndbcluster.sh delete mode 100644 mysql-test/ndb/restart.result delete mode 100644 mysql-test/ndb/restart.test delete mode 100644 mysql-test/ndb/restart_log.result delete mode 100644 mysql-test/r/have_bug25714.require delete mode 100755 mysql-test/resolve-stack create mode 100644 mysql-test/std_data/ndb_config_config.ini create mode 100644 mysql-test/suite/federated/disabled.def create mode 100644 mysql-test/suite/federated/federated.inc rename mysql-test/{r => suite/federated}/federated.result (99%) rename mysql-test/{t => suite/federated}/federated.test (99%) rename mysql-test/{r => suite/federated}/federated_archive.result (89%) rename mysql-test/{t => suite/federated}/federated_archive.test (87%) rename mysql-test/{r => suite/federated}/federated_bug_13118.result (83%) rename mysql-test/{t => suite/federated}/federated_bug_13118.test (81%) rename mysql-test/{r => suite/federated}/federated_bug_25714.result (86%) rename mysql-test/{t => suite/federated}/federated_bug_25714.test (82%) rename mysql-test/{include => suite/federated}/federated_cleanup.inc (100%) rename mysql-test/{t => suite/federated}/federated_innodb-slave.opt (100%) rename mysql-test/{r => suite/federated}/federated_innodb.result (85%) rename mysql-test/{t => suite/federated}/federated_innodb.test (92%) rename mysql-test/{r => suite/federated}/federated_server.result (98%) rename mysql-test/{t => suite/federated}/federated_server.test (97%) rename mysql-test/{t => suite/federated}/federated_transactions-slave.opt (100%) rename mysql-test/{r => suite/federated}/federated_transactions.result (100%) rename mysql-test/{t => suite/federated}/federated_transactions.test (86%) create mode 100644 mysql-test/suite/federated/have_federated_db.inc create mode 100644 mysql-test/suite/federated/my.cnf create mode 100644 mysql-test/suite/ndb/my.cnf create mode 100644 mysql-test/suite/rpl/my.cnf create mode 100644 mysql-test/suite/rpl/rpl_1slave_base.cnf create mode 100644 mysql-test/suite/rpl/t/rpl_000015-master.opt rename mysql-test/suite/rpl/t/{rpl_000015.slave-mi => rpl_000015-slave.opt} (100%) rename mysql-test/suite/rpl/t/{rpl_rotate_logs.slave-mi => rpl_rotate_logs-slave.opt} (100%) create mode 100644 mysql-test/suite/rpl_ndb/my.cnf diff --git a/client/mysqltest.c b/client/mysqltest.c index 04226719888..9af0c93d186 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -2174,8 +2174,19 @@ void eval_expr(VAR *v, const char *p, const char **p_end) int open_file(const char *name) { char buff[FN_REFLEN]; + size_t length; DBUG_ENTER("open_file"); DBUG_PRINT("enter", ("name: %s", name)); + + /* Extract path from current file and try it as base first */ + if (dirname_part(buff, cur_file->file_name, &length)) + { + strxmov(buff, buff, name, NullS); + if (access(buff, F_OK) == 0){ + DBUG_PRINT("info", ("The file exists")); + name= buff; + } + } if (!test_if_hard_path(name)) { strxmov(buff, opt_basedir, name, NullS); diff --git a/configure.in b/configure.in index 161a70dae5f..34e22562e1f 100644 --- a/configure.in +++ b/configure.in @@ -2681,7 +2681,7 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl cmd-line-utils/Makefile cmd-line-utils/libedit/Makefile dnl libmysqld/Makefile libmysqld/examples/Makefile dnl mysql-test/Makefile dnl - mysql-test/ndb/Makefile netware/Makefile sql-bench/Makefile dnl + netware/Makefile sql-bench/Makefile dnl include/mysql_version.h plugin/Makefile win/Makefile) AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index c682cbbd4f7..13bcdbe73cf 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -17,115 +17,22 @@ ## Process this file with automake to create Makefile.in -SUBDIRS = ndb +testdir = $(prefix)/mysql-test -benchdir_root= $(prefix) -testdir = $(benchdir_root)/mysql-test -EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh \ - valgrind.supp $(PRESCRIPTS) -EXTRA_DIST = $(EXTRA_SCRIPTS) suite -GENSCRIPTS = mysql-test-run-shell install_test_db mtr mysql-test-run -PRESCRIPTS = mysql-test-run.pl mysql-stress-test.pl -test_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS) -CLEANFILES = $(GENSCRIPTS) +EXTRA_DIST = README \ + mysql-test-run.pl \ + mysql-stress-test.pl \ + t r include suite extra \ + lib std_data \ + valgrind.supp -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I.. +test_SCRIPTS = mtr mysql-test-run +CLEANFILES = $(test_SCRIPTS) -dist-hook: - mkdir -p \ - $(distdir)/t \ - $(distdir)/extra/binlog_tests \ - $(distdir)/extra/rpl_tests \ - $(distdir)/r \ - $(distdir)/include \ - $(distdir)/std_data \ - $(distdir)/std_data/ndb_backup50 \ - $(distdir)/std_data/ndb_backup51 \ - $(distdir)/std_data/ndb_backup51_data_be \ - $(distdir)/std_data/ndb_backup51_data_le \ - $(distdir)/lib \ - $(distdir)/lib/My - -$(INSTALL_DATA) $(srcdir)/t/*.def $(distdir)/t - $(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t - -$(INSTALL_DATA) $(srcdir)/t/*.imtest $(distdir)/t - $(INSTALL_DATA) $(srcdir)/t/*.sql $(distdir)/t - -$(INSTALL_DATA) $(srcdir)/t/*.disabled $(distdir)/t - -$(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.slave-mi $(distdir)/t - -$(INSTALL_SCRIPT) $(srcdir)/t/*.sh $(distdir)/t - $(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.test $(distdir)/extra/binlog_tests - $(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.test $(distdir)/extra/rpl_tests - -$(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.opt $(distdir)/extra/binlog_tests - -$(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.opt $(distdir)/extra/rpl_tests - $(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include - $(INSTALL_DATA) $(srcdir)/include/*.sql $(distdir)/include - $(INSTALL_DATA) $(srcdir)/include/*.test $(distdir)/include - $(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r - $(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(distdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/Index.xml $(distdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.000001 $(distdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(distdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.pem $(distdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.frm $(distdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(distdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(distdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50/BACKUP* $(distdir)/std_data/ndb_backup50 - $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51/BACKUP* $(distdir)/std_data/ndb_backup51 - $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_be/BACKUP* $(distdir)/std_data/ndb_backup51_data_be - $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_le/BACKUP* $(distdir)/std_data/ndb_backup51_data_le - $(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib - $(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(distdir)/lib/My - -rm -rf `find $(distdir)/suite -type d -name SCCS` $(distdir)/suite/row_lock - +# Install all files and files in directories listed in EXTRA_DIST install-data-local: - $(mkinstalldirs) \ - $(DESTDIR)$(testdir)/t \ - $(DESTDIR)$(testdir)/extra/binlog_tests \ - $(DESTDIR)$(testdir)/extra/rpl_tests \ - $(DESTDIR)$(testdir)/r \ - $(DESTDIR)$(testdir)/include \ - $(DESTDIR)$(testdir)/std_data \ - $(DESTDIR)$(testdir)/std_data/ndb_backup50 \ - $(DESTDIR)$(testdir)/std_data/ndb_backup51 \ - $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_be \ - $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_le \ - $(DESTDIR)$(testdir)/lib \ - $(DESTDIR)$(testdir)/lib/My - $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir) - -$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t - $(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t - -$(INSTALL_DATA) $(srcdir)/t/*.imtest $(DESTDIR)$(testdir)/t - $(INSTALL_DATA) $(srcdir)/t/*.sql $(DESTDIR)$(testdir)/t - -$(INSTALL_DATA) $(srcdir)/t/*.disabled $(DESTDIR)$(testdir)/t - -$(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t - -$(INSTALL_SCRIPT) $(srcdir)/t/*.sh $(DESTDIR)$(testdir)/t - -$(INSTALL_DATA) $(srcdir)/t/*.slave-mi $(DESTDIR)$(testdir)/t - $(INSTALL_DATA) $(srcdir)/r/*.result $(DESTDIR)$(testdir)/r - $(INSTALL_DATA) $(srcdir)/r/*.require $(DESTDIR)$(testdir)/r - $(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.test $(DESTDIR)$(testdir)/extra/binlog_tests - $(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.test $(DESTDIR)$(testdir)/extra/rpl_tests - -$(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.opt $(DESTDIR)$(testdir)/extra/binlog_tests - -$(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.opt $(DESTDIR)$(testdir)/extra/rpl_tests - $(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include - $(INSTALL_DATA) $(srcdir)/include/*.sql $(DESTDIR)$(testdir)/include - $(INSTALL_DATA) $(srcdir)/include/*.test $(DESTDIR)$(testdir)/include - $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.*001 $(DESTDIR)$(testdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(DESTDIR)$(testdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(DESTDIR)$(testdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/Index.xml $(DESTDIR)$(testdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.pem $(DESTDIR)$(testdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.frm $(DESTDIR)$(testdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(DESTDIR)$(testdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup50 - $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51 - $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_be/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_be - $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_le/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_le - $(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib - $(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(DESTDIR)$(testdir)/lib/My - for f in `(cd $(srcdir); find suite -type f | egrep -v 'SCCS|row_lock')`; \ + for f in `(cd $(srcdir); find $(EXTRA_DIST) -type f)`; \ do \ d=$(DESTDIR)$(testdir)/`dirname $$f`; \ mkdir -p $$d ; \ @@ -145,31 +52,5 @@ mysql-test-run: $(RM) -f mysql-test-run $(LN_S) mysql-test-run.pl mysql-test-run -SUFFIXES = .sh - -.sh: - @RM@ -f $@ $@-t - @SED@ \ - -e 's!@''testdir''@!$(testdir)!g' \ - -e 's!@''bindir''@!$(bindir)!g' \ - -e 's!@''scriptdir''@!$(bindir)!g' \ - -e 's!@''prefix''@!$(prefix)!g' \ - -e 's!@''datadir''@!$(datadir)!g' \ - -e 's!@''localstatedir''@!$(localstatedir)!g' \ - -e 's!@''libexecdir''@!$(libexecdir)!g' \ - -e 's!@''PERL''@!@PERL@!' \ - -e 's!@''VERSION''@!@VERSION@!' \ - -e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \ - -e 's!@''MYSQL_TCP_PORT_DEFAULT''@!@MYSQL_TCP_PORT_DEFAULT@!' \ - -e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \ - -e 's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!' \ - -e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \ - -e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \ - -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \ - -e 's!@''USE_NDBCLUSTER''@!@TEST_NDBCLUSTER@!g' \ - $< > $@-t - @CHMOD@ +x $@-t - @MV@ $@-t $@ - # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/mysql-test/create-test-result b/mysql-test/create-test-result deleted file mode 100755 index ad19cdf08a1..00000000000 --- a/mysql-test/create-test-result +++ /dev/null @@ -1,65 +0,0 @@ -#! /bin/sh - -# This script is a hack for lazy developers who want to get a quick -# start on the result file. The code here is rather dirty, but it works -# If you have a spare moment feel free to improve it - the right way is -# to start mysqld yourself and run mysqltest -r - -RESULT_DIR=r -if [ -z "$EDITOR" ] ; then - EDITOR=vi -fi - -function die() -{ - echo $1 - exit 1 -} - -function usage() -{ - echo "Usage: $0 test_name" - exit 1 -} - -test_name=$1 - -[ -z "$test_name" ] && usage - -result_file=$RESULT_DIR/$test_name.result -reject_file=$RESULT_DIR/$test_name.reject - -[ -f $result_file ] && die "result file $result_file has already been created" - -touch $result_file -echo "Running the test case against empty file, will fail, but don't worry" -./mysql-test-run --local $test_name - -if [ -f $reject_file ] ; then - echo "Below are the contents of the reject file:" - echo "-----start---------------------" - cat $reject_file - echo "-----end-----------------------" - echo "Is this the output you expected from your test case?(y/n)[n]" - read yes_no - if [ x$yes_no = xy ] ; then - echo "Press any key to edit it in $EDITOR, or Ctrl-C to abort" - read junk - $EDITOR $reject_file - edited="edited" - fi - echo "Save $edited file as master result? (y/n)[y]" - read yes_no - if [ x$yes_no != xn ]; then - mv $reject_file $result_file - fi -else - echo "Your test failed so bad, it did not even produce a reject file" - echo "You need to fix your bugs in the test case, the code, or both" - exit 1 -fi - - - - - diff --git a/mysql-test/extra/binlog_tests/blackhole.test b/mysql-test/extra/binlog_tests/blackhole.test index 1ca59955d76..660806eeff7 100644 --- a/mysql-test/extra/binlog_tests/blackhole.test +++ b/mysql-test/extra/binlog_tests/blackhole.test @@ -7,7 +7,7 @@ -- source include/have_log_bin.inc # The server need to be started in $MYSQLTEST_VARDIR since it -# uses ../std_data_ln/ +# uses ../../std_data/ -- source include/uses_vardir.inc --disable_warnings @@ -114,7 +114,7 @@ insert into t1 values(1); insert ignore into t1 values(1); replace into t1 values(100); create table t2 (a varchar(200)) engine=blackhole; -eval load data infile '../std_data_ln/words.dat' into table t2; +eval load data infile '../../std_data/words.dat' into table t2; alter table t1 add b int; alter table t1 drop b; create table t3 like t1; diff --git a/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test b/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test index fa374502997..b240109f6e6 100644 --- a/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test +++ b/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test @@ -16,7 +16,8 @@ source include/show_binlog_events.inc; # escaped). flush logs; --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001 +let $MYSQLD_DATADIR= `select @@datadir`; +--exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000001 drop table t2; # End of 4.1 tests diff --git a/mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test b/mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test index 03514bfdb55..4f6a3b8039e 100644 --- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test +++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test @@ -282,7 +282,7 @@ CREATE TABLE t5 (a int, PRIMARY KEY (a)) ENGINE=InnoDB; # execute --error ER_DUP_ENTRY - load data infile '../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2); + load data infile '../../std_data/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2); # check select * from t4; select count(*) from t1 /* must be 2 */; diff --git a/mysql-test/extra/rpl_tests/rpl_EE_err.test b/mysql-test/extra/rpl_tests/rpl_EE_err.test index 3dce12b3f4e..24b3c28d2bb 100644 --- a/mysql-test/extra/rpl_tests/rpl_EE_err.test +++ b/mysql-test/extra/rpl_tests/rpl_EE_err.test @@ -20,7 +20,8 @@ eval create table t1 (a int) engine=$engine_type; flush tables; -system rm $MYSQLTEST_VARDIR/master-data/test/t1.MYI ; +let $MYSQLD_DATADIR= `select @@datadir`; +system rm $MYSQLD_DATADIR/test/t1.MYI ; drop table if exists t1; save_master_pos; connection slave; diff --git a/mysql-test/extra/rpl_tests/rpl_loaddata.test b/mysql-test/extra/rpl_tests/rpl_loaddata.test index bb6afd73034..1abbe8aba91 100644 --- a/mysql-test/extra/rpl_tests/rpl_loaddata.test +++ b/mysql-test/extra/rpl_tests/rpl_loaddata.test @@ -23,12 +23,12 @@ connection master; select last_insert_id(); create table t1(a int not null auto_increment, b int, primary key(a) ); -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1; +load data infile '../../std_data/rpl_loaddata.dat' into table t1; # verify that LAST_INSERT_ID() is set by LOAD DATA INFILE select last_insert_id(); create temporary table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60)); -load data infile '../std_data_ln/rpl_loaddata2.dat' into table t2 fields terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by '\n##\n' starting by '>' ignore 1 lines; +load data infile '../../std_data/rpl_loaddata2.dat' into table t2 fields terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by '\n##\n' starting by '>' ignore 1 lines; create table t3 (day date,id int(9),category enum('a','b','c'),name varchar(60)); insert into t3 select * from t2; @@ -63,7 +63,7 @@ sync_with_master; insert into t1 values(1,10); connection master; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1; +load data infile '../../std_data/rpl_loaddata.dat' into table t1; save_master_pos; connection slave; @@ -87,7 +87,7 @@ connection master; set sql_log_bin=0; delete from t1; set sql_log_bin=1; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1; +load data infile '../../std_data/rpl_loaddata.dat' into table t1; save_master_pos; connection slave; # The SQL slave thread should be stopped now. @@ -112,7 +112,7 @@ connection master; set sql_log_bin=0; delete from t1; set sql_log_bin=1; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1; +load data infile '../../std_data/rpl_loaddata.dat' into table t1; save_master_pos; connection slave; # The SQL slave thread should be stopped now. @@ -132,7 +132,7 @@ reset master; eval create table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60), unique(day)) engine=$engine_type; # no transactions --error ER_DUP_ENTRY -load data infile '../std_data_ln/rpl_loaddata2.dat' into table t2 fields +load data infile '../../std_data/rpl_loaddata2.dat' into table t2 fields terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by '\n##\n' starting by '>' ignore 1 lines; select * from t2; @@ -148,7 +148,7 @@ alter table t2 drop key day; connection master; delete from t2; --error ER_DUP_ENTRY -load data infile '../std_data_ln/rpl_loaddata2.dat' into table t2 fields +load data infile '../../std_data/rpl_loaddata2.dat' into table t2 fields terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by '\n##\n' starting by '>' ignore 1 lines; connection slave; @@ -162,7 +162,7 @@ drop table t1; CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=INNODB; --error ER_DUP_ENTRY -LOAD DATA INFILE "../std_data_ln/words.dat" INTO TABLE t1; +LOAD DATA INFILE "../../std_data/words.dat" INTO TABLE t1; --disable_warnings DROP TABLE IF EXISTS t1; diff --git a/mysql-test/extra/rpl_tests/rpl_log.test b/mysql-test/extra/rpl_tests/rpl_log.test index a5db4dfab4d..eaf93789fe4 100644 --- a/mysql-test/extra/rpl_tests/rpl_log.test +++ b/mysql-test/extra/rpl_tests/rpl_log.test @@ -33,7 +33,7 @@ eval create table t1(n int not null auto_increment primary key)ENGINE=$engine_ty insert into t1 values (NULL); drop table t1; eval create table t1 (word char(20) not null)ENGINE=$engine_type; -load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines; +load data infile '../../std_data/words.dat' into table t1 ignore 1 lines; select count(*) from t1; --replace_result $VERSION VERSION --replace_column 2 # 5 # diff --git a/mysql-test/extra/rpl_tests/rpl_row_001.test b/mysql-test/extra/rpl_tests/rpl_row_001.test index 6261659c4ce..98746326fb2 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_001.test +++ b/mysql-test/extra/rpl_tests/rpl_row_001.test @@ -1,5 +1,5 @@ CREATE TABLE t1 (word CHAR(20) NOT NULL); -LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1; +LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1; --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR eval LOAD DATA LOCAL INFILE '$MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1; SELECT * FROM t1 ORDER BY word LIMIT 10; diff --git a/mysql-test/extra/rpl_tests/rpl_row_charset.test b/mysql-test/extra/rpl_tests/rpl_row_charset.test index c1eccff9bd5..fa1013cd340 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_charset.test +++ b/mysql-test/extra/rpl_tests/rpl_row_charset.test @@ -160,7 +160,8 @@ select hex(c1), hex(c2) from t1; connection master; # Let's have a look at generated SETs. --replace_result $MYSQLTEST_VARDIR MYSQL_TEST_DIR/var -#--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001 +let $MYSQLD_DATADIR= `select @@datadir`; +#--exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000001 drop table t1; sync_slave_with_master; diff --git a/mysql-test/extra/rpl_tests/rpl_stm_000001.test b/mysql-test/extra/rpl_tests/rpl_stm_000001.test index d007e433ab6..1f5eb5786dd 100644 --- a/mysql-test/extra/rpl_tests/rpl_stm_000001.test +++ b/mysql-test/extra/rpl_tests/rpl_stm_000001.test @@ -2,7 +2,7 @@ -- source include/master-slave.inc create table t1 (word char(20) not null); -load data infile '../std_data_ln/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR eval load data local infile '$MYSQL_TEST_DIR/std_data/words.dat' into table t1; select * from t1 limit 10; diff --git a/mysql-test/extra/rpl_tests/rpl_stm_charset.test b/mysql-test/extra/rpl_tests/rpl_stm_charset.test index 629ccdf69f7..6d545621156 100644 --- a/mysql-test/extra/rpl_tests/rpl_stm_charset.test +++ b/mysql-test/extra/rpl_tests/rpl_stm_charset.test @@ -156,7 +156,8 @@ connection master; # Let's have a look at generated SETs. flush logs; --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001 +let $MYSQLD_DATADIR= `select @@datadir`; +--exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000001 drop table t1; sync_slave_with_master; diff --git a/mysql-test/fix-result b/mysql-test/fix-result deleted file mode 100755 index bd380332ff5..00000000000 --- a/mysql-test/fix-result +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/sh - -# Sasha's hack to fix results generated with mysql-test-run --record -# to be version and test port independent. In some cases, further minor -# manual edititing may be required, but most of the time it should not -# happen - -#It is assumed we are running the script in mysql-test directory - -VERSION=4.0.1-alpha-debug-log -TEST_CASE=$1 - -if [ -z "$TEST_CASE" ] ; -then - echo "usage: $0 test_case_name" - exit 1 -fi - -../extra/replace $VERSION '$VERSION' 9306 '$MASTER_MYPORT' 9307 \ -'$SLAVE_MYPORT' \\ \\\\ -- r/$TEST_CASE.result - - diff --git a/mysql-test/include/default_my.cnf b/mysql-test/include/default_my.cnf new file mode 100644 index 00000000000..d77fee0e200 --- /dev/null +++ b/mysql-test/include/default_my.cnf @@ -0,0 +1,25 @@ +# Use default setting for mysqld processes +!include default_mysqld.cnf + +[mysqld.1] + +# Run the master.sh script before starting this process +#!run-master-sh + +log-bin= master-bin + + +[mysqlbinlog] +disable-force-if-open + +# mysql_fix_privilege_tables.sh does not read from [client] so it +# need its own section +[mysql_fix_privilege_tables] +socket= @client.socket +port= @client.port +user= @client.user +password= @client.password + +[ENV] +MASTER_MYPORT= @mysqld.1.port +MASTER_MYSOCK= @mysqld.1.socket diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf new file mode 100644 index 00000000000..60d12ebe1a6 --- /dev/null +++ b/mysql-test/include/default_mysqld.cnf @@ -0,0 +1,18 @@ +# Default values that applies to all MySQL Servers +[mysqld] +open-files-limit= 1024 +local-infile +default-character-set= latin1 + +# Increase default connect_timeout to avoid intermittent +# disconnects when test servers are put under load see BUG#28359 +connect-timeout= 60 + +log-bin-trust-function-creators=1 +key_buffer_size= 1M +sort_buffer= 256K +max_heap_table_size= 1M + +loose-innodb_data_file_path= ibdata1:10M:autoextend + +set-variable= slave_net_timeout=120 diff --git a/mysql-test/include/default_ndbd.cnf b/mysql-test/include/default_ndbd.cnf new file mode 100644 index 00000000000..784d81beabc --- /dev/null +++ b/mysql-test/include/default_ndbd.cnf @@ -0,0 +1,27 @@ + +[cluster_config] +MaxNoOfSavedMessages= 1000 +MaxNoOfConcurrentTransactions= 64 +MaxNoOfConcurrentOperations= 10000 +DataMemory= 20M +IndexMemory= 1M +Diskless= 0 +TimeBetweenWatchDogCheck= 30000 +MaxNoOfOrderedIndexes= 32 +MaxNoOfAttributes= 2048 +TimeBetweenGlobalCheckpoints= 500 +NoOfFragmentLogFiles= 4 +FragmentLogFileSize= 12M +DiskPageBufferMemory= 4M + +# O_DIRECT has issues on 2.4 whach have not been handled, Bug #29612 +#ODirect= 1 +# the following parametes just function as a small regression +# test that the parameter exists +InitialNoOfOpenFiles= 27 + +# Increase timeouts for slow test-machines +HeartbeatIntervalDbDb= 30000 +HeartbeatIntervalDbApi= 30000 + +#TransactionDeadlockDetectionTimeout= 7500 diff --git a/mysql-test/include/federated.inc b/mysql-test/include/federated.inc deleted file mode 100644 index 925ecdd9682..00000000000 --- a/mysql-test/include/federated.inc +++ /dev/null @@ -1,28 +0,0 @@ ---source include/have_log_bin.inc ---source include/not_embedded.inc ---source ./include/have_federated_db.inc - -source ./include/master-slave.inc; - -# remote table creation - -# We have to sync with master, to ensure slave had time to start properly -# before we stop it. If not, we get errors about UNIX_TIMESTAMP() in the log. -connection master; -sync_slave_with_master; - -connection slave; -#--replicate-ignore-db=federated -stop slave; - ---disable_warnings -# at this point, we are connected to master -DROP DATABASE IF EXISTS federated; ---enable_warnings -CREATE DATABASE federated; - -connection master; ---disable_warnings -DROP DATABASE IF EXISTS federated; ---enable_warnings -CREATE DATABASE federated; diff --git a/mysql-test/include/have_blackhole.inc b/mysql-test/include/have_blackhole.inc index 6c4da01d61d..2ddb0df4eae 100644 --- a/mysql-test/include/have_blackhole.inc +++ b/mysql-test/include/have_blackhole.inc @@ -1,4 +1,3 @@ -disable_query_log; ---require r/true.require -select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'blackhole'; -enable_query_log; +if (`select (support = 'YES' or support = 'DEFAULT')=0 from information_schema.engines where engine = 'blackhole'`){ + skip Need blackhole engine; +} diff --git a/mysql-test/include/have_bug25714.inc b/mysql-test/include/have_bug25714.inc deleted file mode 100644 index 0c09ae1a035..00000000000 --- a/mysql-test/include/have_bug25714.inc +++ /dev/null @@ -1,7 +0,0 @@ -# -# Check if the variable MYSQL_BUG25714 is set -# ---require r/have_bug25714.require -disable_query_log; -eval select LENGTH("$MYSQL_BUG25714") > 0 as "have_bug25714_exe"; -enable_query_log; diff --git a/mysql-test/include/have_federated_db.inc b/mysql-test/include/have_federated_db.inc deleted file mode 100644 index 041a29f460b..00000000000 --- a/mysql-test/include/have_federated_db.inc +++ /dev/null @@ -1,4 +0,0 @@ -disable_query_log; ---require r/true.require -select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'federated'; -enable_query_log; diff --git a/mysql-test/include/have_ndbapi_examples.inc b/mysql-test/include/have_ndbapi_examples.inc index 3ab1f063b61..9ce5dadd510 100644 --- a/mysql-test/include/have_ndbapi_examples.inc +++ b/mysql-test/include/have_ndbapi_examples.inc @@ -1,4 +1,4 @@ --require r/have_ndbapi_examples.require disable_query_log; -eval select LENGTH("$MY_NDB_EXAMPLES_BINARY") > 0 as "have_ndb_example"; +eval select LENGTH("$NDB_EXAMPLES_BINARY") > 0 as "have_ndb_example"; enable_query_log; diff --git a/mysql-test/include/loaddata_autocom.inc b/mysql-test/include/loaddata_autocom.inc index cca56709331..bb286fb4169 100644 --- a/mysql-test/include/loaddata_autocom.inc +++ b/mysql-test/include/loaddata_autocom.inc @@ -7,16 +7,20 @@ eval SET SESSION STORAGE_ENGINE = $engine_type; drop table if exists t1; --enable_warnings +let $load_file= $MYSQLTEST_VARDIR/std_data/loaddata2.dat; + # NDB does not support the create option 'Binlog of table with BLOB attribute and no PK' # So use a dummy PK here. create table t1 (id int unsigned not null auto_increment primary key, a text, b text); start transaction; -load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''' (a, b); +--replace_result $load_file LOAD_FILE +eval load data infile '$load_file' into table t1 fields terminated by ',' enclosed by '''' (a, b); commit; select count(*) from t1; truncate table t1; start transaction; -load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''' (a, b); +--replace_result $load_file LOAD_FILE +eval load data infile '$load_file' into table t1 fields terminated by ',' enclosed by '''' (a, b); rollback; select count(*) from t1; diff --git a/mysql-test/include/mix1.inc b/mysql-test/include/mix1.inc index 7998baa6ccf..799f9dc996d 100644 --- a/mysql-test/include/mix1.inc +++ b/mysql-test/include/mix1.inc @@ -623,7 +623,8 @@ DROP TABLE t1,t2,t3; # create table t1 (a int) engine=innodb; -copy_file $MYSQLTEST_VARDIR/master-data/test/t1.frm $MYSQLTEST_VARDIR/master-data/test/bug29807.frm; +let $MYSQLD_DATADIR= `select @@datadir`; +copy_file $MYSQLD_DATADIR/test/t1.frm $MYSQLD_DATADIR/test/bug29807.frm; --error 1146 select * from bug29807; drop table t1; diff --git a/mysql-test/include/ndb_backup.inc b/mysql-test/include/ndb_backup.inc index f0a883d4e11..e6780788fe9 100644 --- a/mysql-test/include/ndb_backup.inc +++ b/mysql-test/include/ndb_backup.inc @@ -2,23 +2,21 @@ # By JBM 2006-02-16 So that the code is not repeated # # in test cases and can be reused. # ###################################################### ---exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "start backup" >> $NDB_TOOLS_OUTPUT +--exec $NDB_MGM --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -e "start backup" >> $NDB_TOOLS_OUTPUT # there is no neat way to find the backupid, this is a hack to find it... +let $dump_file= $MYSQLTEST_VARDIR/tmp/tmp.dat; +--exec $NDB_TOOLS_DIR/ndb_select_all --ndb-connectstring="$NDB_CONNECTSTRING" -d sys --delimiter=',' SYSTAB_0 | grep 520093696 > $dump_file ---exec $NDB_TOOLS_DIR/ndb_select_all --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -d sys --delimiter=',' SYSTAB_0 | grep 520093696 > $MYSQLTEST_VARDIR/tmp.dat +CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP; -CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; - -DELETE FROM test.backup_info; - -LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; - ---replace_column 1 - -SELECT @the_backup_id:=backup_id FROM test.backup_info; - -let the_backup_id=`select @the_backup_id`; +--replace_result $dump_file DUMP_FILE +eval LOAD DATA INFILE '$dump_file' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; +# Load backup id into environment variable +let the_backup_id=`SELECT backup_id from test.backup_info`; DROP TABLE test.backup_info; +remove_file $dump_file; + + diff --git a/mysql-test/include/ndb_restore_master.inc b/mysql-test/include/ndb_restore_master.inc index b01a0b58ee9..ae5f055b442 100644 --- a/mysql-test/include/ndb_restore_master.inc +++ b/mysql-test/include/ndb_restore_master.inc @@ -3,6 +3,6 @@ # in test cases and can be reused. # ###################################################### ---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -p 8 -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT +--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -p 8 -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT ---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -p 8 -b $the_backup_id -n 2 -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT +--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -p 8 -b $the_backup_id -n 2 -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT diff --git a/mysql-test/include/ndb_restore_slave_eoption.inc b/mysql-test/include/ndb_restore_slave_eoption.inc index f1f6cf96881..a8657f68c8d 100644 --- a/mysql-test/include/ndb_restore_slave_eoption.inc +++ b/mysql-test/include/ndb_restore_slave_eoption.inc @@ -3,9 +3,9 @@ # in test cases and can be reused. # ###################################################### ---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT_SLAVE" -p 8 -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT +--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING_SLAVE" -p 8 -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT ---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT_SLAVE" -p 8 -b $the_backup_id -n 2 -r -e --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT +--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING_SLAVE" -p 8 -b $the_backup_id -n 2 -r -e --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT diff --git a/mysql-test/include/testdb_only.inc b/mysql-test/include/testdb_only.inc index ddc3f123d45..528e2f3eb9d 100644 --- a/mysql-test/include/testdb_only.inc +++ b/mysql-test/include/testdb_only.inc @@ -19,12 +19,6 @@ # # ################################################################### ---disable_query_log -eval set @USE_RUNNING_SERVER= '$USE_RUNNING_SERVER'; ---require r/testdb_only.require -SELECT 'use extern server' - AS "Variable_name ", - IF(@USE_RUNNING_SERVER= '1','YES', - IF(@USE_RUNNING_SERVER= '0','NO','UNEXPECTED')) - AS "Value" ; ---enable_query_log +if ($USE_RUNNING_SERVER){ + skip Not with extern server; +} diff --git a/mysql-test/install_test_db.sh b/mysql-test/install_test_db.sh deleted file mode 100644 index e4df8f619cc..00000000000 --- a/mysql-test/install_test_db.sh +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/sh -# Copyright (C) 1997-2006 MySQL AB -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# This scripts creates the privilege tables db, host, user, tables_priv, -# columns_priv in the mysql database, as well as the func table. - -if [ x$1 = x"--bin" ]; then - shift 1 - BINARY_DIST=1 - - bindir=../bin - scriptdir=bin - libexecdir=../libexec - - # Check if it's a binary distribution or a 'make install' - if test -x ../libexec/mysqld - then - execdir=../libexec - elif test -x ../../sbin/mysqld # RPM installation - then - execdir=../../sbin - bindir=../../bin - scriptdir=../bin - libexecdir=../../libexec - else - execdir=../bin - fi - fix_bin=mysql-test -else - execdir=../sql - bindir=../client - fix_bin=. - scriptdir=scripts - libexecdir=../libexec -fi - -vardir=var -logdir=$vardir/log -if [ x$1 = x"-slave" ] -then - shift 1 - data=var/slave-data -else - if [ x$1 = x"-1" ] - then - data=var/master-data1 - else - data=var/master-data - fi -fi -ldata=$fix_bin/$data - -mdata=$data/mysql -EXTRA_ARG="" - -mysqld= -if test -x $execdir/mysqld -then - mysqld=$execdir/mysqld -else - if test ! -x $libexecdir/mysqld - then - echo "mysqld is missing - looked in $execdir and in $libexecdir" - exit 1 - else - mysqld=$libexecdir/mysqld - fi -fi - -# On IRIX hostname is in /usr/bsd so add this to the path -PATH=$PATH:/usr/bsd -hostname=`hostname` # Install this too in the user table -hostname="$hostname%" # Fix if not fully qualified hostname - - -#create the directories -[ -d $vardir ] || mkdir $vardir -[ -d $logdir ] || mkdir $logdir - -# Create database directories mysql & test -if [ -d $data ] ; then rm -rf $data ; fi -mkdir $data $data/mysql $data/test - -#for error messages -if [ x$BINARY_DIST = x1 ] ; then -basedir=.. -else -basedir=. -EXTRA_ARG="--windows" -fi - -INSTALL_CMD="$scriptdir/mysql_install_db --no-defaults $EXTRA_ARG --basedir=$basedir --datadir=mysql-test/$ldata --srcdir=." -echo "running $INSTALL_CMD" - -cd .. -if $INSTALL_CMD -then - exit 0 -else - echo "Error executing mysqld --bootstrap" - exit 1 -fi diff --git a/mysql-test/lib/My/Config.pm b/mysql-test/lib/My/Config.pm index 5491e341ddc..35273f08cf7 100644 --- a/mysql-test/lib/My/Config.pm +++ b/mysql-test/lib/My/Config.pm @@ -4,6 +4,7 @@ package My::Config::Option; use strict; use warnings; +use Carp; sub new { @@ -31,7 +32,7 @@ package My::Config::Group; use strict; use warnings; - +use Carp; sub new { my ($class, $group_name)= @_; @@ -68,7 +69,7 @@ sub remove { return undef unless defined $option; # Remove from the hash - delete($self->{options_by_name}->{$option_name}) or die; + delete($self->{options_by_name}->{$option_name}) or croak; # Remove from the array @{$self->{options}}= grep { $_->name ne $option_name } @{$self->{options}}; @@ -88,6 +89,33 @@ sub name { return $self->{name}; } +sub suffix { + my ($self)= @_; + # Everything in name from the last . + my @parts= split(/\./, $self->{name}); + my $suffix= pop(@parts); + return ".$suffix"; +} + +sub after { + my ($self, $prefix)= @_; + die unless defined $prefix; + + # everything after $prefix + my $name= $self->{name}; + if ($name =~ /^\Q$prefix\E(.*)$/) + { + return $1; + } + die "Failed to extract the value after '$prefix' in $name"; +} + + +sub split { + my ($self)= @_; + # Return an array with name parts + return split(/\./, $self->{name}); +} # # Return a specific option in the group @@ -100,23 +128,37 @@ sub option { # -# Return a specific value for an option in the group +# Return value for an option in the group, fail if it does not exist # sub value { my ($self, $option_name)= @_; my $option= $self->option($option_name); - die "No option named '$option_name' in this group" + croak "No option named '$option_name' in group '$self->{name}'" if ! defined($option); return $option->value(); } +# +# Return value for an option if it exist +# +sub if_exist { + my ($self, $option_name)= @_; + my $option= $self->option($option_name); + + return undef if ! defined($option); + + return $option->value(); +} + + package My::Config; use strict; use warnings; +use Carp; use IO::File; use File::Basename; @@ -132,13 +174,13 @@ sub new { my $self= bless { groups => [] }, $class; my $F= IO::File->new($path, "<") - or die "Could not open '$path': $!"; + or croak "Could not open '$path': $!"; while ( my $line= <$F> ) { chomp($line); # [group] - if ( $line =~ /\[(.*)\]/ ) { + if ( $line =~ /^\[(.*)\]/ ) { # New group found $group_name= $1; #print "group: $group_name\n"; @@ -149,7 +191,7 @@ sub new { # Magic #! comments elsif ( $line =~ /^#\!/) { my $magic= $line; - die "Found magic comment '$magic' outside of group" + croak "Found magic comment '$magic' outside of group" unless $group_name; #print "$magic\n"; @@ -171,8 +213,13 @@ sub new { # !include elsif ( $line =~ /^\!include\s*(.*?)\s*$/ ) { my $include_file_name= dirname($path)."/".$1; - # Check that the file exists - die "The include file '$include_file_name' does not exist" + + # Check that the file exists relative to path of first config file + if (! -f $include_file_name){ + # Try to include file relativ to current dir + $include_file_name= $1; + } + croak "The include file '$include_file_name' does not exist" unless -f $include_file_name; $self->append(My::Config->new($include_file_name)); @@ -182,7 +229,7 @@ sub new { elsif ( $line =~ /^([\@\w-]+)\s*$/ ) { my $option= $1; - die "Found option '$option' outside of group" + croak "Found option '$option' outside of group" unless $group_name; #print "$option\n"; @@ -194,13 +241,13 @@ sub new { my $option= $1; my $value= $2; - die "Found option '$option=$value' outside of group" + croak "Found option '$option=$value' outside of group" unless $group_name; #print "$option=$value\n"; $self->insert($group_name, $option, $value); } else { - die "Unexpected line '$line' found in '$path'"; + croak "Unexpected line '$line' found in '$path'"; } } @@ -231,6 +278,7 @@ sub insert { # Add the option to the group $group->insert($option, $value, $if_not_exist); } + return $group; } # @@ -240,11 +288,11 @@ sub remove { my ($self, $group_name, $option_name)= @_; my $group= $self->group($group_name); - die "group '$group_name' does not exist" + croak "group '$group_name' does not exist" unless defined($group); $group->remove($option_name) or - die "option '$option_name' does not exist"; + croak "option '$option_name' does not exist"; } @@ -267,10 +315,10 @@ sub group_exists { # sub _group_insert { my ($self, $group_name)= @_; - caller eq __PACKAGE__ or die; + caller eq __PACKAGE__ or croak; # Check that group does not already exist - die "Group already exists" if $self->group_exists($group_name); + croak "Group already exists" if $self->group_exists($group_name); my $group= My::Config::Group->new($group_name); push(@{$self->{groups}}, $group); @@ -354,11 +402,11 @@ sub value { my ($self, $group_name, $option_name)= @_; my $group= $self->group($group_name); - die "group '$group_name' does not exist" + croak "group '$group_name' does not exist" unless defined($group); my $option= $group->option($option_name); - die "option '$option_name' does not exist" + croak "option '$option_name' does not exist" unless defined($option); return $option->value(); @@ -372,7 +420,7 @@ sub exists { my ($self, $group_name, $option_name)= @_; my $group= $self->group($group_name); - die "group '$group_name' does not exist" + croak "group '$group_name' does not exist" unless defined($group); my $option= $group->option($option_name); @@ -412,11 +460,11 @@ sub stringify { # Save the config to named file # sub save { - my ($self, $path)= @_; - my $F= IO::File->new($path, ">") - or die "Could not open '$path': $!"; - print $F $self; - undef $F; # Close the file + my ($self, $path)= @_; + my $F= IO::File->new($path, ">") + or croak "Could not open '$path': $!"; + print $F $self; + undef $F; # Close the file } 1; diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm new file mode 100644 index 00000000000..f176ccbeab3 --- /dev/null +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -0,0 +1,583 @@ +# -*- cperl -*- +package My::ConfigFactory; + +use strict; +use warnings; +use Carp; + +use My::Config; +use My::Find; + +use File::Basename; + + +# +# Rules to run first of all +# +my @pre_rules= +( +); + + +my @share_locations= ("share/mysql", "sql/share", "share"); + + +sub get_basedir { + my ($self, $group)= @_; + my $basedir= $group->if_exist('basedir') || + $self->{ARGS}->{basedir}; + return $basedir; +} + + +sub fix_charset_dir { + my ($self, $config, $group_name, $group)= @_; + return my_find_dir($self->get_basedir($group), + \@share_locations, "charsets"); +} + +sub fix_language { + my ($self, $config, $group_name, $group)= @_; + return my_find_dir($self->get_basedir($group), + \@share_locations, "english"); +} + +sub fix_datadir { + my ($self, $config, $group_name)= @_; + my $vardir= $self->{ARGS}->{vardir}; + return "$vardir/$group_name/data"; +} + +sub fix_pidfile { + my ($self, $config, $group_name, $group)= @_; + my $vardir= $self->{ARGS}->{vardir}; + return "$vardir/run/$group_name.pid"; +} + +sub fix_port { + my ($self, $config, $group_name, $group)= @_; + my $hostname= $group->value('#host'); + return $self->{HOSTS}->{$hostname}++; +} + +sub fix_host { + my ($self)= @_; + # Get next host from HOSTS array + my @hosts= keys(%{$self->{HOSTS}});; + my $host_no= $self->{NEXT_HOST}++ % @hosts; + return $hosts[$host_no]; +} + +sub is_unique { + my ($config, $name, $value)= @_; + + foreach my $group ( $config->groups() ) { + if ($group->option($name)) { + if ($group->value($name) eq $value){ + return 0; + } + } + } + return 1; +} + +sub fix_server_id { + my ($self, $config, $group_name, $group)= @_; +#define in the order that mysqlds are listed in my.cnf + + my $server_id= $group->if_exist('server-id'); + if (defined $server_id){ + if (!is_unique($config, 'server-id', $server_id)) { + croak "The server-id($server_id) for '$group_name' is not unique"; + } + return $server_id; + } + + do { + $server_id= $self->{SERVER_ID}++; + } while(!is_unique($config, 'server-id', $server_id)); + + #print "$group_name: server_id: $server_id\n"; + return $server_id; +} + +sub fix_socket { + my ($self, $config, $group_name, $group)= @_; + # Put socket file in tmpdir + my $dir= $group->value('tmpdir'); + return "$dir/$group_name.sock"; +} + +sub fix_log_error { + my ($self, $config, $group_name, $group)= @_; + my $dir= dirname($group->value('datadir')); + return "$dir/mysqld.err"; +} + +sub fix_log { + my ($self, $config, $group_name, $group)= @_; + my $dir= dirname($group->value('datadir')); + return "$dir/mysqld.log"; +} + +sub fix_log_slow_queries { + my ($self, $config, $group_name, $group)= @_; + my $dir= dirname($group->value('datadir')); + return "$dir/mysqld-slow.log"; +} + +sub fix_secure_file_priv { + my ($self)= @_; + my $vardir= $self->{ARGS}->{vardir}; + # By default, prevent the started mysqld to access files outside of vardir + return $vardir; +} + +sub fix_std_data { + my ($self, $config, $group_name, $group)= @_; + my $basedir= $self->get_basedir($group); + return "$basedir/mysql-test/std_data"; +} + +sub fix_ssl_ca { + my $std_data= fix_std_data(@_); + return "$std_data/cacert.pem" +} + +sub fix_ssl_server_cert { + my $std_data= fix_std_data(@_); + return "$std_data/server-cert.pem" +} + +sub fix_ssl_client_cert { + my $std_data= fix_std_data(@_); + return "$std_data/client-cert.pem" +} + +sub fix_ssl_server_key { + my $std_data= fix_std_data(@_); + return "$std_data/server-key.pem" +} + +sub fix_ssl_client_key { + my $std_data= fix_std_data(@_); + return "$std_data/client-key.pem" +} + + +# +# Rules to run for each mysqld in the config +# - will be run in order listed here +# +my @mysqld_rules= + ( + { 'basedir' => sub { return shift->{ARGS}->{basedir}; } }, + { 'tmpdir' => sub { return shift->{ARGS}->{tmpdir}; } }, + { 'character-sets-dir' => \&fix_charset_dir }, + { 'language' => \&fix_language }, + { 'datadir' => \&fix_datadir }, + { 'pid-file' => \&fix_pidfile }, + { '#host' => \&fix_host }, + { 'port' => \&fix_port }, + { 'socket' => \&fix_socket }, + { 'log-error' => \&fix_log_error }, + { 'log' => \&fix_log }, + { 'log-slow-queries' => \&fix_log_slow_queries }, + { '#user' => sub { return shift->{ARGS}->{user} || ""; } }, + { '#password' => sub { return shift->{ARGS}->{password} || ""; } }, + { 'server-id' => \&fix_server_id, }, + # By default, prevent the started mysqld to access files outside of vardir + { 'secure-file-priv' => sub { return shift->{ARGS}->{vardir}; } }, + { 'loose-ssl-ca' => \&fix_ssl_ca }, + { 'loose-ssl-cert' => \&fix_ssl_server_cert }, + { 'loose-ssl-key' => \&fix_ssl_server_key }, + ); + + +sub fix_ndb_mgmd_port { + my ($self, $config, $group_name, $group)= @_; + my $hostname= $group->value('HostName'); + return $self->{HOSTS}->{$hostname}++; +} + + +sub fix_cluster_dir { + my ($self, $config, $group_name, $group)= @_; + my $vardir= $self->{ARGS}->{vardir}; + my (undef, $process_type, $idx, $suffix)= split(/\./, $group_name); + return "$vardir/mysql_cluster.$suffix/$process_type.$idx"; +} + + +sub fix_cluster_backup_dir { + my ($self, $config, $group_name, $group)= @_; + my $vardir= $self->{ARGS}->{vardir}; + my (undef, $process_type, $idx, $suffix)= split(/\./, $group_name); + return "$vardir/mysql_cluster.$suffix/"; +} + + +# +# Rules to run for each ndb_mgmd in the config +# - will be run in order listed here +# +my @ndb_mgmd_rules= +( + { 'PortNumber' => \&fix_ndb_mgmd_port }, + { 'DataDir' => \&fix_cluster_dir }, +); + + +# +# Rules to run for each ndbd in the config +# - will be run in order listed here +# +my @ndbd_rules= +( + { 'HostName' => \&fix_host }, + { 'DataDir' => \&fix_cluster_dir }, + { 'BackupDataDir' => \&fix_cluster_backup_dir }, +); + + +# +# Rules to run for each cluster_config section +# - will be run in order listed here +# +my @cluster_config_rules= +( + { 'ndb_mgmd' => \&fix_host }, + { 'ndbd' => \&fix_host }, + { 'mysqld' => \&fix_host }, + { 'ndbapi' => \&fix_host }, +); + + +# +# Rules to run for [client] section +# - will be run in order listed here +# +my @client_rules= +( +); + + +# +# Rules to run for [mysqltest] section +# - will be run in order listed here +# +my @mysqltest_rules= +( + { 'loose-ssl-ca' => \&fix_ssl_ca }, + { 'loose-ssl-cert' => \&fix_ssl_client_cert }, + { 'loose-ssl-key' => \&fix_ssl_client_key }, +); + + +# +# Rules to run for [mysqlbinlog] section +# - will be run in order listed here +# +my @mysqlbinlog_rules= +( + { 'character-sets-dir' => \&fix_charset_dir }, +); + + +# +# Generate a [client.] group pointing to be +# used for connecting to [mysqld.] +# +sub post_check_client_group { + my ($self, $config, $client_group_name, $mysqld_group_name)= @_; + + # Settings needed for client, copied from its "mysqld" + my %client_needs= + ( + port => 'port', + socket => 'socket', + host => '#host', + user => '#user', + password => '#password', + ); + + my $group_to_copy_from= $config->group($mysqld_group_name); + while (my ($name_to, $name_from)= each( %client_needs )) { + my $option= $group_to_copy_from->option($name_from); + + if (! defined $option){ + #print $config; + croak "Could not get value for '$name_from'"; + } + $config->insert($client_group_name, $name_to, $option->value()) + } +} + + +sub post_check_client_groups { + my ($self, $config)= @_; + + my $first_mysqld= $config->first_like('mysqld.'); + + return unless $first_mysqld; + + # Always generate [client] pointing to the first + # [mysqld.] + $self->post_check_client_group($config, + 'client', + $first_mysqld->name()); + + # Then generate [client.] for each [mysqld.] + foreach my $mysqld ( $config->like('mysqld.') ) { + $self->post_check_client_group($config, + 'client'.$mysqld->after('mysqld'), + $mysqld->name()) + } + +} + + +sub resolve_at_variable { + my ($self, $config, $group, $option)= @_; + + # Split the options value on last . + my @parts= split(/\./, $option->value()); + my $option_name= pop(@parts); + my $group_name= join('.', @parts); + + $group_name =~ s/^\@//; # Remove at + + my $from_group= $config->group($group_name) + or croak "There is no group named '$group_name' that ", + "can be used to resolve '$option_name'"; + + my $from= $from_group->value($option_name); + $config->insert($group->name(), $option->name(), $from) +} + + +sub post_fix_resolve_at_variables { + my ($self, $config)= @_; + + foreach my $group ( $config->groups() ) { + foreach my $option ( $group->options()) { + next unless defined $option->value(); + + $self->resolve_at_variable($config, $group, $option) + if ($option->value() =~ /^\@/); + } + } +} + +sub post_fix_mysql_cluster_section { + my ($self, $config)= @_; + + # Add a [mysl_cluster.] section for each + # defined [cluster_config.] section + foreach my $group ( $config->like('cluster_config.') ) + { + my @urls; + # Generate ndb_connectstring for this cluster + foreach my $ndb_mgmd ( $config->like('cluster_config.ndb_mgmd.')) { + if ($ndb_mgmd->suffix() eq $group->suffix()) { + my $host= $ndb_mgmd->value('HostName'); + my $port= $ndb_mgmd->value('PortNumber'); + push(@urls, "$host:$port"); + } + } + croak "Could not generate valid ndb_connectstring for '$group'" + unless @urls > 0; + my $ndb_connectstring= join(";", @urls); + + # Add ndb_connectstring to [mysql_cluster.] + $config->insert('mysql_cluster'.$group->suffix(), + 'ndb_connectstring', $ndb_connectstring); + + # Add ndb_connectstring to each mysqld connected to this + # cluster + foreach my $mysqld ( $config->like('cluster_config.mysqld.')) { + if ($mysqld->suffix() eq $group->suffix()) { + my $after= $mysqld->after('cluster_config.mysqld'); + $config->insert("mysqld$after", + 'ndb_connectstring', $ndb_connectstring); + } + } + } +} + +# +# Rules to run last of all +# +my @post_rules= +( + \&post_check_client_groups, + \&post_fix_mysql_cluster_section, + \&post_fix_resolve_at_variables, +); + + +sub run_rules_for_group { + my ($self, $config, $group, @rules)= @_; + foreach my $hash ( @rules ) { + while (my ($option, $rule)= each( %{$hash} )) { + # Only run this rule if the value is not already defined + if (!$config->exists($group->name(), $option)) { + my $value; + if (ref $rule eq "CODE") { + # Call the rule function + $value= &$rule($self, $config, $group->name(), + $config->group($group->name())); + } else { + $value= $rule; + } + if (defined $value) { + $config->insert($group->name(), $option, $value, 1); + } + } + } + } +} + + +sub run_section_rules { + my ($self, $config, $name, @rules)= @_; + + foreach my $group ( $config->like($name) ) { + $self->run_rules_for_group($config, $group, @rules); + } +} + + +sub run_generate_sections_from_cluster_config { + my ($self, $config)= @_; + + my @options= ('ndb_mgmd', 'ndbd', + 'mysqld', 'ndbapi'); + + foreach my $group ( $config->like('cluster_config.') ) { + + # Keep track of current index per process type + my %idxes; + map { $idxes{$_}= 1; } @options; + + foreach my $option_name ( @options ) { + my $value= $group->value($option_name); + my @hosts= split(/,/, $value, -1); # -1 => return also empty strings + + # Add at least one host + push(@hosts, undef) unless scalar(@hosts); + + # Assign hosts unless already fixed + @hosts= map { $self->fix_host() unless $_; } @hosts; + + # Write the hosts value back + $group->insert($option_name, join(",", @hosts)); + + # Generate sections for each host + foreach my $host ( @hosts ){ + my $idx= $idxes{$option_name}++; + + my $suffix= $group->suffix(); + # Generate a section for ndb_mgmd to read + $config->insert("cluster_config.$option_name.$idx$suffix", + "HostName", $host); + + if ($option_name eq 'mysqld'){ + my $datadir= + $self->fix_cluster_dir($config, + "cluster_config.mysqld.$idx$suffix", + $group); + $config->insert("mysqld.$idx$suffix", + 'datadir', "$datadir/data"); + } + } + } + } +} + + +sub new_config { + my ($class, $args)= @_; + + my @required_args= ('basedir', 'baseport', 'vardir', 'template_path'); + + foreach my $required ( @required_args ) { + croak "you must pass '$required'" unless defined $args->{$required}; + } + + # Fill in hosts/port hash + my $hosts= {}; + my $baseport= $args->{baseport}; + $args->{hosts}= [ 'localhost' ] unless exists($args->{hosts}); + foreach my $host ( @{$args->{hosts}} ) { + $hosts->{$host}= $baseport; + } + + # Open the config template + my $config= My::Config->new($args->{'template_path'}); + my $extra_template_path= $args->{'extra_template_path'}; + if ($extra_template_path){ + $config->append(My::Config->new($extra_template_path)); + } + my $self= bless { + CONFIG => $config, + ARGS => $args, + HOSTS => $hosts, + NEXT_HOST => 0, + SERVER_ID => 1, + }, $class; + + + { + # Run pre rules + foreach my $rule ( @pre_rules ) { + &$rule($self, $config); + } + } + + + $self->run_section_rules($config, + 'cluster_config.', + @cluster_config_rules); + $self->run_generate_sections_from_cluster_config($config); + + $self->run_section_rules($config, + 'cluster_config.ndb_mgmd.', + @ndb_mgmd_rules); + $self->run_section_rules($config, + 'cluster_config.ndbd', + @ndbd_rules); + + $self->run_section_rules($config, + 'mysqld.', + @mysqld_rules); + + # [mysqlbinlog] need additional settings + $self->run_rules_for_group($config, + $config->insert('mysqlbinlog'), + @mysqlbinlog_rules); + + # Additional reuls required for [client] + $self->run_rules_for_group($config, + $config->insert('client'), + @client_rules); + + + # Additional reuls required for [mysqltest] + $self->run_rules_for_group($config, + $config->insert('mysqltest'), + @mysqltest_rules); + + { + # Run post rules + foreach my $rule ( @post_rules ) { + &$rule($self, $config); + } + } + + return $config; +} + + +1; + diff --git a/mysql-test/lib/My/File/Path.pm b/mysql-test/lib/My/File/Path.pm new file mode 100644 index 00000000000..b6056bf470f --- /dev/null +++ b/mysql-test/lib/My/File/Path.pm @@ -0,0 +1,83 @@ +# -*- cperl -*- +package My::File::Path; +use strict; + + +# +# File::Path::rmtree has a problem with deleting files +# and directories where it hasn't got read permission +# +# Patch this by installing a 'rmtree' function in local +# scope that first chmod all files to 0777 before calling +# the original rmtree function. +# +# This is almost gone in version 1.08 of File::Path - +# but unfortunately some hosts still suffers +# from this also in 1.08 +# + +use Exporter; +use base "Exporter"; +our @EXPORT= qw / rmtree mkpath copytree /; + + +use File::Find; +use File::Path; +use File::Copy; +use Carp; + +no warnings 'redefine'; + +sub rmtree { + my ($dir)= @_; + + # + # chmod all files to 0777 before calling rmtree + # + find( { + no_chdir => 1, + wanted => sub { + chmod(0777, $_) + or warn("couldn't chmod(0777, $_): $!"); + } + }, + $dir + ); + + + # Call rmtree from File::Path + goto &File::Path::rmtree; +}; + + +sub mkpath { + goto &File::Path::mkpath; +}; + + +sub copytree { + my ($from_dir, $to_dir) = @_; + + die "Usage: copytree(, " unless @_ == 2; + + mkpath("$to_dir"); + opendir(DIR, "$from_dir") + or croak("Can't find $from_dir$!"); + for(readdir(DIR)) { + + next if "$_" eq "." or "$_" eq ".."; + + # Skip SCCS/ directories + next if "$_" eq "SCCS"; + + if ( -d "$from_dir/$_" ) + { + copytree("$from_dir/$_", "$to_dir/$_"); + next; + } + copy("$from_dir/$_", "$to_dir/$_"); + } + closedir(DIR); +} + +1; diff --git a/mysql-test/lib/My/Find.pm b/mysql-test/lib/My/Find.pm new file mode 100644 index 00000000000..8b996ce45a4 --- /dev/null +++ b/mysql-test/lib/My/Find.pm @@ -0,0 +1,171 @@ +# -*- cperl -*- +# Copyright (C) 2004-2006 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +package My::Find; + +# +# Utility functions to find files in a MySQL source or bindist +# + +use strict; + +use base qw(Exporter); +our @EXPORT= qw(my_find_bin my_find_dir); + +our $vs_config_dir; + +my $is_win= ($^O eq "MSWin32" or $^O eq "Win32"); + +# +# my_find_bin - find an executable with "name_1...name_n" in +# paths "path_1...path_n" and return the full path +# +# Example: +# my $mysqld_exe= my_find_bin($basedir. +# ["sql", "bin"], +# ["mysqld", "mysqld-debug"]); +# my $mysql_exe= my_find_bin($basedir, +# ["client", "bin"], +# "mysql"); +# +# NOTE: The function honours MTR_VS_CONFIG environment variable +# +# +sub my_find_bin { + my ($base, $paths, $names)= @_; + die "usage: my_find_bin(, , )" + unless @_ == 3; + + # ------------------------------------------------------- + # Find and return the first executable + # ------------------------------------------------------- + foreach my $path (my_find_paths($base, $paths, $names)) { + return $path if ( -x $path or ($is_win and -f $path) ); + } + find_error($base, $paths, $names); +} + + +# +# my_find_dir - find the first existing directory in one of +# the given paths +# +# Example: +# my $charset_set= my_find_dir($basedir, +# ["mysql/share","sql/share", "share"], +# ["charset"]); +# or +# my $charset_set= my_find_dir($basedir, +# ['client_release', 'client_debug', +# 'client', 'bin']); +# +# NOTE: The function honours MTR_VS_CONFIG environment variable +# +# +sub my_find_dir { + my ($base, $paths, $dirs)= @_; + die "usage: my_find_dir(, [, ])" + unless (@_ == 3 or @_ == 2); + + # ------------------------------------------------------- + # Find and return the first directory + # ------------------------------------------------------- + foreach my $path (my_find_paths($base, $paths, $dirs)) { + return $path if ( -d $path ); + } + find_error($base, $paths, $dirs); +} + + +sub my_find_paths { + my ($base, $paths, $names)= @_; + + # Convert the arguments into two normal arrays to ease + # further mappings + my (@names, @paths); + push(@names, ref $names eq "ARRAY" ? @$names : $names); + push(@paths, ref $paths eq "ARRAY" ? @$paths : $paths); + + #print "base: $base\n"; + #print "names: @names\n"; + #print "paths: @paths\n"; + + # User can select to look in a special build dir + # which is a subdirectory of any of the paths + my @extra_dirs; + my $build_dir= $vs_config_dir || $ENV{MTR_VS_CONFIG} || $ENV{MTR_BUILD_DIR}; + push(@extra_dirs, $build_dir) if defined $build_dir; + + # ------------------------------------------------------- + # Windows specific + # ------------------------------------------------------- + if ($is_win) { + # Append .exe to names, if name does not already have extension + map { $_.=".exe" unless /\.(.*)+$/ } @names; + + # Add the default extra build dirs unless a specific one has + # already been selected + push(@extra_dirs, + ("release", + "relwithdebinfo", + "debug")) if @extra_dirs == 0; + } + + #print "extra_build_dir: @extra_dirs\n"; + + # ------------------------------------------------------- + # Build cross product of "paths * extra_build_dirs" + # ------------------------------------------------------- + push(@paths, map { my $path= $_; + map { "$path/$_" } @extra_dirs + } @paths); + #print "paths: @paths\n"; + + # ------------------------------------------------------- + # Build cross product of "paths * names" + # ------------------------------------------------------- + @paths= map { my $path= $_; + map { "$path/$_" } @names + } @paths; + #print "paths: @paths\n"; + + # ------------------------------------------------------- + # Prepend base to all paths + # ------------------------------------------------------- + @paths= map { "$base/$_" } @paths; + #print "paths: @paths\n"; + + # ------------------------------------------------------- + # Return the list of paths + # ------------------------------------------------------- + return @paths; +} + + +sub find_error { + my ($base, $paths, $names)= @_; + + my (@names, @paths); + push(@names, ref $names eq "ARRAY" ? @$names : $names); + push(@paths, ref $paths eq "ARRAY" ? @$paths : $paths); + + die "Could not find ", + join(", ", @names), " in ", + join(", ", my_find_paths($base, $paths, $names)); +} + +1; diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm new file mode 100644 index 00000000000..7e1f699ee25 --- /dev/null +++ b/mysql-test/lib/My/SafeProcess.pm @@ -0,0 +1,502 @@ +# -*- cperl -*- +# Copyright (C) 2004-2006 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +package My::SafeProcess; + +# +# Class that encapsulates process creation, monitoring and cleanup +# +# Spawns a monitor process which spawns a new process locally or +# remote using subclasses My::Process::Local or My::Process::Remote etc. +# +# The monitor process runs a simple event loop more or less just +# waiting for a reason to zap the process it monitors. Thus the user +# of this class does not need to care about process cleanup, it's +# handled automatically. +# +# The monitor process wait for: +# - the parent process to close the pipe, in that case it +# will zap the "monitored process" and exit +# - the "monitored process" to exit, in which case it will exit +# itself with same exit code as the "monitored process" +# - the parent process to send the "shutdown" signal in wich case +# monitor will kill the "monitored process" hard and exit +# +# +# When used it will look something like this: +# $> ps +# [script.pl] +# - [monitor for `mysqld`] +# - [mysqld] +# - [monitor for `mysqld`] +# - [mysqld] +# - [monitor for `mysqld`] +# - [mysqld] +# +# + +use strict; + +use POSIX qw(WNOHANG); + +use My::SafeProcess::Base; +use base 'My::SafeProcess::Base'; + +use My::Find; + +my %running; + +BEGIN { + if ($^O eq "MSWin32") { + eval 'sub IS_WIN32PERL () { 1 }'; + } + else { + eval 'sub IS_WIN32PERL () { 0 }'; + } + if ($^O eq "cygwin") { + eval 'sub IS_CYGWIN () { 1 }'; + # Make sure cygpath works + if ((system("cygpath > /dev/null 2>&1") >> 8) != 1){ + die "Could not execute 'cygpath': $!"; + } + eval 'sub fixpath { + my ($path)= @_; + return unless defined $path; + $path= `cygpath -w $path`; + chomp $path; + return $path; + }'; + } + else { + eval 'sub IS_CYGWIN () { 0 }'; + } +} + +# Find the safe process binary or script +my $safe_path= $^X; # Path to perl binary +my $safe_script; +my $safe_kill; +if (IS_WIN32PERL or IS_CYGWIN){ + # Use my_safe_process.exe + $safe_path= my_find_bin(("extra","bin"), "my_safe_process.exe"); + die "Could not find my_safe_process.exe" unless $safe_path; + + # Use my_safe_kill.exe + $safe_path= my_find_bin(("extra","bin"), "my_safe_kill"); + die "Could not find my_safe_kill.exe" unless $safe_kill; +} +else { + # Use safe_process.pl + $safe_script= "lib/My/SafeProcess/safe_process.pl"; + $safe_script= "../$safe_script" unless -f $safe_script; + die "Could not find safe_process.pl" unless -f $safe_script; +} + + +sub new { + my $class= shift; + + my %opts= + ( + verbose => 0, + @_ + ); + + my $path = delete($opts{'path'}) or die "path required"; + my $args = delete($opts{'args'}) or die "args required"; + my $input = delete($opts{'input'}); + my $output = delete($opts{'output'}); + my $error = delete($opts{'error'}); + my $verbose = delete($opts{'verbose'}); + my $host = delete($opts{'host'}); + my $shutdown = delete($opts{'shutdown'}); + + if (defined $host) { + $safe_script= "lib/My/SafeProcess/safe_process_cpcd.pl"; + } + + if (IS_CYGWIN){ + # safe_procss is a windows program and need + # windows paths + $path= fixpath($path); + $input= fixpath($input); + $output= fixpath($output); + $error= fixpath($error); + } + + my @safe_args; + push(@safe_args, $safe_script) if defined $safe_script; + + push(@safe_args, "--verbose") if $verbose > 0; + + # Point the safe_process at the right parent if running on cygwin + push(@safe_args, "--parent-pid=".Cygwin::pid_to_winpid($$)) if IS_CYGWIN; + + push(@safe_args, "--"); + push(@safe_args, $path); # The program safe_process should execute + push(@safe_args, @$$args); + + print "### safe_path: ", $safe_path, " ", join(" ", @safe_args), "\n" + if $verbose > 1; + + my ($pid, $winpid)= create_process( + path => $safe_path, + input => $input, + output => $output, + error => $error, + append => $opts{append}, + args => \@safe_args, + ); + + my $name = delete($opts{'name'}) || "SafeProcess$pid"; + my $proc= bless + ({ + SAFE_PID => $pid, + SAFE_WINPID => $winpid, + SAFE_NAME => $name, + SAFE_SHUTDOWN => $shutdown, + }, $class); + + # Put the new process in list of running + $running{$pid}= $proc; + return $proc; + +} + + +sub run { + my $proc= new(@_); + $proc->wait_one(); + return $proc->exit_status(); +} + +# +# Start a process that returns after "duration" seconds +# or when it's parent process does not exist anymore +# +sub timer { + my $class= shift; + my $duration= shift or die "duration required"; + my $parent_pid= $$; + + my $pid= My::SafeProcess::Base::_safe_fork(); + if ($pid){ + # Parent + my $proc= bless + ({ + SAFE_PID => $pid, + SAFE_NAME => "timer", + }, $class); + + # Put the new process in list of running + $running{$pid}= $proc; + return $proc; + } + + # Child, install signal handlers and sleep for "duration" + $SIG{INT}= 'DEFAULT'; + + $SIG{TERM}= sub { + #print STDERR "timer $$: woken up, exiting!\n"; + exit(0); + }; + + $0= "safe_timer($duration)"; + my $count_down= $duration; + while($count_down--){ + + # Check that parent is still alive + if (kill(0, $parent_pid) == 0){ + #print STDERR "timer $$: parent gone, exiting!\n"; + exit(0); + } + + sleep(1); + } + print STDERR "timer $$: expired after $duration seconds\n"; + exit(0); +} + + +# +# Shutdown process nicely, and wait for shutdown_timeout seconds +# If processes hasn't shutdown, kill them hard and wait for return +# +sub shutdown { + my $shutdown_timeout= shift; + my @processes= @_; + + return if (@processes == 0); + + #print "shutdown: @processes\n"; + + # Call shutdown function if process has one, else + # use kill + foreach my $proc (@processes){ + my $shutdown= $proc->{SAFE_SHUTDOWN}; + if ($shutdown_timeout > 0 and defined $shutdown){ + $shutdown->(); + } + else { + $proc->start_kill(); + } + } + + my @kill_processes= (); + + # Wait for shutdown_timeout for processes to exit + foreach my $proc (@processes){ + my $ret= $proc->wait_one($shutdown_timeout); + if ($ret != 0) { + push(@kill_processes, $proc); + } + # Only wait for the first process with shutdown timeout + $shutdown_timeout= 0; + } + + # Return if all servers has exited + return if (@kill_processes == 0); + + foreach my $proc (@kill_processes){ + $proc->start_kill(); + } + + foreach my $proc (@kill_processes){ + $proc->wait_one(); + } + return; +} + + +# +# Tell the process to die as fast as possible +# +sub start_kill { + my ($self)= @_; + die "usage: \$safe_proc->start_kill()" unless (@_ == 1 and ref $self); + #print "start_kill $self\n"; + + if (defined $safe_kill and $self->{SAFE_WINPID}){ + # Use my_safe_kill to tell my_safe_process + # it's time to kill it's child and return + my $pid= $self->{SAFE_WINPID}; + my $ret= system($safe_kill, $pid); + #print STDERR "start_kill, safe_killed $pid, ret: $ret\n"; + } else { + my $pid= $self->{SAFE_PID}; + die "Can't kill not started process" unless defined $pid; + my $ret= kill(15, $pid); + #print STDERR "start_kill, sent signal 15 to $pid, ret: $ret\n"; + } + return 1; +} + + +# +# Kill the process as fast as possible +# and wait for it to return +# +sub kill { + my ($self)= @_; + die "usage: \$safe_proc->kill()" unless (@_ == 1 and ref $self); + + $self->start_kill(); + $self->wait_one(); + return 1; +} + + +sub _collect { + my ($self)= @_; + + #print "_collect\n"; + $self->{EXIT_STATUS}= $?; + + # Take the process out of running list + my $pid= $self->{SAFE_PID}; + die unless delete($running{$pid}); +} + + +# Wait for process to exit +# optionally with a timeout +# +# timeout +# undef -> wait blocking infinitely +# 0 -> just poll with WNOHANG +# >0 -> wait blocking for max timeout seconds +# +# RETURN VALUES +# 0 Not running +# 1 Still running +# +sub wait_one { + my ($self, $timeout)= @_; + die "usage: \$safe_proc->wait_one([timeout])" unless ref $self; + + #print "wait_one $self, $timeout\n"; + + if ( ! defined($self->{SAFE_PID}) ) { + # No pid => not running + return 0; + } + + if ( defined $self->{EXIT_STATUS} ) { + # Exit status already set => not running + return 0; + } + + my $pid= $self->{SAFE_PID}; + + my $use_alarm; + my $blocking; + if (defined $timeout) + { + if ($timeout == 0) + { + # 0 -> just poll with WNOHANG + $blocking= 0; + $use_alarm= 0; + } + else + { + # >0 -> wait blocking for max timeout seconds + $blocking= 1; + $use_alarm= 1; + } + } + else + { + # undef -> wait blocking infinitely + $blocking= 1; + $use_alarm= 0; + } + + my $retpid; + eval + { + # alarm should break the wait + local $SIG{ALRM}= sub { die "waitpid timeout"; }; + + alarm($timeout) if $use_alarm; + + $retpid= waitpid($pid, $blocking ? 0 : &WNOHANG); + + alarm(0) if $use_alarm; + }; + + if ($@) + { + die "Got unexpected: $@" if ($@ !~ /waitpid timeout/); + if (!defined $retpid) { + # Got timeout + return 1; + } + # Got pid _and_ alarm, continue + } + + if ( $retpid == 0 ) { + # 0 => still running + return 1; + } + + if ( not $blocking and $retpid == -1 ) { + # still running + return 1; + } + + warn "wait_one: expected pid $pid but got $retpid" + unless( $retpid == $pid ); + + $self->_collect(); + return 0; +} + + +# +# Wait for any process to exit +# +# Returns a reference to the SafeProcess that +# exited or undefined +# +sub wait_any { + my $ret_pid; + if (IS_WIN32PERL) { + # Can't wait for -1 => use a polling loop + do { + Win32::Sleep(10); # 10 milli seconds + foreach my $pid (keys %running){ + $ret_pid= waitpid($pid, &WNOHANG); + last if $pid == $ret_pid; + } + } while ($ret_pid == 0); + + # Special processig of return code + # since negative pids are valid + if ($ret_pid == 0 or $ret_pid == -1) { + print STDERR "wait_any, got invalid pid: $ret_pid\n"; + return undef; + } + } + else + { + $ret_pid= waitpid(-1, 0); + if ($ret_pid <= 0){ + # No more processes to wait for + print STDERR "wait_any, got invalid pid: $ret_pid\n"; + return undef; + } + } + + # Look it up in "running" table + my $proc= $running{$ret_pid}; + unless (defined $proc){ + print STDERR "Could not find pid in running list\n"; + print STDERR "running: ". join(", ", keys(%running)). "\n"; + return undef; + } + $proc->_collect; + return $proc; +} + +# +# Overload string operator +# and fallback to default functions if no +# overloaded function is found +# +use overload + '""' => \&self2str, + fallback => 1; + + +# +# Return the process as a nicely formatted string +# +sub self2str { + my ($self)= @_; + my $pid= $self->{SAFE_PID}; + my $winpid= $self->{SAFE_WINPID}; + my $name= $self->{SAFE_NAME}; + my $exit_status= $self->{EXIT_STATUS}; + + my $str= "[$name - pid: $pid"; + $str.= ", winpid: $winpid" if defined $winpid; + $str.= ", exit: $exit_status" if defined $exit_status; + $str.= "]"; +} + + +1; diff --git a/mysql-test/lib/My/SafeProcess/Base.pm b/mysql-test/lib/My/SafeProcess/Base.pm new file mode 100644 index 00000000000..2f3cf9d037a --- /dev/null +++ b/mysql-test/lib/My/SafeProcess/Base.pm @@ -0,0 +1,236 @@ +# -*- cperl -*- +# Copyright (C) 2004-2006 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +# This is a library file used by the Perl version of mysql-test-run, +# and is part of the translation of the Bourne shell script with the +# same name. + +use strict; + +package My::SafeProcess::Base; + +# +# Utility functions for Process management +# + +use Carp; +use IO::Pipe; + +use base qw(Exporter); +our @EXPORT= qw(create_process); + + +sub winpid { + my ($pid)= @_; + + return undef unless $^O eq "cygwin"; + + # The child get a new winpid when the exec takes + # place, wait for that to happen + my $winpid; + my $delay= 0; + do + { + # Yield to the child + select(undef, undef, undef, $delay); + # Increase the delay slightly for each loop + $delay += 0.000001; + + $winpid= Cygwin::pid_to_winpid($pid); + + } until ($winpid != $pid); + + return $winpid; +} + + + +# +# safe_fork +# Retry a couple of times if fork returns EAGAIN +# +sub _safe_fork { + my $retries= 5; + my $pid; + + FORK: + { + $pid= fork; + if ( not defined($pid)) { + + croak("fork failed after: $!") if (!$retries--); + + warn("fork failed sleep 1 second and redo: $!"); + sleep(1); + redo FORK; + } + } + + return $pid; +}; + + +# +# Decode exit status +# +sub exit_status { + my $self= shift; + my $raw= $self->{EXIT_STATUS}; + + croak("Can't call exit_status before process has died") + unless defined $raw; + + if ($raw & 127) + { + # Killed by signal + my $signal_num= $raw & 127; + my $dumped_core= $raw & 128; + return 1; # Return error code + } + else + { + # Normal process exit + return $raw >> 8; + }; +} + + +# +# Create a new process +# Return pid of the new process +# +sub create_process { + my %opts= + ( + @_ + ); + + my $path = delete($opts{'path'}) or die "path required"; + my $args = delete($opts{'args'}) or die "args required"; + my $input = delete($opts{'input'}); + my $output = delete($opts{'output'}); + my $error = delete($opts{'error'}); + + my $open_mode= $opts{append} ? ">>" : ">"; + + if ($^O eq "MSWin32"){ + + #printf STDERR "stdin %d, stdout %d, stderr %d\n", + # fileno STDIN, fileno STDOUT, fileno STDERR; + + # input output redirect + my ($oldin, $oldout, $olderr); + open $oldin, '<&', \*STDIN or die "Failed to save old stdin: $!"; + open $oldout, '>&', \*STDOUT or die "Failed to save old stdout: $!"; + open $olderr, '>&', \*STDERR or die "Failed to save old stderr: $!"; + + if ( $input ) { + if ( ! open(STDIN, "<", $input) ) { + croak("can't redirect STDIN to '$input': $!"); + } + } + + if ( $output ) { + if ( ! open(STDOUT, $open_mode, $output) ) { + croak("can't redirect STDOUT to '$output': $!"); + } + } + + if ( $error ) { + if ( $output eq $error ) { + if ( ! open(STDERR, ">&STDOUT") ) { + croak("can't dup STDOUT: $!"); + } + } + elsif ( ! open(STDERR, $open_mode, $error) ) { + croak("can't redirect STDERR to '$error': $!"); + } + } + + + # Magic use of 'system(1, @args)' to spawn a process + # and get a proper Win32 pid + unshift (@$args, $path); + my $pid= system(1, @$args); + if ( $pid == 0 ){ + print $olderr "create_process failed: $^E\n"; + die "create_process failed: $^E"; + } + + # Retore IO redirects + open STDERR, '>&', $olderr + or croak("unable to reestablish STDERR"); + open STDOUT, '>&', $oldout + or croak("unable to reestablish STDOUT"); + open STDIN, '<&', $oldin + or croak("unable to reestablish STDIN"); + #printf STDERR "stdin %d, stdout %d, stderr %d\n", + # fileno STDIN, fileno STDOUT, fileno STDERR; + return wantarray ? ($pid, $pid) : $pid; + + } + + local $SIG{PIPE}= sub { print STDERR "Got signal $@\n"; }; + my $pipe= IO::Pipe->new(); + my $pid= _safe_fork(); + if ($pid){ + # Parent + $pipe->reader(); + my $line= <$pipe>; # Wait for child to say it's ready + return wantarray ? ($pid, winpid($pid)) : $pid; + } + + $SIG{INT}= 'DEFAULT'; + + # Make this process it's own process group to be able to kill + # it and any childs(that hasn't changed group themself) + setpgrp(0,0) if $opts{setpgrp}; + + if ( $output and !open(STDOUT, $open_mode, $output) ) { + croak("can't redirect STDOUT to '$output': $!"); + } + + if ( $error ) { + if ( defined $output and $output eq $error ) { + if ( ! open(STDERR, ">&STDOUT") ) { + croak("can't dup STDOUT: $!"); + } + } + elsif ( ! open(STDERR, $open_mode, $error) ) { + croak("can't redirect STDERR to '$error': $!"); + } + } + + if ( $input ) { + if ( ! open(STDIN, "<", $input) ) { + croak("can't redirect STDIN to '$input': $!"); + } + } + + # Tell parent to continue + $pipe->writer(); + print $pipe "ready\n"; + + if ( !exec($path, @$args) ){ + croak("Failed to exec '$path': $!"); + } + + croak("Should never come here"); + +} + +1; + diff --git a/mysql-test/lib/My/SafeProcess/safe_kill_win.cc b/mysql-test/lib/My/SafeProcess/safe_kill_win.cc new file mode 100755 index 00000000000..8049f626c93 --- /dev/null +++ b/mysql-test/lib/My/SafeProcess/safe_kill_win.cc @@ -0,0 +1,56 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + + +/* + Utility program used to signal a safe_process it's time to shutdown + + Usage: + safe_kill +*/ + +#include +#include + +int main(int argc, const char** argv ) +{ + DWORD pid= -1; + HANDLE shutdown_event; + char safe_process_name[32]= {0}; + + if (argc != 2) { + fprintf(stderr, "safe_kill \n"); + exit(2); + } + pid= atoi(argv[1]); + + _snprintf(safe_process_name, sizeof(safe_process_name), "safe_process[%d]", pid); + + /* Open the event to signal */ + if ((shutdown_event= + OpenEvent(EVENT_MODIFY_STATE, FALSE, safe_process_name)) == NULL){ + fprintf(stderr, "Failed to open shutdown_event\n"); + exit(1); + } + + if(SetEvent(shutdown_event) == 0) { + fprintf(stderr, "Failed to signal shutdown_event\n"); + CloseHandle(shutdown_event); + exit(1); + } + CloseHandle(shutdown_event); + exit(0); +} + diff --git a/mysql-test/lib/My/SafeProcess/safe_process.pl b/mysql-test/lib/My/SafeProcess/safe_process.pl new file mode 100644 index 00000000000..707f78d36bd --- /dev/null +++ b/mysql-test/lib/My/SafeProcess/safe_process.pl @@ -0,0 +1,141 @@ +#!/usr/bin/perl +# -*- cperl -*- + +use strict; +use warnings; + +use Time::localtime; +use lib 'lib'; +use My::SafeProcess::Base; +use POSIX qw(WNOHANG); + +########################################################################### +# Util functions +########################################################################### + +# +#Print message to stderr +# +my $verbose= 0; +sub message { + if ($verbose > 0){ + my $tm= localtime(); + my $timestamp= sprintf("%02d%02d%02d %2d:%02d:%02d", + $tm->year % 100, $tm->mon+1, $tm->mday, + $tm->hour, $tm->min, $tm->sec); + print STDERR $timestamp, " monitor[$$]: ", @_, "\n"; + } +} + + +########################################################################### +# Main program +########################################################################### + +my $terminated= 0; + +# Protect against being killed in the middle +# of child creation, just set the terminated flag +# to make sure the child will be killed off +# when program is ready to do that +$SIG{TERM}= sub { message("!Got signal @_"); $terminated= 1; }; +$SIG{INT}= sub { message("!Got signal @_"); $terminated= 1; }; + +my $parent_pid= getppid(); + +use Getopt::Long; +GetOptions( + 'verbose' => \$verbose, + ) or die "GetOptions failed"; +shift(@ARGV) if defined($ARGV[0]) and $ARGV[0] eq "--"; +my $path= shift(@ARGV); # Executable + +die "usage:\n" . + " safe_process.pl [opts] -- [ [...]]" + unless defined $path; + + +message("started"); +#message("path: '$path'"); +message("parent: $parent_pid"); + +# Start process to monitor +my $child_pid= + create_process( + path => $path, + args => \@ARGV, + setpgrp => 1, + ); +message("Started child $child_pid"); + +eval { + sub handle_signal { + $terminated= 1; + message("Got signal @_"); + + # Ignore all signals + foreach my $name (keys %SIG){ + $SIG{$name}= 'IGNORE'; + } + + die "signaled\n"; + }; + local $SIG{TERM}= \&handle_signal; + local $SIG{INT}= \&handle_signal; + local $SIG{CHLD}= sub { + message("Got signal @_"); + kill(9, -$child_pid); + my $ret= waitpid($child_pid, 0); + if ($? & 127){ + exit(65); # Killed by signal + } + exit($? >> 8); + }; + + # Monitoring loop + while(!$terminated) { + + # Check if parent is still alive + if (kill(0, $parent_pid) < 1){ + message("Parent is not alive anymore"); + last; + } + + # Wait for child to terminate but wakeup every + # second to also check that parent is still alive + my $ret_pid; + $ret_pid= waitpid($child_pid, &WNOHANG); + if ($ret_pid == $child_pid) { + # Process has exited, collect return status + my $ret_code= $? >> 8; + message("Child exit: $ret_code"); + # Exit with exit status of the child + exit ($ret_code); + } + sleep(1); + } +}; +if ( $@ ) { + # The monitoring loop should have been + # broken by handle_signal + warn "Unexpected: $@" unless ( $@ =~ /signaled/ ); +} + +# Use negative pid in order to kill the whole +# process group +# +my $ret= kill(9, -$child_pid); +message("Killed child: $child_pid, ret: $ret"); +if ($ret > 0) { + message("Killed child: $child_pid"); + # Wait blocking for the child to return + my $ret_pid= waitpid($child_pid, 0); + if ($ret_pid != $child_pid){ + message("unexpected pid $ret_pid returned from waitpid($child_pid)"); + } +} + +message("DONE!"); +exit (1); + + diff --git a/mysql-test/lib/My/SafeProcess/safe_process_win.cc b/mysql-test/lib/My/SafeProcess/safe_process_win.cc new file mode 100755 index 00000000000..1547070ce20 --- /dev/null +++ b/mysql-test/lib/My/SafeProcess/safe_process_win.cc @@ -0,0 +1,312 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + + +/* + Utility program that encapsulates process creation, monitoring + and bulletproof process cleanup + + Usage: + safe_process [options to safe_process] -- progname arg1 ... argn + + To safeguard mysqld you would invoke safe_process with a few options + for safe_process itself followed by a double dash to indicate start + of the command line for the program you really want to start + + $> safe_process --output=output.log -- mysqld --datadir=var/data1 ... + + This would redirect output to output.log and then start mysqld, + once it has done that it will continue to monitor the child as well + as the parent. + + The safe_process then checks the follwing things: + 1. Child exits, propagate the childs return code to the parent + by exiting with the same return code as the child. + + 2. Parent dies, immediately kill the child and exit, thus the + parent does not need to properly cleanup any child, it is handled + automatically. + + 3. Signal's recieced by the process will trigger same action as 2) + + 4. The named event "safe_process[pid]" can be signaled and will + trigger same action as 2) + + WARNING! Be careful when using ProcessExplorer, since it will open + a handle to each process(and maybe also the Job), the process + spawned by safe_process will not be closed off when safe_process + is killed. +*/ + +/* Requires Windows 2000 or higher */ +#define _WIN32_WINNT 0x0500 + +#include +#include +#include +#include + +static int verbose= 0; +static char safe_process_name[32]= {0}; + +static void message(const char* fmt, ...) +{ + if (!verbose) + return; + va_list args; + fprintf(stderr, "%s: ", safe_process_name); + va_start(args, fmt); + vfprintf(stderr, fmt, args); + fprintf(stderr, "\n"); + va_end(args); + fflush(stderr); +} + + +static void die(const char* fmt, ...) +{ + va_list args; + fprintf(stderr, "%s: FATAL ERROR, ", safe_process_name); + va_start(args, fmt); + vfprintf(stderr, fmt, args); + fprintf(stderr, "\n"); + va_end(args); + if (int last_err= GetLastError()) + fprintf(stderr, "error: %d, %s\n", last_err, strerror(last_err)); + exit(1); +} + + +DWORD get_parent_pid(DWORD pid) +{ + HANDLE snapshot; + DWORD parent_pid= -1; + PROCESSENTRY32 pe32; + pe32.dwSize= sizeof(PROCESSENTRY32); + + snapshot= CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); + if (snapshot == INVALID_HANDLE_VALUE) + die("CreateToolhelp32Snapshot failed"); + + if (!Process32First(snapshot, &pe32)) + { + CloseHandle(snapshot); + die("Process32First failed"); + } + + do + { + if (pe32.th32ProcessID == pid) + parent_pid= pe32.th32ParentProcessID; + } while(Process32Next( snapshot, &pe32)); + CloseHandle(snapshot); + + if (parent_pid == -1) + die("Could not find parent pid"); + + return parent_pid; +} + + +enum { + PARENT, + CHILD, + EVENT, + NUM_HANDLES +}; + + +HANDLE shutdown_event; +void handle_signal (int signal) +{ + message("Got signal: %d", signal); + if(SetEvent(shutdown_event) == 0) { + /* exit safe_process and (hopefully) kill off the child */ + die("Failed to SetEvent"); + } +} + + +int main(int argc, const char** argv ) +{ + char child_args[4096]= {0}; + DWORD pid= GetCurrentProcessId(); + DWORD parent_pid= get_parent_pid(pid); + HANDLE job_handle; + HANDLE wait_handles[NUM_HANDLES]= {0}; + PROCESS_INFORMATION process_info= {0}; + + sprintf(safe_process_name, "safe_process[%d]", pid); + + /* Create an event for the signal handler */ + if ((shutdown_event= + CreateEvent(NULL, TRUE, FALSE, safe_process_name)) == NULL) + die("Failed to create shutdown_event"); + wait_handles[EVENT]= shutdown_event; + + signal(SIGINT, handle_signal); + signal(SIGBREAK, handle_signal); + signal(SIGTERM, handle_signal); + + message("Started"); + + /* Parse arguments */ + for (int i= 1; i < argc; i++) { + const char* arg= argv[i]; + char* to= child_args; + if (strcmp(arg, "--") == 0 && strlen(arg) == 2) { + /* Got the "--" delimiter */ + if (i >= argc) + die("No real args -> nothing to do"); + /* Copy the remaining args to child_arg */ + for (int j= i+1; j < argc; j++) { + to+= _snprintf(to, child_args + sizeof(child_args) - to, "%s ", argv[j]); + } + break; + } else { + if ( strcmp(arg, "--verbose") == 0 ) + verbose++; + else if ( strncmp(arg, "--parent-pid", 10) == 0 ) + { + /* Override parent_pid with a value provided by user */ + const char* start; + if ((start= strstr(arg, "=")) == NULL) + die("Could not find start of option value in '%s'", arg); + start++; /* Step past = */ + if ((parent_pid= atoi(start)) == 0) + die("Invalid value '%s' passed to --parent-id", start); + } + else + die("Unknown option: %s", arg); + } + } + if (*child_args == '\0') + die("nothing to do"); + + /* Open a handle to the parent process */ + message("parent_pid: %d", parent_pid); + if (parent_pid == pid) + die("parent_pid is equal to own pid!"); + + if ((wait_handles[PARENT]= + OpenProcess(SYNCHRONIZE, FALSE, parent_pid)) == NULL) + die("Failed to open parent process with pid: %d", parent_pid); + + /* Create the child process in a job */ + JOBOBJECT_EXTENDED_LIMIT_INFORMATION jeli = { 0 }; + STARTUPINFO si = { 0 }; + si.cb = sizeof(si); + + /* + Create the job object to make it possible to kill the process + and all of it's children in one go + */ + if ((job_handle= CreateJobObject(NULL, NULL)) == NULL) + die("CreateJobObject failed"); + + /* + Make all processes associated with the job terminate when the + last handle to the job is closed. + */ + jeli.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE; + if (SetInformationJobObject(job_handle, JobObjectExtendedLimitInformation, + &jeli, sizeof(jeli)) == 0) + message("SetInformationJobObject failed, continue anyway..."); + +#if 0 + /* Setup stdin, stdout and stderr redirect */ + si.dwFlags= STARTF_USESTDHANDLES; + si.hStdInput= GetStdHandle(STD_INPUT_HANDLE); + si.hStdOutput= GetStdHandle(STD_OUTPUT_HANDLE); + si.hStdError= GetStdHandle(STD_ERROR_HANDLE); +#endif + + /* + Create the process suspended to make sure it's assigned to the + Job before it creates any process of it's own + */ + if (CreateProcess(NULL, (LPSTR)child_args, + NULL, + NULL, + TRUE, /* inherit handles */ + CREATE_SUSPENDED, + NULL, + NULL, + &si, + &process_info) == 0) + die("CreateProcess failed"); + + if (AssignProcessToJobObject(job_handle, process_info.hProcess) == 0) + { + TerminateProcess(process_info.hProcess, 200); + die("AssignProcessToJobObject failed"); + } + ResumeThread(process_info.hThread); + CloseHandle(process_info.hThread); + + wait_handles[CHILD]= process_info.hProcess; + + message("Started child %d", process_info.dwProcessId); + + /* Monitor loop */ + DWORD child_exit_code= 1; + DWORD wait_res= WaitForMultipleObjects(NUM_HANDLES, wait_handles, + FALSE, INFINITE); + switch (wait_res) + { + case WAIT_OBJECT_0 + PARENT: + message("Parent exit"); + break; + case WAIT_OBJECT_0 + CHILD: + if (GetExitCodeProcess(wait_handles[CHILD], &child_exit_code) == 0) + message("Child exit: could not get exit_code"); + else + message("Child exit: exit_code: %d", child_exit_code); + break; + case WAIT_OBJECT_0 + EVENT: + message("Wake up from shutdown_event"); + break; + + default: + message("Unexpected result %d from WaitForMultipleObjects", wait_res); + break; + } + message("Exiting, child: %d", process_info.dwProcessId); + + if (TerminateJobObject(job_handle, 201) == 0) + message("TerminateJobObject failed"); + CloseHandle(job_handle); + + if (wait_res != WAIT_OBJECT_0 + CHILD) + { + /* The child has not yet returned, wait for it */ + message("waiting for child to exit"); + if ((wait_res= WaitForSingleObject(wait_handles[CHILD], INFINITE)) != WAIT_OBJECT_0) + { + message("child wait failed: %d", wait_res); + } + else + { + message("child wait succeeded"); + } + /* Child's exit code should now be 201, no need to get it */ + } + + for (int i= 0; i < NUM_HANDLES; i++) + CloseHandle(wait_handles[i]); + + exit(child_exit_code); +} + diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pm similarity index 53% rename from mysql-test/lib/mtr_cases.pl rename to mysql-test/lib/mtr_cases.pm index a4ef9aad897..4d6885f5495 100644 --- a/mysql-test/lib/mtr_cases.pl +++ b/mysql-test/lib/mtr_cases.pm @@ -1,15 +1,15 @@ # -*- cperl -*- # Copyright (C) 2005-2006 MySQL AB -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA @@ -18,59 +18,86 @@ # and is part of the translation of the Bourne shell script with the # same name. -use File::Basename; -use IO::File(); +package mtr_cases; use strict; +use base qw(Exporter); +our @EXPORT= qw(collect_option collect_test_cases); + +# Options used for the collect phase +our $start_from; +our $print_testcases; +our $skip_rpl; +our $do_test; +our $skip_test; +our $opt_skip_combination; +our $binlog_format;; +our $enable_disabled; +our $default_storage_engine; +our $opt_with_ndbcluster_only; +our $defaults_file; +our $defaults_extra_file; + +sub collect_option { + my ($opt, $value)= @_; + + # Convert - to _ in option name + $opt =~ s/-/_/; + no strict 'refs'; + ${$opt}= $value; +} + +use File::Basename; +use IO::File(); use My::Config; -sub collect_test_cases ($); -sub collect_one_suite ($); -sub collect_one_test_case ($$$$$$$$$); +require "mtr_settings.pl"; +require "mtr_report.pl"; +require "mtr_match.pl"; +require "mtr_misc.pl"; -sub mtr_options_from_test_file($$); - -my $do_test; -my $skip_test; +# Precompiled regex's for tests to do or skip +my $do_test_reg; +my $skip_test_reg; sub init_pattern { my ($from, $what)= @_; - if ( $from =~ /[a-z0-9]/ ) { - # Does not contain any regex, make the pattern match + return undef unless defined $from; + if ( $from =~ /^[a-z0-9\.]*$/ ) { + # Does not contain any regex (except . that we allow as + # separator betwen suite and testname), make the pattern match # beginning of string $from= "^$from"; + mtr_verbose("$what='$from'"); } - else { - # Check that pattern is a valid regex - eval { "" =~/$from/; 1 } or - mtr_error("Invalid regex '$from' passed to $what\nPerl says: $@"); - } + # Check that pattern is a valid regex + eval { "" =~/$from/; 1 } or + mtr_error("Invalid regex '$from' passed to $what\nPerl says: $@"); return $from; } - ############################################################################## # -# Collect information about test cases we are to run +# Collect information about test cases to be run # ############################################################################## sub collect_test_cases ($) { - $do_test= init_pattern($::opt_do_test, "--do-test"); - $skip_test= init_pattern($::opt_skip_test, "--skip-test"); - my $suites= shift; # Semicolon separated list of test suites - my $cases = []; # Array of hash + my $cases= []; # Array of hash(one hash for each testcase) + + $do_test_reg= init_pattern($do_test, "--do-test"); + $skip_test_reg= init_pattern($skip_test, "--skip-test"); foreach my $suite (split(",", $suites)) { push(@$cases, collect_one_suite($suite)); } - if ( @::opt_cases ) { + # A list of tests was specified on the command line # Check that the tests specified was found # in at least one suite foreach my $test_name_spec ( @::opt_cases ) @@ -99,14 +126,13 @@ sub collect_test_cases ($) { # Make a mapping of test name to a string that represents how that test # should be sorted among the other tests. Put the most important criterion - # first, then a sub-criterion, then sub-sub-criterion, et c. + # first, then a sub-criterion, then sub-sub-criterion, etc. foreach my $tinfo (@$cases) { my @criteria = (); - # Look for tests that muct be in run in a defined order - # that is defined by test having the same name except for - # the ending digit + # Look for tests that must be run in a defined order - that is + # defined by test having the same name except for the ending digit # Put variables into hash my $test_name= $tinfo->{'name'}; @@ -156,25 +182,23 @@ sub collect_test_cases ($) { $sort_criteria{$a->{'name'}} . $a->{'name'} cmp $sort_criteria{$b->{'name'}} . $b->{'name'}; } @$cases; - if ( $::opt_script_debug ) - { - # For debugging the sort-order - foreach my $tinfo (@$cases) - { - print("$sort_criteria{$tinfo->{'name'}} -> \t$tinfo->{'name'}\n"); - } - } + # For debugging the sort-order + # foreach my $tinfo (@$cases) + # { + # print("$sort_criteria{$tinfo->{'name'}} -> \t$tinfo->{'name'}\n"); + # } + + } + + if (defined $print_testcases){ + print_testcases(@$cases); + exit(1); } return $cases; } -# Valid extensions and their corresonding component id -my %exts = ( 'test' => 'mysqld', - 'imtest' => 'im' - ); - # Returns (suitename, testname, extension) sub split_testname { @@ -190,7 +214,7 @@ sub split_testname { # Either testname.test or suite.testname given # Ex. main.alias or alias.test - if (defined $exts{$parts[1]}) + if ($parts[1] eq "test") { return (undef , $parts[0], $parts[1]); } @@ -212,7 +236,7 @@ sub split_testname { sub collect_one_suite($) { my $suite= shift; # Test suite name - my @cases; # Array of hash + my @cases; # Array of hash mtr_verbose("Collecting: $suite"); @@ -222,11 +246,39 @@ sub collect_one_suite($) $suitedir= mtr_path_exists("$suitedir/suite/$suite", "$suitedir/$suite"); mtr_verbose("suitedir: $suitedir"); + + } my $testdir= "$suitedir/t"; my $resdir= "$suitedir/r"; + # Check if t/ exists + if (-d $testdir){ + # t/ exists + + if ( -d $resdir ) + { + # r/exists + } + else + { + # No r/, use t/ as result dir + $resdir= $testdir; + } + + } + else { + # No t/ dir => there can' be any r/ dir + mtr_error("Can't have r/ dir without t/") if -d $resdir; + + # No t/ or r/ => use suitedir + $resdir= $testdir= $suitedir; + } + + mtr_verbose("testdir: $testdir"); + mtr_verbose("resdir: $resdir"); + # ---------------------------------------------------------------------- # Build a hash of disabled testcases for this suite # ---------------------------------------------------------------------- @@ -249,7 +301,7 @@ sub collect_one_suite($) my $suite_opts= []; if ( -f $suite_opt_file ) { - $suite_opts= mtr_get_opts_from_file($suite_opt_file); + $suite_opts= opts_from_file($suite_opt_file); } if ( @::opt_cases ) @@ -267,7 +319,6 @@ sub collect_one_suite($) # Check cirrect suite if suitename is defined next if (defined $sname and $suite ne $sname); - my $component_id; if ( defined $extension ) { my $full_name= "$testdir/$tname.$extension"; @@ -281,28 +332,26 @@ sub collect_one_suite($) next; } - $component_id= $exts{$extension}; } else { - # No extension was specified - my ($ext, $component); - while (($ext, $component)= each %exts) { - my $full_name= "$testdir/$tname.$ext"; + # No extension was specified, use default + $extension= "test"; + my $full_name= "$testdir/$tname.$extension"; - if ( ! -f $full_name ) { - next; - } - $component_id= $component; - $extension= $ext; - } # Test not found here, could exist in other suite - next unless $component_id; + next if ( ! -f $full_name ); } - collect_one_test_case($testdir,$resdir,$suite,$tname, - "$tname.$extension",\@cases,\%disabled, - $component_id,$suite_opts); + push(@cases, + collect_one_test_case($suitedir, + $testdir, + $resdir, + $suite, + $tname, + "$tname.$extension", + \%disabled, + $suite_opts)); } } else @@ -311,33 +360,26 @@ sub collect_one_suite($) foreach my $elem ( sort readdir(TESTDIR) ) { - my $component_id= undef; - my $tname= undef; + my $tname= mtr_match_extension($elem, 'test'); - if ($tname= mtr_match_extension($elem, 'test')) - { - $component_id = 'mysqld'; - } - elsif ($tname= mtr_match_extension($elem, 'imtest')) - { - $component_id = 'im'; - } - else - { - next; - } + next unless defined $tname; # Skip tests that does not match the --do-test= filter - next if ($do_test and not $tname =~ /$do_test/o); + next if ($do_test_reg and not $tname =~ /$do_test_reg/o); - collect_one_test_case($testdir,$resdir,$suite,$tname, - $elem,\@cases,\%disabled,$component_id, - $suite_opts); + push(@cases, + collect_one_test_case($suitedir, + $testdir, + $resdir, + $suite, + $tname, + $elem, + \%disabled, + $suite_opts)); } closedir TESTDIR; } - # Return empty list if no testcases found return if (@cases == 0); @@ -345,7 +387,7 @@ sub collect_one_suite($) # Read combinations for this suite and build testcases x combinations # if any combinations exists # ---------------------------------------------------------------------- - if ( ! $::opt_skip_combination ) + if ( ! $opt_skip_combination ) { my @combinations; my $combination_file= "$suitedir/combinations"; @@ -366,7 +408,6 @@ sub collect_one_suite($) # Read combinations file in my.cnf format mtr_verbose("Read combinations file"); my $config= My::Config->new($combination_file); - foreach my $group ($config->groups()) { my $comb= {}; $comb->{name}= $group->name(); @@ -414,7 +455,6 @@ sub collect_one_suite($) #print_testcases(@cases); } } - optimize_cases(\@cases); #print_testcases(@cases); @@ -422,6 +462,7 @@ sub collect_one_suite($) } + # # Loop through all test cases # - optimize which test to run by skipping unnecessary ones @@ -435,169 +476,79 @@ sub optimize_cases { # Skip processing if already marked as skipped next if $tinfo->{skip}; - # Replication test needs an adjustment of binlog format - if (mtr_match_prefix($tinfo->{'name'}, "rpl")) + # ======================================================= + # If a special binlog format was selected with + # --mysqld=--binlog-format=x, skip all test that does not + # support it + # ======================================================= + if (defined $binlog_format ) { - # ======================================================= - # Get binlog-format used by this test from master_opt + # Fixed --binlog-format=x specified on command line # ======================================================= - my $test_binlog_format; - foreach my $opt ( @{$tinfo->{master_opt}} ) { - $test_binlog_format= $test_binlog_format || - mtr_match_prefix($opt, "--binlog-format="); - } - # print $tinfo->{name}." uses ".$test_binlog_format."\n"; - - # ======================================================= - # If a special binlog format was selected with - # --mysqld=--binlog-format=x, skip all test with different - # binlog-format - # ======================================================= - if (defined $::used_binlog_format and - $test_binlog_format and - $::used_binlog_format ne $test_binlog_format) - { - $tinfo->{'skip'}= 1; - $tinfo->{'comment'}= "Requires --binlog-format='$test_binlog_format'"; - next; - } - - # ======================================================= - # Check that testcase supports the designated binlog-format - # ======================================================= - if ($test_binlog_format and defined $tinfo->{'sup_binlog_formats'} ) + if ( defined $tinfo->{'binlog_formats'} ) { + # The test supports different binlog formats + # check if the selected one is ok my $supported= - grep { $_ eq $test_binlog_format } @{$tinfo->{'sup_binlog_formats'}}; + grep { $_ eq $binlog_format } @{$tinfo->{'binlog_formats'}}; if ( !$supported ) { $tinfo->{'skip'}= 1; $tinfo->{'comment'}= - "Doesn't support --binlog-format='$test_binlog_format'"; - next; + "Doesn't support --binlog-format='$binlog_format'"; } } + } + else + { + # ======================================================= + # Use dynamic switching of binlog format + # ======================================================= - # ======================================================= - # Use dynamic switching of binlog-format if mtr started - # w/o --mysqld=--binlog-format=xxx and combinations. - # ======================================================= - if (!defined $tinfo->{'combination'} and - !defined $::used_binlog_format) - { - $test_binlog_format= $tinfo->{'sup_binlog_formats'}->[0]; + # Get binlog-format used by this test from master_opt + my $test_binlog_format; + foreach my $opt ( @{$tinfo->{master_opt}} ) { + $test_binlog_format= + mtr_match_prefix($opt, "--binlog-format=") || $test_binlog_format; } - # Save binlog format for dynamic switching - $tinfo->{binlog_format}= $test_binlog_format; + if (defined $test_binlog_format) + { + if ( defined $tinfo->{binlog_formats} ) + { + my $supported= + grep { $_ eq $test_binlog_format } @{$tinfo->{'binlog_formats'}}; + if ( !$supported ) + { + $tinfo->{'skip'}= 1; + $tinfo->{'comment'}= + "Doesn't support --binlog-format='$test_binlog_format'"; + next; + } + } + + # Save binlog format for dynamic switching + $tinfo->{binlog_format_switch}= $test_binlog_format; + } } } } -############################################################################## # -# Collect information about a single test case +# Read options from the given opt file and append them as an array +# to $tinfo->{$opt_name} # -############################################################################## +sub process_opts_file { + my ($tinfo, $opt_file, $opt_name)= @_; - -sub collect_one_test_case($$$$$$$$$) { - my $testdir= shift; - my $resdir= shift; - my $suite= shift; - my $tname= shift; - my $elem= shift; - my $cases= shift; - my $disabled=shift; - my $component_id= shift; - my $suite_opts= shift; - - my $path= "$testdir/$elem"; - - # ---------------------------------------------------------------------- - # Skip some tests silently - # ---------------------------------------------------------------------- - - if ( $::opt_start_from and $tname lt $::opt_start_from ) + $tinfo->{$opt_name}= []; + if ( -f $opt_file ) { - return; - } + my $opts= opts_from_file($opt_file); - - my $tinfo= {}; - $tinfo->{'name'}= basename($suite) . ".$tname"; - $tinfo->{'result_file'}= "$resdir/$tname.result"; - $tinfo->{'component_id'} = $component_id; - push(@$cases, $tinfo); - - # ---------------------------------------------------------------------- - # Skip some tests but include in list, just mark them to skip - # ---------------------------------------------------------------------- - - if ( $skip_test and $tname =~ /$skip_test/o ) - { - $tinfo->{'skip'}= 1; - return; - } - - # ---------------------------------------------------------------------- - # Collect information about test case - # ---------------------------------------------------------------------- - - $tinfo->{'path'}= $path; - $tinfo->{'timezone'}= "GMT-3"; # for UNIX_TIMESTAMP tests to work - - $tinfo->{'slave_num'}= 0; # Default, no slave - $tinfo->{'master_num'}= 1; # Default, 1 master - if ( defined mtr_match_prefix($tname,"rpl") ) - { - if ( $::opt_skip_rpl ) - { - $tinfo->{'skip'}= 1; - $tinfo->{'comment'}= "No replication tests(--skip-rpl)"; - return; - } - - $tinfo->{'slave_num'}= 1; # Default for rpl* tests, use one slave - - } - - if ( defined mtr_match_prefix($tname,"federated") ) - { - # Default, federated uses the first slave as it's federated database - $tinfo->{'slave_num'}= 1; - } - - my $master_opt_file= "$testdir/$tname-master.opt"; - my $slave_opt_file= "$testdir/$tname-slave.opt"; - my $slave_mi_file= "$testdir/$tname.slave-mi"; - my $master_sh= "$testdir/$tname-master.sh"; - my $slave_sh= "$testdir/$tname-slave.sh"; - my $disabled_file= "$testdir/$tname.disabled"; - my $im_opt_file= "$testdir/$tname-im.opt"; - - $tinfo->{'master_opt'}= []; - $tinfo->{'slave_opt'}= []; - $tinfo->{'slave_mi'}= []; - - - # Add suite opts - foreach my $opt ( @$suite_opts ) - { - mtr_verbose($opt); - push(@{$tinfo->{'master_opt'}}, $opt); - push(@{$tinfo->{'slave_opt'}}, $opt); - } - - # Add master opts - if ( -f $master_opt_file ) - { - - my $master_opt= mtr_get_opts_from_file($master_opt_file); - - foreach my $opt ( @$master_opt ) + foreach my $opt ( @$opts ) { my $value; @@ -612,13 +563,6 @@ sub collect_one_test_case($$$$$$$$$) { next; } - $value= mtr_match_prefix($opt, "--slave-num="); - if ( defined $value ) - { - $tinfo->{'slave_num'}= $value; - next; - } - $value= mtr_match_prefix($opt, "--result-file="); if ( defined $value ) { @@ -628,6 +572,14 @@ sub collect_one_test_case($$$$$$$$$) { next; } + $value= mtr_match_prefix($opt, "--config-file-template="); + if ( defined $value) + { + # Specifies the configuration file to use for this test + $tinfo->{'template_path'}= dirname($tinfo->{path})."/$value"; + next; + } + # If we set default time zone, remove the one we have $value= mtr_match_prefix($opt, "--default-time-zone="); if ( defined $value ) @@ -648,36 +600,124 @@ sub collect_one_test_case($$$$$$$$$) { } # Ok, this was a real option, add it - push(@{$tinfo->{'master_opt'}}, $opt); + push(@{$tinfo->{$opt_name}}, $opt); } } +} - # Add slave opts - if ( -f $slave_opt_file ) +############################################################################## +# +# Collect information about a single test case +# +############################################################################## + +sub collect_one_test_case { + my $suitedir= shift; + my $testdir= shift; + my $resdir= shift; + my $suitename= shift; + my $tname= shift; + my $filename= shift; + my $disabled= shift; + my $suite_opts= shift; + + #print "collect_one_test_case\n"; + #print " suitedir: $suitedir\n"; + #print " testdir: $testdir\n"; + #print " resdir: $resdir\n"; + #print " suitename: $suitename\n"; + #print " tname: $tname\n"; + #print " filename: $filename\n"; + + # ---------------------------------------------------------------------- + # Skip some tests silently + # ---------------------------------------------------------------------- + if ( $start_from and $tname lt $start_from ) { - my $slave_opt= mtr_get_opts_from_file($slave_opt_file); + return; + } - foreach my $opt ( @$slave_opt ) + # ---------------------------------------------------------------------- + # Set defaults + # ---------------------------------------------------------------------- + my $tinfo= {}; + $tinfo->{'name'}= basename($suitename) . ".$tname"; + $tinfo->{'path'}= "$testdir/$filename"; + + # TODO allow nonexistsing result file + # in that case .test must issue "exit" otherwise test should fail by default + $tinfo->{'result_file'}= "$resdir/$tname.result"; + + # ---------------------------------------------------------------------- + # Skip some tests but include in list, just mark them as skipped + # ---------------------------------------------------------------------- + if ( $skip_test_reg and $tname =~ /$skip_test_reg/o ) + { + $tinfo->{'skip'}= 1; + return $tinfo; + } + + # ---------------------------------------------------------------------- + # Check for disabled tests + # ---------------------------------------------------------------------- + my $marked_as_disabled= 0; + if ( $disabled->{$tname} ) + { + # Test was marked as disabled in suites disabled.def file + $marked_as_disabled= 1; + $tinfo->{'comment'}= $disabled->{$tname}; + } + + my $disabled_file= "$testdir/$tname.disabled"; + if ( -f $disabled_file ) + { + $marked_as_disabled= 1; + $tinfo->{'comment'}= mtr_fromfile($disabled_file); + } + + if ( $marked_as_disabled ) + { + if ( $enable_disabled ) { - # If we set default time zone, remove the one we have - my $value= mtr_match_prefix($opt, "--default-time-zone="); - $tinfo->{'slave_opt'}= [] if defined $value; + # User has selected to run all disabled tests + mtr_report(" - $tinfo->{name} wil be run although it's been disabled\n", + " due to '$tinfo->{comment}'"); + } + else + { + $tinfo->{'skip'}= 1; + $tinfo->{'disable'}= 1; # Sub type of 'skip' + return $tinfo; } - push(@{$tinfo->{'slave_opt'}}, @$slave_opt); } - if ( -f $slave_mi_file ) - { - $tinfo->{'slave_mi'}= mtr_get_opts_from_file($slave_mi_file); - } + # ---------------------------------------------------------------------- + # Append suite extra options to both master and slave + # ---------------------------------------------------------------------- + push(@{$tinfo->{'master_opt'}}, @$suite_opts); + push(@{$tinfo->{'slave_opt'}}, @$suite_opts); + # ---------------------------------------------------------------------- + # Add master opts, extra options only for master + # ---------------------------------------------------------------------- + process_opts_file($tinfo, "$testdir/$tname-master.opt", 'master_opt'); + + # ---------------------------------------------------------------------- + # Add slave opts, list of extra option only for slave + # ---------------------------------------------------------------------- + process_opts_file($tinfo, "$testdir/$tname-slave.opt", 'slave_opt'); + + # ---------------------------------------------------------------------- + # master sh + # ---------------------------------------------------------------------- + my $master_sh= "$testdir/$tname-master.sh"; if ( -f $master_sh ) { - if ( $::glob_win32_perl ) + if ( $main::is_win32_perl ) { $tinfo->{'skip'}= 1; $tinfo->{'comment'}= "No tests with sh scripts on Windows"; - return; + return $tinfo; } else { @@ -685,13 +725,17 @@ sub collect_one_test_case($$$$$$$$$) { } } + # ---------------------------------------------------------------------- + # slave sh + # ---------------------------------------------------------------------- + my $slave_sh= "$testdir/$tname-slave.sh"; if ( -f $slave_sh ) { - if ( $::glob_win32_perl ) + if ( $main::is_win32_perl ) { $tinfo->{'skip'}= 1; $tinfo->{'comment'}= "No tests with sh scripts on Windows"; - return; + return $tinfo; } else { @@ -699,202 +743,178 @@ sub collect_one_test_case($$$$$$$$$) { } } - if ( -f $im_opt_file ) + # ---------------------------------------------------------------------- + # .slave-mi + # ---------------------------------------------------------------------- + mtr_error("$tname: slave-mi not supported anymore") + if ( -f "$testdir/$tname.slave-mi"); + + + tags_from_test_file($tinfo,"$testdir/${tname}.test"); + + if ( defined $default_storage_engine ) { - $tinfo->{'im_opts'} = mtr_get_opts_from_file($im_opt_file); - } - else - { - $tinfo->{'im_opts'} = []; + # Different default engine is used + # tag test to require that engine + $tinfo->{'ndb_test'}= 1 + if ( $default_storage_engine =~ /^ndb/i ); + + $tinfo->{'innodb_test'}= 1 + if ( $default_storage_engine =~ /^innodb/i ); + } - # FIXME why this late? - my $marked_as_disabled= 0; - if ( $disabled->{$tname} ) + if ( $tinfo->{'big_test'} and ! $::opt_big_test ) { - $marked_as_disabled= 1; - $tinfo->{'comment'}= $disabled->{$tname}; + $tinfo->{'skip'}= 1; + $tinfo->{'comment'}= "Test need 'big-test' option"; + return $tinfo } - if ( -f $disabled_file ) + if ( $tinfo->{'ndb_extra'} and ! $::opt_ndb_extra_test ) { - $marked_as_disabled= 1; - $tinfo->{'comment'}= mtr_fromfile($disabled_file); + $tinfo->{'skip'}= 1; + $tinfo->{'comment'}= "Test need 'ndb_extra' option"; + return $tinfo } - # If test was marked as disabled, either opt_enable_disabled is off and then - # we skip this test, or it is on and then we run this test but warn - - if ( $marked_as_disabled ) + if ( $tinfo->{'need_debug'} && ! $::debug_compiled_binaries ) { - if ( $::opt_enable_disabled ) - { - $tinfo->{'dont_skip_though_disabled'}= 1; - } - else + $tinfo->{'skip'}= 1; + $tinfo->{'comment'}= "Test need debug binaries"; + return $tinfo + } + + if ( $tinfo->{'ndb_test'} ) + { + # This is a NDB test + if ( ! $::glob_ndbcluster_supported ) { + # Ndb is not supported, skip it $tinfo->{'skip'}= 1; - $tinfo->{'disable'}= 1; # Sub type of 'skip' - return; + $tinfo->{'comment'}= "No ndbcluster support"; + return $tinfo; } - } - - if ( $component_id eq 'im' ) - { - if ( $::glob_use_embedded_server ) + elsif ( $::opt_skip_ndbcluster ) { + # All ndb test's should be skipped $tinfo->{'skip'}= 1; - $tinfo->{'comment'}= "No IM with embedded server"; - return; - } - elsif ( $::opt_ps_protocol ) - { - $tinfo->{'skip'}= 1; - $tinfo->{'comment'}= "No IM with --ps-protocol"; - return; - } - elsif ( $::opt_skip_im ) - { - $tinfo->{'skip'}= 1; - $tinfo->{'comment'}= "No IM tests(--skip-im)"; - return; + $tinfo->{'comment'}= "No ndbcluster tests(--skip-ndbcluster)"; + return $tinfo; } } else { - mtr_options_from_test_file($tinfo,"$testdir/${tname}.test"); - - if ( defined $::used_default_engine ) - { - # Different default engine is used - # tag test to require that engine - $tinfo->{'ndb_test'}= 1 - if ( $::used_default_engine =~ /^ndb/i ); - - $tinfo->{'innodb_test'}= 1 - if ( $::used_default_engine =~ /^innodb/i ); - } - - if ( $tinfo->{'big_test'} and ! $::opt_big_test ) + # This is not a ndb test + if ( $opt_with_ndbcluster_only ) { + # Only the ndb test should be run, all other should be skipped $tinfo->{'skip'}= 1; - $tinfo->{'comment'}= "Test need 'big-test' option"; - return; + $tinfo->{'comment'}= "Only ndbcluster tests"; + return $tinfo; } + } - if ( $tinfo->{'ndb_extra'} and ! $::opt_ndb_extra_test ) - { - $tinfo->{'skip'}= 1; - $tinfo->{'comment'}= "Test need 'ndb_extra' option"; - return; - } - - if ( $tinfo->{'require_manager'} ) - { - $tinfo->{'skip'}= 1; - $tinfo->{'comment'}= "Test need the _old_ manager(to be removed)"; - return; - } - - if ( $tinfo->{'need_debug'} && ! $::debug_compiled_binaries ) - { - $tinfo->{'skip'}= 1; - $tinfo->{'comment'}= "Test need debug binaries"; - return; - } - - if ( $tinfo->{'ndb_test'} ) - { - # This is a NDB test - if ( ! $::glob_ndbcluster_supported ) - { - # Ndb is not supported, skip it - $tinfo->{'skip'}= 1; - $tinfo->{'comment'}= "No ndbcluster support"; - return; - } - elsif ( $::opt_skip_ndbcluster ) - { - # All ndb test's should be skipped - $tinfo->{'skip'}= 1; - $tinfo->{'comment'}= "No ndbcluster tests(--skip-ndbcluster)"; - return; - } - # Ndb tests run with two mysqld masters - $tinfo->{'master_num'}= 2; - } - else - { - # This is not a ndb test - if ( $::opt_with_ndbcluster_only ) - { - # Only the ndb test should be run, all other should be skipped - $tinfo->{'skip'}= 1; - $tinfo->{'comment'}= "Only ndbcluster tests(--with-ndbcluster-only)"; - return; - } - } - - if ( $tinfo->{'innodb_test'} ) - { + if ( $tinfo->{'innodb_test'} ) + { # This is a test that need innodb - if ( $::mysqld_variables{'innodb'} ne "TRUE" ) - { - # innodb is not supported, skip it - $tinfo->{'skip'}= 1; - $tinfo->{'comment'}= "No innodb support"; - return; - } - } - - if ( $tinfo->{'need_binlog'} ) + if ( $::mysqld_variables{'innodb'} ne "TRUE" ) { - if (grep(/^--skip-log-bin/, @::opt_extra_mysqld_opt) ) - { - $tinfo->{'skip'}= 1; - $tinfo->{'comment'}= "Test need binlog"; - return; - } + # innodb is not supported, skip it + $tinfo->{'skip'}= 1; + $tinfo->{'comment'}= "No innodb support"; + return $tinfo; } - else - { - if ( $::mysql_version_id >= 50100 ) - { - # Test does not need binlog, add --skip-binlog to - # the options used when starting it - push(@{$tinfo->{'master_opt'}}, "--skip-log-bin"); - } - } - } + else + { + push(@{$tinfo->{'master_opt'}}, "--loose-skip-innodb"); + push(@{$tinfo->{'slave_opt'}}, "--loose-skip-innodb"); + } + + if ( $tinfo->{'need_binlog'} ) + { + if (grep(/^--skip-log-bin/, @::opt_extra_mysqld_opt) ) + { + $tinfo->{'skip'}= 1; + $tinfo->{'comment'}= "Test need binlog"; + return $tinfo; + } + } + else + { + # Test does not need binlog, add --skip-binlog to + # the options used when starting + push(@{$tinfo->{'master_opt'}}, "--loose-skip-log-bin"); + push(@{$tinfo->{'slave_opt'}}, "--loose-skip-log-bin"); + } + + if ( $tinfo->{'rpl_test'} ) + { + if ( $skip_rpl ) + { + $tinfo->{'skip'}= 1; + $tinfo->{'comment'}= "No replication tests(--skip-rpl)"; + return $tinfo; + } + } + + # ---------------------------------------------------------------------- + # Find config file to use if not already selected in .opt file + # ---------------------------------------------------------------------- + if (defined $defaults_file) { + # Using same config file for all tests + $tinfo->{template_path}= $defaults_file; + } + elsif (! $tinfo->{template_path} ) + { + my $config= "$suitedir/my.cnf"; + if (! -f $config ) + { + # Suite has no config, use default.cnf + $config= "include/default_my.cnf"; + } + $tinfo->{template_path}= $config; + } + + # Set extra config file to use + if (defined $defaults_extra_file) { + $tinfo->{extra_template_path}= $defaults_extra_file; + } + + return $tinfo; } # List of tags in the .test files that if found should set # the specified value in "tinfo" -our @tags= +my @tags= ( - ["include/have_innodb.inc", "innodb_test", 1], - ["include/have_binlog_format_row.inc", "sup_binlog_formats", ["row"]], - ["include/have_log_bin.inc", "need_binlog", 1], - ["include/have_binlog_format_statement.inc", - "sup_binlog_formats", ["statement"]], - ["include/have_binlog_format_mixed.inc", "sup_binlog_formats", ["mixed"]], + ["include/have_binlog_format_row.inc", "binlog_formats", ["row"]], + ["include/have_binlog_format_statement.inc", "binlog_formats", ["statement"]], + ["include/have_binlog_format_mixed.inc", "binlog_formats", ["mixed"]], ["include/have_binlog_format_mixed_or_row.inc", - "sup_binlog_formats", ["mixed","row"]], + "binlog_formats", ["mixed", "row"]], ["include/have_binlog_format_mixed_or_statement.inc", - "sup_binlog_formats", ["mixed","statement"]], + "binlog_formats", ["mixed", "statement"]], ["include/have_binlog_format_row_or_statement.inc", - "sup_binlog_formats", ["row","statement"]], + "binlog_formats", ["row", "statement"]], + + ["include/have_log_bin.inc", "need_binlog", 1], + + ["include/have_innodb.inc", "innodb_test", 1], ["include/big_test.inc", "big_test", 1], ["include/have_debug.inc", "need_debug", 1], ["include/have_ndb.inc", "ndb_test", 1], ["include/have_multi_ndb.inc", "ndb_test", 1], ["include/have_ndb_extra.inc", "ndb_extra", 1], - ["require_manager", "require_manager", 1], + ["include/master-slave.inc", "rpl_test", 1], + ["include/ndb_master-slave.inc", "rpl_test", 1], + ["include/federated.inc", "federated_test", 1], ); -sub mtr_options_from_test_file($$) { + +sub tags_from_test_file { my $tinfo= shift; my $file= shift; #mtr_verbose("$file"); @@ -911,8 +931,8 @@ sub mtr_options_from_test_file($$) { { if ( index($line, $tag->[0]) >= 0 ) { - # Tag matched, assign value to "tinfo" - $tinfo->{"$tag->[1]"}= $tag->[2]; + # Tag matched, assign value to "tinfo" + $tinfo->{"$tag->[1]"}= $tag->[2]; } } @@ -930,12 +950,83 @@ sub mtr_options_from_test_file($$) { # Only source the file if it exists, we may get # false positives in the regexes above if someone # writes "source nnnn;" in a test case(such as mysqltest.test) - mtr_options_from_test_file($tinfo, $sourced_file); + tags_from_test_file($tinfo, $sourced_file); } } + } } +sub unspace { + my $string= shift; + my $quote= shift; + $string =~ s/[ \t]/\x11/g; + return "$quote$string$quote"; +} + + + +sub envsubst { + my $string= shift; + + if ( ! defined $ENV{$string} ) + { + mtr_error("opt file referense \$$string that is unknown"); + } + + return $ENV{$string}; +} + + +sub opts_from_file ($) { + my $file= shift; + + open(FILE,"<",$file) or mtr_error("can't open file \"$file\": $!"); + my @args; + while ( ) + { + chomp; + + # --set-variable=init_connect=set @a='a\\0c' + s/^\s+//; # Remove leading space + s/\s+$//; # Remove ending space + + # This is strange, but we need to fill whitespace inside + # quotes with something, to remove later. We do this to + # be able to split on space. Else, we have trouble with + # options like + # + # --someopt="--insideopt1 --insideopt2" + # + # But still with this, we are not 100% sure it is right, + # we need a shell to do it right. + + s/\'([^\'\"]*)\'/unspace($1,"\x0a")/ge; + s/\"([^\'\"]*)\"/unspace($1,"\x0b")/ge; + s/\'([^\'\"]*)\'/unspace($1,"\x0a")/ge; + s/\"([^\'\"]*)\"/unspace($1,"\x0b")/ge; + + foreach my $arg (split(/[ \t]+/)) + { + $arg =~ tr/\x11\x0a\x0b/ \'\"/; # Put back real chars + # The outermost quotes has to go + $arg =~ s/^([^\'\"]*)\'(.*)\'([^\'\"]*)$/$1$2$3/ + or $arg =~ s/^([^\'\"]*)\"(.*)\"([^\'\"]*)$/$1$2$3/; + $arg =~ s/\\\\/\\/g; + + # Expand environment variables + $arg =~ s/\$\{(\w+)\}/envsubst($1)/ge; + $arg =~ s/\$(\w+)/envsubst($1)/ge; + + # Do not pass empty string since my_getopt is not capable to handle it. + if (length($arg)) { + push(@args, $arg); + } + } + } + close FILE; + return \@args; +} sub print_testcases { my (@cases)= @_; @@ -944,9 +1035,9 @@ sub print_testcases { foreach my $test (@cases){ print "[", $test->{name}, "]", "\n"; while ((my ($key, $value)) = each(%$test)) { - print " ", $key, "="; + print " ", $key, "= "; if (ref $value eq "ARRAY") { - print join(", ", @$value); + print "[", join(", ", @$value), "]"; } else { print $value; } diff --git a/mysql-test/lib/mtr_diff.pl b/mysql-test/lib/mtr_diff.pl deleted file mode 100644 index 26e556de5e8..00000000000 --- a/mysql-test/lib/mtr_diff.pl +++ /dev/null @@ -1,297 +0,0 @@ -# -*- cperl -*- -# Copyright (C) 2005 MySQL AB -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# This is a library file used by the Perl version of mysql-test-run, -# and is part of the translation of the Bourne shell script with the -# same name. - -#use Data::Dumper; -use strict; - -# $Data::Dumper::Indent= 1; - -sub mtr_diff($$); - -############################################################################## -# -# This is a simplified unified diff, with some special handling -# of unsorted result sets -# -############################################################################## - -# FIXME replace die with mtr_error - -#require "mtr_report.pl"; -#mtr_diff("a.txt","b.txt"); - -sub mtr_diff ($$) { - my $file1 = shift; - my $file2 = shift; - - # ---------------------------------------------------------------------- - # We read in all of the files at once - # ---------------------------------------------------------------------- - - unless ( open(FILE1, $file1) ) - { - mtr_warning("can't open \"$file1\": $!"); - return; - } - - unless ( open(FILE2, $file2) ) - { - mtr_warning("can't open \"$file2\": $!"); - return; - } - - my $lines1= collect_lines(); - my $lines2= collect_lines(); - close FILE1; - close FILE2; - -# print Dumper($lines1); -# print Dumper($lines2); - - # ---------------------------------------------------------------------- - # We compare line by line, but don't shift off elements until we know - # what to do. This way we use the "restart" method, do simple change - # and restart by entering the diff loop from the beginning again. - # ---------------------------------------------------------------------- - - my @context; - my @info; # Collect information, and output later - my $lno1= 1; - my $lno2= 1; - - while ( @$lines1 or @$lines2 ) - { - unless ( @$lines1 ) - { - push(@info, map {['+',$lno1,$lno2++,$_]} @$lines2); - last; - } - unless ( @$lines2 ) - { - push(@info, map {['-',$lno1++,$lno2,$_]} @$lines1); - last; - } - - # ---------------------------------------------------------------------- - # We know both have lines - # ---------------------------------------------------------------------- - - if ( $lines1->[0] eq $lines2->[0] ) - { - # Simple case, first line match and all is well - push(@info, ['',$lno1++,$lno2++,$lines1->[0]]); - shift @$lines1; - shift @$lines2; - next; - } - - # ---------------------------------------------------------------------- - # Now, we know they differ - # ---------------------------------------------------------------------- - - # How far in the other one, is there a match? - - my $idx2= find_next_match($lines1->[0], $lines2); - my $idx1= find_next_match($lines2->[0], $lines1); - - # Here we could test "if ( !defined $idx2 or !defined $idx1 )" and - # use a more complicated diff algorithm in the case both contains - # each others lines, just dislocated. But for this application, there - # should be no need. - - if ( !defined $idx2 ) - { - push(@info, ['-',$lno1++,$lno2,$lines1->[0]]); - shift @$lines1; - } - else - { - push(@info, ['+',$lno1,$lno2++,$lines2->[0]]); - shift @$lines2; - } - } - - # ---------------------------------------------------------------------- - # Try to output nicely - # ---------------------------------------------------------------------- - -# print Dumper(\@info); - - # We divide into "chunks" to output - # We want at least three lines of context - - my @chunks; - my @chunk; - my $state= 'pre'; # 'pre', 'in' and 'post' difference - my $post_count= 0; - - foreach my $info ( @info ) - { - if ( $info->[0] eq '' and $state eq 'pre' ) - { - # Collect no more than three lines of context before diff - push(@chunk, $info); - shift(@chunk) if @chunk > 3; - next; - } - - if ( $info->[0] =~ /(\+|\-)/ and $state =~ /(pre|in)/ ) - { - # Start/continue collecting diff - $state= 'in'; - push(@chunk, $info); - next; - } - - if ( $info->[0] eq '' and $state eq 'in' ) - { - # Stop collecting diff, and collect context after diff - $state= 'post'; - $post_count= 1; - push(@chunk, $info); - next; - } - - if ( $info->[0] eq '' and $state eq 'post' and $post_count < 6 ) - { - # We might find a new diff sequence soon, continue to collect - # non diffs but five up on 6. - $post_count++; - push(@chunk, $info); - next; - } - - if ( $info->[0] eq '' and $state eq 'post' ) - { - # We put an end to this, giving three non diff lines to - # the old chunk, and three to the new one. - my @left= splice(@chunk, -3, 3); - push(@chunks, [@chunk]); - $state= 'pre'; - $post_count= 0; - @chunk= @left; - next; - } - - if ( $info->[0] =~ /(\+|\-)/ and $state eq 'post' ) - { - # We didn't split, continue collect diff - $state= 'in'; - push(@chunk, $info); - next; - } - - } - - if ( $post_count > 3 ) - { - $post_count -= 3; - splice(@chunk, -$post_count, $post_count); - } - push(@chunks, [@chunk]) if @chunk and $state ne 'pre'; - - foreach my $chunk ( @chunks ) - { - my $from_file_start= $chunk->[0]->[1]; - my $to_file_start= $chunk->[0]->[2]; - my $from_file_offset= $chunk->[$#$chunk]->[1] - $from_file_start; - my $to_file_offset= $chunk->[$#$chunk]->[2] - $to_file_start; - print "\@\@ -$from_file_start,$from_file_offset ", - "+$to_file_start,$to_file_offset \@\@\n"; - - foreach my $info ( @$chunk ) - { - if ( $info->[0] eq '' ) - { - print " $info->[3]\n"; - } - elsif ( $info->[0] eq '-' ) - { - print "- $info->[3]\n"; - } - elsif ( $info->[0] eq '+' ) - { - print "+ $info->[3]\n"; - } - } - } - -# print Dumper(\@chunks); - -} - - -############################################################################## -# Find if the string is found in the array, return the index if found, -# if not found, return "undef" -############################################################################## - -sub find_next_match { - my $line= shift; - my $lines= shift; - - for ( my $idx= 0; $idx < @$lines; $idx++ ) - { - return $idx if $lines->[$idx] eq $line; - } - - return undef; # No match found -} - - -############################################################################## -# Just read the lines, but handle "sets" of lines that are unordered -############################################################################## - -sub collect_lines { - - my @recordset; - my @lines; - - while (@_) - { - my $line= shift @_; - chomp($line); - - if ( $line =~ /^\Q%unordered%\E\t/ ) - { - push(@recordset, $line); - } - elsif ( @recordset ) - { - push(@lines, sort @recordset); - @recordset= (); # Clear it - } - else - { - push(@lines, $line); - } - } - - if ( @recordset ) - { - push(@lines, sort @recordset); - @recordset= (); # Clear it - } - - return \@lines; -} - -1; diff --git a/mysql-test/lib/mtr_im.pl b/mysql-test/lib/mtr_im.pl deleted file mode 100644 index c8e332498d7..00000000000 --- a/mysql-test/lib/mtr_im.pl +++ /dev/null @@ -1,775 +0,0 @@ -# -*- cperl -*- -# Copyright (C) 2006 MySQL AB -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# This is a library file used by the Perl version of mysql-test-run, -# and is part of the translation of the Bourne shell script with the -# same name. - -use strict; - -# Private IM-related operations. - -sub mtr_im_kill_process ($$$$); -sub mtr_im_load_pids ($); -sub mtr_im_terminate ($); -sub mtr_im_check_alive ($); -sub mtr_im_check_main_alive ($); -sub mtr_im_check_angel_alive ($); -sub mtr_im_check_mysqlds_alive ($); -sub mtr_im_check_mysqld_alive ($); -sub mtr_im_cleanup ($); -sub mtr_im_rm_file ($); -sub mtr_im_errlog ($); -sub mtr_im_kill ($); -sub mtr_im_wait_for_connection ($$$); -sub mtr_im_wait_for_mysqld($$$); - -# Public IM-related operations. - -sub mtr_im_start ($$); -sub mtr_im_stop ($); - -############################################################################## -# -# Private operations. -# -############################################################################## - -sub mtr_im_kill_process ($$$$) { - my $pid_lst= shift; - my $signal= shift; - my $total_retries= shift; - my $timeout= shift; - - my %pids; - - foreach my $pid ( @{$pid_lst} ) - { - $pids{$pid}= 1; - } - - for ( my $cur_attempt= 1; $cur_attempt <= $total_retries; ++$cur_attempt ) - { - foreach my $pid ( keys %pids ) - { - mtr_debug("Sending $signal to $pid..."); - - kill($signal, $pid); - - unless ( kill (0, $pid) ) - { - mtr_debug("Process $pid died."); - delete $pids{$pid}; - } - } - - return if scalar keys %pids == 0; - - mtr_debug("Sleeping $timeout second(s) waiting for processes to die..."); - - sleep($timeout); - } - - mtr_debug("Process(es) " . - join(' ', keys %pids) . - " is still alive after $total_retries " . - "of sending signal $signal."); -} - -########################################################################### - -sub mtr_im_load_pids($) { - my $im= shift; - - mtr_debug("Loading PID files..."); - - # Obtain mysqld-process pids. - - my $instances = $im->{'instances'}; - - for ( my $idx= 0; $idx < 2; ++$idx ) - { - mtr_debug("IM-guarded mysqld[$idx] PID file: '" . - $instances->[$idx]->{'path_pid'} . "'."); - - my $mysqld_pid; - - if ( -r $instances->[$idx]->{'path_pid'} ) - { - $mysqld_pid= mtr_get_pid_from_file($instances->[$idx]->{'path_pid'}); - mtr_debug("IM-guarded mysqld[$idx] PID: $mysqld_pid."); - } - else - { - $mysqld_pid= undef; - mtr_debug("IM-guarded mysqld[$idx]: no PID file."); - } - - $instances->[$idx]->{'pid'}= $mysqld_pid; - } - - # Re-read Instance Manager PIDs from the file, since during tests Instance - # Manager could have been restarted, so its PIDs could have been changed. - - # - IM-main - - mtr_debug("IM-main PID file: '$im->{path_pid}'."); - - if ( -f $im->{'path_pid'} ) - { - $im->{'pid'} = - mtr_get_pid_from_file($im->{'path_pid'}); - - mtr_debug("IM-main PID: $im->{pid}."); - } - else - { - mtr_debug("IM-main: no PID file."); - $im->{'pid'}= undef; - } - - # - IM-angel - - mtr_debug("IM-angel PID file: '$im->{path_angel_pid}'."); - - if ( -f $im->{'path_angel_pid'} ) - { - $im->{'angel_pid'} = - mtr_get_pid_from_file($im->{'path_angel_pid'}); - - mtr_debug("IM-angel PID: $im->{'angel_pid'}."); - } - else - { - mtr_debug("IM-angel: no PID file."); - $im->{'angel_pid'} = undef; - } -} - -########################################################################### - -sub mtr_im_terminate($) { - my $im= shift; - - # Load pids from pid-files. We should do it first of all, because IM deletes - # them on shutdown. - - mtr_im_load_pids($im); - - mtr_debug("Shutting Instance Manager down..."); - - # Ignoring SIGCHLD so that all children could rest in peace. - - start_reap_all(); - - # Send SIGTERM to IM-main. - - if ( defined $im->{'pid'} ) - { - mtr_debug("IM-main pid: $im->{pid}."); - mtr_debug("Stopping IM-main..."); - - mtr_im_kill_process([ $im->{'pid'} ], 'TERM', 10, 1); - } - else - { - mtr_debug("IM-main pid: n/a."); - } - - # If IM-angel was alive, wait for it to die. - - if ( defined $im->{'angel_pid'} ) - { - mtr_debug("IM-angel pid: $im->{'angel_pid'}."); - mtr_debug("Waiting for IM-angel to die..."); - - my $total_attempts= 10; - - for ( my $cur_attempt=1; $cur_attempt <= $total_attempts; ++$cur_attempt ) - { - unless ( kill (0, $im->{'angel_pid'}) ) - { - mtr_debug("IM-angel died."); - last; - } - - sleep(1); - } - } - else - { - mtr_debug("IM-angel pid: n/a."); - } - - stop_reap_all(); - - # Re-load PIDs. - - mtr_im_load_pids($im); -} - -########################################################################### - -sub mtr_im_check_alive($) { - my $im= shift; - - mtr_debug("Checking whether IM-components are alive..."); - - return 1 if mtr_im_check_main_alive($im); - - return 1 if mtr_im_check_angel_alive($im); - - return 1 if mtr_im_check_mysqlds_alive($im); - - return 0; -} - -########################################################################### - -sub mtr_im_check_main_alive($) { - my $im= shift; - - # Check that the process, that we know to be IM's, is dead. - - if ( defined $im->{'pid'} ) - { - if ( kill (0, $im->{'pid'}) ) - { - mtr_debug("IM-main (PID: $im->{pid}) is alive."); - return 1; - } - else - { - mtr_debug("IM-main (PID: $im->{pid}) is dead."); - } - } - else - { - mtr_debug("No PID file for IM-main."); - } - - # Check that IM does not accept client connections. - - if ( mtr_ping_port($im->{'port'}) ) - { - mtr_debug("IM-main (port: $im->{port}) " . - "is accepting connections."); - - mtr_im_errlog("IM-main is accepting connections on port " . - "$im->{port}, but there is no " . - "process information."); - return 1; - } - else - { - mtr_debug("IM-main (port: $im->{port}) " . - "does not accept connections."); - return 0; - } -} - -########################################################################### - -sub mtr_im_check_angel_alive($) { - my $im= shift; - - # Check that the process, that we know to be the Angel, is dead. - - if ( defined $im->{'angel_pid'} ) - { - if ( kill (0, $im->{'angel_pid'}) ) - { - mtr_debug("IM-angel (PID: $im->{angel_pid}) is alive."); - return 1; - } - else - { - mtr_debug("IM-angel (PID: $im->{angel_pid}) is dead."); - return 0; - } - } - else - { - mtr_debug("No PID file for IM-angel."); - return 0; - } -} - -########################################################################### - -sub mtr_im_check_mysqlds_alive($) { - my $im= shift; - - mtr_debug("Checking for IM-guarded mysqld instances..."); - - my $instances = $im->{'instances'}; - - for ( my $idx= 0; $idx < 2; ++$idx ) - { - mtr_debug("Checking mysqld[$idx]..."); - - return 1 - if mtr_im_check_mysqld_alive($instances->[$idx]); - } -} - -########################################################################### - -sub mtr_im_check_mysqld_alive($) { - my $mysqld_instance= shift; - - # Check that the process is dead. - - if ( defined $mysqld_instance->{'pid'} ) - { - if ( kill (0, $mysqld_instance->{'pid'}) ) - { - mtr_debug("Mysqld instance (PID: $mysqld_instance->{pid}) is alive."); - return 1; - } - else - { - mtr_debug("Mysqld instance (PID: $mysqld_instance->{pid}) is dead."); - } - } - else - { - mtr_debug("No PID file for mysqld instance."); - } - - # Check that mysqld does not accept client connections. - - if ( mtr_ping_port($mysqld_instance->{'port'}) ) - { - mtr_debug("Mysqld instance (port: $mysqld_instance->{port}) " . - "is accepting connections."); - - mtr_im_errlog("Mysqld is accepting connections on port " . - "$mysqld_instance->{port}, but there is no " . - "process information."); - return 1; - } - else - { - mtr_debug("Mysqld instance (port: $mysqld_instance->{port}) " . - "does not accept connections."); - return 0; - } -} - -########################################################################### - -sub mtr_im_cleanup($) { - my $im= shift; - - mtr_im_rm_file($im->{'path_pid'}); - mtr_im_rm_file($im->{'path_sock'}); - - mtr_im_rm_file($im->{'path_angel_pid'}); - - for ( my $idx= 0; $idx < 2; ++$idx ) - { - mtr_im_rm_file($im->{'instances'}->[$idx]->{'path_pid'}); - mtr_im_rm_file($im->{'instances'}->[$idx]->{'path_sock'}); - } -} - -########################################################################### - -sub mtr_im_rm_file($) -{ - my $file_path= shift; - - if ( -f $file_path ) - { - mtr_debug("Removing '$file_path'..."); - - unless ( unlink($file_path) ) - { - mtr_warning("Can not remove '$file_path'.") - } - } - else - { - mtr_debug("File '$file_path' does not exist already."); - } -} - -########################################################################### - -sub mtr_im_errlog($) { - my $msg= shift; - - # Complain in error log so that a warning will be shown. - # - # TODO: unless BUG#20761 is fixed, we will print the warning to stdout, so - # that it can be seen on console and does not produce pushbuild error. - - # my $errlog= "$opt_vardir/log/mysql-test-run.pl.err"; - # - # open (ERRLOG, ">>$errlog") || - # mtr_error("Can not open error log ($errlog)"); - # - # my $ts= localtime(); - # print ERRLOG - # "Warning: [$ts] $msg\n"; - # - # close ERRLOG; - - my $ts= localtime(); - print "Warning: [$ts] $msg\n"; -} - -########################################################################### - -sub mtr_im_kill($) { - my $im= shift; - - # Re-load PIDs. That can be useful because some processes could have been - # restarted. - - mtr_im_load_pids($im); - - # Ignoring SIGCHLD so that all children could rest in peace. - - start_reap_all(); - - # Kill IM-angel first of all. - - if ( defined $im->{'angel_pid'} ) - { - mtr_debug("Killing IM-angel (PID: $im->{angel_pid})..."); - mtr_im_kill_process([ $im->{'angel_pid'} ], 'KILL', 10, 1) - } - else - { - mtr_debug("IM-angel is dead."); - } - - # Re-load PIDs again. - - mtr_im_load_pids($im); - - # Kill IM-main. - - if ( defined $im->{'pid'} ) - { - mtr_debug("Killing IM-main (PID: $im->pid})..."); - mtr_im_kill_process([ $im->{'pid'} ], 'KILL', 10, 1); - } - else - { - mtr_debug("IM-main is dead."); - } - - # Re-load PIDs again. - - mtr_im_load_pids($im); - - # Kill guarded mysqld instances. - - my @mysqld_pids; - - mtr_debug("Collecting PIDs of mysqld instances to kill..."); - - for ( my $idx= 0; $idx < 2; ++$idx ) - { - my $pid= $im->{'instances'}->[$idx]->{'pid'}; - - unless ( defined $pid ) - { - next; - } - - mtr_debug(" - IM-guarded mysqld[$idx] PID: $pid."); - - push (@mysqld_pids, $pid); - } - - if ( scalar @mysqld_pids > 0 ) - { - mtr_debug("Killing IM-guarded mysqld instances..."); - mtr_im_kill_process(\@mysqld_pids, 'KILL', 10, 1); - } - - # That's all. - - stop_reap_all(); -} - -############################################################################## - -sub mtr_im_wait_for_connection($$$) { - my $im= shift; - my $total_attempts= shift; - my $connect_timeout= shift; - - mtr_debug("Waiting for IM on port $im->{port} " . - "to start accepting connections..."); - - for ( my $cur_attempt= 1; $cur_attempt <= $total_attempts; ++$cur_attempt ) - { - mtr_debug("Trying to connect to IM ($cur_attempt of $total_attempts)..."); - - if ( mtr_ping_port($im->{'port'}) ) - { - mtr_debug("IM is accepting connections " . - "on port $im->{port}."); - return 1; - } - - mtr_debug("Sleeping $connect_timeout..."); - sleep($connect_timeout); - } - - mtr_debug("IM does not accept connections " . - "on port $im->{port} after " . - ($total_attempts * $connect_timeout) . " seconds."); - - return 0; -} - -############################################################################## - -sub mtr_im_wait_for_mysqld($$$) { - my $mysqld= shift; - my $total_attempts= shift; - my $connect_timeout= shift; - - mtr_debug("Waiting for IM-guarded mysqld on port $mysqld->{port} " . - "to start accepting connections..."); - - for ( my $cur_attempt= 1; $cur_attempt <= $total_attempts; ++$cur_attempt ) - { - mtr_debug("Trying to connect to mysqld " . - "($cur_attempt of $total_attempts)..."); - - if ( mtr_ping_port($mysqld->{'port'}) ) - { - mtr_debug("Mysqld is accepting connections " . - "on port $mysqld->{port}."); - return 1; - } - - mtr_debug("Sleeping $connect_timeout..."); - sleep($connect_timeout); - } - - mtr_debug("Mysqld does not accept connections " . - "on port $mysqld->{port} after " . - ($total_attempts * $connect_timeout) . " seconds."); - - return 0; -} - -############################################################################## -# -# Public operations. -# -############################################################################## - -sub mtr_im_start($$) { - my $im = shift; - my $opts = shift; - - mtr_debug("Starting Instance Manager..."); - - my $args; - mtr_init_args(\$args); - mtr_add_arg($args, "--defaults-file=%s", $im->{'defaults_file'}); - - foreach my $opt ( @{$opts} ) - { - mtr_add_arg($args, $opt); - } - - $im->{'spawner_pid'} = - mtr_spawn( - $::exe_im, # path to the executable - $args, # cmd-line args - '', # stdin - $im->{'path_log'}, # stdout - $im->{'path_err'}, # stderr - '', # pid file path (not used) - { append_log_file => 1 } # append log files - ); - - unless ( $im->{'spawner_pid'} ) - { - mtr_error('Could not start Instance Manager.') - } - - # Instance Manager can be run in daemon mode. In this case, it creates - # several processes and the parent process, created by mtr_spawn(), exits just - # after start. So, we have to obtain Instance Manager PID from the PID file. - - mtr_debug("Waiting for IM to create PID file (" . - "path: '$im->{path_pid}'; " . - "timeout: $im->{start_timeout})..."); - - unless ( sleep_until_file_created($im->{'path_pid'}, - $im->{'start_timeout'}, - -1) ) # real PID is still unknown - { - mtr_debug("IM has not created PID file in $im->{start_timeout} secs."); - mtr_debug("Aborting test suite..."); - - mtr_kill_leftovers(); - - mtr_report("IM has not created PID file in $im->{start_timeout} secs."); - return 0; - } - - $im->{'pid'}= mtr_get_pid_from_file($im->{'path_pid'}); - - mtr_debug("Instance Manager started. PID: $im->{pid}."); - - # Wait until we can connect to IM. - - my $IM_CONNECT_TIMEOUT= 30; - - unless ( mtr_im_wait_for_connection($im, - $IM_CONNECT_TIMEOUT, 1) ) - { - mtr_debug("Can not connect to Instance Manager " . - "in $IM_CONNECT_TIMEOUT seconds after start."); - mtr_debug("Aborting test suite..."); - - mtr_kill_leftovers(); - - mtr_report("Can not connect to Instance Manager " . - "in $IM_CONNECT_TIMEOUT seconds after start."); - return 0; - } - - # Wait for IM to start guarded instances: - # - wait for PID files; - - mtr_debug("Waiting for guarded mysqlds instances to create PID files..."); - - for ( my $idx= 0; $idx < 2; ++$idx ) - { - my $mysqld= $im->{'instances'}->[$idx]; - - if ( exists $mysqld->{'nonguarded'} ) - { - next; - } - - mtr_debug("Waiting for mysqld[$idx] to create PID file (" . - "path: '$mysqld->{path_pid}'; " . - "timeout: $mysqld->{start_timeout})..."); - - unless ( sleep_until_file_created($mysqld->{'path_pid'}, - $mysqld->{'start_timeout'}, - -1) ) # real PID is still unknown - { - mtr_debug("mysqld[$idx] has not created PID file in " . - "$mysqld->{start_timeout} secs."); - mtr_debug("Aborting test suite..."); - - mtr_kill_leftovers(); - - mtr_report("mysqld[$idx] has not created PID file in " . - "$mysqld->{start_timeout} secs."); - return 0; - } - - mtr_debug("PID file for mysqld[$idx] ($mysqld->{path_pid} created."); - } - - # Wait until we can connect to guarded mysqld-instances - # (in other words -- wait for IM to start guarded instances). - - mtr_debug("Waiting for guarded mysqlds to start accepting connections..."); - - for ( my $idx= 0; $idx < 2; ++$idx ) - { - my $mysqld= $im->{'instances'}->[$idx]; - - if ( exists $mysqld->{'nonguarded'} ) - { - next; - } - - mtr_debug("Waiting for mysqld[$idx] to accept connection..."); - - unless ( mtr_im_wait_for_mysqld($mysqld, 30, 1) ) - { - mtr_debug("Can not connect to mysqld[$idx] " . - "in $IM_CONNECT_TIMEOUT seconds after start."); - mtr_debug("Aborting test suite..."); - - mtr_kill_leftovers(); - - mtr_report("Can not connect to mysqld[$idx] " . - "in $IM_CONNECT_TIMEOUT seconds after start."); - return 0; - } - - mtr_debug("mysqld[$idx] started."); - } - - mtr_debug("Instance Manager and its components are up and running."); - - return 1; -} - -############################################################################## - -sub mtr_im_stop($) { - my $im= shift; - - mtr_debug("Stopping Instance Manager..."); - - # Try graceful shutdown. - - mtr_im_terminate($im); - - # Check that all processes died. - - unless ( mtr_im_check_alive($im) ) - { - mtr_debug("Instance Manager has been stopped successfully."); - mtr_im_cleanup($im); - return 1; - } - - # Instance Manager don't want to die. We should kill it. - - mtr_im_errlog("Instance Manager did not shutdown gracefully."); - - mtr_im_kill($im); - - # Check again that all IM-related processes have been killed. - - my $im_is_alive= mtr_im_check_alive($im); - - mtr_im_cleanup($im); - - if ( $im_is_alive ) - { - mtr_debug("Can not kill Instance Manager or its children."); - return 0; - } - - mtr_debug("Instance Manager has been killed successfully."); - return 1; -} - -########################################################################### - -1; diff --git a/mysql-test/lib/mtr_io.pl b/mysql-test/lib/mtr_io.pl index aa671c0f4f7..6712c19b829 100644 --- a/mysql-test/lib/mtr_io.pl +++ b/mysql-test/lib/mtr_io.pl @@ -20,135 +20,14 @@ use strict; -sub mtr_get_pid_from_file ($); -sub mtr_get_opts_from_file ($); sub mtr_fromfile ($); sub mtr_tofile ($@); sub mtr_tonewfile($@); -sub mtr_lastlinefromfile($); sub mtr_appendfile_to_file ($$); sub mtr_grab_file($); +sub mtr_printfile($); -############################################################################## -# -# -# -############################################################################## - -sub mtr_get_pid_from_file ($) { - my $pid_file_path= shift; - my $TOTAL_ATTEMPTS= 30; - my $timeout= 1; - - # We should read from the file until we get correct pid. As it is - # stated in BUG#21884, pid file can be empty at some moment. So, we should - # read it until we get valid data. - - for (my $cur_attempt= 1; $cur_attempt <= $TOTAL_ATTEMPTS; ++$cur_attempt) - { - mtr_debug("Reading pid file '$pid_file_path' " . - "($cur_attempt of $TOTAL_ATTEMPTS)..."); - - open(FILE, '<', $pid_file_path) - or mtr_error("can't open file \"$pid_file_path\": $!"); - - # Read pid number from file - my $pid= ; - chomp $pid; - close FILE; - - return $pid if $pid=~ /^(\d+)/; - - mtr_debug("Pid file '$pid_file_path' does not yet contain pid number.\n" . - "Sleeping $timeout second(s) more..."); - - sleep($timeout); - } - - mtr_error("Pid file '$pid_file_path' is corrupted. " . - "Can not retrieve PID in " . - ($timeout * $TOTAL_ATTEMPTS) . " seconds."); -} - -sub mtr_get_opts_from_file ($) { - my $file= shift; - - open(FILE,"<",$file) or mtr_error("can't open file \"$file\": $!"); - my @args; - while ( ) - { - chomp; - - # --set-variable=init_connect=set @a='a\\0c' - s/^\s+//; # Remove leading space - s/\s+$//; # Remove ending space - - # This is strange, but we need to fill whitespace inside - # quotes with something, to remove later. We do this to - # be able to split on space. Else, we have trouble with - # options like - # - # --someopt="--insideopt1 --insideopt2" - # - # But still with this, we are not 100% sure it is right, - # we need a shell to do it right. - -# print STDERR "\n"; -# print STDERR "AAA: $_\n"; - - s/\'([^\'\"]*)\'/unspace($1,"\x0a")/ge; - s/\"([^\'\"]*)\"/unspace($1,"\x0b")/ge; - s/\'([^\'\"]*)\'/unspace($1,"\x0a")/ge; - s/\"([^\'\"]*)\"/unspace($1,"\x0b")/ge; - -# print STDERR "BBB: $_\n"; - -# foreach my $arg (/(--?\w.*?)(?=\s+--?\w|$)/) - - # FIXME ENV vars should be expanded!!!! - - foreach my $arg (split(/[ \t]+/)) - { - $arg =~ tr/\x11\x0a\x0b/ \'\"/; # Put back real chars - # The outermost quotes has to go - $arg =~ s/^([^\'\"]*)\'(.*)\'([^\'\"]*)$/$1$2$3/ - or $arg =~ s/^([^\'\"]*)\"(.*)\"([^\'\"]*)$/$1$2$3/; - $arg =~ s/\\\\/\\/g; - - $arg =~ s/\$\{(\w+)\}/envsubst($1)/ge; - $arg =~ s/\$(\w+)/envsubst($1)/ge; - -# print STDERR "ARG: $arg\n"; - # Do not pass empty string since my_getopt is not capable to handle it. - if (length($arg)) - { - push(@args, $arg) - } - } - } - close FILE; - return \@args; -} - -sub envsubst { - my $string= shift; - - if ( ! defined $ENV{$string} ) - { - mtr_error("opt file referense \$$string that is unknown"); - } - - return $ENV{$string}; -} - -sub unspace { - my $string= shift; - my $quote= shift; - $string =~ s/[ \t]/\x11/g; - return "$quote$string$quote"; -} - # Read a whole file, stripping leading and trailing whitespace. sub mtr_fromfile ($) { my $file= shift; @@ -161,19 +40,6 @@ sub mtr_fromfile ($) { return $text; } -sub mtr_lastlinefromfile ($) { - my $file= shift; - my $text; - - open(FILE,"<",$file) or mtr_error("can't open file \"$file\": $!"); - while (my $line= ) - { - $text= $line; - } - close FILE; - return $text; -} - sub mtr_tofile ($@) { my $file= shift; @@ -183,6 +49,7 @@ sub mtr_tofile ($@) { close FILE; } + sub mtr_tonewfile ($@) { my $file= shift; @@ -191,6 +58,7 @@ sub mtr_tonewfile ($@) { close FILE; } + sub mtr_appendfile_to_file ($$) { my $from_file= shift; my $to_file= shift; @@ -203,6 +71,7 @@ sub mtr_appendfile_to_file ($$) { close TOFILE; } + # Read a whole file verbatim. sub mtr_grab_file($) { my $file= shift; @@ -215,4 +84,15 @@ sub mtr_grab_file($) { } +# Print the file to STDOUT +sub mtr_printfile($) { + my $file= shift; + open(FILE, '<', $file) + or warn $!; + print while(); + close FILE; + return; +} + + 1; diff --git a/mysql-test/lib/mtr_misc.pl b/mysql-test/lib/mtr_misc.pl index 0173e8b8572..95f5bf584f0 100644 --- a/mysql-test/lib/mtr_misc.pl +++ b/mysql-test/lib/mtr_misc.pl @@ -19,18 +19,16 @@ # same name. use strict; -use File::Find; sub mtr_native_path($); sub mtr_init_args ($); sub mtr_add_arg ($$@); +sub mtr_args2str($@); sub mtr_path_exists(@); sub mtr_script_exists(@); sub mtr_file_exists(@); sub mtr_exe_exists(@); sub mtr_exe_maybe_exists(@); -sub mtr_copy_dir($$); -sub mtr_rmtree($); sub mtr_same_opts($$); sub mtr_cmp_opts($$); @@ -56,7 +54,11 @@ sub mtr_native_path($) } -# FIXME move to own lib +############################################################################## +# +# Args +# +############################################################################## sub mtr_init_args ($) { my $args = shift; @@ -68,9 +70,18 @@ sub mtr_add_arg ($$@) { my $format= shift; my @fargs = @_; + # Quote args if args contain space + $format= "\"$format\"" + if ($::glob_win32 and grep(/\s/, @fargs)); + push(@$args, sprintf($format, @fargs)); } +sub mtr_args2str($@) { + my $exe= shift or die; + return join(" ", mtr_native_path($exe), @_); +} + ############################################################################## # @@ -141,7 +152,6 @@ sub mtr_exe_maybe_exists (@) { my @path= @_; map {$_.= ".exe"} @path if $::glob_win32; - map {$_.= ".nlm"} @path if $::glob_netware; foreach my $path ( @path ) { if($::glob_win32) @@ -179,79 +189,6 @@ sub mtr_exe_exists (@) { } -sub mtr_copy_dir($$) { - my $from_dir= shift; - my $to_dir= shift; - - # mtr_verbose("Copying from $from_dir to $to_dir"); - - mkpath("$to_dir"); - opendir(DIR, "$from_dir") - or mtr_error("Can't find $from_dir$!"); - for(readdir(DIR)) { - next if "$_" eq "." or "$_" eq ".."; - if ( -d "$from_dir/$_" ) - { - mtr_copy_dir("$from_dir/$_", "$to_dir/$_"); - next; - } - copy("$from_dir/$_", "$to_dir/$_"); - } - closedir(DIR); - -} - - -sub mtr_rmtree($) { - my ($dir)= @_; - mtr_verbose("mtr_rmtree: $dir"); - - # Try to use File::Path::rmtree. Recent versions - # handles removal of directories and files that don't - # have full permissions, while older versions - # may have a problem with that and we use our own version - - eval { rmtree($dir); }; - if ( $@ ) { - mtr_warning("rmtree($dir) failed, trying with File::Find..."); - - my $errors= 0; - - # chmod - find( { - no_chdir => 1, - wanted => sub { - chmod(0777, $_) - or mtr_warning("couldn't chmod(0777, $_): $!") and $errors++; - } - }, - $dir - ); - - # rm - finddepth( { - no_chdir => 1, - wanted => sub { - my $file= $_; - # Use special underscore (_) filehandle, caches stat info - if (!-l $file and -d _ ) { - rmdir($file) or - mtr_warning("couldn't rmdir($file): $!") and $errors++; - } else { - unlink($file) - or mtr_warning("couldn't unlink($file): $!") and $errors++; - } - } - }, - $dir - ); - - mtr_error("Failed to remove '$dir'") if $errors; - - mtr_report("OK, that worked!"); - } -} - sub mtr_same_opts ($$) { my $l1= shift; @@ -280,33 +217,41 @@ sub mtr_cmp_opts ($$) { return 0; # They are the same } + +sub mtr_milli_sleep { + die "usage: mtr_milli_sleep(milliseconds)" unless @_ == 1; + my ($millis)= @_; + + select(undef, undef, undef, ($millis/1000)); +} + # # Compare two arrays and put all unequal elements into a new one # sub mtr_diff_opts ($$) { my $l1= shift; my $l2= shift; - my $f; - my $l= []; - foreach my $e1 (@$l1) - { - $f= undef; - foreach my $e2 (@$l2) - { - $f= 1 unless ($e1 ne $e2); - } - push(@$l, $e1) unless (defined $f); - } - foreach my $e2 (@$l2) + my $found; + my @result; + foreach my $e1 (@$l1) { - $f= undef; - foreach my $e1 (@$l1) + $found= undef; + foreach my $e2 (@$l2) { - $f= 1 unless ($e1 ne $e2); + $found= 1 unless ($e1 ne $e2); } - push(@$l, $e2) unless (defined $f); + push(@result, $e1) unless (defined $found); } - return $l; + foreach my $e2 (@$l2) + { + $found= undef; + foreach my $e1 (@$l1) + { + $found= 1 unless ($e1 ne $e2); + } + push(@result, $e2) unless (defined $found); + } + return @result; } 1; diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index 8fd900330da..a99119a199d 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -18,985 +18,13 @@ # and is part of the translation of the Bourne shell script with the # same name. +use strict; use Socket; use Errno; -use strict; -use POSIX qw(WNOHANG SIGHUP); - -sub mtr_run ($$$$$$;$); -sub mtr_spawn ($$$$$$;$); -sub mtr_check_stop_servers ($); -sub mtr_kill_leftovers (); -sub mtr_wait_blocking ($); -sub mtr_record_dead_children (); -sub mtr_ndbmgm_start($$); -sub mtr_mysqladmin_start($$$); -sub mtr_exit ($); sub sleep_until_file_created ($$$); -sub mtr_kill_processes ($); -sub mtr_ping_with_timeout($); sub mtr_ping_port ($); -# Local function -sub spawn_impl ($$$$$$$); - -############################################################################## -# -# Execute an external command -# -############################################################################## - -sub mtr_run ($$$$$$;$) { - my $path= shift; - my $arg_list_t= shift; - my $input= shift; - my $output= shift; - my $error= shift; - my $pid_file= shift; # Not used - my $spawn_opts= shift; - - return spawn_impl($path,$arg_list_t,'run',$input,$output,$error, - $spawn_opts); -} - -sub mtr_run_test ($$$$$$;$) { - my $path= shift; - my $arg_list_t= shift; - my $input= shift; - my $output= shift; - my $error= shift; - my $pid_file= shift; # Not used - my $spawn_opts= shift; - - return spawn_impl($path,$arg_list_t,'test',$input,$output,$error, - $spawn_opts); -} - -sub mtr_spawn ($$$$$$;$) { - my $path= shift; - my $arg_list_t= shift; - my $input= shift; - my $output= shift; - my $error= shift; - my $pid_file= shift; # Not used - my $spawn_opts= shift; - - return spawn_impl($path,$arg_list_t,'spawn',$input,$output,$error, - $spawn_opts); -} - - - -sub spawn_impl ($$$$$$$) { - my $path= shift; - my $arg_list_t= shift; - my $mode= shift; - my $input= shift; - my $output= shift; - my $error= shift; - my $spawn_opts= shift; - - if ( $::opt_script_debug ) - { - mtr_report(""); - mtr_debug("-" x 73); - mtr_debug("STDIN $input") if $input; - mtr_debug("STDOUT $output") if $output; - mtr_debug("STDERR $error") if $error; - mtr_debug("$mode: $path ", join(" ",@$arg_list_t)); - mtr_debug("spawn options:"); - if ($spawn_opts) - { - foreach my $key (sort keys %{$spawn_opts}) - { - mtr_debug(" - $key: $spawn_opts->{$key}"); - } - } - else - { - mtr_debug(" none"); - } - mtr_debug("-" x 73); - mtr_report(""); - } - - mtr_error("Can't spawn with empty \"path\"") unless defined $path; - - - FORK: - { - my $pid= fork(); - - if ( ! defined $pid ) - { - if ( $! == $!{EAGAIN} ) # See "perldoc Errno" - { - mtr_warning("Got EAGAIN from fork(), sleep 1 second and redo"); - sleep(1); - redo FORK; - } - - mtr_error("$path ($pid) can't be forked, error: $!"); - - } - - if ( $pid ) - { - select(STDOUT) if $::glob_win32_perl; - return spawn_parent_impl($pid,$mode,$path); - } - else - { - # Child, redirect output and exec - - $SIG{INT}= 'DEFAULT'; # Parent do some stuff, we don't - - my $log_file_open_mode = '>'; - - if ($spawn_opts and $spawn_opts->{'append_log_file'}) - { - $log_file_open_mode = '>>'; - } - - if ( $output ) - { - if ( $::glob_win32_perl ) - { - # Don't redirect stdout on ActiveState perl since this is - # just another thread in the same process. - } - elsif ( ! open(STDOUT,$log_file_open_mode,$output) ) - { - mtr_child_error("can't redirect STDOUT to \"$output\": $!"); - } - } - - if ( $error ) - { - if ( !$::glob_win32_perl and $output eq $error ) - { - if ( ! open(STDERR,">&STDOUT") ) - { - mtr_child_error("can't dup STDOUT: $!"); - } - } - else - { - if ( ! open(STDERR,$log_file_open_mode,$error) ) - { - mtr_child_error("can't redirect STDERR to \"$error\": $!"); - } - } - } - - if ( $input ) - { - if ( ! open(STDIN,"<",$input) ) - { - mtr_child_error("can't redirect STDIN to \"$input\": $!"); - } - } - - if ( ! exec($path,@$arg_list_t) ) - { - mtr_child_error("failed to execute \"$path\": $!"); - } - mtr_error("Should never come here 1!"); - } - mtr_error("Should never come here 2!"); - } - mtr_error("Should never come here 3!"); -} - - -sub spawn_parent_impl { - my $pid= shift; - my $mode= shift; - my $path= shift; - - if ( $mode eq 'run' or $mode eq 'test' ) - { - if ( $mode eq 'run' ) - { - # Simple run of command, wait blocking for it to return - my $ret_pid= waitpid($pid,0); - if ( $ret_pid != $pid ) - { - # The "simple" waitpid has failed, print debug info - # and try to handle the error - mtr_warning("waitpid($pid, 0) returned $ret_pid " . - "when waiting for '$path', error: '$!'"); - if ( $ret_pid == -1 ) - { - # waitpid returned -1, that would indicate the process - # no longer exist and waitpid couldn't wait for it. - return 1; - } - mtr_error("Error handling failed"); - } - - return mtr_process_exit_status($?); - } - else - { - # We run mysqltest and wait for it to return. But we try to - # catch dying mysqld processes as well. - # - # We do blocking waitpid() until we get the return from the - # "mysqltest" call. But if a mysqld process dies that we - # started, we take this as an error, and kill mysqltest. - - - my $exit_value= -1; - my $saved_exit_value; - my $ret_pid; # What waitpid() returns - - while ( ($ret_pid= waitpid(-1,0)) != -1 ) - { - # Someone terminated, don't know who. Collect - # status info first before $? is lost, - # but not $exit_value, this is flagged from - - my $timer_name= mtr_timer_timeout($::glob_timers, $ret_pid); - if ( $timer_name ) - { - if ( $timer_name eq "suite" ) - { - # We give up here - # FIXME we should only give up the suite, not all of the run? - print STDERR "\n"; - mtr_error("Test suite timeout"); - } - elsif ( $timer_name eq "testcase" ) - { - $saved_exit_value= 63; # Mark as timeout - kill(9, $pid); # Kill mysqltest - next; # Go on and catch the termination - } - } - - if ( $ret_pid == $pid ) - { - # We got termination of mysqltest, we are done - $exit_value= mtr_process_exit_status($?); - last; - } - - # One of the child processes died, unless this was expected - # mysqltest should be killed and test aborted - - check_expected_crash_and_restart($ret_pid); - } - - if ( $ret_pid != $pid ) - { - # We terminated the waiting because a "mysqld" process died. - # Kill the mysqltest process. - mtr_verbose("Kill mysqltest because another process died"); - kill(9,$pid); - - $ret_pid= waitpid($pid,0); - - if ( $ret_pid != $pid ) - { - mtr_error("$path ($pid) got lost somehow"); - } - } - - return $saved_exit_value || $exit_value; - } - } - else - { - # We spawned a process we don't wait for - return $pid; - } -} - - -# ---------------------------------------------------------------------- -# We try to emulate how an Unix shell calculates the exit code -# ---------------------------------------------------------------------- - -sub mtr_process_exit_status { - my $raw_status= shift; - - if ( $raw_status & 127 ) - { - return ($raw_status & 127) + 128; # Signal num + 128 - } - else - { - return $raw_status >> 8; # Exit code - } -} - - -############################################################################## -# -# Kill processes left from previous runs -# -############################################################################## - - -# Kill all processes(mysqld, ndbd, ndb_mgmd and im) that would conflict with -# this run -# Make sure to remove the PID file, if any. -# kill IM manager first, else it will restart the servers -sub mtr_kill_leftovers () { - - mtr_report("Killing Possible Leftover Processes"); - mtr_debug("mtr_kill_leftovers(): started."); - - my @kill_pids; - my %admin_pids; - - foreach my $srv (@{$::master}, @{$::slave}) - { - mtr_debug(" - mysqld " . - "(pid: $srv->{pid}; " . - "pid file: '$srv->{path_pid}'; " . - "socket: '$srv->{path_sock}'; ". - "port: $srv->{port})"); - - my $pid= mtr_mysqladmin_start($srv, "shutdown", 20); - - # Save the pid of the mysqladmin process - $admin_pids{$pid}= 1; - - push(@kill_pids,{ - pid => $srv->{'pid'}, - pidfile => $srv->{'path_pid'}, - sockfile => $srv->{'path_sock'}, - port => $srv->{'port'}, - }); - $srv->{'pid'}= 0; # Assume we are done with it - } - - if ( ! $::opt_skip_ndbcluster ) - { - - foreach my $cluster (@{$::clusters}) - { - - # Don't shut down a "running" cluster - next if $cluster->{'use_running'}; - - mtr_debug(" - cluster " . - "(pid: $cluster->{pid}; " . - "pid file: '$cluster->{path_pid})"); - - my $pid= mtr_ndbmgm_start($cluster, "shutdown"); - - # Save the pid of the ndb_mgm process - $admin_pids{$pid}= 1; - - push(@kill_pids,{ - pid => $cluster->{'pid'}, - pidfile => $cluster->{'path_pid'} - }); - - $cluster->{'pid'}= 0; # Assume we are done with it - - foreach my $ndbd (@{$cluster->{'ndbds'}}) - { - mtr_debug(" - ndbd " . - "(pid: $ndbd->{pid}; " . - "pid file: '$ndbd->{path_pid})"); - - push(@kill_pids,{ - pid => $ndbd->{'pid'}, - pidfile => $ndbd->{'path_pid'}, - }); - $ndbd->{'pid'}= 0; # Assume we are done with it - } - } - } - - # Wait for all the admin processes to complete - mtr_wait_blocking(\%admin_pids); - - # If we trusted "mysqladmin --shutdown_timeout= ..." we could just - # terminate now, but we don't (FIXME should be debugged). - # So we try again to ping and at least wait the same amount of time - # mysqladmin would for all to die. - - mtr_ping_with_timeout(\@kill_pids); - - # We now have tried to terminate nice. We have waited for the listen - # port to be free, but can't really tell if the mysqld process died - # or not. We now try to find the process PID from the PID file, and - # send a kill to that process. Note that Perl let kill(0,@pids) be - # a way to just return the numer of processes the kernel can send - # signals to. So this can be used (except on Cygwin) to determine - # if there are processes left running that we cound out might exists. - # - # But still after all this work, all we know is that we have - # the ports free. - - # We scan the "var/run/" directory for other process id's to kill - - my $rundir= "$::opt_vardir/run"; - - mtr_debug("Processing PID files in directory '$rundir'..."); - - if ( -d $rundir ) - { - opendir(RUNDIR, $rundir) - or mtr_error("can't open directory \"$rundir\": $!"); - - my @pids; - - while ( my $elem= readdir(RUNDIR) ) - { - # Only read pid from files that end with .pid - if ( $elem =~ /.*[.]pid$/) - { - my $pidfile= "$rundir/$elem"; - - if ( -f $pidfile ) - { - mtr_debug("Processing PID file: '$pidfile'..."); - - my $pid= mtr_get_pid_from_file($pidfile); - - mtr_debug("Got pid: $pid from file '$pidfile'"); - - if ( $::glob_cygwin_perl or kill(0, $pid) ) - { - mtr_debug("There is process with pid $pid -- scheduling for kill."); - push(@pids, $pid); # We know (cygwin guess) it exists - } - else - { - mtr_debug("There is no process with pid $pid -- skipping."); - } - } - } - else - { - mtr_warning("Found non pid file $elem in $rundir") - if -f "$rundir/$elem"; - next; - } - } - closedir(RUNDIR); - - if ( @pids ) - { - mtr_debug("Killing the following processes with PID files: " . - join(' ', @pids) . "..."); - - start_reap_all(); - - if ( $::glob_cygwin_perl ) - { - # We have no (easy) way of knowing the Cygwin controlling - # process, in the PID file we only have the Windows process id. - system("kill -f " . join(" ",@pids)); # Hope for the best.... - mtr_debug("Sleep 5 seconds waiting for processes to die"); - sleep(5); - } - else - { - my $retries= 10; # 10 seconds - do - { - mtr_debug("Sending SIGKILL to pids: " . join(' ', @pids)); - kill(9, @pids); - mtr_report("Sleep 1 second waiting for processes to die"); - sleep(1) # Wait one second - } while ( $retries-- and kill(0, @pids) ); - - if ( kill(0, @pids) ) # Check if some left - { - mtr_warning("can't kill process(es) " . join(" ", @pids)); - } - } - - stop_reap_all(); - } - } - else - { - mtr_debug("Directory for PID files ($rundir) does not exist."); - } - - # We may have failed everything, but we now check again if we have - # the listen ports free to use, and if they are free, just go for it. - - mtr_debug("Checking known mysqld servers..."); - - foreach my $srv ( @kill_pids ) - { - if ( defined $srv->{'port'} and mtr_ping_port($srv->{'port'}) ) - { - mtr_warning("can't kill old process holding port $srv->{'port'}"); - } - } - - mtr_debug("mtr_kill_leftovers(): finished."); -} - - -# -# Check that all processes in "spec" are shutdown gracefully -# else kill them off hard -# -sub mtr_check_stop_servers ($) { - my $spec= shift; - - # Return if no processes are defined - return if ! @$spec; - - mtr_verbose("mtr_check_stop_servers"); - - # ---------------------------------------------------------------------- - # Wait until servers in "spec" has stopped listening - # to their ports or timeout occurs - # ---------------------------------------------------------------------- - mtr_ping_with_timeout(\@$spec); - - # ---------------------------------------------------------------------- - # Use waitpid() nonblocking for a little while, to see how - # many process's will exit sucessfully. - # This is the normal case. - # ---------------------------------------------------------------------- - my $wait_counter= 50; # Max number of times to redo the loop - foreach my $srv ( @$spec ) - { - my $pid= $srv->{'pid'}; - my $ret_pid; - if ( $pid ) - { - $ret_pid= waitpid($pid,&WNOHANG); - if ($ret_pid == $pid) - { - mtr_verbose("Caught exit of process $ret_pid"); - $srv->{'pid'}= 0; - } - elsif ($ret_pid == 0) - { - mtr_verbose("Process $pid is still alive"); - if ($wait_counter-- > 0) - { - # Give the processes more time to exit - select(undef, undef, undef, (0.1)); - redo; - } - } - else - { - mtr_warning("caught exit of unknown child $ret_pid"); - } - } - } - - # ---------------------------------------------------------------------- - # The processes that haven't yet exited need to - # be killed hard, put them in "kill_pids" hash - # ---------------------------------------------------------------------- - my %kill_pids; - foreach my $srv ( @$spec ) - { - my $pid= $srv->{'pid'}; - if ( $pid ) - { - # Server is still alive, put it in list to be hard killed - if ($::glob_win32_perl) - { - # Kill the real process if it's known - $pid= $srv->{'real_pid'} if ($srv->{'real_pid'}); - } - $kill_pids{$pid}= 1; - - # Write a message to the process's error log (if it has one) - # that it's being killed hard. - if ( defined $srv->{'errfile'} ) - { - mtr_tofile($srv->{'errfile'}, "Note: Forcing kill of process $pid\n"); - } - mtr_warning("Forcing kill of process $pid"); - - } - else - { - # Server is dead, remove the pidfile if it exists - # - # Race, could have been removed between test with -f - # and the unlink() below, so better check again with -f - if ( -f $srv->{'pidfile'} and ! unlink($srv->{'pidfile'}) and - -f $srv->{'pidfile'} ) - { - mtr_error("can't remove $srv->{'pidfile'}"); - } - } - } - - if ( ! keys %kill_pids ) - { - # All processes has exited gracefully - return; - } - - mtr_kill_processes(\%kill_pids); - - # ---------------------------------------------------------------------- - # All processes are killed, cleanup leftover files - # ---------------------------------------------------------------------- - { - my $errors= 0; - foreach my $srv ( @$spec ) - { - if ( $srv->{'pid'} ) - { - # Server has been hard killed, clean it's resources - foreach my $file ($srv->{'pidfile'}, $srv->{'sockfile'}) - { - # Know it is dead so should be no race, careful anyway - if ( defined $file and -f $file and ! unlink($file) and -f $file ) - { - $errors++; - mtr_warning("couldn't delete $file"); - } - } - - if ($::glob_win32_perl and $srv->{'real_pid'}) - { - # Wait for the pseudo pid - if the real_pid was known - # the pseudo pid has not been waited for yet, wai blocking - # since it's "such a simple program" - mtr_verbose("Wait for pseudo process $srv->{'pid'}"); - my $ret_pid= waitpid($srv->{'pid'}, 0); - mtr_verbose("Pseudo process $ret_pid died"); - } - - $srv->{'pid'}= 0; - } - } - if ( $errors ) - { - # There where errors killing processes - # do one last attempt to ping the servers - # and if they can't be pinged, assume they are dead - if ( ! mtr_ping_with_timeout( \@$spec ) ) - { - mtr_error("we could not kill or clean up all processes"); - } - else - { - mtr_verbose("All ports were free, continuing"); - } - } - } -} - - -# Wait for all the process in the list to terminate -sub mtr_wait_blocking($) { - my $admin_pids= shift; - - - # Return if no processes defined - return if ! %$admin_pids; - - mtr_verbose("mtr_wait_blocking"); - - # Wait for all the started processes to exit - # As mysqladmin is such a simple program, we trust it to terminate itself. - # I.e. we wait blocking, and wait for them all before we go on. - foreach my $pid (keys %{$admin_pids}) - { - my $ret_pid= waitpid($pid,0); - - } -} - -# Start "mysqladmin " for a specific mysqld -sub mtr_mysqladmin_start($$$) { - my $srv= shift; - my $command= shift; - my $adm_shutdown_tmo= shift; - - my $args; - mtr_init_args(\$args); - - mtr_add_arg($args, "--no-defaults"); - mtr_add_arg($args, "--user=%s", $::opt_user); - mtr_add_arg($args, "--password="); - mtr_add_arg($args, "--silent"); - if ( -e $srv->{'path_sock'} ) - { - mtr_add_arg($args, "--socket=%s", $srv->{'path_sock'}); - } - if ( $srv->{'port'} ) - { - mtr_add_arg($args, "--port=%s", $srv->{'port'}); - } - if ( $srv->{'port'} and ! -e $srv->{'path_sock'} ) - { - mtr_add_arg($args, "--protocol=tcp"); # Needed if no --socket - } - mtr_add_arg($args, "--connect_timeout=5"); - - # Shutdown time must be high as slave may be in reconnect - mtr_add_arg($args, "--shutdown_timeout=$adm_shutdown_tmo"); - mtr_add_arg($args, "$command"); - my $pid= mtr_spawn($::exe_mysqladmin, $args, - "", "", "", "", - { append_log_file => 1 }); - mtr_verbose("mtr_mysqladmin_start, pid: $pid"); - return $pid; - -} - -# Start "ndb_mgm shutdown" for a specific cluster, it will -# shutdown all data nodes and leave the ndb_mgmd running -sub mtr_ndbmgm_start($$) { - my $cluster= shift; - my $command= shift; - - my $args; - - mtr_init_args(\$args); - - mtr_add_arg($args, "--no-defaults"); - mtr_add_arg($args, "--core"); - mtr_add_arg($args, "--try-reconnect=1"); - mtr_add_arg($args, "--ndb_connectstring=%s", $cluster->{'connect_string'}); - mtr_add_arg($args, "-e"); - mtr_add_arg($args, "$command"); - - my $pid= mtr_spawn($::exe_ndb_mgm, $args, - "", "/dev/null", "/dev/null", "", - {}); - mtr_verbose("mtr_ndbmgm_start, pid: $pid"); - return $pid; - -} - - -# Ping all servers in list, exit when none of them answers -# or when timeout has passed -sub mtr_ping_with_timeout($) { - my $spec= shift; - my $timeout= 200; # 20 seconds max - my $res= 1; # If we just fall through, we are done - # in the sense that the servers don't - # listen to their ports any longer - - mtr_debug("Waiting for mysqld servers to stop..."); - - TIME: - while ( $timeout-- ) - { - foreach my $srv ( @$spec ) - { - $res= 1; # We are optimistic - if ( $srv->{'pid'} and defined $srv->{'port'} ) - { - if ( mtr_ping_port($srv->{'port'}) ) - { - mtr_verbose("waiting for process $srv->{'pid'} to stop ". - "using port $srv->{'port'}"); - - # Millisceond sleep emulated with select - select(undef, undef, undef, (0.1)); - $res= 0; - next TIME; - } - else - { - # Process was not using port - } - } - } - last; # If we got here, we are done - } - - if ($res) - { - mtr_debug("mtr_ping_with_timeout(): All mysqld instances are down."); - } - else - { - mtr_report("mtr_ping_with_timeout(): At least one server is alive."); - } - - return $res; -} - - -# -# Loop through our list of processes and look for and entry -# with the provided pid -# Set the pid of that process to 0 if found -# -sub mark_process_dead($) -{ - my $ret_pid= shift; - - foreach my $mysqld (@{$::master}, @{$::slave}) - { - if ( $mysqld->{'pid'} eq $ret_pid ) - { - mtr_verbose("$mysqld->{'type'} $mysqld->{'idx'} exited, pid: $ret_pid"); - $mysqld->{'pid'}= 0; - return; - } - } - - foreach my $cluster (@{$::clusters}) - { - if ( $cluster->{'pid'} eq $ret_pid ) - { - mtr_verbose("$cluster->{'name'} cluster ndb_mgmd exited, pid: $ret_pid"); - $cluster->{'pid'}= 0; - return; - } - - foreach my $ndbd (@{$cluster->{'ndbds'}}) - { - if ( $ndbd->{'pid'} eq $ret_pid ) - { - mtr_verbose("$cluster->{'name'} cluster ndbd exited, pid: $ret_pid"); - $ndbd->{'pid'}= 0; - return; - } - } - } - mtr_warning("mark_process_dead couldn't find an entry for pid: $ret_pid"); - -} - -# -# Loop through our list of processes and look for and entry -# with the provided pid, if found check for the file indicating -# expected crash and restart it. -# -sub check_expected_crash_and_restart($) -{ - my $ret_pid= shift; - - foreach my $mysqld (@{$::master}, @{$::slave}) - { - if ( $mysqld->{'pid'} eq $ret_pid ) - { - mtr_verbose("$mysqld->{'type'} $mysqld->{'idx'} exited, pid: $ret_pid"); - $mysqld->{'pid'}= 0; - - # Check if crash expected and restart if it was - my $expect_file= "$::opt_vardir/tmp/" . "$mysqld->{'type'}" . - "$mysqld->{'idx'}" . ".expect"; - if ( -f $expect_file ) - { - mtr_verbose("Crash was expected, file $expect_file exists"); - mysqld_start($mysqld, $mysqld->{'start_opts'}, - $mysqld->{'start_slave_master_info'}); - unlink($expect_file); - } - - return; - } - } - - foreach my $cluster (@{$::clusters}) - { - if ( $cluster->{'pid'} eq $ret_pid ) - { - mtr_verbose("$cluster->{'name'} cluster ndb_mgmd exited, pid: $ret_pid"); - $cluster->{'pid'}= 0; - - # Check if crash expected and restart if it was - my $expect_file= "$::opt_vardir/tmp/ndb_mgmd_" . "$cluster->{'type'}" . - ".expect"; - if ( -f $expect_file ) - { - mtr_verbose("Crash was expected, file $expect_file exists"); - ndbmgmd_start($cluster); - unlink($expect_file); - } - return; - } - - foreach my $ndbd (@{$cluster->{'ndbds'}}) - { - if ( $ndbd->{'pid'} eq $ret_pid ) - { - mtr_verbose("$cluster->{'name'} cluster ndbd exited, pid: $ret_pid"); - $ndbd->{'pid'}= 0; - - # Check if crash expected and restart if it was - my $expect_file= "$::opt_vardir/tmp/ndbd_" . "$cluster->{'type'}" . - "$ndbd->{'idx'}" . ".expect"; - if ( -f $expect_file ) - { - mtr_verbose("Crash was expected, file $expect_file exists"); - ndbd_start($cluster, $ndbd->{'idx'}, - $ndbd->{'start_extra_args'}); - unlink($expect_file); - } - return; - } - } - } - - if ($::instance_manager->{'spawner_pid'} eq $ret_pid) - { - return; - } - - mtr_warning("check_expected_crash_and_restart couldn't find an entry for pid: $ret_pid"); - -} - -############################################################################## -# -# The operating system will keep information about dead children, -# we read this information here, and if we have records the process -# is alive, we mark it as dead. -# -############################################################################## - -sub mtr_record_dead_children () { - - my $process_died= 0; - my $ret_pid; - - # Wait without blockinng to see if any processes had died - # -1 or 0 means there are no more procesess to wait for - while ( ($ret_pid= waitpid(-1,&WNOHANG)) != 0 and $ret_pid != -1) - { - mtr_warning("mtr_record_dead_children: $ret_pid"); - mark_process_dead($ret_pid); - $process_died= 1; - } - return $process_died; -} - -sub start_reap_all { - # This causes terminating processes to not become zombies, avoiding - # the need for (or possibility of) explicit waitpid(). - $SIG{CHLD}= 'IGNORE'; - - # On some platforms (Linux, QNX, OSX, ...) there is potential race - # here. If a process terminated before setting $SIG{CHLD} (but after - # any attempt to waitpid() it), it will still be a zombie. So we - # have to handle any such process here. - my $pid; - while(($pid= waitpid(-1, &WNOHANG)) != 0 and $pid != -1) - { - mtr_warning("start_reap_all pid: $pid"); - mark_process_dead($pid); - }; -} - -sub stop_reap_all { - $SIG{CHLD}= 'DEFAULT'; -} - - sub mtr_ping_port ($) { my $port= shift; @@ -1041,7 +69,7 @@ sub mtr_ping_port ($) { sub sleep_until_file_created ($$$) { my $pidfile= shift; my $timeout= shift; - my $pid= shift; + my $proc= shift; my $sleeptime= 100; # Milliseconds my $loops= ($timeout * 1000) / $sleeptime; @@ -1053,9 +81,9 @@ sub sleep_until_file_created ($$$) { } # Check if it died after the fork() was successful - if ( $pid != 0 && waitpid($pid,&WNOHANG) == $pid ) + if ( defined $proc and ! $proc->wait_one(0) ) { - mtr_warning("Process $pid died"); + mtr_warning("Process $proc died"); return 0; } @@ -1070,73 +98,12 @@ sub sleep_until_file_created ($$$) { "still waiting for $left seconds..."); } - # Millisceond sleep emulated with select - select(undef, undef, undef, ($sleeptime/1000)); + mtr_milli_sleep($sleeptime); + } return 0; } -sub mtr_kill_processes ($) { - my $pids = shift; - - mtr_verbose("mtr_kill_processes (" . join(" ", keys %{$pids}) . ")"); - - foreach my $pid (keys %{$pids}) - { - - if ($pid <= 0) - { - mtr_warning("Trying to kill illegal pid: $pid"); - next; - } - - my $signaled_procs= kill(9, $pid); - if ($signaled_procs == 0) - { - # No such process existed, assume it's killed - mtr_verbose("killed $pid(no such process)"); - } - else - { - my $ret_pid= waitpid($pid,0); - if ($ret_pid == $pid) - { - mtr_verbose("killed $pid(got the pid)"); - } - elsif ($ret_pid == -1) - { - mtr_verbose("killed $pid(got -1)"); - } - } - } - mtr_verbose("done killing processes"); -} - - -############################################################################## -# -# When we exit, we kill off all children -# -############################################################################## - -sub mtr_exit ($) { - my $code= shift; - mtr_timer_stop_all($::glob_timers); - local $SIG{HUP} = 'IGNORE'; - # ToDo: Signalling -$$ will only work if we are the process group - # leader (in fact on QNX it will signal our session group leader, - # which might be Do-compile or Pushbuild, causing tests to be - # aborted). So we only do it if we are the group leader. We might - # set ourselves as the group leader at startup (with - # POSIX::setpgrp(0,0)), but then care must be needed to always do - # proper child process cleanup. - POSIX::kill(SIGHUP, -$$) if !$::glob_win32_perl and $$ == getpgrp(); - - exit($code); -} - -########################################################################### - 1; diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl index d345740c5c2..f3b950e4d3a 100644 --- a/mysql-test/lib/mtr_report.pl +++ b/mysql-test/lib/mtr_report.pl @@ -21,46 +21,42 @@ use strict; use warnings; -sub mtr_report_test_name($); -sub mtr_report_test_passed($); -sub mtr_report_test_failed($); +sub mtr_report_test_passed($$); +sub mtr_report_test_failed($$); sub mtr_report_test_skipped($); -sub mtr_report_test_not_skipped_though_disabled($); - sub mtr_report_stats ($); + sub mtr_print_line (); -sub mtr_print_thick_line (); +sub mtr_print_thick_line ($); sub mtr_print_header (); sub mtr_report (@); sub mtr_warning (@); sub mtr_error (@); -sub mtr_child_error (@); sub mtr_debug (@); sub mtr_verbose (@); my $tot_real_time= 0; - - -############################################################################## -# -# -# -############################################################################## - sub mtr_report_test_name ($) { my $tinfo= shift; my $tname= $tinfo->{name}; + + # Remove suite part of name + $tname =~ s/.*\.// unless SHOW_SUITE_NAME; + + # Add combination name if any $tname.= " '$tinfo->{combination}'" if defined $tinfo->{combination}; - _mtr_log($tname); + _mtr_log("$tname"); printf "%-30s ", $tname; } + sub mtr_report_test_skipped ($) { my $tinfo= shift; + mtr_report_test_name($tinfo); $tinfo->{'result'}= 'MTR_RES_SKIPPED'; if ( $tinfo->{'disable'} ) @@ -69,36 +65,26 @@ sub mtr_report_test_skipped ($) { } elsif ( $tinfo->{'comment'} ) { - mtr_report("[ skipped ] $tinfo->{'comment'}"); + if ( $tinfo->{skip_detected_by_test} ) + { + mtr_report("[ skip.] $tinfo->{'comment'}"); + } else { + mtr_report("[ skip ] $tinfo->{'comment'}"); + } } else { - mtr_report("[ skipped ]"); + mtr_report("[ skip ]"); } } -sub mtr_report_tests_not_skipped_though_disabled ($) { - my $tests= shift; - if ( $::opt_enable_disabled ) - { - my @disabled_tests= grep {$_->{'dont_skip_though_disabled'}} @$tests; - if ( @disabled_tests ) - { - print "\nTest(s) which will be run though they are marked as disabled:\n"; - foreach my $tinfo ( sort {$a->{'name'} cmp $b->{'name'}} @disabled_tests ) - { - printf " %-20s : %s\n", $tinfo->{'name'}, $tinfo->{'comment'}; - } - } - } -} - -sub mtr_report_test_passed ($) { - my $tinfo= shift; +sub mtr_report_test_passed ($$) { + my ($tinfo, $use_timer)= @_; + mtr_report_test_name($tinfo); my $timer= ""; - if ( $::opt_timer and -f "$::opt_vardir/log/timer" ) + if ( $use_timer and -f "$::opt_vardir/log/timer" ) { $timer= mtr_fromfile("$::opt_vardir/log/timer"); $tot_real_time += ($timer/1000); @@ -108,8 +94,10 @@ sub mtr_report_test_passed ($) { mtr_report("[ pass ] $timer"); } -sub mtr_report_test_failed ($) { - my $tinfo= shift; + +sub mtr_report_test_failed ($$) { + my ($tinfo, $logfile)= @_; + mtr_report_test_name($tinfo); $tinfo->{'result'}= 'MTR_RES_FAILED'; if ( defined $tinfo->{'timeout'} ) @@ -129,12 +117,12 @@ sub mtr_report_test_failed ($) { # failing the test is saved in "comment" mtr_report("\nERROR: $tinfo->{'comment'}"); } - elsif ( -f $::path_timefile ) + elsif ( defined $logfile and -f $logfile ) { - # Test failure was detected by test tool and it's report + # Test failure was detected by test tool and its report # about what failed has been saved to file. Display the report. print "\n"; - print mtr_fromfile($::path_timefile); # FIXME print_file() instead + mtr_printfile($logfile); print "\n"; } else @@ -145,6 +133,7 @@ sub mtr_report_test_failed ($) { } } + sub mtr_report_stats ($) { my $tests= shift; @@ -184,28 +173,7 @@ sub mtr_report_stats ($) { # ---------------------------------------------------------------------- # Print out a summary report to screen # ---------------------------------------------------------------------- - - if ( ! $tot_failed ) - { - print "All $tot_tests tests were successful.\n"; - } - else - { - my $ratio= $tot_passed * 100 / $tot_tests; - print "Failed $tot_failed/$tot_tests tests, "; - printf("%.2f", $ratio); - print "\% were successful.\n\n"; - print - "The log files in var/log may give you some hint\n", - "of what went wrong.\n", - "If you want to report this error, please read first ", - "the documentation at\n", - "http://dev.mysql.com/doc/mysql/en/mysql-test-suite.html\n"; - } - if (!$::opt_extern) - { - print "The servers were restarted $tot_restarts times\n"; - } + print "The servers were restarted $tot_restarts times\n"; if ( $::opt_timer ) { @@ -220,7 +188,7 @@ sub mtr_report_stats ($) { # the "var/log/*.err" files. We save this info in "var/log/warnings" # ---------------------------------------------------------------------- - if ( ! $::glob_use_running_server ) + if ( $::opt_warnings ) { # Save and report if there was any fatal warnings/errors in err logs @@ -346,19 +314,11 @@ sub mtr_report_stats ($) { # BUG#29807 - innodb_mysql.test: Cannot find table test/t2 # from the internal data dictionary - /Cannot find or open table test\/bug29807 from/ or + /Cannot find table test\/bug29807 from the internal data dictionary/ or # BUG#29839 - lowercase_table3.test: Cannot find table test/T1 # from the internal data dictiona - /Cannot find table test\/BUG29839 from the internal data dictionary/ or - - # rpl_extrColmaster_*.test, the slave thread produces warnings - # when it get updates to a table that has more columns on the - # master - /Slave: Unknown column 'c7' in 't15' Error_code: 1054/ or - /Slave: Can't DROP 'c7'.* 1091/ or - /Slave: Key column 'c6'.* 1072/ - + /Cannot find table test\/BUG29839 from the internal data dictionary/ ) { next; # Skip these lines @@ -400,23 +360,6 @@ sub mtr_report_stats ($) { print "\n"; - # Print a list of testcases that failed - if ( $tot_failed != 0 ) - { - my $test_mode= join(" ", @::glob_test_mode) || "default"; - print "mysql-test-run in $test_mode mode: *** Failing the test(s):"; - - foreach my $tinfo (@$tests) - { - if ( $tinfo->{'result'} eq 'MTR_RES_FAILED' ) - { - print " $tinfo->{'name'}"; - } - } - print "\n"; - - } - # Print a list of check_testcases that failed(if any) if ( $::opt_check_testcases ) { @@ -438,12 +381,47 @@ sub mtr_report_stats ($) { } } + # Print a list of testcases that failed + if ( $tot_failed != 0 ) + { + my $ratio= $tot_passed * 100 / $tot_tests; + print "Failed $tot_failed/$tot_tests tests, "; + printf("%.2f", $ratio); + print "\% were successful.\n\n"; + + # Print the list of test that failed in a format + # that can be copy pasted to rerun only failing tests + print "Failing test(s):"; + + foreach my $tinfo (@$tests) + { + if ( $tinfo->{'result'} eq 'MTR_RES_FAILED' ) + { + print " $tinfo->{'name'}"; + } + } + print "\n\n"; + + # Print info about reporting the error + print + "The log files in var/log may give you some hint of what went wrong.\n\n", + "If you want to report this error, please read first ", + "the documentation\n", + "at http://dev.mysql.com/doc/mysql/en/mysql-test-suite.html\n\n"; + + } + else + { + print "All $tot_tests tests were successful.\n"; + } + if ( $tot_failed != 0 || $found_problems) { mtr_error("there were failing test cases"); } } + ############################################################################## # # Text formatting @@ -451,22 +429,25 @@ sub mtr_report_stats ($) { ############################################################################## sub mtr_print_line () { - print '-' x 55, "\n"; + print '-' x 60, "\n"; } -sub mtr_print_thick_line () { - print '=' x 55, "\n"; + +sub mtr_print_thick_line ($) { + my $char= shift || '='; + print $char x 60, "\n"; } + sub mtr_print_header () { print "\n"; if ( $::opt_timer ) { - print "TEST RESULT TIME (ms)\n"; + print "TEST RESULT TIME (ms)\n"; } else { - print "TEST RESULT\n"; + print "TEST RESULT\n"; } mtr_print_line(); print "\n"; @@ -480,6 +461,14 @@ sub mtr_print_header () { ############################################################################## use IO::File; +use Time::localtime; + +sub _timestamp { + my $tm= localtime(); + return sprintf("%02d%02d%02d %2d:%02d:%02d ", + $tm->year % 100, $tm->mon+1, $tm->mday, + $tm->hour, $tm->min, $tm->sec); +} my $log_file_ref= undef; @@ -492,46 +481,44 @@ sub mtr_log_init ($) { mtr_warning("Could not create logfile $filename: $!"); } + sub _mtr_log (@) { - print $log_file_ref join(" ", @_),"\n" + print $log_file_ref join(" ", _timestamp(), @_),"\n" if defined $log_file_ref; } + sub mtr_report (@) { # Print message to screen and log _mtr_log(@_); print join(" ", @_),"\n"; } + sub mtr_warning (@) { # Print message to screen and log _mtr_log("WARNING: ", @_); print STDERR "mysql-test-run: WARNING: ",join(" ", @_),"\n"; } + sub mtr_error (@) { # Print message to screen and log _mtr_log("ERROR: ", @_); print STDERR "mysql-test-run: *** ERROR: ",join(" ", @_),"\n"; - mtr_exit(1); -} - -sub mtr_child_error (@) { - # Print message to screen and log - _mtr_log("ERROR(child): ", @_); - print STDERR "mysql-test-run: *** ERROR(child): ",join(" ", @_),"\n"; exit(1); } + sub mtr_debug (@) { - # Only print if --script-debug is used - if ( $::opt_script_debug ) + if ( $::opt_verbose > 1 ) { _mtr_log("###: ", @_); print STDERR "####: ",join(" ", @_),"\n"; } } + sub mtr_verbose (@) { # Always print to log, print to screen only when --verbose is used _mtr_log("> ",@_); @@ -541,4 +528,5 @@ sub mtr_verbose (@) { } } + 1; diff --git a/mysql-test/lib/mtr_settings.pl b/mysql-test/lib/mtr_settings.pl new file mode 100644 index 00000000000..01ba4c9516e --- /dev/null +++ b/mysql-test/lib/mtr_settings.pl @@ -0,0 +1,16 @@ +# +# Defines used to control how mysql-test-run.pl +# should work in the current version of MySQL +# + +# Control if the suite name should be output before testname +sub SHOW_SUITE_NAME { return 1; }; + + +# Control which suites are run by default +sub DEFAULT_SUITES { return "main,binlog,federated,rpl,rpl_ndb,ndb"; }; + + + +1; + diff --git a/mysql-test/lib/mtr_stress.pl b/mysql-test/lib/mtr_stress.pl index 93b06b32c5f..cd5c7b0dbb7 100644 --- a/mysql-test/lib/mtr_stress.pl +++ b/mysql-test/lib/mtr_stress.pl @@ -135,7 +135,7 @@ sub run_stress_test () } mtr_init_args(\$args); - + mtr_add_args($args, "$::glob_mysql_test_dir/mysql-stress-test.pl"); mtr_add_arg($args, "--server-socket=%s", $::master->[0]->{'path_sock'}); mtr_add_arg($args, "--server-user=%s", $::opt_user); mtr_add_arg($args, "--server-database=%s", "test"); @@ -181,7 +181,13 @@ sub run_stress_test () } #Run stress test - mtr_run("$::glob_mysql_test_dir/mysql-stress-test.pl", $args, "", "", "", ""); + My::SafeProcess->run + ( + name => "stress test", + path => $^X, + args => \$args, + ); + if ( ! $::glob_use_embedded_server ) { stop_all_servers(); diff --git a/mysql-test/lib/mtr_timer.pl b/mysql-test/lib/mtr_timer.pl deleted file mode 100644 index 326fbea74ec..00000000000 --- a/mysql-test/lib/mtr_timer.pl +++ /dev/null @@ -1,158 +0,0 @@ -# -*- cperl -*- -# Copyright (C) 2005-2006 MySQL AB -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# This is a library file used by the Perl version of mysql-test-run, -# and is part of the translation of the Bourne shell script with the -# same name. - -use Errno; -use strict; - -sub mtr_init_timers (); -sub mtr_timer_start($$$); -sub mtr_timer_stop($$); -sub mtr_timer_stop_all($); - - -############################################################################## -# -# Initiate the structure shared by all timers -# -############################################################################## - -sub mtr_init_timers () { - my $timers = { timers => {}, pids => {}}; - return $timers; -} - - -############################################################################## -# -# Start, stop and poll a timer -# -# As alarm() isn't portable to Windows, we use separate processes to -# implement timers. -# -############################################################################## - -sub mtr_timer_start($$$) { - my ($timers,$name,$duration)= @_; - - if ( exists $timers->{'timers'}->{$name} ) - { - # We have an old running timer, kill it - mtr_warning("There is an old timer running"); - mtr_timer_stop($timers,$name); - } - - FORK: - { - my $tpid= fork(); - - if ( ! defined $tpid ) - { - if ( $! == $!{EAGAIN} ) # See "perldoc Errno" - { - mtr_warning("Got EAGAIN from fork(), sleep 1 second and redo"); - sleep(1); - redo FORK; - } - else - { - mtr_error("can't fork timer, error: $!"); - } - } - - if ( $tpid ) - { - # Parent, record the information - mtr_verbose("Starting timer for '$name',", - "duration: $duration, pid: $tpid"); - $timers->{'timers'}->{$name}->{'pid'}= $tpid; - $timers->{'timers'}->{$name}->{'duration'}= $duration; - $timers->{'pids'}->{$tpid}= $name; - } - else - { - # Child, install signal handlers and sleep for "duration" - - # Don't do the ^C cleanup in the timeout child processes! - # There is actually a race here, if we get ^C after fork(), but before - # clearing the signal handler. - $SIG{INT}= 'DEFAULT'; - - $SIG{TERM}= sub { - mtr_verbose("timer $$ woke up, exiting!"); - exit(0); - }; - - $0= "mtr_timer(timers,$name,$duration)"; - sleep($duration); - mtr_verbose("timer $$ expired after $duration seconds"); - exit(0); - } - } -} - - -sub mtr_timer_stop ($$) { - my ($timers,$name)= @_; - - if ( exists $timers->{'timers'}->{$name} ) - { - my $tpid= $timers->{'timers'}->{$name}->{'pid'}; - mtr_verbose("Stopping timer for '$name' with pid $tpid"); - - # FIXME as Cygwin reuses pids fast, maybe check that is - # the expected process somehow?! - kill(15, $tpid); - - # As the timers are so simple programs, we trust them to terminate, - # and use blocking wait for it. We wait just to avoid a zombie. - waitpid($tpid,0); - - delete $timers->{'timers'}->{$name}; # Remove the timer information - delete $timers->{'pids'}->{$tpid}; # and PID reference - - return 1; - } - - mtr_error("Asked to stop timer '$name' not started"); -} - - -sub mtr_timer_stop_all ($) { - my $timers= shift; - - foreach my $name ( keys %{$timers->{'timers'}} ) - { - mtr_timer_stop($timers, $name); - } - return 1; -} - - -sub mtr_timer_timeout ($$) { - my ($timers,$pid)= @_; - - return "" unless exists $timers->{'pids'}->{$pid}; - - # Got a timeout(the process with $pid is recorded as being a timer) - # return the name of the timer - return $timers->{'pids'}->{$pid}; -} - -1; diff --git a/mysql-test/lib/t/Base.t b/mysql-test/lib/t/Base.t new file mode 100644 index 00000000000..6ca7657d421 --- /dev/null +++ b/mysql-test/lib/t/Base.t @@ -0,0 +1,27 @@ +# -*- cperl -*- +use Test::More qw(no_plan); +use strict; + +use_ok ("My::SafeProcess::Base"); + + +my $count= 0; +for (1..100){ + my $pid= My::SafeProcess::Base::_safe_fork(); + exit unless $pid; + (waitpid($pid, 0) == $pid) and $count++; +} +ok($count == 100, "safe_fork"); + +# A nice little forkbomb +SKIP: { + skip("forkbomb", 1); + eval { + while(1){ + my $pid= My::SafeProcess::Base::_safe_fork(); + exit unless $pid; + } + }; + ok($@, "forkbomb"); +} + diff --git a/mysql-test/lib/t/Find.t b/mysql-test/lib/t/Find.t new file mode 100644 index 00000000000..90489ba06dd --- /dev/null +++ b/mysql-test/lib/t/Find.t @@ -0,0 +1,33 @@ +# -*- cperl -*- +use Test::More qw(no_plan); +use strict; + +use_ok ("My::Find"); +my $basedir= "../.."; + +print "=" x 40, "\n"; +my $mysqld_exe= my_find_bin($basedir, + ["sql", "bin"], + ["mysqld", "mysqld-debug"]); +print "mysqld_exe: $mysqld_exe\n"; +print "=" x 40, "\n"; +my $mysql_exe= my_find_bin($basedir, + ["client", "bin"], + "mysql"); +print "mysql_exe: $mysql_exe\n"; +print "=" x 40, "\n"; + +my $mtr_build_dir= $ENV{MTR_BUILD_DIR}; +$ENV{MTR_BUILD_DIR}= "debug"; +my $mysql_exe= my_find_bin($basedir, + ["client", "bin"], + "mysql"); +print "mysql_exe: $mysql_exe\n"; +$ENV{MTR_BUILD_DIR}= $mtr_build_dir; +print "=" x 40, "\n"; + +my $charset_dir= my_find_dir($basedir, + ["share/mysql", "sql/share", "share"], + "charsets"); +print "charset_dir: $charset_dir\n"; +print "=" x 40, "\n"; diff --git a/mysql-test/lib/t/SafeProcess.t b/mysql-test/lib/t/SafeProcess.t new file mode 100644 index 00000000000..d4a62ff8cca --- /dev/null +++ b/mysql-test/lib/t/SafeProcess.t @@ -0,0 +1,102 @@ +# -*- cperl -*- + +use strict; +use FindBin; +use IO::File; + +use Test::More qw(no_plan); +use_ok ("My::SafeProcess"); + + +my $perl_path= $^X; + +{ + # Test exit codes + my $count= 32; + my $ok_count= 0; + for my $code (0..$count-1) { + + my $args= [ "$FindBin::Bin/test_child.pl", "--exit-code=$code" ]; + my $proc= My::SafeProcess->new + ( + path => $perl_path, + args => \$args, + output => "/dev/null", + error => "/dev/null", + ); + # Wait max 10 seconds for the process to finish + $ok_count++ if ($proc->wait_one(10) == 0 and + $proc->exit_status() == $code); + } + ok($count == $ok_count, "check exit_status, $ok_count"); +} + + +{ + # spawn a number of concurrent processes + my $count= 16; + my $ok_count= 0; + my %procs; + for my $code (0..$count-1) { + + my $args= [ "$FindBin::Bin/test_child.pl", "--exit-code=$code" ]; + $procs{$code}= My::SafeProcess->new + ( + path => $perl_path, + args => \$args, + output => "/dev/null", + error => "/dev/null", + ); + } + + for my $code (0..$count-1) { + $ok_count++ if ($procs{$code}->wait_one(10) == 0 and + $procs{$code}->exit_status() == $code); + } + ok($count == $ok_count, "concurrent, $ok_count"); +} + + +# +# Test stdout, stderr +# +{ + use File::Temp qw / tempdir /; + my $dir = tempdir( CLEANUP => 1 ); + + my $args= [ "$FindBin::Bin/test_child.pl" ]; + my $proc= My::SafeProcess->new + ( + path => $perl_path, + args => \$args, + output => "$dir/output.txt", + error => "$dir/error.txt", + ); + + $proc->wait_one(2); # Wait max 2 seconds for the process to finish + + my $fh= IO::File->new("$dir/output.txt"); + my @text= <$fh>; + ok(grep(/Hello stdout/, @text), "check stdout"); + $fh= IO::File->new("$dir/error.txt"); + my @text= <$fh>; + ok(grep(/Hello stderr/, @text), "check stderr"); + + # To same file + $proc= My::SafeProcess->new + ( + path => $perl_path, + args => \$args, + output => "$dir/output.txt", + error => "$dir/output.txt", + debug => 1, + ); + + $proc->wait_one(2); # Wait max 2 seconds for the process to finish + + my $fh= IO::File->new("$dir/output.txt"); + my @text= <$fh>; + ok((grep(/Hello stdout/, @text) and grep(/Hello stderr/, @text)), + "check stdout and stderr"); + +} diff --git a/mysql-test/lib/t/SafeProcessStress.pl b/mysql-test/lib/t/SafeProcessStress.pl new file mode 100755 index 00000000000..a31f3031262 --- /dev/null +++ b/mysql-test/lib/t/SafeProcessStress.pl @@ -0,0 +1,149 @@ +#!/usr/bin/perl +# -*- cperl -*- + +use strict; +use FindBin; +use My::SafeProcess; + +# +# Test longterm running of SafeProcess +# + +my $perl_path= $^X; +my $verbose= 0; +my $loops= 1000; + +print "kill one and wait for one\n"; +for (1...$loops){ + use File::Temp qw / tempdir /; + my $dir = tempdir( CLEANUP => 1 ); + + my @procs; + for (1..10){ + + my $args= [ "$FindBin::Bin/dummyd.pl", "--vardir=$dir" ]; + my $proc= My::SafeProcess->new + ( + path => $perl_path, + args => \$args, + verbose => $verbose, + ); + push(@procs, $proc); + } + + foreach my $proc (@procs) { + $proc->kill(); + # dummyd will always be kiled and thus + # exit_status should have been set to 1 + die "oops, exit_status: ", $proc->exit_status() + unless $proc->exit_status() == 1; + } + + print "=" x 60, "\n"; +} + + +print "With 1 second sleep in dummyd\n"; +for (1...$loops){ + use File::Temp qw / tempdir /; + my $dir = tempdir( CLEANUP => 1 ); + + my @procs; + for (1..10){ + + my $args= [ "$FindBin::Bin/dummyd.pl", + "--vardir=$dir", + "--sleep=1" ]; + my $proc= My::SafeProcess->new + ( + path => $perl_path, + args => \$args, + verbose => $verbose, + ); + push(@procs, $proc); + } + + foreach my $proc (@procs) { + $proc->kill(); + } + + print "=" x 60, "\n"; +} + +print "kill all and wait for one\n"; +for (1...$loops){ + use File::Temp qw / tempdir /; + my $dir = tempdir( CLEANUP => 1 ); + + my @procs; + for (1..10){ + + my $args= [ "$FindBin::Bin/dummyd.pl", "--vardir=$dir" ]; + my $proc= My::SafeProcess->new + ( + path => $perl_path, + args => \$args, + verbose => $verbose, + ); + push(@procs, $proc); + } + + foreach my $proc (@procs) { + $proc->start_kill(); + } + + foreach my $proc (@procs) { + $proc->wait_one(); + } + + print "=" x 60, "\n"; +} + +print "kill all using shutdown without callback\n"; +for (1...$loops){ + use File::Temp qw / tempdir /; + my $dir = tempdir( CLEANUP => 1 ); + + my @procs; + for (1..10){ + + my $args= [ "$FindBin::Bin/dummyd.pl", "--vardir=$dir" ]; + my $proc= My::SafeProcess->new + ( + path => $perl_path, + args => \$args, + verbose => $verbose, + ); + push(@procs, $proc); + } + + My::SafeProcess::shutdown(2, @procs); + + print "=" x 60, "\n"; +} + +print "kill all using shutdown\n"; +for (1...$loops){ + use File::Temp qw / tempdir /; + my $dir = tempdir( CLEANUP => 1 ); + + my @procs; + for (1..10){ + + my $args= [ "$FindBin::Bin/dummyd.pl", "--vardir=$dir" ]; + my $proc= My::SafeProcess->new + ( + path => $perl_path, + args => \$args, + verbose => $verbose, + shutdown => sub { }, # Does nothing + ); + push(@procs, $proc); + } + + My::SafeProcess::shutdown(2, @procs); + + print "=" x 60, "\n"; +} + +exit(0); diff --git a/mysql-test/lib/t/copytree.t b/mysql-test/lib/t/copytree.t new file mode 100644 index 00000000000..15e4d1a7b1b --- /dev/null +++ b/mysql-test/lib/t/copytree.t @@ -0,0 +1,34 @@ +#!/usr/bin/perl +# -*- cperl -*- + +use strict; + +use My::File::Path; + +use Test::Simple tests => 7; +use File::Temp qw / tempdir /; +my $dir = tempdir( CLEANUP => 1 ); +my $testdir="$dir/test"; +my $test_todir="$dir/to"; + +my $subdir= "$testdir/test1/test2/test3"; + +# +# 1. Create, copy and remove a directory structure +# +mkpath($subdir); +ok( -d $subdir, "Check '$subdir' is created"); + +copytree($testdir, $test_todir); +ok( -d $test_todir, "Check '$test_todir' is created"); +ok( -d "$test_todir/test1", "Check 'test1' is created"); +ok( -d "$test_todir/test1/test2", "Check 'test2' is created"); +ok( -d "$test_todir/test1/test2/test3", "Check 'test3' is created"); + + +rmtree($testdir); +ok( ! -d $testdir, "Check '$testdir' is gone"); + +rmtree($test_todir); +ok( ! -d $test_todir, "Check '$test_todir' is gone"); + diff --git a/mysql-test/lib/t/dummyd.pl b/mysql-test/lib/t/dummyd.pl new file mode 100644 index 00000000000..07336e3c2d2 --- /dev/null +++ b/mysql-test/lib/t/dummyd.pl @@ -0,0 +1,38 @@ +#!/usr/bin/perl +# -*- cperl -*- + +use strict; +use Getopt::Long; +use IO::File; + +my $vardir; +my $randie= 0; +my $sleep= 0; +GetOptions + ( + # Directory where to write files + 'vardir=s' => \$vardir, + 'die-randomly' => \$randie, + 'sleep=i' => \$sleep, + ); + +die("invalid vardir ") unless defined $vardir and -d $vardir; + +my $pid= $$; +while(1){ + for my $i (1..64){ + # Write to file + my $name= "$vardir/$pid.$i.tmp"; + my $F= IO::File->new($name, "w") + or warn "$$, Could not open $name: $!" and next; + print $F rand($.) for (1..1000); + $F->close(); + sleep($sleep); + die "ooops!" if $randie and rand() < 0.0001 + } +} + + +exit (0); + + diff --git a/mysql-test/lib/t/rmtree.t b/mysql-test/lib/t/rmtree.t new file mode 100644 index 00000000000..08c9077d001 --- /dev/null +++ b/mysql-test/lib/t/rmtree.t @@ -0,0 +1,52 @@ +#!/usr/bin/perl +# -*- cperl -*- + +use strict; + +use My::File::Path; + +use Test::Simple tests => 8; +use File::Temp qw / tempdir /; +my $dir = tempdir( CLEANUP => 1 ); +my $testdir="$dir/test"; + +my $subdir= "$testdir/test1/test2/test3"; + +# +# 1. Create and remove a directory structure +# +mkpath($subdir); +ok( -d $subdir, "Check '$subdir' is created"); + +rmtree($testdir); +ok( ! -d $testdir, "Check '$testdir' is gone"); + +# +# 2. Create and remove a directory structure +# where one directory is chmod to 0000 +# +mkpath($subdir); +ok( -d $subdir, "Check '$subdir' is created"); + +ok( chmod(0000, $subdir) == 1 , "Check one dir was chmoded"); + +rmtree($testdir); +ok( ! -d $testdir, "Check '$testdir' is gone"); + +# +# 3. Create and remove a directory structure +# where one file is chmod to 0000 +# +mkpath($subdir); +ok( -d $subdir, "Check '$subdir' is created"); + +my $testfile= "$subdir/test.file"; +open(F, ">", $testfile) or die; +print F "hello\n"; +close(F); + +ok( chmod(0000, $testfile) == 1 , "Check one file was chmoded"); + +rmtree($testdir); +ok( ! -d $testdir, "Check '$testdir' is gone"); + diff --git a/mysql-test/lib/t/testMyConfig.t b/mysql-test/lib/t/testMyConfig.t new file mode 100755 index 00000000000..da08cb8b4d1 --- /dev/null +++ b/mysql-test/lib/t/testMyConfig.t @@ -0,0 +1,131 @@ +#!/usr/bin/perl +# -*- cperl -*- + +use strict; +use warnings; +use File::Temp qw / tempdir /; +my $dir = tempdir( CLEANUP => 1 ); + +use Test::More qw(no_plan); + +BEGIN { use_ok ( "My::Config" ) }; + +my $test_cnf= "$dir/test.cnf"; + +# Write test config file +open(OUT, ">", $test_cnf) or die; +print $test_cnf, "\n"; + +print OUT <new($test_cnf); +isa_ok( $config, "My::Config" ); + +print $config; + +ok ( $config->group("mysqld_2"), "group mysqld_2 exists"); +ok ( $config->group("mysqld_1"), "group mysqld_1 exists"); +ok ( $config->group("mysqld.9"), "group mysqld.9 exists"); +ok ( $config->group("mysqld.9")->suffix() eq ".9", "group mysqld.9 has suffix .9"); + +ok ( $config->group("mysqld"), "group mysqld exists"); +ok ( $config->group("client"), "group client exists"); +ok ( !$config->group("mysqld_3"), "group mysqld_3 does not exist"); + +ok ( $config->options_in_group("mysqld") == 4, "options in [mysqld] is 4"); +ok ( $config->options_in_group("nonexist") == 0, "options in [nonexist] is 0"); + +{ + my @groups= $config->groups(); + ok(@groups == 5, "5 groups"); + my $idx= 0; + foreach my $name ('mysqld', 'mysqld_1', 'mysqld_2', 'mysqld.9', 'client') { + is($groups[$idx++]->name(), $name, "checking groups $idx"); + } +} + +{ + my @groups= $config->like("mysqld"); + ok(@groups == 4, "4 groups like mysqld"); + my $idx= 0; + foreach my $name ('mysqld', 'mysqld_1', 'mysqld_2', 'mysqld.9') { + is($groups[$idx++]->name(), $name, "checking like(\"mysqld\") $idx"); + } +} + +{ + my @groups= $config->like("not"); + ok(@groups == 0, "checking like(\"not\")"); +} + +is($config->first_like("mysqld_")->name(), "mysqld_1", "first_like"); + +is( $config->value('mysqld', 'option4'), undef, + "mysqld_option4 exists, does not have a value"); + +ok( $config->exists('mysqld', 'option4'), + "mysqld_option4 exists"); +ok( $config->exists('mysqld', 'option2'), + "mysqld_option2 exists"); +ok( !$config->exists('mysqld', 'option5'), + "mysqld_option5 does not exists"); + +# Save the config to file +my $test2_cnf= "$dir/test2.cnf"; +$config->save($test2_cnf); + +# read it back and check it's the same +my $config2= My::Config->new($test2_cnf); +isa_ok( $config2, "My::Config" ); +is_deeply( \$config, \$config2, "test.cnf is equal to test2.cnf"); + + +my $test_include_cnf= "$dir/test_include.cnf"; +# Write test config file that includes test.cnf +open(OUT, ">", $test_include_cnf) or die; + +print OUT <new($test_include_cnf); +isa_ok( $config3, "My::Config" ); +print $config3; +is( $config3->value('mysqld', 'basedir'), 'anotherbasedir', + "mysqld_basedir has been overriden by value in test_include.cnf"); + +is( $config3->value('mysqld', 'option1'), 'values3', + "mysqld_option1 has been overriden by value in test_include.cnf"); + +is( $config3->value('mysqld', 'option2'), 'value4', + "mysqld_option2 is from included file"); + +is( $config3->value('client', 'socket'), 'asocketpath', + "client.socket is from included file"); + +is( $config3->value('mysqld', 'option4'), undef, + "mysqld_option4 exists, does not have a value"); + +print "$config3\n"; + diff --git a/mysql-test/lib/t/testMyConfigFactory.t b/mysql-test/lib/t/testMyConfigFactory.t new file mode 100755 index 00000000000..16fdd9db539 --- /dev/null +++ b/mysql-test/lib/t/testMyConfigFactory.t @@ -0,0 +1,98 @@ +#!/usr/bin/perl +# -*- cperl -*- + +use strict; +use warnings; + +use File::Temp qw / tempdir /; +my $dir = tempdir( CLEANUP => 1 ); + +use Test::More qw(no_plan); + +BEGIN { use_ok ( "My::ConfigFactory" ) }; + +my $gen1_cnf= "$dir/gen1.cnf"; +open(OUT, ">", $gen1_cnf) or die; + +print OUT <new_config +( + { + basedir => $basedir, + template_path => $gen1_cnf, + vardir => "/path/to/var", + baseport => 10987, + #hosts => [ 'host1', 'host2' ], + } +); + +print $config; + +ok ( $config->group("mysqld.master"), "group mysqld.master exists"); +ok ( $config->group("mysqld.1"), "group mysqld.1 exists"); +ok ( $config->group("client"), "group client exists"); +ok ( !$config->group("mysqld.3"), "group mysqld.3 does not exist"); + +ok ( $config->first_like("mysqld"), "group like 'mysqld' exists"); + +is( $config->value('mysqld.1', '#host'), 'localhost', + "mysqld.1.#host has been generated"); + +is( $config->value('client', 'host'), 'localhost', + "client.host has been generated"); + +is( $config->value('client', 'host'), + $config->value('mysqld.master', '#host'), + "client.host is same as mysqld.master.host"); + +ok ( $config->value("mysqld.1", 'character-sets-dir') =~ /$basedir.*charsets$/, + "'character-sets-dir' generated"); + +ok ( $config->value("mysqld.1", 'language') =~ /$basedir.*english$/, + "'language' generated"); + +ok ( $config->value("ENV", 'MASTER_MY_PORT') =~ /\d/, + "'language' generated"); + +my $gen2_cnf= "$dir/gen2.cnf"; +open(OUT, ">", $gen2_cnf) or die; + +print OUT <new_config +( + { + basedir => $basedir, + template_path => $gen2_cnf, + vardir => "/path/to/var", + baseport => 10987, + #hosts => [ 'host1', 'host2' ], + } +); + +print $config2; + +ok ( $config2->first_like("mysqld"), "group like 'mysqld' exists"); diff --git a/mysql-test/lib/t/test_child.pl b/mysql-test/lib/t/test_child.pl new file mode 100755 index 00000000000..99f4e68003d --- /dev/null +++ b/mysql-test/lib/t/test_child.pl @@ -0,0 +1,21 @@ +#!/usr/bin/perl +# -*- cperl -*- + +use strict; +use Getopt::Long; + +my $opt_exit_code= 0; + +GetOptions + ( + # Exit with the specified exit code + 'exit-code=i' => \$opt_exit_code + ); + + +print "Hello stdout\n"; +print STDERR "Hello stderr\n"; + +exit ($opt_exit_code); + + diff --git a/mysql-test/misc/kill_master.sh b/mysql-test/misc/kill_master.sh deleted file mode 100644 index 7938c9d3ac2..00000000000 --- a/mysql-test/misc/kill_master.sh +++ /dev/null @@ -1,4 +0,0 @@ -kill -9 `cat var/run/master.pid` -# The kill may fail if process has already gone away, -# so don't use the exit code of the kill. Use 0. -exit 0 diff --git a/mysql-test/misc/mysql-test_V1.9.pl b/mysql-test/misc/mysql-test_V1.9.pl deleted file mode 100644 index 129ec41b4d5..00000000000 --- a/mysql-test/misc/mysql-test_V1.9.pl +++ /dev/null @@ -1,1121 +0,0 @@ -#!/usr/bin/perl -# -# Tests MySQL. Output is given to the stderr. Use -# diff to check the possible differencies. -# - -use DBI; -use Getopt::Long; - -$VER = "1.9"; -$| = 1; - -$opt_db = "test"; -$opt_user = $opt_password = $opt_without = ""; -$opt_host = "localhost"; -$opt_port = "3306"; -$opt_socket = "/tmp/mysql.sock"; -$opt_help = 0; - -$NO_ERR = 0; # No error -$EXP_ERR = 1; # Expect error -$MAY_ERR = 2; # Maybe error -$HS = 0; # Horizontal style of output -$VS = 1; # Vertical style of output -$VERBOSE = 0; # Print the results -$SILENT = 1; # No output - -@test_packages = ("FUNC", "PROC", "SHOW"); - -#### -#### main program -#### - -main(); - -sub main() -{ - GetOptions("help", "db=s", "port=i", "host=s", "password=s", "user=s", "socket=s", - "without=s") || usage(); - - usage() if ($opt_help); - - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host:port=$opt_port:mysql_socket=$opt_socket", $opt_user, $opt_password, { PrintError => 0 }) - || die $DBI::errstr; - -## QQ ###################################### - -$sth = $dbh->prepare("show felds from t2") -|| die "Couldn't prepare query: $DBI::errstr\n"; -if (!$sth->execute) -{ - print "Couldn't execute query: $DBI::errstr\n"; - $sth->finish; - die; -} -while (($row = $sth->fetchrow_arrayref)) -{ - print "$row->[1]\n"; -} - - -exit(0); - -## QQ ###################################### - - printf("####\n#### THIS IS mysql-test script RUNNING\n"); - printf("#### mysql-test version $VER\n####\n"); - - test_mysql_functions() if (&chk_package($opt_without, $test_packages[0])); - test_mysql_procedures() if (&chk_package($opt_without, $test_packages[1])); - test_mysql_show() if (&chk_package($opt_without, $test_packages[2])); - - print "\n"; - return; -} - -#### -#### test show -command of MySQL -#### - -sub test_mysql_show -{ - my ($query, $i); - - $query = create_show_tables(); - &exec_query(["drop table my_t"], $MAY_ERR, $SILENT); - for ($i = 0; $query[$i]; $i++) - { - &exec_query([$query[$i]], $NO_ERR, $VERBOSE, $HS); - &exec_query(["show fields from my_t"], $NO_ERR, $VERBOSE, $HS); - &exec_query(["show keys from my_t"], $NO_ERR, $VERBOSE, $HS); - &exec_query(["drop table my_t"], $NO_ERR, $SILENT); - } -} - -sub create_show_tables -{ - my ($query, $i); - - $query[0] = <[0][0]) - { - printf("No function found!\n"); - if (!$force) { die; } - } - - for ($i = 0; $func->[$i][0]; $i++) - { - $tbused = 0; - $no_arg = 0; - for ($j = 0; $j < $count && !$no_arg; $j++) - { - if ($tbused || $no_arg) { next; } - $query = "select $func->[$i][0]("; - #search the values for the args - for ($k = 0; $k < length($func->[$i][1]) && !$no_arg; $k++) - { - if ($mix) - { - $arg = $j + 1 + $k; - } - else - { - $arg = $j + 1; - } - if (substr($func->[$i][1], $k, 1) eq 'E') - { - $no_arg = 1; - next; - } - if ($k) { $query .= ','; } - - if (substr($func->[$i][1], $k, 1) eq 'S') - { - $query .= &find_value(\@value, 'S', $arg); - } - elsif (substr($func->[$i][1], $k, 1) eq 'N') - { - $query .= &find_value(\@value, 'N', $arg); - } - elsif (substr($func->[$i][1], $k, 1) eq 'Z') - { - $query .= &find_value(\@value, 'Z', $arg); - } - elsif ((substr($func->[$i][1], $k, 1) eq 'R')) - { - $query .= &find_value(\@value, 'R', $arg); - } - elsif (substr($func->[$i][1], $k, 1) eq 'T') - { - $query .= &find_value(\@value, 'T', $arg); - } - elsif (substr($func->[$i][1], $k, 1) eq 'D') - { - $query .= &find_value(\@value, 'D', $arg); - } - elsif (substr($func->[$i][1], $k, 1) eq 'B') - { - $query .= &find_value(\@value, 'B', $arg); - } - elsif (substr($func->[$i][1], $k, 1) eq 'C') - { - $query .= &find_value(\@value, 'C', $arg); - } - elsif (substr($func->[$i][1], $k, 1) eq 'F') - { - $query .= &find_value(\@value, 'F', $arg); - } - elsif (substr($func->[$i][1], $k, 1) eq '.') - { - chop($query); - for ($ulimit = 0; $ulimit < $ulargs; $ulimit++) - { - $query .= ','; - $query .= &find_value(\@value, - substr($func->[$i][1], $k - 1, 1), - $j + $ulimit + 2); - } - } - elsif (substr($func->[$i][1], $k, 1) eq 'A') - { - for ($tbinfo = 1; substr($table_info->[$tbinfo], 0, 1) ne - substr($func->[$i][1], $k + 1, 1); $tbinfo++) - { - if (!defined($table_info->[$tbinfo])) - { - printf("Illegal function structure!\n"); - printf("A table was needed, but no type specified!\n"); - printf("Unready query was: $query\n"); - if (!$force) { die; } - else { next; } - } - } - if ($k) { $query .= ","; } - $query .= substr($table_info->[$tbinfo], 1, - length($table_info->[$tbinfo]) - 1); - $k++; - $tbused = 1; - } - else - { - printf("Not a valid type: \n"); - printf(substr($func->[$i][1], $k, 1)); - printf("\nAttempted to be used with unready query: \n"); - printf("$query\n"); - } - } - $query .= ")"; - if ($tbused) - { - $query .= " from "; - $query .= $table_info->[0]; - } - if (!($sth = $dbh->prepare($query))) - { - printf("Couldn't prepare: $query\n"); - if (!$force) { die; } - } - if (!$sth->execute) - { - printf("Execution failed: $DBI::errstr\n"); - printf("Attempted query was:\n$query\n"); - $sth->finish; - if (!$force) { die; } - } - else - { - printf("mysql> $query;\n"); - display($sth, 1); - printf("Query OK\n\n"); - } - } - } -} - -#### -#### mk_str returns a string where the first arg is repeated second arg times -#### if repeat is 1, return the original str -#### - -sub mk_str() -{ - my ($str, $repeat) = @_; - my ($res_str); - - if ($repeat <= 0) - { - die "Invalid repeat times!\n"; - } - - for ($repeat--, $res_str = $str; $repeat > 0; $repeat--) - { - $res_str .= $str; - } - return $res_str; -} - -#### -#### find_value: returns a value from list of values -#### args: $values: list of values -#### $type: type of argument (S = string, N = integer etc.) -#### $ordinal: the ordinal number of an argument in the list -#### - -sub find_value() -{ - my ($values, $type, $ordinal) = @_; - my ($total, $i, $j, $tmp, $val); - - $total = -1; # The first one is the type - - for ($i = 0; $values[$i][0]; $i++) - { - if ($values[$i][0] eq $type) - { - $tmp = $values[$i]; - foreach $val (@$tmp) { $total++; } - for ( ;$total < $ordinal; ) - { - $ordinal -= $total; - } - return $values[$i][$ordinal]; - } - } - printf("No type '$type' found in values\n"); - die; -} - -#### -#### exec_query: execute a query, print information if wanted and exit -#### args: $queries: list of queries to be executed -#### $expect_error: if 0, error is not expected. In this case if an -#### error occurs, inform about it and quit -#### if 1, error is expected. In this case if sql server -#### doesn't give an error message, inform about it -#### and quit -#### if 2, error may happen or not, don't care -#### $silent: if true, reduce output -#### $style: type of output, 0 == horizontal, 1 == vertical -#### - -sub exec_query() -{ - my ($queries, $expect_error, $silent, $style) = @_; - my ($query); - - foreach $query (@$queries) - { - if (!($sth = $dbh->prepare($query))) - { - printf("Couldn't prepare: $query\n"); - die; - } - if (!$sth->execute) - { - if ($expect_error == 1) - { - printf("An invalid instruction was purposely made,\n"); - printf("server failed succesfully:\n"); - printf("$DBI::errstr\n"); - printf("Everything OK, continuing...\n"); - return; - } - if ($expect_error != 2) - { - printf("Execution failed: $DBI::errstr\n"); - printf("Attempted query was:\n$query\n"); - die; - } - } - if ($expect_error == 1) - { - printf("An invalid instruction was purposely made,\n"); - printf("server didn't note, ALARM!\n"); - printf("The query made was: $query\n"); - printf("The output from the server:\n"); - } - if ($expect_error == 2) { return; } - if (!$silent) { printf("mysql> $query;\n"); } - display($sth, $style); - if (!$silent) { printf("Query OK\n\n"); } - if ($expect_error) { die; } - } - return; -} - -#### -#### Display to stderr -#### Args: 1: ($sth) statememt handler -#### 2: ($style) 0 == horizontal style, 1 == vertical style -#### - -sub display() -{ - my ($sth, $style) = @_; - my (@data, @max_length, $row, $nr_rows, $nr_cols, $i, $j, $tmp, $mxl); - - # Store the field names and values in @data. - # Store the max field lengths in @max_length - for ($i = 0; ($row = $sth->fetchrow_arrayref); $i++) - { - if (!$i) - { - $nr_cols = $#$row; - for ($j = 0; $j <= $#$row; $j++) - { - $data[$i][$j] = $sth->{NAME}->[$j]; - $max_length[$j] = length($data[$i][$j]); - } - $i++; - } - for ($j = 0; $j <= $#$row; $j++) - { - $data[$i][$j] = $row->[$j]; - $max_length[$j] = $tmp if ($max_length[$j] < - ($tmp = length($data[$i][$j]))); - } - } - if (!($nr_rows = $i)) - { - return; - } - # Display data - if ($style == 0) - { - for ($i = 0; $i < $nr_rows; $i++) - { - if (!$i) - { - for ($j = 0; $j <= $nr_cols; $j++) - { - print "+"; print "-" x ($max_length[$j] + 2); - } - print "+\n"; - } - print "|"; - for ($j = 0; $j <= $nr_cols; $j++) - { - print " "; - if (defined($data[$i][$j])) - { - print $data[$i][$j]; - $tmp = length($data[$i][$j]); - } - else - { - print "NULL"; - $tmp = 4; - } - print " " x ($max_length[$j] - $tmp); - print " |"; - } - print "\n"; - if (!$i) - { - for ($j = 0; $j <= $nr_cols; $j++) - { - print "+"; print "-" x ($max_length[$j] + 2); - } - print "+\n"; - } - } - for ($j = 0; $j <= $nr_cols; $j++) - { - print "+"; print "-" x ($max_length[$j] + 2); - } - print "+\n"; - return; - } - if ($style == 1) - { - for ($i = 0; $max_length[$i]; $i++) - { - $mxl = $max_length[$i] if ($mxl < $max_length[$i]); - } - - for ($i = 1; $i < $nr_rows; $i++) - { - print "*" x 27; - print " " . $i . ". row "; - print "*" x 27; - print "\n"; - for ($j = 0; $j <= $nr_cols; $j++) - { - print " " x ($mxl - length($data[0][$j])); - print "$data[0][$j]: "; - if (defined($data[$i][$j])) - { - print "$data[$i][$j] \n"; - } - else - { - print "NULL\n"; - } - } - } - return; - } -} - -#### -#### usage -#### - -sub usage -{ - print <", "#__#"], - ["N", -1000, -500, -100, -1, 0, 1, 40, 50, 70, 90, - 100, 500, 1000], - ["Z", -100, -50, 200, 1000], - ["R", -500.5, -10.333, 100.667, 400.0], - ["T", 19980728154204, 19980728154205, 19980728154206, - 19980728154207], - ["D", "'1997-12-06'", "'1997-12-07'", "'1997-12-08'", - "'1997-12-09'"], - ["B", 1, 0, 0, 1], - ["C", "'a'", "'e'", "'r'", "'q'"], - ["F", "'%a'", "'%b'", "'%d'", "'%H'"]); - &test_func(\@functions, \@values, 4, 5, ["mysql_test1","Zi","Rd"]); - - printf("\n####\n#### Second basic test part\n####\n\n"); - - @values = (["S", "'a'", "'BC'", "'def'", "'HIJK'", "'lmnop'", "'QRSTUV'"], - ["N", 0, 1, 2, 3, 4, 5], - ["Z", 0, 1, 2, 3, 4, 5], - ["R", 0, 1, 2, 3, 4, 5], - ["T", 19990608234530, 20000709014631, 20010810024732, - 20020911034833, 20031012044934, 20041113055035], - ["D", "'1999-06-08'", "'2000-07-09'", "'2001-08-10'", - "'2002-09-11'", "'2003-10-12'", "'2004-11-13'"], - ["B", 0, 1, 0, 1, 0, 1], - ["C", "'a'", "'BC'", "'def'", "'HIJK'", "'lmnop'", "'QRSTUV'"], - ["F", "'%a'", "'%b'", "'%d'", "'%h'", "'%H'", "'%i'"]); - &test_func(\@functions, \@values, 6, 6, ["mysql_test1","Zi","Rd"], 0, 1); - - printf("\n####\n#### Third basic test part\n####\n\n"); - - @values = (["S", "'Monty'", "'Jani'", "'MySQL'", "''"], - ["N", 10, 54, -70, -499], - ["Z", 11.03, "'Abo'", 54.333, "''"], - ["R", 12, "'gnome'", -34.211, "''"], - ["T", 3, "'Redhat'", -19984021774433, "''"], - ["D", "'1990-01-31'", "'-3333-10-23'", -5631_23_12, "''"], - ["B", 0, "'asb'", -4, "''"], - ["C", "'a'", 503, -45353453, "''"], - ["F", "'%a'", -231, "'Mitsubishi'", "''"]); - &test_func(\@functions, \@values, 3, 3, ["mysql_test1","Zi","Rd"], 0, 1); - - &exec_query(["delete from mysql_test1"], $NO_ERR, $SILENT); - - #### - #### Null tests - #### - - printf("\n\n####\n#### NULL TESTS FOR FUNCTIONS\n####\n\n\n"); - - &exec_query(["insert into mysql_test1 values(null,null)"], $NO_ERR, - $SILENT); - @values = (["S", "NULL"], - ["N", "NULL"], - ["Z", "NULL"], - ["R", "NULL"], - ["T", "NULL"], - ["D", "NULL"], - ["B", "NULL"], - ["C", "NULL"], - ["F", "NULL"]); - &test_func(\@functions, \@values, 1, 5, ["mysql_test1","Zi","Rd"], 1); - &exec_query(["delete from mysql_test1"], $NO_ERR, $SILENT); - - #### - #### Tests to fulfill the main part of function tests above - #### - - printf("\n\n####\n#### FULFILL TESTS \n####\n\n\n"); - - &exec_query(["drop table my_t"], $MAY_ERR, $SILENT); - &exec_query(["create table my_t (s1 char(64), s2 char(64))"], - $NO_ERR, $VERBOSE, $HS); - $query = < -# modified by Sasha Pachev -# Slightly updated by Monty -# Cleaned up again by Matt -# Fixed by Sergei -# List of failed cases (--force) backported from 4.1 by Joerg -# :-) - -#echo "##################################################"; -#echo "This script is deprecated and will soon be removed"; -#echo "Use mysql-test-run.pl instead"; -#echo "##################################################"; -#echo - -#++ -# Access Definitions -#-- -DB=test -DBPASSWD="" -VERBOSE="" -USE_MANAGER=0 -MY_TZ=GMT-3 -TZ=$MY_TZ; export TZ # for UNIX_TIMESTAMP tests to work -LOCAL_SOCKET=@MYSQL_UNIX_ADDR@ - -if [ -z "$MYSQL_TCP_PORT" ]; then - MYSQL_TCP_PORT=@MYSQL_TCP_PORT@ - if [ @MYSQL_TCP_PORT_DEFAULT@ -eq 0 ]; then - ESP=`getent services mysql/tcp` - if [ $? -eq 0 ]; then - MYSQL_TCP_PORT=`echo "$ESP"|sed -e's-^[a-z]*[ ]*\([0-9]*\)/[a-z]*$-\1-g'` - fi - fi -fi - -umask 022 - -# For query_cache test -case `uname` in - SCO_SV | UnixWare | OpenUNIX ) - # do nothing (Causes strange behavior) - ;; - QNX) - # do nothing (avoid error message) - ;; - * ) - ulimit -n 1024 - ;; -esac - -#++ -# Program Definitions -#-- - -LC_COLLATE=C -export LC_COLLATE -PATH=/bin:/usr/bin:/usr/local/bin:/usr/bsd:/usr/X11R6/bin:/usr/openwin/bin:/usr/bin/X11:$PATH -MASTER_40_ARGS="--rpl-recovery-rank=1 --init-rpl-role=master" - -# Standard functions - -which () -{ - IFS="${IFS= }"; save_ifs="$IFS"; IFS=':' - for file - do - for dir in $PATH - do - if test -f $dir/$file - then - echo "$dir/$file" - continue 2 - fi - done - echo "Fatal error: Cannot find program $file in $PATH" 1>&2 - exit 1 - done - IFS="$save_ifs" - exit 0 -} - - -sleep_until_file_deleted () -{ - pid=$1; - file=$2 - loop=$SLEEP_TIME_FOR_DELETE - while (test $loop -gt 0) - do - if [ ! -r $file ] - then - if test $pid != "0" - then - wait_for_pid $pid - fi - return - fi - sleep 1 - loop=`expr $loop - 1` - done -} - -sleep_until_file_created () -{ - file=$1 - loop=$2 - org_time=$2 - while (test $loop -gt 0) - do - if [ -r $file ] - then - return 0 - fi - sleep 1 - loop=`expr $loop - 1` - done - echo "ERROR: $file was not created in $org_time seconds; Aborting" - exit 1; -} - -# For the future - -wait_for_pid() -{ - pid=$1 - #$WAIT_PID pid $SLEEP_TIME_FOR_DELETE -} - -# Check that valgrind is installed -find_valgrind() -{ - FIND_VALGRIND=`which valgrind` # this will print an error if not found - # Give good warning to the user and stop - if [ -z "$FIND_VALGRIND" ] ; then - $ECHO "You need to have the 'valgrind' program in your PATH to run mysql-test-run with option --valgrind. Valgrind's home page is http://valgrind.kde.org ." - exit 1 - fi - # >=2.1.2 requires the --tool option, some versions write to stdout, some to stderr - valgrind --help 2>&1 | grep "\-\-tool" > /dev/null && FIND_VALGRIND="$FIND_VALGRIND --tool=memcheck" - FIND_VALGRIND="$FIND_VALGRIND --alignment=8 --leak-check=yes --num-callers=16 --suppressions=$MYSQL_TEST_DIR/valgrind.supp" -} - -# No paths below as we can't be sure where the program is! - -SED=sed - -BASENAME=`which basename` -if test $? != 0; then exit 1; fi -DIFF=`which diff | $SED q` -if test $? != 0; then exit 1; fi -CAT=cat -CUT=cut -HEAD=head -TAIL=tail -ECHO=echo # use internal echo if possible -EXPR=expr # use internal if possible -FIND=find -GREP=grep -if test $? != 0; then exit 1; fi -PRINTF=printf -RM=rm -if test $? != 0; then exit 1; fi -TR=tr -XARGS=`which xargs` -if test $? != 0; then exit 1; fi -SORT=sort - -# Are we using a source or a binary distribution? - -testdir=@testdir@ -if [ -d bin/mysqld ] && [ -d mysql-test ] ; then - cd mysql-test -else - if [ -d $testdir/mysql-test ] ; then - cd $testdir - fi -fi - -if [ ! -f ./mysql-test-run ] ; then - $ECHO "Can't find the location for the mysql-test-run script" - - $ECHO "Go to to the mysql-test directory and execute the script as follows:" - $ECHO "./mysql-test-run." - exit 1 -fi - -#++ -# Misc. Definitions -#-- - -# BASEDIR is always above mysql-test directory ... -MYSQL_TEST_DIR=`pwd` -cd .. - -if [ -d ./sql ] ; then - SOURCE_DIST=1 -else - BINARY_DIST=1 - - # ... one level for tar.gz, two levels for a RPM installation - if [ ! -f ./bin/mysql_upgrade ] ; then - # Has to be RPM installation - cd .. - fi -fi -BASEDIR=`pwd` - -cd $MYSQL_TEST_DIR -MYSQL_TEST_WINDIR=$MYSQL_TEST_DIR -MYSQLTEST_VARDIR=$MYSQL_TEST_DIR/var -export MYSQL_TEST_DIR MYSQL_TEST_WINDIR MYSQLTEST_VARDIR -STD_DATA=$MYSQL_TEST_DIR/std_data -hostname=`hostname` # Installed in the mysql privilege table - -MANAGER_QUIET_OPT="-q" -TESTDIR="$MYSQL_TEST_DIR/t" -TESTSUFFIX=test -TOT_SKIP=0 -TOT_PASS=0 -TOT_FAIL=0 -TOT_TEST=0 -GOT_WARNINGS=0 -USERT=0 -SYST=0 -REALT=0 -FAST_START="" -MYSQL_TMP_DIR=$MYSQL_TEST_DIR/var/tmp -export MYSQL_TMP_DIR - -# Use a relative path for where the slave will find the dumps -# generated by "LOAD DATA" on the master. The path is relative -# since it must have fixed length to test logging -# i.e otherwise the output from "SHOW MASTER STATUS" will vary -# with the strlen() of MYSQL_TEST_DIR -SLAVE_LOAD_TMPDIR=../tmp - -RES_SPACE=" " -MYSQLD_SRC_DIRS="strings mysys include extra regex myisam \ - myisammrg heap sql" -MY_LOG_DIR="$MYSQL_TEST_DIR/var/log" -# -# Set LD_LIBRARY_PATH if we are using shared libraries -# -LD_LIBRARY_PATH="$BASEDIR/lib:$BASEDIR/libmysql/.libs:$BASEDIR/libmysql_r/.libs:$BASEDIR/zlib/.libs:$LD_LIBRARY_PATH" -DYLD_LIBRARY_PATH="$BASEDIR/lib:$BASEDIR/libmysql/.libs:$BASEDIR/libmysql_r/.libs:$BASEDIR/zlib/.libs:$DYLD_LIBRARY_PATH" -export LD_LIBRARY_PATH DYLD_LIBRARY_PATH - -# -# Allow anyone in the group to see the generated database files -# -UMASK=0660 -UMASK_DIR=0770 -export UMASK UMASK_DIR - -MASTER_RUNNING=0 -MASTER1_RUNNING=0 -MASTER_MYHOST=127.0.0.1 -MASTER_MYPORT=9306 -SLAVE_RUNNING=0 -SLAVE_MYHOST=127.0.0.1 -SLAVE_MYPORT=9308 # leave room for 2 masters for cluster tests -MYSQL_MANAGER_LOG=$MYSQL_TEST_DIR/var/log/manager.log -NDBCLUSTER_PORT=9350 -NDBCLUSTER_PORT_SLAVE=9358 - -# -# To make it easier for different devs to work on the same host, -# an environment variable can be used to control all ports. A small -# number is to be used, 0 - 16 or similar. -# -# Note the MASTER_MYPORT has to be set the same in all 4.x and 5.x -# versions of this script, else a 4.0 test run might conflict with a -# 5.1 test run, even if different MTR_BUILD_THREAD is used. This means -# all port numbers might not be used in this version of the script. -# -if [ -n "$MTR_BUILD_THREAD" ] ; then - MASTER_MYPORT=`expr $MTR_BUILD_THREAD '*' 10 + 10000` - SLAVE_MYPORT=`expr $MASTER_MYPORT + 3` - NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 6` - NDBCLUSTER_PORT_SLAVE=`expr $MASTER_MYPORT + 7` - - echo "Using MTR_BUILD_THREAD = $MTR_BUILD_THREAD" - echo "Using MASTER_MYPORT = $MASTER_MYPORT" - echo "Using SLAVE_MYPORT = $SLAVE_MYPORT" - echo "Using NDBCLUSTER_PORT = $NDBCLUSTER_PORT" - echo "Using NDBCLUSTER_PORT_SLAVE = $NDBCLUSTER_PORT_SLAVE" -fi - -NO_SLAVE=0 -USER_TEST= -FAILED_CASES= - -EXTRA_MASTER_OPT="" -EXTRA_MYSQL_TEST_OPT="" -EXTRA_MYSQLCHECK_OPT="" -EXTRA_MYSQLDUMP_OPT="" -EXTRA_MYSQLSLAP_OPT="" -EXTRA_MYSQLSHOW_OPT="" -EXTRA_MYSQLBINLOG_OPT="" -USE_RUNNING_SERVER=0 -USE_NDBCLUSTER=@USE_NDBCLUSTER@ -USE_NDBCLUSTER_SLAVE=@USE_NDBCLUSTER@ -USE_NDBCLUSTER_ALL=0 -USE_NDBCLUSTER_ONLY=0 -USE_RUNNING_NDBCLUSTER="" -USE_RUNNING_NDBCLUSTER_SLAVE="" -NDB_EXTRA_TEST=0 -NDB_VERBOSE=0 -NDBCLUSTER_EXTRA_OPTS="" -USE_PURIFY="" -PURIFY_LOGS="" -DO_GCOV="" -DO_GDB="" -MANUAL_GDB="" -DO_DDD="" -DO_CLIENT_GDB="" -SLEEP_TIME_AFTER_RESTART=1 -SLEEP_TIME_FOR_DELETE=10 -SLEEP_TIME_FOR_FIRST_MASTER=400 # Enough time to create innodb tables -SLEEP_TIME_FOR_SECOND_MASTER=400 -SLEEP_TIME_FOR_FIRST_SLAVE=400 -SLEEP_TIME_FOR_SECOND_SLAVE=300 -CHARACTER_SET=latin1 -DBUSER="" -START_WAIT_TIMEOUT=10 -STOP_WAIT_TIMEOUT=10 -MYSQL_TEST_SSL_OPTS="" -USE_TIMER="" -USE_EMBEDDED_SERVER="" -TEST_MODE="" - -NDB_MGM_EXTRA_OPTS= -NDB_MGMD_EXTRA_OPTS= -NDBD_EXTRA_OPTS= -MASTER_MYSQLDBINLOG=1 -SLAVE_MYSQLDBINLOG=1 - -DO_STRESS="" -STRESS_SUITE="main" -STRESS_MODE="random" -STRESS_THREADS=5 -STRESS_TEST_COUNT="" -STRESS_LOOP_COUNT="" -STRESS_TEST_DURATION="" -STRESS_INIT_FILE="" -STRESS_TEST_FILE="" -STRESS_TEST="" - -$ECHO "Logging: $0 $*" # To ensure we see all arguments in the output, for the test analysis tool - -while test $# -gt 0; do - case "$1" in - --embedded-server) - USE_EMBEDDED_SERVER=1 - USE_MANAGER=0 NO_SLAVE=1 - USE_RUNNING_SERVER=0 - USE_NDBCLUSTER="" - USE_NDBCLUSTER_SLAVE="" - TEST_MODE="$TEST_MODE embedded" ;; - --purify) - USE_PURIFY=1 - USE_MANAGER=0 - USE_RUNNING_SERVER=0 - TEST_MODE="$TEST_MODE purify" ;; - --user=*) DBUSER=`$ECHO "$1" | $SED -e "s;--user=;;"` ;; - --force) FORCE=1 ;; - --timer) USE_TIMER=1 ;; - --old-master) MASTER_40_ARGS="";; - --master-binary=*) - MASTER_MYSQLD=`$ECHO "$1" | $SED -e "s;--master-binary=;;"` ;; - --slave-binary=*) - SLAVE_MYSQLD=`$ECHO "$1" | $SED -e "s;--slave-binary=;;"` ;; - --local) USE_RUNNING_SERVER=0 ;; - --extern) USE_RUNNING_SERVER=1 ;; - --with-ndbcluster) - USE_NDBCLUSTER="--ndbcluster" ;; - --with-ndbcluster-slave) - USE_NDBCLUSTER_SLAVE="--ndbcluster" ;; - --with-ndbcluster-all) - USE_NDBCLUSTER="--ndbcluster" - USE_NDBCLUSTER_SLAVE="--ndbcluster" - USE_NDBCLUSTER_ALL=1 ;; - --with-ndbcluster-only) - USE_NDBCLUSTER="--ndbcluster" - USE_NDBCLUSTER_SLAVE="--ndbcluster" - USE_NDBCLUSTER_ONLY=1 ;; - --ndb-connectstring=*) - USE_NDBCLUSTER="--ndbcluster" ; - USE_RUNNING_NDBCLUSTER=`$ECHO "$1" | $SED -e "s;--ndb-connectstring=;;"` ;; - --ndb-connectstring-slave=*) - USE_NDBCLUSTER_SLAVE="--ndbcluster" ; - USE_RUNNING_NDBCLUSTER_SLAVE=`$ECHO "$1" | $SED -e "s;--ndb-connectstring-slave=;;"` ;; - --ndb-extra-test) - NDBCLUSTER_EXTRA_OPTS=" " - NDB_EXTRA_TEST=1 ; - ;; - --ndb-verbose) - NDB_VERBOSE=2 ;; - --ndb_mgm-extra-opts=*) - NDB_MGM_EXTRA_OPTS=`$ECHO "$1" | $SED -e "s;--ndb_mgm-extra-opts=;;"` ;; - --ndb_mgmd-extra-opts=*) - NDB_MGMD_EXTRA_OPTS=`$ECHO "$1" | $SED -e "s;--ndb_mgmd-extra-opts=;;"` ;; - --ndbd-extra-opts=*) - NDBD_EXTRA_OPTS=`$ECHO "$1" | $SED -e "s;--ndbd-extra-opts=;;"` ;; - --tmpdir=*) MYSQL_TMP_DIR=`$ECHO "$1" | $SED -e "s;--tmpdir=;;"` ;; - --local-master) - MASTER_MYPORT=3306; - EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT --host=127.0.0.1 \ - --port=$MYSQL_MYPORT" - LOCAL_MASTER=1 ;; - --master_port=*) MASTER_MYPORT=`$ECHO "$1" | $SED -e "s;--master_port=;;"` ;; - --slave_port=*) SLAVE_MYPORT=`$ECHO "$1" | $SED -e "s;--slave_port=;;"` ;; - --ndbcluster_port=*) NDBCLUSTER_PORT=`$ECHO "$1" | $SED -e "s;--ndbcluster_port=;;"` ;; - --ndbcluster-port=*) NDBCLUSTER_PORT=`$ECHO "$1" | $SED -e "s;--ndbcluster-port=;;"` ;; - --ndbcluster-port-slave=*) NDBCLUSTER_PORT_SLAVE=`$ECHO "$1" | $SED -e "s;--ndbcluster-port-slave=;;"` ;; - --with-openssl) - EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT \ - --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem \ - --ssl-cert=$MYSQL_TEST_DIR/std_data/server-cert.pem \ - --ssl-key=$MYSQL_TEST_DIR/std_data/server-key.pem" - EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT \ - --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem \ - --ssl-cert=$MYSQL_TEST_DIR/std_data/server-cert.pem \ - --ssl-key=$MYSQL_TEST_DIR/std_data/server-key.pem" - MYSQL_TEST_SSL_OPTS="--ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem \ - --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem \ - --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem" ;; - --start-and-exit) - START_AND_EXIT=1 - ;; - --socket=*) LOCAL_SOCKET=`$ECHO "$1" | $SED -e "s;--socket=;;"` ;; - --skip-rpl) NO_SLAVE=1 ;; - --skip-test=*) SKIP_TEST=`$ECHO "$1" | $SED -e "s;--skip-test=;;"`;; - --do-test=*) DO_TEST=`$ECHO "$1" | $SED -e "s;--do-test=;;"`;; - --start-from=* ) START_FROM=`$ECHO "$1" | $SED -e "s;--start-from=;;"` ;; - --warnings | --log-warnings) - EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --log-warnings" - EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --log-warnings" - ;; - --wait-timeout=*) - START_WAIT_TIMEOUT=`$ECHO "$1" | $SED -e "s;--wait-timeout=;;"` - STOP_WAIT_TIMEOUT=$START_WAIT_TIMEOUT;; - --record) - RECORD=1; - EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT $1" ;; - --small-bench) - DO_SMALL_BENCH=1 - DO_BENCH=1 - NO_SLAVE=1 - ;; - --bench) - DO_BENCH=1 - NO_SLAVE=1 - ;; - --stress) - DO_STRESS=1 - NO_SLAVE=1 - SKIP_SLAVE=1 - ;; - --stress-suite=*) - STRESS_SUITE=`$ECHO "$1" | $SED -e "s;--stress-suite=;;"` - ;; - --stress-threads=*) - STRESS_THREADS=`$ECHO "$1" | $SED -e "s;--stress-threads=;;"` - ;; - --stress-test-file=*) - STRESS_TEST_FILE=`$ECHO "$1" | $SED -e "s;--stress-test-file=;;"` - ;; - --stress-init-file=*) - STRESS_INIT_FILE=`$ECHO "$1" | $SED -e "s;--stress-init-file=;;"` - ;; - --stress-mode=*) - STRESS_MODE=`$ECHO "$1" | $SED -e "s;--stress-mode=;;"` - ;; - --stress-loop-count=*) - STRESS_LOOP_COUNT=`$ECHO "$1" | $SED -e "s;--stress-loop-count=;;"` - ;; - --stress-test-count=*) - STRESS_TEST_COUNT=`$ECHO "$1" | $SED -e "s;--stress-test-count=;;"` - ;; - --stress-test-duration=*) - STRESS_TEST_DURATION=`$ECHO "$1" | $SED -e "s;--stress-test-duration=;;"` - ;; - --big*) # Actually --big-test - EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT $1" ;; - --compress) - EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT $1" ;; - --sleep=*) - EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT $1" - SLEEP_TIME_AFTER_RESTART=`$ECHO "$1" | $SED -e "s;--sleep=;;"` - ;; - --ps-protocol) - TEST_MODE="$TEST_MODE ps-protocol" EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT $1" ;; - --user-test=*) - USER_TEST=`$ECHO "$1" | $SED -e "s;--user-test=;;"` - ;; - --mysqld=*) - TMP=`$ECHO "$1" | $SED -e "s;--mysqld=;;"` - EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT $TMP" - EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT $TMP" - ;; - --gcov ) - if [ x$BINARY_DIST = x1 ] ; then - $ECHO "Cannot do coverage test without the source - please use source dist" - exit 1 - fi - DO_GCOV=1 - GCOV=`which gcov` - ;; - --gprof ) - DO_GPROF=1 - ;; - --gdb ) - START_WAIT_TIMEOUT=300 - STOP_WAIT_TIMEOUT=300 - if [ x$BINARY_DIST = x1 ] ; then - $ECHO "Note: you will get more meaningful output on a source distribution compiled with debugging option when running tests with --gdb option" - fi - DO_GDB=1 - EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --gdb" - EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --gdb" - # This needs to be checked properly - # USE_MANAGER=1 - USE_RUNNING_SERVER=0 - ;; - --client-gdb ) - if [ x$BINARY_DIST = x1 ] ; then - $ECHO "Note: you will get more meaningful output on a source distribution compiled with debugging option when running tests with --client-gdb option" - fi - DO_CLIENT_GDB=1 - EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --gdb" - EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --gdb" - ;; - --manual-gdb ) - DO_GDB=1 - MANUAL_GDB=1 - USE_RUNNING_SERVER=0 - EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --gdb" - EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --gdb" - ;; - --ddd ) - if [ x$BINARY_DIST = x1 ] ; then - $ECHO "Note: you will get more meaningful output on a source distribution compiled with debugging option when running tests with --ddd option" - fi - DO_DDD=1 - USE_RUNNING_SERVER=0 - EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --gdb" - EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --gdb" - ;; - --valgrind | --valgrind-all) - find_valgrind; - VALGRIND=$FIND_VALGRIND - EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-safemalloc" - EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-safemalloc" - SLEEP_TIME_AFTER_RESTART=10 - SLEEP_TIME_FOR_DELETE=60 - USE_RUNNING_SERVER=0 - if test "$1" = "--valgrind-all" - then - VALGRIND="$VALGRIND -v --show-reachable=yes" - fi - ;; - --valgrind-options=*) - TMP=`$ECHO "$1" | $SED -e "s;--valgrind-options=;;"` - VALGRIND="$VALGRIND $TMP" - ;; - --skip-ndbcluster-slave | --skip-ndb-slave) - USE_NDBCLUSTER_SLAVE="" - EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-ndbcluster" - ;; - --valgrind-mysqltest | --valgrind-mysqltest-all) - find_valgrind; - VALGRIND_MYSQLTEST=$FIND_VALGRIND - if test "$1" = "--valgrind-mysqltest-all" - then - VALGRIND_MYSQLTEST="$VALGRIND_MYSQLTEST -v --show-reachable=yes" - fi - ;; - --skip-ndbcluster | --skip-ndb) - USE_NDBCLUSTER="" - USE_NDBCLUSTER_SLAVE="" - EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-ndbcluster" - EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-ndbcluster" - ;; - --skip-master-binlog) MASTER_MYSQLDBINLOG=0 ;; - --skip-slave-binlog) SLAVE_MYSQLDBINLOG=0 ;; - --skip-*) - EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT $1" - EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT $1" - ;; - --strace-client ) - STRACE_CLIENT=1 - ;; - --debug) - EXTRA_MASTER_MYSQLD_TRACE=" \ - --debug=d:t:i:A,$MYSQL_TEST_DIR/var/log/master.trace" - EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT \ - --debug=d:t:i:A,$MYSQL_TEST_DIR/var/log/slave.trace" - EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT \ - --debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysqltest.trace" - EXTRA_MYSQLCHECK_OPT="$EXTRA_MYSQLCHECK_OPT \ - --debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysqlcheck.trace" - EXTRA_MYSQLDUMP_OPT="$EXTRA_MYSQLDUMP_OPT \ - --debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysqldump.trace" - EXTRA_MYSQLSLAP_OPT="$EXTRA_MYSQLSLAP_OPT \ - --debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysqlslap.trace" - EXTRA_MYSQLSHOW_OPT="$EXTRA_MYSQLSHOW_OPT \ - --debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysqlshow.trace" - EXTRA_MYSQLBINLOG_OPT="$EXTRA_MYSQLBINLOG_OPT \ - --debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysqlbinlog.trace" - EXTRA_MYSQL_CLIENT_TEST_OPT="--debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysql_client_test.trace" - ;; - --fast) - FAST_START=1 - ;; - --use-old-data) - USE_OLD_DATA=1 - ;; - --comment=*) - TMP=`$ECHO "$1" | $SED -e "s;--comment=;;"` - echo - echo '############################################' - echo "# $TMP" - echo '############################################' - ;; - -- ) shift; break ;; - --* ) $ECHO "Unrecognized option: $1"; exit 1 ;; - * ) break ;; - esac - shift -done - -if [ -z "$TEST_MODE" ] ; then - TEST_MODE="default" -else - # Remove the leading space if any - TEST_MODE=`echo $TEST_MODE | sed 's/^ *//'` -fi - -# -# Skip tests that doesn't work with shell version -# -SKIP_TEST="$SKIP_TEST bootstrap" - -#++ -# mysqld Environment Parameters -#-- - -MYRUN_DIR=$MYSQL_TEST_DIR/var/run - -MASTER_MYDDIR="$MYSQL_TEST_DIR/var/master-data" -MASTER_MYSOCK="$MYSQL_TMP_DIR/master.sock" -MASTER_MYSOCK1=$MYSQL_MYSOCK"1" -MASTER_MYPID="$MYRUN_DIR/master.pid" -MASTER_MYLOG="$MYSQL_TEST_DIR/var/log/master.log" -MASTER_MYERR="$MYSQL_TEST_DIR/var/log/master.err" - -SLAVE_MYDDIR="$MYSQL_TEST_DIR/var/slave-data" -SLAVE_MYSOCK="$MYSQL_TMP_DIR/slave.sock" -SLAVE_MYPID="$MYRUN_DIR/slave.pid" -SLAVE_MYLOG="$MYSQL_TEST_DIR/var/log/slave.log" -SLAVE_MYERR="$MYSQL_TEST_DIR/var/log/slave.err" - -CURRENT_TEST="$MYSQL_TEST_DIR/var/log/current_test" -SMALL_SERVER="--key_buffer_size=1M --sort_buffer=256K --max_heap_table_size=1M" - -export MASTER_MYHOST MASTER_MYPORT SLAVE_MYHOST SLAVE_MYPORT MYSQL_TCP_PORT MASTER_MYSOCK MASTER_MYSOCK1 - -NDBCLUSTER_OPTS="--port=$NDBCLUSTER_PORT --data-dir=$MYSQL_TEST_DIR/var --ndb_mgm-extra-opts=$NDB_MGM_EXTRA_OPTS --ndb_mgmd-extra-opts=$NDB_MGMD_EXTRA_OPTS --ndbd-extra-opts=$NDBD_EXTRA_OPTS" -NDBCLUSTER_OPTS_SLAVE="--port=$NDBCLUSTER_PORT_SLAVE --data-dir=$MYSQL_TEST_DIR/var" -if [ -n "$USE_NDBCLUSTER_SLAVE" ] ; then - USE_NDBCLUSTER_SLAVE="$USE_NDBCLUSTER_SLAVE --ndb-connectstring=localhost:$NDBCLUSTER_PORT_SLAVE --ndb-extra-logging" -fi -NDB_BACKUP_DIR=$MYSQL_TEST_DIR/var/ndbcluster-$NDBCLUSTER_PORT -NDB_TOOLS_OUTPUT=$MYSQL_TEST_DIR/var/log/ndb_tools.log - -if [ x$SOURCE_DIST = x1 ] ; then - MY_BASEDIR=$MYSQL_TEST_DIR -else - MY_BASEDIR=$BASEDIR -fi - -# Create the directories - -# This should be fixed to be not be dependent on the contence of MYSQL_TMP_DIR -# or MYRUN_DIR -# (mkdir -p is not portable) -[ -d $MYSQL_TEST_DIR/var ] || mkdir $MYSQL_TEST_DIR/var -[ -d $MYSQL_TEST_DIR/var/tmp ] || mkdir $MYSQL_TEST_DIR/var/tmp -[ -d $MYSQL_TEST_DIR/var/run ] || mkdir $MYSQL_TEST_DIR/var/run -[ -d $MYSQL_TEST_DIR/var/log ] || mkdir $MYSQL_TEST_DIR/var/log - -# Use 'test', not '[' as the shell builtin might not have '-L -if test ! -L "$MYSQL_TEST_DIR/var/std_data_ln" ; then - ln -s $MYSQL_TEST_DIR/std_data/ $MYSQL_TEST_DIR/var/std_data_ln -fi - -if test ${COLUMNS:-0} -lt 80 ; then COLUMNS=80 ; fi -E=`$EXPR $COLUMNS - 8` -DASH72=`$ECHO '-------------------------------------------------------'|$CUT -c 1-$E` - -# on source dist, we pick up freshly build executables -# on binary, use what is installed -if [ x$SOURCE_DIST = x1 ] ; then - if [ "x$USE_EMBEDDED_SERVER" = "x1" ] ; then - if [ -f "$BASEDIR/libmysqld/examples/mysqltest_embedded" ] ; then - MYSQL_TEST="$BASEDIR/libmysqld/examples/mysqltest_embedded" - else - echo "Fatal error: Cannot find embedded server 'mysqltest_embedded'" 1>&2 - exit 1 - fi - MYSQL_CLIENT_TEST="$BASEDIR/libmysqld/examples/mysql_client_test_embedded" - else - MYSQLD="$BASEDIR/sql/mysqld" - if [ -n "$VALGRIND" ] ; then - MYSQLD="$VALGRIND $MYSQLD" - fi - if [ -f "$BASEDIR/client/.libs/lt-mysqltest" ] ; then - MYSQL_TEST="$BASEDIR/client/.libs/lt-mysqltest" - elif [ -f "$BASEDIR/client/.libs/mysqltest" ] ; then - MYSQL_TEST="$BASEDIR/client/.libs/mysqltest" - else - MYSQL_TEST="$BASEDIR/client/mysqltest" - fi - MYSQL_CLIENT_TEST="$BASEDIR/tests/mysql_client_test" - fi - if [ -f "$BASEDIR/client/.libs/mysqlcheck" ] ; then - MYSQL_CHECK="$BASEDIR/client/.libs/mysqlcheck" - else - MYSQL_CHECK="$BASEDIR/client/mysqlcheck" - fi - if [ -f "$BASEDIR/client/.libs/mysqldump" ] ; then - MYSQL_DUMP="$BASEDIR/client/.libs/mysqldump" - else - MYSQL_DUMP="$BASEDIR/client/mysqldump" - fi - if [ -f "$BASEDIR/client/.libs/mysqlslap" ] ; then - MYSQL_SLAP="$BASEDIR/client/.libs/mysqlslap" - else - MYSQL_SLAP="$BASEDIR/client/mysqlslap" - fi - if [ -f "$BASEDIR/client/.libs/mysqlimport" ] ; then - MYSQL_IMPORT="$BASEDIR/client/.libs/mysqlimport" - else - MYSQL_IMPORT="$BASEDIR/client/mysqlimport" - fi - if [ -f "$BASEDIR/client/.libs/mysqlshow" ] ; then - MYSQL_SHOW="$BASEDIR/client/.libs/mysqlshow" - else - MYSQL_SHOW="$BASEDIR/client/mysqlshow" - fi - if [ -f "$BASEDIR/client/.libs/mysqlbinlog" ] ; then - MYSQL_BINLOG="$BASEDIR/client/.libs/mysqlbinlog" - else - MYSQL_BINLOG="$BASEDIR/client/mysqlbinlog" - fi - if [ -n "$STRACE_CLIENT" ]; then - MYSQL_TEST="strace -o $MYSQL_TEST_DIR/var/log/mysqltest.strace $MYSQL_TEST" - fi - - CLIENT_BINDIR="$BASEDIR/client" - MYSQLADMIN="$CLIENT_BINDIR/mysqladmin" - WAIT_PID="$BASEDIR/extra/mysql_waitpid" - MYSQL_MY_PRINT_DEFAULTS="$BASEDIR/extra/my_print_defaults" - MYSQL="$CLIENT_BINDIR/mysql" - LANGUAGE="$BASEDIR/sql/share/english/" - CHARSETSDIR="$BASEDIR/sql/share/charsets" - INSTALL_DB="./install_test_db" - MYSQL_FIX_SYSTEM_TABLES="$BASEDIR/scripts/mysql_fix_privilege_tables" - NDB_TOOLS_DIR="$BASEDIR/storage/ndb/tools" - NDB_MGM="$BASEDIR/storage/ndb/src/mgmclient/ndb_mgm" - - if [ -n "$USE_PURIFY" ] ; then - PSUP="$MYSQL_TEST_DIR/suppress.purify" - PURIFYOPTIONS="-windows=no -log-file=%v.purifylog -append-logfile -add-suppression-files=$PSUP" - if [ -f "${MYSQL_TEST}-purify" ] ; then - MYSQL_TEST="${MYSQL_TEST}-purify" - PLOG="$MYSQL_TEST.purifylog" - if [ -f $PLOG ]; then - mv $PLOG $PLOG.$$ - fi - PURIFY_LOGS="$PLOG" - fi - if [ -f "${MYSQLD}-purify" ] ; then - MYSQLD="${MYSQLD}-purify" - PLOG="$MYSQLD.purifylog" - if [ -f $PLOG ]; then - mv $PLOG $PLOG.$$ - fi - PURIFY_LOGS="$PURIFY_LOGS $PLOG" - fi - fi - -else - - # We have a binary installation. Note that this can be both from - # unpacking a MySQL AB binary distribution (created using - # "scripts/make_binary_distribution", and from a "make install". - # Unfortunately the structure differs a bit, for a "make install" - # currently all binaries are in "bin", for a MySQL AB packaging - # some are in "tests". - - if test -x "$BASEDIR/libexec/mysqld" - then - MYSQLD="$VALGRIND $BASEDIR/libexec/mysqld" - elif test -x "$BASEDIR/bin/mysqld" - then - MYSQLD="$VALGRIND $BASEDIR/bin/mysqld" - elif test -x "$BASEDIR/sbin/mysqld" - then - MYSQLD="$VALGRIND $BASEDIR/sbin/mysqld" - else - $ECHO "Fatal error: Cannot find program mysqld in $BASEDIR/{libexec,bin,sbin}" 1>&2 - exit 1 - fi - CLIENT_BINDIR="$BASEDIR/bin" - if test -d "$BASEDIR/tests" - then - TESTS_BINDIR="$BASEDIR/tests" - else - TESTS_BINDIR="$BASEDIR/bin" - fi - MYSQL_TEST="$CLIENT_BINDIR/mysqltest" - MYSQL_CHECK="$CLIENT_BINDIR/mysqlcheck" - MYSQL_SLAP="$CLIENT_BINDIR/mysqlslap" - MYSQL_SHOW="$CLIENT_BINDIR/mysqlshow" - MYSQL_IMPORT="$CLIENT_BINDIR/mysqlimport" - MYSQL_BINLOG="$CLIENT_BINDIR/mysqlbinlog" - MYSQLADMIN="$CLIENT_BINDIR/mysqladmin" - WAIT_PID="$CLIENT_BINDIR/mysql_waitpid" - MYSQL_MY_PRINT_DEFAULTS="$CLIENT_BINDIR/my_print_defaults" - MYSQL="$CLIENT_BINDIR/mysql" - INSTALL_DB="./install_test_db --bin" - MYSQL_FIX_SYSTEM_TABLES="$CLIENT_BINDIR/mysql_fix_privilege_tables" - NDB_TOOLS_DIR="$CLIENT_BINDIR" - NDB_MGM="$CLIENT_BINDIR/ndb_mgm" - if test -d "$BASEDIR/share/mysql/english" - then - LANGUAGE="$BASEDIR/share/mysql/english/" - CHARSETSDIR="$BASEDIR/share/mysql/charsets" - else - LANGUAGE="$BASEDIR/share/english/" - CHARSETSDIR="$BASEDIR/share/charsets" - fi - if [ "x$USE_EMBEDDED_SERVER" = "x1" ] ; then - if [ -f "$CLIENT_BINDIR/mysqltest_embedded" ] ; then - MYSQL_TEST="$CLIENT_BINDIR/mysqltest_embedded" - else - echo "Fatal error: Cannot find embedded server 'mysqltest_embedded'" 1>&2 - exit 1 - fi - if [ -d "$BASEDIR/tests/mysql_client_test_embedded" ] ; then - MYSQL_CLIENT_TEST="$TESTS_BINDIR/mysql_client_test_embedded" - else - MYSQL_CLIENT_TEST="$CLIENT_BINDIR/mysql_client_test_embedded" - fi - else - MYSQL_TEST="$CLIENT_BINDIR/mysqltest" - MYSQL_CLIENT_TEST="$CLIENT_BINDIR/mysql_client_test" - fi - if [ -f "$BASEDIR/client/.libs/mysqldump" ] ; then - MYSQL_DUMP="$BASEDIR/client/.libs/mysqldump" - elif [ -f "$BASEDIR/client/mysqldump" ] ; then - MYSQL_DUMP="$BASEDIR/client/mysqldump" - else - MYSQL_DUMP="$BASEDIR/bin/mysqldump" - fi -fi - -if [ -z "$MASTER_MYSQLD" ] -then -MASTER_MYSQLD=$MYSQLD -fi - -if [ -z "$SLAVE_MYSQLD" ] -then -SLAVE_MYSQLD=$MYSQLD -fi - -# If we should run all tests cases, we will use a local server for that - -if [ -z "$1" -a -z "$DO_STRESS" ] -then - USE_RUNNING_SERVER=0 -fi -if [ $USE_RUNNING_SERVER -eq 1 ] -then - MASTER_MYSOCK=$LOCAL_SOCKET; - DBUSER=${DBUSER:-test} -else - DBUSER=${DBUSER:-root} # We want to do FLUSH xxx commands -fi - -if [ -w / ] -then - # We are running as root; We need to add the --root argument - EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --user=root" - EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --user=root" -fi - -MYSQL_CLIENT_TEST="$MYSQL_CLIENT_TEST --no-defaults --testcase --user=root --socket=$MASTER_MYSOCK --port=$MYSQL_TCP_PORT --silent $EXTRA_MYSQL_CLIENT_TEST_OPT" -# Need to pass additional arguments to MYSQL_CLIENT_TEST for embedded server -# -A marks each argument for passing to the function which initializes the -# embedded library -if [ "x$USE_EMBEDDED_SERVER" = "x1" ]; then - MYSQL_CLIENT_TEST="$MYSQL_CLIENT_TEST -A --language=$LANGUAGE -A --datadir=$SLAVE_MYDDIR -A --character-sets-dir=$CHARSETSDIR" -fi -# Save path and name of mysqldump -MYSQL_DUMP_DIR="$MYSQL_DUMP" -export MYSQL_DUMP_DIR -MYSQL_CHECK="$MYSQL_CHECK --no-defaults --debug-info -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLCHECK_OPT" -MYSQL_DUMP="$MYSQL_DUMP --no-defaults --debug-info -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT" -MYSQL_SLAP="$MYSQL_SLAP -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLSLAP_OPT" -MYSQL_DUMP_SLAVE="$MYSQL_DUMP_DIR --no-defaults -uroot --socket=$SLAVE_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT" -MYSQL_SHOW="$MYSQL_SHOW --no-defaults --debug-info -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLSHOW_OPT" -MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --debug-info --local-load=$MYSQL_TMP_DIR --character-sets-dir=$CHARSETSDIR $EXTRA_MYSQLBINLOG_OPT" -MYSQL_IMPORT="$MYSQL_IMPORT --no-defaults --debug-info -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT" -MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD --basedir=$BASEDIR --bindir=$CLIENT_BINDIR --verbose" -MYSQL="$MYSQL --no-defaults --debug-info --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD" -export MYSQL MYSQL_CHECK MYSQL_DUMP MYSQL_DUMP_SLAVE MYSQL_SHOW MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES MYSQL_IMPORT -export CLIENT_BINDIR MYSQL_CLIENT_TEST CHARSETSDIR MYSQL_MY_PRINT_DEFAULTS -export MYSQL_SLAP -export NDB_TOOLS_DIR -export NDB_MGM -export NDB_BACKUP_DIR -export NDB_TOOLS_OUTPUT -export PURIFYOPTIONS -NDB_STATUS_OK=1 -export NDB_STATUS_OK -NDB_SLAVE_STATUS_OK=1 -export NDB_SLAVE_STATUS_OK -export NDB_EXTRA_TEST NDBCLUSTER_PORT NDBCLUSTER_PORT_SLAVE - -MYSQL_TEST_ARGS="--no-defaults --socket=$MASTER_MYSOCK --database=$DB \ - --user=$DBUSER --password=$DBPASSWD --silent -v --skip-safemalloc \ - --tmpdir=$MYSQL_TMP_DIR --port=$MASTER_MYPORT $MYSQL_TEST_SSL_OPTS" -if [ x$USE_TIMER = x1 ] ; then - MYSQL_TEST_ARGS="$MYSQL_TEST_ARGS --timer-file=$MY_LOG_DIR/timer" -fi -MYSQL_TEST_BIN=$MYSQL_TEST -MYSQL_TEST="$MYSQL_TEST $MYSQL_TEST_ARGS" - -# Export MYSQL_TEST variable for use from .test files -export MYSQL_TEST - -GDB_CLIENT_INIT=$MYSQL_TMP_DIR/gdbinit.client -GDB_MASTER_INIT=$MYSQL_TMP_DIR/gdbinit.master -GDB_SLAVE_INIT=$MYSQL_TMP_DIR/gdbinit.slave -GCOV_MSG=$MYSQL_TMP_DIR/mysqld-gcov.out -GCOV_ERR=$MYSQL_TMP_DIR/mysqld-gcov.err -GPROF_DIR=$MYSQL_TMP_DIR/gprof -GPROF_MASTER=$GPROF_DIR/master.gprof -GPROF_SLAVE=$GPROF_DIR/slave.gprof -TIMEFILE="$MYSQL_TEST_DIR/var/log/mysqltest-time" -MYSQLTEST_LOG="$MYSQL_TEST_DIR/var/log/mysqltest.log" -if [ -n "$DO_CLIENT_GDB" -o -n "$DO_GDB" ] ; then - XTERM=`which xterm` -fi - -export MYSQL MYSQL_CHECK MYSQL_DUMP MYSQL_SHOW MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES CLIENT_BINDIR MASTER_MYSOCK - -#++ -# Function Definitions -#-- - -prompt_user () -{ - $ECHO $1 - read unused -} - -# We can't use diff -u or diff -a as these are not portable - -show_failed_diff () -{ - reject_file=r/$1.reject - result_file=r/$1.result - eval_file=r/$1.eval - - if [ -f $eval_file ] - then - result_file=$eval_file - fi - - if [ -x "$DIFF" ] && [ -f $reject_file ] - then - echo "Below are the diffs between actual and expected results:" - echo "-------------------------------------------------------" - $DIFF -c $result_file $reject_file - echo "-------------------------------------------------------" - echo "Please follow the instructions outlined at" - echo "http://forge.mysql.com/wiki/MySQL_Internals_Porting#Debugging_a_MySQL_Server" - echo "to find the reason to this problem and how to report this." - echo "" - fi -} - -do_gdb_test () -{ - mysql_test_args="$MYSQL_TEST_ARGS $1" - $ECHO "set args $mysql_test_args < $2" > $GDB_CLIENT_INIT - echo "Set breakpoints ( if needed) and type 'run' in gdb window" - #this xterm should not be backgrounded - $XTERM -title "Client" -e gdb -x $GDB_CLIENT_INIT $MYSQL_TEST_BIN -} - -error () { - $ECHO "Error: $1" - exit 1 -} - -error_is () { - $ECHO "Errors are (from $TIMEFILE) :" - $CAT < $TIMEFILE - $ECHO "(the last lines may be the most important ones)" -} - -prefix_to_8() { - $ECHO " $1" | $SED -e 's:.*\(........\)$:\1:' -} - -pass_inc () { - TOT_PASS=`$EXPR $TOT_PASS + 1` -} - -fail_inc () { - TOT_FAIL=`$EXPR $TOT_FAIL + 1` -} - -skip_inc () { - TOT_SKIP=`$EXPR $TOT_SKIP + 1` -} - -total_inc () { - TOT_TEST=`$EXPR $TOT_TEST + 1` -} - - -skip_test() { - USERT=" ...." - SYST=" ...." - REALT=" ...." - pname=`$ECHO "$1 "|$CUT -c 1-24` - RES="$pname" - skip_inc - $ECHO "$RES$RES_SPACE [ skipped ]" -} - - -disable_test() { - USERT=" ...." - SYST=" ...." - REALT=" ...." - pname=`$ECHO "$1 "|$CUT -c 1-24` - RES="$pname" - skip_inc - $ECHO "$RES$RES_SPACE [ disabled ] $2" -} - - -report_current_test () { - tname=$1 - echo "CURRENT_TEST: $tname" >> $MASTER_MYERR - eval "master1_running=\$MASTER1_RUNNING" - if [ x$master1_running = x1 ] ; then - echo "CURRENT_TEST: $tname" >> $MASTER_MYERR"1" - fi - if [ -n "$PURIFY_LOGS" ] ; then - for log in $PURIFY_LOGS - do - echo "CURRENT_TEST: $tname" >> $log - done - fi -} - - -report_stats () { - if [ $TOT_FAIL = 0 ]; then - $ECHO "All $TOT_TEST tests were successful." - else - xten=`$EXPR $TOT_PASS \* 10000` - raw=`$EXPR $xten / $TOT_TEST` - raw=`$PRINTF %.4d $raw` - whole=`$PRINTF %.2s $raw` - xwhole=`$EXPR $whole \* 100` - deci=`$EXPR $raw - $xwhole` - $ECHO "Failed ${TOT_FAIL}/${TOT_TEST} tests, ${whole}.${deci}% were successful." - $ECHO "" - $ECHO "The log files in $MY_LOG_DIR may give you some hint" - $ECHO "of what went wrong." - $ECHO "If you want to report this error, please read first the documentation at" - $ECHO "http://dev.mysql.com/doc/mysql/en/mysql-test-suite.html" - fi - - if [ $USE_RUNNING_SERVER -eq 0 ] - then - - # Report if there was any fatal warnings/errors in the log files - # - $RM -f $MY_LOG_DIR/warnings $MY_LOG_DIR/warnings.tmp - # Remove some non fatal warnings from the log files - $SED -e 's!Warning: Table:.* on delete!!g' -e 's!Warning: Setting lower_case_table_names=2!!g' -e 's!Warning: One can only use the --user.*root!!g' -e 's|InnoDB: Warning: we did not need to do crash recovery||g' \ - $MY_LOG_DIR/*.err \ - | $SED -e 's!Warning: Table:.* on rename!!g' \ - > $MY_LOG_DIR/warnings.tmp - - # Find errors - for i in "^Warning:" "^Error:" "^==.* at 0x" "InnoDB: Warning" "missing DBUG_RETURN" "mysqld: Warning" "Attempting backtrace" "Assertion .* failed" - do - if $GREP "$i" $MY_LOG_DIR/warnings.tmp >> $MY_LOG_DIR/warnings - then - GOT_WARNINGS=1 - fi - done - $RM -f $MY_LOG_DIR/warnings.tmp - if [ $GOT_WARNINGS = "1" ] - then - echo "WARNING: Got errors/warnings while running tests. Please examine" - echo "$MY_LOG_DIR/warnings for details." - fi - - fi # USE_RUNNING_SERVER - - # Check valgrind errors from mysqltest - if [ ! -z "$VALGRIND_MYSQLTEST" ] - then - if $GREP "ERROR SUMMARY" $MYSQLTEST_LOG | $GREP -v "0 errors" > /dev/null - then - $ECHO "Valgrind detected errors!" - $GREP "ERROR SUMMARY" $MYSQLTEST_LOG | $GREP -v "0 errors" - $ECHO "See $MYSQLTEST_LOG" - fi - fi -} - -mysql_install_db () { - $ECHO "Removing Stale Files" - if [ -z "$USE_OLD_DATA" ]; then - $RM -rf $MASTER_MYDDIR $MASTER_MYDDIR"1" - $ECHO "Installing Master Databases" - $INSTALL_DB - if [ $? != 0 ]; then - error "Could not install master test DBs" - exit 1 - fi - fi - if [ ! -z "$USE_NDBCLUSTER" ] - then - $ECHO "Installing Master Databases 1" -# $INSTALL_DB -1 - $RM -rf var/master-data1 - mkdir var/master-data1 - cp -r var/master-data/* var/master-data1 - if [ $? != 0 ]; then - error "Could not install master test DBs 1" - exit 1 - fi - fi - $ECHO "Installing Slave Databases" - $RM -rf $SLAVE_MYDDIR $MY_LOG_DIR/* -# $INSTALL_DB -slave - mkdir var/slave-data - cp -r var/master-data/* var/slave-data - if [ $? != 0 ]; then - error "Could not install slave test DBs" - exit 1 - fi - - for slave_num in 1 2 ; - do - $RM -rf var/slave$slave_num-data - mkdir -p var/slave$slave_num-data/mysql - mkdir -p var/slave$slave_num-data/test - cp var/slave-data/mysql/* var/slave$slave_num-data/mysql - done - return 0 -} - -gprof_prepare () -{ - $RM -rf $GPROF_DIR - mkdir -p $GPROF_DIR -} - -gprof_collect () -{ - if [ -f $MASTER_MYDDIR/gmon.out ]; then - gprof $MASTER_MYSQLD $MASTER_MYDDIR/gmon.out > $GPROF_MASTER - echo "Master execution profile has been saved in $GPROF_MASTER" - fi - if [ -f $SLAVE_MYDDIR/gmon.out ]; then - gprof $SLAVE_MYSQLD $SLAVE_MYDDIR/gmon.out > $GPROF_SLAVE - echo "Slave execution profile has been saved in $GPROF_SLAVE" - fi -} - -gcov_prepare () { - $FIND $BASEDIR -name \*.gcov \ - -or -name \*.da | $XARGS $RM -} - -gcov_collect () { - $ECHO "Collecting source coverage info..." - [ -f $GCOV_MSG ] && $RM $GCOV_MSG - [ -f $GCOV_ERR ] && $RM $GCOV_ERR - for d in $MYSQLD_SRC_DIRS; do - cd $BASEDIR/$d - for f in *.h *.cc *.c; do - $GCOV $f 2>>$GCOV_ERR >>$GCOV_MSG - done - cd $MYSQL_TEST_DIR - done - - $ECHO "gcov info in $GCOV_MSG, errors in $GCOV_ERR" -} - -abort_if_failed() -{ - if [ ! $? = 0 ] ; then - echo $1 - exit 1 - fi -} - -launch_in_background() -{ - shift - echo $@ | /bin/sh >> $CUR_MYERR 2>&1 & - sleep 2 #hack - return -} - -shutdown_mysqld() -{ - pid=$1 - ident=$2 - # Shutdown time must be high as slave may be in reconnect - $MYSQLADMIN --no-defaults -uroot --socket=$MYSQL_TMP_DIR/$ident.sock$3 --connect_timeout=5 --shutdown_timeout=70 shutdown >> $MYSQL_MANAGER_LOG 2>&1 - res=$? - # Some systems require an extra connect - $MYSQLADMIN --no-defaults -uroot --socket=$MYSQL_TMP_DIR/$ident.sock$3 --connect_timeout=1 ping >> $MYSQL_MANAGER_LOG 2>&1 - if test $res = 0 - then - wait_for_pid $pid - fi - return $res -} - -start_ndbcluster() -{ - if [ ! -n "$USE_NDBCLUSTER" ] ; - then - USING_NDBCLUSTER=0 - USE_NDBCLUSTER_OPT= - fi - - if [ x$USING_NDBCLUSTER = x1 -a -z "$USE_NDBCLUSTER_OPT" ] - then - rm -f $NDB_TOOLS_OUTPUT - if [ -z "$USE_RUNNING_NDBCLUSTER" ] - then - if [ "$DO_BENCH" != 1 -a -z "$NDBCLUSTER_EXTRA_OPTS" ] - then - NDBCLUSTER_EXTRA_OPTS="--small" - fi - OPTS="$NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --character-sets-dir=$CHARSETSDIR --verbose=$NDB_VERBOSE --initial --relative-config-data-dir --core" - if [ "x$NDB_VERBOSE" != "x0" ] ; then - echo "Starting master ndbcluster " $OPTS - fi - ./ndb/ndbcluster $OPTS || NDB_STATUS_OK=0 - if [ x$NDB_STATUS_OK != x1 ] ; then - if [ x$FORCE != x1 ] ; then - exit 1 - fi - USING_NDBCLUSTER=0 - USE_NDBCLUSTER_OPT= - return - fi - - NDB_CONNECTSTRING="host=localhost:$NDBCLUSTER_PORT" - else - NDB_CONNECTSTRING="$USE_RUNNING_NDBCLUSTER" - echo "Using ndbcluster at $NDB_CONNECTSTRING" - fi - USE_NDBCLUSTER_OPT="$USE_NDBCLUSTER --ndb-connectstring=\"$NDB_CONNECTSTRING\" --ndb-extra-logging" - export NDB_CONNECTSTRING - fi -} - -rm_ndbcluster_tables() -{ - $RM -f $1/mysql/apply_status* - $RM -f $1/mysql/schema* -} - -stop_ndbcluster() -{ - if [ -n "$USE_NDBCLUSTER_OPT" ] - then - USE_NDBCLUSTER_OPT= - if [ -z "$USE_RUNNING_NDBCLUSTER" ] - then - # Kill any running ndbcluster stuff - $ECHO "Stopping master cluster" - ./ndb/ndbcluster $NDBCLUSTER_OPTS --stop - # remove ndb table the hard way as not to upset later tests - rm_ndbcluster_tables $MASTER_MYDDIR - rm_ndbcluster_tables $MASTER_MYDDIR"1" - fi - fi -} - -# The embedded server needs the cleanup so we do some of the start work -# but stop before actually running mysqld or anything. - -start_master() -{ - eval "this_master_running=\$MASTER$1_RUNNING" - if [ x$this_master_running = x1 ] || [ x$LOCAL_MASTER = x1 ] ; then - return - fi - # Remove stale binary logs except for 2 tests which need them - if [ "$tname" != "rpl_crash_binlog_ib_1b" ] && [ "$tname" != "rpl_crash_binlog_ib_2b" ] && [ "$tname" != "rpl_crash_binlog_ib_3b" ] - then - $RM -f $MYSQL_TEST_DIR/var/log/master-bin$1.* - fi - - # Remove old master.info and relay-log.info files - $RM -f $MYSQL_TEST_DIR/var/master-data$1/master.info $MYSQL_TEST_DIR/var/master-data$1/relay-log.info - - #run master initialization shell script if one exists - - if [ -f "$master_init_script" ] ; - then - /bin/sh $master_init_script - fi - cd $BASEDIR # for gcov - if [ -n "$1" ] ; then - id=`$EXPR $1 + 101`; - this_master_myport=`$EXPR $MASTER_MYPORT + $1` - NOT_FIRST_MASTER_EXTRA_OPTS="--skip-innodb" - eval "MASTER_MYPORT$1=$this_master_myport" - export MASTER_MYPORT$1 - else - id=1; - this_master_myport=$MASTER_MYPORT - NOT_FIRST_MASTER_EXTRA_OPTS="" - fi - if [ -n "$EXTRA_MASTER_MYSQLD_TRACE" ] - then - CURR_MASTER_MYSQLD_TRACE="$EXTRA_MASTER_MYSQLD_TRACE$1" - fi - if [ x$MASTER_MYSQLDBINLOG = x1 ] - then - MASTER_MYSQLD_BINLOG_OPT="--log-bin=$MYSQL_TEST_DIR/var/log/master-bin$1" - fi - if [ -z "$DO_BENCH" -a -z "$DO_STRESS" ] - then - master_args="--no-defaults \ - --server-id=$id \ - --basedir=$MY_BASEDIR \ - --port=$this_master_myport \ - --port-open-timeout=380 \ - --local-infile \ - --exit-info=256 \ - --core \ - $USE_NDBCLUSTER_OPT \ - --datadir=$MASTER_MYDDIR$1 \ - --pid-file=$MASTER_MYPID$1 \ - --socket=$MASTER_MYSOCK$1 \ - --log=$MASTER_MYLOG$1 \ - --character-sets-dir=$CHARSETSDIR \ - --default-character-set=$CHARACTER_SET \ - --tmpdir=$MYSQL_TMP_DIR \ - --language=$LANGUAGE \ - --innodb_data_file_path=ibdata1:128M:autoextend \ - --open-files-limit=1024 \ - --log-bin-trust-function-creators \ - $MASTER_40_ARGS \ - $SMALL_SERVER \ - $MASTER_MYSQLD_BINLOG_OPT \ - $EXTRA_MASTER_MYSQLD_OPT $EXTRA_MASTER_OPT \ - $NOT_FIRST_MASTER_EXTRA_OPTS $CURR_MASTER_MYSQLD_TRACE" - else - master_args="--no-defaults \ - --server-id=$id --rpl-recovery-rank=1 \ - --basedir=$MY_BASEDIR --init-rpl-role=master \ - --port=$this_master_myport \ - --port-open-timeout=380 \ - --local-infile \ - --datadir=$MASTER_MYDDIR$1 \ - --pid-file=$MASTER_MYPID$1 \ - --socket=$MASTER_MYSOCK$1 \ - --character-sets-dir=$CHARSETSDIR \ - --default-character-set=$CHARACTER_SET \ - --core \ - $USE_NDBCLUSTER_OPT \ - --tmpdir=$MYSQL_TMP_DIR \ - --language=$LANGUAGE \ - --innodb_data_file_path=ibdata1:128M:autoextend \ - --log-bin-trust-function-creators \ - $MASTER_40_ARGS \ - $SMALL_SERVER \ - $MASTER_MYSQLD_BINLOG_OPT \ - $EXTRA_MASTER_MYSQLD_OPT $EXTRA_MASTER_OPT \ - $NOT_FIRST_MASTER_EXTRA_OPTS" - fi - - CUR_MYERR=$MASTER_MYERR$1 - CUR_MYSOCK=$MASTER_MYSOCK$1 - - # For embedded server we collect the server flags and return - if [ "x$USE_EMBEDDED_SERVER" = "x1" ] ; then - # Add a -A to each argument to pass it to embedded server - EMBEDDED_SERVER_OPTS="" - for opt in $master_args - do - EMBEDDED_SERVER_OPTS="$EMBEDDED_SERVER_OPTS -A $opt" - done - EXTRA_MYSQL_TEST_OPT="$EMBEDDED_SERVER_OPTS" - return - fi - - if [ x$DO_DDD = x1 ] - then - $ECHO "set args $master_args" > $GDB_MASTER_INIT$1 - launch_in_background master ddd -display $DISPLAY --debugger \ - "gdb -x $GDB_MASTER_INIT$1" $MASTER_MYSQLD - elif [ x$DO_GDB = x1 ] - then - if [ x$MANUAL_GDB = x1 ] - then - $ECHO "set args $master_args" > $GDB_MASTER_INIT$1 - $ECHO "To start gdb for the master , type in another window:" - $ECHO "cd $MYSQL_TEST_DIR ; gdb -x $GDB_MASTER_INIT$1 $MASTER_MYSQLD" - wait_for_master=1500 - else - ( $ECHO set args $master_args; - if [ $USE_MANAGER = 0 ] ; then - cat < $GDB_MASTER_INIT$1 - launch_in_background master $XTERM -display $DISPLAY \ - -title "Master" -e gdb -x $GDB_MASTER_INIT$1 $MASTER_MYSQLD - fi - else - launch_in_background master $MASTER_MYSQLD $master_args - fi - sleep_until_file_created $MASTER_MYPID$1 $wait_for_master - wait_for_master=$SLEEP_TIME_FOR_SECOND_MASTER - eval "MASTER$1_RUNNING=1" -} - -start_slave() -{ - [ x$SKIP_SLAVE = x1 ] && return - eval "this_slave_running=\$SLAVE$1_RUNNING" - [ x$this_slave_running = 1 ] && return - - # When testing fail-safe replication, we will have more than one slave - # in this case, we start secondary slaves with an argument - slave_ident="slave$1" - if [ -n "$1" ] ; - then - slave_server_id=`$EXPR 2 + $1` - slave_rpl_rank=$slave_server_id - slave_port=`expr $SLAVE_MYPORT + $1` - slave_log="$SLAVE_MYLOG.$1" - slave_err="$SLAVE_MYERR.$1" - slave_datadir="$SLAVE_MYDDIR/../$slave_ident-data/" - slave_pid="$MYRUN_DIR/mysqld-$slave_ident.pid" - slave_sock="$SLAVE_MYSOCK-$1" - else - slave_server_id=2 - slave_rpl_rank=2 - slave_port=$SLAVE_MYPORT - slave_log=$SLAVE_MYLOG - slave_err=$SLAVE_MYERR - slave_datadir=$SLAVE_MYDDIR - slave_pid=$SLAVE_MYPID - slave_sock="$SLAVE_MYSOCK" - fi - - # - if [ x$USING_NDBCLUSTER = x1 -a -n "$USE_NDBCLUSTER_SLAVE" ] ; then - if [ $slave_server_id -eq 2 ] ; then - savedir=`pwd` - cd $MYSQL_TEST_DIR - if [ "$DO_BENCH" != 1 -a -z "$NDBCLUSTER_EXTRA_OPTS" ] - then - NDBCLUSTER_EXTRA_OPTS="--small" - fi - - OPTS="$NDBCLUSTER_OPTS_SLAVE --initial $NDBCLUSTER_EXTRA_OPTS --ndbd-nodes=1 --verbose=$NDB_VERBOSE --relative-config-data-dir --core" - if [ "x$NDB_VERBOSE" != "x0" ] ; then - echo "Starting slave ndbcluster " $OPTS - fi - ./ndb/ndbcluster $OPTS \ - || NDB_SLAVE_STATUS_OK=0 - # > /dev/null 2>&1 || NDB_SLAVE_STATUS_OK=0 - cd $savedir - if [ x$NDB_SLAVE_STATUS_OK != x1 ] ; then - if [ x$FORCE != x1 ] ; then - exit 1 - fi - USE_NDBCLUSTER_SLAVE_OPT= - USE_NDBCLUSTER_SLAVE= - fi - USE_NDBCLUSTER_SLAVE_OPT=$USE_NDBCLUSTER_SLAVE - fi - else - USE_NDBCLUSTER_SLAVE_OPT= - fi - - # Remove stale binary logs and old master.info files - # except for too tests which need them - if [ "$tname" != "rpl_crash_binlog_ib_1b" ] && [ "$tname" != "rpl_crash_binlog_ib_2b" ] && [ "$tname" != "rpl_crash_binlog_ib_3b" ] - then - $RM -f $MYSQL_TEST_DIR/var/log/$slave_ident-*bin.* - $RM -f $slave_datadir/master.info $slave_datadir/relay-log.info - fi - - #run slave initialization shell script if one exists - if [ -f "$slave_init_script" ] ; - then - /bin/sh $slave_init_script - fi - - if [ -z "$SLAVE_MASTER_INFO" ] ; then - master_info="--master-user=root \ - --master-connect-retry=1 \ - --master-host=127.0.0.1 \ - --master-password="" \ - --master-port=$MASTER_MYPORT \ - --server-id=$slave_server_id --rpl-recovery-rank=$slave_rpl_rank" - else - master_info=$SLAVE_MASTER_INFO - fi - - if [ x$SLAVE_MYSQLDBINLOG = x1 ] - then - SLAVE_MYSQLD_BINLOG_OPT="--log-bin=$MYSQL_TEST_DIR/var/log/$slave_ident-bin --log-slave-updates" - fi - - $RM -f $slave_datadir/log.* - slave_args="--no-defaults $master_info \ - --exit-info=256 \ - $SLAVE_MYSQLDBINLOG_OPT \ - --relay-log=$MYSQL_TEST_DIR/var/log/$slave_ident-relay-bin \ - --log=$slave_log \ - --basedir=$MY_BASEDIR \ - --datadir=$slave_datadir \ - --pid-file=$slave_pid \ - --port=$slave_port \ - --port-open-timeout=380 \ - --socket=$slave_sock \ - --character-sets-dir=$CHARSETSDIR \ - --default-character-set=$CHARACTER_SET \ - --core --init-rpl-role=slave \ - --tmpdir=$MYSQL_TMP_DIR \ - --language=$LANGUAGE \ - --skip-innodb --skip-ndbcluster --skip-slave-start \ - --slave-load-tmpdir=$SLAVE_LOAD_TMPDIR \ - --report-host=127.0.0.1 --report-user=root \ - --report-port=$slave_port \ - --master-retry-count=10 \ - -O slave_net_timeout=10 \ - --log-bin-trust-function-creators \ - $SMALL_SERVER \ - $SLAVE_MYSQLD_BINLOG_OPT \ - $EXTRA_SLAVE_MYSQLD_OPT $EXTRA_SLAVE_OPT \ - $USE_NDBCLUSTER_SLAVE_OPT" - CUR_MYERR=$slave_err - CUR_MYSOCK=$slave_sock - - if [ x$DO_DDD = x1 ] - then - $ECHO "set args $slave_args" > $GDB_SLAVE_INIT - launch_in_background $slave_ident ddd -display $DISPLAY --debugger \ - "gdb -x $GDB_SLAVE_INIT" $SLAVE_MYSQLD - elif [ x$DO_GDB = x1 ] - then - if [ x$MANUAL_GDB = x1 ] - then - $ECHO "set args $slave_args" > $GDB_SLAVE_INIT - echo "To start gdb for the slave, type in another window:" - echo "cd $MYSQL_TEST_DIR ; gdb -x $GDB_SLAVE_INIT $SLAVE_MYSQLD" - wait_for_slave=1500 - else - ( $ECHO set args $slave_args; - if [ $USE_MANAGER = 0 ] ; then - cat < $GDB_SLAVE_INIT - launch_in_background $slave_ident $XTERM -display $DISPLAY -title "Slave" -e \ - gdb -x $GDB_SLAVE_INIT $SLAVE_MYSQLD - fi - else - launch_in_background $slave_ident $SLAVE_MYSQLD $slave_args - fi - eval "SLAVE$1_RUNNING=1" - sleep_until_file_created $slave_pid $wait_for_slave - wait_for_slave=$SLEEP_TIME_FOR_SECOND_SLAVE -} - -mysql_start () -{ -# We should not start the daemon here as we don't know the arguments -# for the test. Better to let the test start the daemon - -# $ECHO "Starting MySQL daemon" -# start_master -# start_slave - cd $MYSQL_TEST_DIR - return 1 -} - -stop_slave () -{ - eval "this_slave_running=\$SLAVE$1_RUNNING" - slave_ident="slave$1" - if [ -n "$1" ] ; - then - slave_pid="$MYRUN_DIR/mysqld-$slave_ident.pid" - else - slave_pid=$SLAVE_MYPID - fi - if [ x$this_slave_running = x1 ] - then - pid=`$CAT $slave_pid` - shutdown_mysqld $pid $slave_ident - if [ $? != 0 ] && [ -f $slave_pid ] - then # try harder! - $ECHO "slave not cooperating with mysqladmin, will try manual kill" - kill $pid - sleep_until_file_deleted $pid $slave_pid - if [ -f $slave_pid ] ; then - $ECHO "slave refused to die. Sending SIGKILL" - kill -9 `$CAT $slave_pid` - $RM -f $slave_pid - else - $ECHO "slave responded to SIGTERM " - fi - else - sleep $SLEEP_TIME_AFTER_RESTART - fi - eval "SLAVE$1_RUNNING=0" - if [ -n "$USE_NDBCLUSTER_SLAVE_OPT" ] ; then - savedir=`pwd` - cd $MYSQL_TEST_DIR - $ECHO "Stopping slave cluster" - ./ndb/ndbcluster $NDBCLUSTER_OPTS_SLAVE --stop - rm_ndbcluster_tables $SLAVE_MYDDIR - cd $savedir - fi - fi -} - -stop_slave_threads () -{ - eval "this_slave_running=\$SLAVE$1_RUNNING" - slave_ident="slave$1" - if [ x$this_slave_running = x1 ] - then - $MYSQLADMIN --no-defaults -uroot --socket=$MYSQL_TMP_DIR/$slave_ident.sock stop-slave > /dev/null 2>&1 - fi -} - -stop_master () -{ - eval "this_master_running=\$MASTER$1_RUNNING" - if [ x$this_master_running = x1 ] - then - # For embedded server we don't stop anyting but mark that - # MASTER_RUNNING=0 to get cleanup when calling start_master(). - if [ x$USE_EMBEDDED_SERVER != x1 ] ; then - pid=`$CAT $MASTER_MYPID$1` - shutdown_mysqld $pid master $1 - if [ $? != 0 ] && [ -f $MASTER_MYPID$1 ] - then # try harder! - $ECHO "master not cooperating with mysqladmin, will try manual kill" - kill $pid - sleep_until_file_deleted $pid $MASTER_MYPID$1 - if [ -f $MASTER_MYPID$1 ] ; then - $ECHO "master refused to die. Sending SIGKILL" - kill -9 `$CAT $MASTER_MYPID$1` - $RM -f $MASTER_MYPID$1 - else - $ECHO "master responded to SIGTERM " - fi - else - sleep $SLEEP_TIME_AFTER_RESTART - fi - fi - eval "MASTER$1_RUNNING=0" - fi -} - -mysql_stop () -{ - if [ "$MASTER_RUNNING" = 1 ] - then - $ECHO "Ending Tests" - $ECHO "Shutting-down MySQL daemon" - $ECHO "" - stop_master - stop_master 1 - $ECHO "Master shutdown finished" - stop_slave - stop_slave 1 - stop_slave 2 - $ECHO "Slave shutdown finished" - stop_ndbcluster - fi - return 1 -} - -mysql_restart () -{ - mysql_stop - mysql_start - return 1 -} - -mysql_loadstd () { - - # cp $STD_DATA/*.frm $STD_DATA/*.MRG $MASTER_MYDDIR/test - return 1 -} - -run_testcase () -{ - tf=$1 - tname=`$BASENAME $tf .test` - master_opt_file=$TESTDIR/$tname-master.opt - slave_opt_file=$TESTDIR/$tname-slave.opt - master_init_script=$TESTDIR/$tname-master.sh - slave_init_script=$TESTDIR/$tname-slave.sh - slave_master_info_file=$TESTDIR/$tname.slave-mi - tsrcdir=$TESTDIR/$tname-src - result_file="r/$tname.result" - echo $tname > $CURRENT_TEST - SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0 \& \( $tname : federated \) = 0` - NDBCLUSTER_TEST=`$EXPR \( $tname : '.*ndb.*' \) != 0` - if [ "x$USE_NDBCLUSTER_ALL" = "x1" ] ; then - NDBCLUSTER_TEST=1 - fi - if [ "x$USE_NDBCLUSTER_ONLY" = "x1" -a "x$NDBCLUSTER_TEST" != "x1" ] ; then - skip_test $tname - return - fi - if [ "$USE_MANAGER" = 1 ] ; then - many_slaves=`$EXPR \( \( $tname : rpl_failsafe \) != 0 \) \| \( \( $tname : rpl_chain_temp_table \) != 0 \)` - fi - if $EXPR "$tname" '<' "$START_FROM" > /dev/null ; then - #skip_test $tname - return - fi - - if [ "$SKIP_TEST" ] ; then - if $EXPR \( "$tname" : "$SKIP_TEST" \) > /dev/null ; then - skip_test $tname - return - fi - fi - - if [ "$DO_TEST" ] ; then - if $EXPR \( "$tname" : "$DO_TEST" \) > /dev/null ; then - : #empty command to keep some shells happy - else - #skip_test $tname - return - fi - fi - - if [ x${NO_SLAVE}x$SKIP_SLAVE = x1x0 ] ; then - skip_test $tname - return - fi - -# if [ -f "$TESTDIR/$tname.disabled" ] -# then -# comment=`$CAT $TESTDIR/$tname.disabled`; -# disable_test $tname "$comment" -# return -# fi - if [ -f "$TESTDIR/disabled.def" ] ; then - comment=`$GREP "^$tname *: *" $TESTDIR/disabled.def`; - if [ -n "$comment" ] - then - comment=`echo $comment | sed 's/^[^:]*: *//'` - disable_test $tname "$comment" - return - fi - fi - - if [ "x$USE_EMBEDDED_SERVER" != "x1" ] ; then - # Stop all slave threads, so that we don't have useless reconnection - # attempts and error messages in case the slave and master servers restart. - stop_slave_threads - stop_slave_threads 1 - stop_slave_threads 2 - fi - - # FIXME temporary solution, we will get a new C version of this - # script soon anyway so it is not worth it spending the time - if [ "x$USE_EMBEDDED_SERVER" = "x1" -a -z "$DO_TEST" ] ; then - for t in \ - "init_connect" \ - "init_file" - do - if [ "$tname" = "$t" ] ; then - skip_test $tname - return - fi - done - fi - - if [ $USE_RUNNING_SERVER -eq 0 ] ; - then - if [ -f $master_opt_file ] ; - then - EXTRA_MASTER_OPT=`$CAT $master_opt_file | $SED -e "s;\\$MYSQL_TEST_DIR;$MYSQL_TEST_DIR;"` - case "$EXTRA_MASTER_OPT" in - --timezone=*) - TZ=`$ECHO "$EXTRA_MASTER_OPT" | $SED -e "s;--timezone=;;"` - export TZ - # Note that this must be set to space, not "" for test-reset to work - EXTRA_MASTER_OPT=" " - ;; - --result-file=*) - result_file=`$ECHO "$EXTRA_MASTER_OPT" | $SED -e "s;--result-file=;;"` - result_file="r/$result_file.result" - # Note that this must be set to space, not "" for test-reset to work - EXTRA_MASTER_OPT=" " - ;; - --force-restart) - # Note that this must be set to space, not "" for test-reset to work - EXTRA_MASTER_OPT=" " - ;; - esac - stop_master - stop_master 1 - - # only stop the cluster if this test will not use cluster - if [ x$NDBCLUSTER_TEST != x1 ] ; - then - stop_ndbcluster - fi - - report_current_test $tname - USING_NDBCLUSTER=$NDBCLUSTER_TEST - # start_ndbcluster knows if cluster is already started - start_ndbcluster - start_master - if [ x$USING_NDBCLUSTER = x1 -a -z "$DO_BENCH" -a -z "$DO_STRESS" ] ; then - echo "CURRENT_TEST: $tname" >> $MASTER_MYERR"1" - start_master 1 - fi - TZ=$MY_TZ; export TZ - else - # If we had extra master opts to the previous run - # or there is no master running (FIXME strange.....) - # or there is a master init script - if [ ! -z "$EXTRA_MASTER_OPT" ] || [ x$MASTER_RUNNING != x1 ] || \ - [ -f $master_init_script ] || \ - [ -n "$USE_NDBCLUSTER" -a x$NDBCLUSTER_TEST != x$USING_NDBCLUSTER ] - then - EXTRA_MASTER_OPT="" - stop_master - stop_master 1 - - # only stop the cluster if this test will not use cluster - if [ x$NDBCLUSTER_TEST != x1 ] ; - then - stop_ndbcluster - fi - - report_current_test $tname - USING_NDBCLUSTER=$NDBCLUSTER_TEST - # start_ndbcluster knows if cluster is already started - start_ndbcluster - start_master - if [ x$USING_NDBCLUSTER = x1 -a -z "$DO_BENCH" -a -z "$DO_STRESS" ] ; then - echo "CURRENT_TEST: $tname" >> $MASTER_MYERR"1" - start_master 1 - fi - else - report_current_test $tname - fi - fi - - # We never start a slave if embedded server is used - if [ "x$USE_EMBEDDED_SERVER" != "x1" ] ; then - do_slave_restart=0 - if [ -f $slave_opt_file ] ; - then - EXTRA_SLAVE_OPT=`$CAT $slave_opt_file | $SED -e "s;\\$MYSQL_TEST_DIR;$MYSQL_TEST_DIR;"` - do_slave_restart=1 - else - if [ ! -z "$EXTRA_SLAVE_OPT" ] || [ x$SLAVE_RUNNING != x1 ] ; - then - EXTRA_SLAVE_OPT="" - do_slave_restart=1 - fi - fi - - if [ -f $slave_master_info_file ] ; then - SLAVE_MASTER_INFO=`$CAT $slave_master_info_file` - do_slave_restart=1 - else - if [ ! -z "$SLAVE_MASTER_INFO" ] || [ x$SLAVE_RUNNING != x1 ] ; - then - SLAVE_MASTER_INFO="" - do_slave_restart=1 - fi - fi - - USING_NDBCLUSTER=$NDBCLUSTER_TEST - if [ -n "$USE_NDBCLUSTER_SLAVE_OPT" ] ; then - if [ x$USING_NDBCLUSTER != x1 ] ; then - do_slave_restart=1 - fi - else - if [ x$USING_NDBCLUSTER = x1 ] ; then - do_slave_restart=1 - fi - fi - - - if [ x$do_slave_restart = x1 ] ; then - stop_slave - echo "CURRENT_TEST: $tname" >> $SLAVE_MYERR - start_slave - else - echo "CURRENT_TEST: $tname" >> $SLAVE_MYERR - fi - if [ x$many_slaves = x1 ]; then - start_slave 1 - start_slave 2 - fi - fi - fi - - if [ "x$START_AND_EXIT" = "x1" ] ; then - echo "Servers started, exiting" - exit - fi - - cd $MYSQL_TEST_DIR - - if [ -f $tf ] ; then - $RM -f r/$tname.*reject - mysql_test_args="-R $result_file $EXTRA_MYSQL_TEST_OPT" - if [ -z "$DO_CLIENT_GDB" ] ; then - `$VALGRIND_MYSQLTEST $MYSQL_TEST $mysql_test_args < $tf 2> $TIMEFILE`; - else - do_gdb_test "$mysql_test_args" "$tf" - fi - - res=$? - - # Save the testcase log to mysqltest log file - echo "CURRENT_TEST: $tname" >> $MYSQLTEST_LOG - cat $TIMEFILE >> $MYSQLTEST_LOG - - pname=`$ECHO "$tname "|$CUT -c 1-24` - RES="$pname" - - if [ x$many_slaves = x1 ] ; then - stop_slave 1 - stop_slave 2 - fi - - if [ $res = 0 ]; then - total_inc - pass_inc - TIMER="" - if [ x$USE_TIMER = x1 -a -f "$MY_LOG_DIR/timer" ]; then - TIMER=`cat $MY_LOG_DIR/timer` - TIMER=`$PRINTF "%13s" $TIMER` - fi - $ECHO "$RES$RES_SPACE [ pass ] $TIMER" - else - # why the following ``if'' ? That is why res==1 is special ? - if [ $res = 62 ]; then - skip_inc - $ECHO "$RES$RES_SPACE [ skipped ]" - else - if [ $res -ne 1 ]; then - $ECHO "mysqltest returned unexpected code $res, it has probably crashed" >> $TIMEFILE - fi - total_inc - fail_inc - $ECHO "$RES$RES_SPACE [ fail ]" - $ECHO - error_is - show_failed_diff $tname - $ECHO - if [ x$FORCE != x1 ] ; then - $ECHO "Aborting: $tname failed in $TEST_MODE mode. To continue, re-run with '--force'." - $ECHO - if [ -z "$DO_GDB" ] && [ $USE_RUNNING_SERVER -eq 0 ] && \ - [ -z "$DO_DDD" ] && [ -z "$USE_EMBEDDED_SERVER" ] - then - mysql_stop - fi - exit 1 - fi - FAILED_CASES="$FAILED_CASES $tname" - if [ -z "$DO_GDB" ] && [ $USE_RUNNING_SERVER -eq 0 ] && \ - [ -z "$DO_DDD" ] && [ -z "$USE_EMBEDDED_SERVER" ] - then - mysql_restart - fi - fi - fi - fi -} - -run_stress_test() -{ - - STRESS_BASEDIR="$MYSQL_TEST_DIR/var/stress" - - #Clean-up old stress test basedir - if [ -d $STRESS_BASEDIR ] ; then - $RM -rf $STRESS_BASEDIR - fi - #Create stress test basedir - mkdir $STRESS_BASEDIR - - if [ "$STRESS_SUITE" != "main" -a "$STRESS_SUITE" != "default" ] ; then - STRESS_SUITE_DIR="$MYSQL_TEST_DIR/suite/$STRESS_SUITE" - else - STRESS_SUITE_DIR="$MYSQL_TEST_DIR" - fi - - if [ -d "$STRESS_SUITE_DIR" ] ; then - STRESS_SUITE_T_DIR="$STRESS_SUITE_DIR/t" - STRESS_SUITE_R_DIR="$STRESS_SUITE_DIR/r" - #FIXME: check that dirs above are exist - else - echo "Directory $STRESS_SUITE_DIR with test suite doesn't exists. Abort stress testing" - exit 1 - fi - - if [ -n "$STRESS_TEST" ] ; then - STRESS_TEST_FILE="$STRESS_BASEDIR/stress_tests.txt" - echo $STRESS_TEST > $STRESS_TEST_FILE - elif [ -n "$STRESS_TEST_FILE" ] ; then - STRESS_TEST_FILE="$STRESS_SUITE_DIR/$STRESS_TEST_FILE" - if [ ! -f "$STRESS_TEST_FILE" ] ; then - echo "Specified file $STRESS_TEST_FILE with list of tests does not exist" - echo "Please ensure that file exists and has proper permissions" - exit 1 - fi - else - STRESS_TEST_FILE="$STRESS_SUITE_DIR/stress_tests.txt" - if [ ! -f "$STRESS_TEST_FILE" ] ; then - echo "Default file $STRESS_TEST_FILE with list of tests does not exist." - echo "Please use --stress-test-file option to specify custom one or you can" - echo "just specify name of test for testing as last argument in command line" - exit 1 - fi - fi - - if [ -n "$STRESS_INIT_FILE" ] ; then - STRESS_INIT_FILE="$STRESS_SUITE_DIR/$STRESS_INIT_FILE" - if [ ! -f "$STRESS_INIT_FILE" ] ; then - echo "Specified file $STRESS_INIT_FILE with list of tests doesn't exist." - echo "Please ensure that file exists and has proper permissions" - exit 1 - fi - else - STRESS_INIT_FILE="$STRESS_SUITE_DIR/stress_init.txt" - #Check for default init file - if [ ! -f "$STRESS_INIT_FILE" ] ; then - STRESS_INIT_FILE="" - fi - fi - - if [ "$STRESS_MODE" != "random" -a "$STRESS_MODE" != "seq" ] ; then - echo "You specified wrong mode '$STRESS_MODE' for stress test." - echo "Correct values are 'random' or 'seq'" - exit 1 - fi - - STRESS_TEST_ARGS="--server-socket=$MASTER_MYSOCK \ - --server-user=$DBUSER \ - --server-database=$DB \ - --stress-suite-basedir=$MYSQL_TEST_DIR \ - --suite=$STRESS_SUITE \ - --stress-tests-file=$STRESS_TEST_FILE \ - --stress-basedir=$STRESS_BASEDIR \ - --server-logs-dir=$STRESS_BASEDIR \ - --stress-mode=$STRESS_MODE \ - --mysqltest=$CLIENT_BINDIR/mysqltest \ - --threads=$STRESS_THREADS \ - --verbose \ - --cleanup \ - --log-error-details \ - --abort-on-error" - - if [ -n "$STRESS_INIT_FILE" ] ; then - STRESS_TEST_ARGS="$STRESS_TEST_ARGS --stress-init-file=$STRESS_INIT_FILE" - fi - - if [ -z "$STRESS_LOOP_COUNT" -a -z "$STRESS_TEST_COUNT" -a - -z "$STRESS_TEST_DURATION" ] ; then - - #Limit stress testing with 20 loops in case when any limit parameter - #was specified - STRESS_TEST_COUNT=20 - fi - - if [ -n "$STRESS_LOOP_COUNT" ] ; then - STRESS_TEST_ARGS="$STRESS_TEST_ARGS --loop-count=$STRESS_LOOP_COUNT" - fi - - if [ -n "$STRESS_TEST_COUNT" ] ; then - STRESS_TEST_ARGS="$STRESS_TEST_ARGS --test-count=$STRESS_TEST_COUNT" - fi - - if [ -n "$STRESS_TEST_DURATION" ] ; then - STRESS_TEST_ARGS="$STRESS_TEST_ARGS --test-duration=$STRESS_TEST_DURATION" - fi - - echo "Stress test related variables:" - echo "TESTS - $1" - echo "STRESS - $DO_STRESS" - echo "STRESS_SUITE - $STRESS_SUITE" - echo "STRESS_TEST_FILE - $STRESS_TEST_FILE" - echo "STRESS_INIT_FILE - $STRESS_INIT_FILE" - echo "STRESS_THREADS - $STRESS_THREADS" - echo "STRESS_MODE - $STRESS_MODE" - echo "STRESS_TEST_COUNT - $STRESS_TEST_COUNT" - echo "STRESS_LOOP_COUNT - $STRESS_LOOP_COUNT" - echo "STRESS_TEST_DURATION - $STRESS_TEST_DURATION" - - #echo "$STRESS_TEST_ARGS"; - #Run stress test - $MYSQL_TEST_DIR/mysql-stress-test.pl $STRESS_TEST_ARGS - - -} - -###################################################################### -# Main script starts here -###################################################################### - -[ "$DO_GCOV" -a ! -x "$GCOV" ] && error "No gcov found" - -[ "$DO_GCOV" ] && gcov_prepare -[ "$DO_GPROF" ] && gprof_prepare - -if [ $USE_RUNNING_SERVER -eq 0 ] -then - if [ -z "$FAST_START" ] - then - # Ensure that no old mysqld test servers are running - $MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 - $MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK1 -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 - $MYSQLADMIN --no-defaults --socket=$SLAVE_MYSOCK -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 - $MYSQLADMIN --no-defaults --host=$hostname --port=$MASTER_MYPORT --protocol=tcp -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 - $MYSQLADMIN --no-defaults --host=$hostname --protocol=tcp --port=`expr $MASTER_MYPORT + 1` -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 - $MYSQLADMIN --no-defaults --host=$hostname --protocol=tcp --port=$SLAVE_MYPORT -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 - $MYSQLADMIN --no-defaults --host=$hostname --protocol=tcp --port=`expr $SLAVE_MYPORT + 1` -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 - sleep_until_file_deleted 0 $MASTER_MYPID - sleep_until_file_deleted 0 $MASTER_MYPID"1" - sleep_until_file_deleted 0 $SLAVE_MYPID - else - rm $MASTER_MYPID $MASTER_MYPID"1" $SLAVE_MYPID - fi - - # just to force stopping anything from previous runs - USE_NDBCLUSTER_OPT=$USE_NDBCLUSTER - stop_ndbcluster - - # Remove files that can cause problems - $RM -rf $MYSQL_TEST_DIR/var/ndbcluster - $RM -rf $MYSQL_TEST_DIR/var/tmp/snapshot* - $RM -rf $MYSQL_TEST_DIR/var/run/* $MYSQL_TEST_DIR/var/tmp/* - - # Remove old berkeley db log files that can confuse the server - $RM -f $MASTER_MYDDIR/log.* - $RM -f $MASTER_MYDDIR"1"/log.* - - # Remove old log and reject files - $RM -f r/*.reject r/*.progress r/*.log r/*.warnings - - wait_for_master=$SLEEP_TIME_FOR_FIRST_MASTER - wait_for_slave=$SLEEP_TIME_FOR_FIRST_SLAVE - $ECHO "Installing Test Databases" - mysql_install_db - - if [ -n "$1" -a `expr "X$*" : '.*ndb'` -eq 0 ] - then - USING_NDBCLUSTER=0 - USE_NDBCLUSTER_OPT= - fi - - mysql_start - $ECHO "Loading Standard Test Databases" - mysql_loadstd -fi - -$ECHO "Starting Tests" - -# Some test cases need USE_RUNNING_SERVER -export USE_RUNNING_SERVER - -# -# This can probably be deleted -# -if [ "$DO_BENCH" = 1 ] -then - start_master - - if [ "$DO_SMALL_BENCH" = 1 ] - then - EXTRA_BENCH_ARGS="--small-test --small-tables" - fi - - if [ x$USING_NDBCLUSTER = x1 ] - then - EXTRA_BENCH_ARGS="--create-options=TYPE=ndb $EXTRA_BENCH_ARGS" - fi - - BENCHDIR=$BASEDIR/sql-bench/ - savedir=`pwd` - cd $BENCHDIR - if [ -z "$1" ] - then - ./run-all-tests --socket=$MASTER_MYSOCK --user=root $EXTRA_BENCH_ARGS --log - else - if [ -x "./$1" ] - then - ./$1 --socket=$MASTER_MYSOCK --user=root $EXTRA_BENCH_ARGS - else - echo "benchmark $1 not found" - fi - fi - cd $savedir - mysql_stop - exit -fi - -# -# Stress testing -# -if [ "$DO_STRESS" = 1 ] -then - - if [ -n "$1" ] ; then - STRESS_TEST="$1"; - fi - - if [ $USE_RUNNING_SERVER -eq 0 ] ; then - start_master - fi - - run_stress_test - - if [ $USE_RUNNING_SERVER -eq 0 ] ; then - mysql_stop - fi - - exit - -fi - - -$ECHO -if [ x$USE_TIMER = x1 ] ; then -$ECHO "TEST RESULT TIME (ms)" -else -$ECHO "TEST RESULT" -fi -$ECHO $DASH72 - -if [ -z "$1" ] ; -then - if [ x$RECORD = x1 ]; then - $ECHO "Will not run in record mode without a specific test case." - else - for tf in $TESTDIR/*.$TESTSUFFIX - do - run_testcase $tf - done - $RM -f $TIMEFILE # Remove for full test - fi -else - while [ ! -z "$1" ]; do - tname=`$BASENAME $1 .test` - tf=$TESTDIR/$tname.$TESTSUFFIX - if [ -f $tf ] ; then - run_testcase $tf - else - $ECHO "Test case $tf does not exist." - fi - shift - done -fi - -$ECHO $DASH72 -$ECHO - -if [ -z "$DO_GDB" ] && [ $USE_RUNNING_SERVER -eq 0 ] && [ -z "$DO_DDD" ] -then - mysql_stop -fi -report_stats -$ECHO - -[ "$DO_GCOV" ] && gcov_collect # collect coverage information -[ "$DO_GPROF" ] && gprof_collect # collect coverage information - -if [ $TOT_FAIL -ne 0 ]; then - $ECHO "mysql-test-run in $TEST_MODE mode: *** Failing the test(s):$FAILED_CASES" - $ECHO - exit 1 -fi -if [ $GOT_WARNINGS -ne 0 ]; then - exit 1 -fi -exit 0 diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index c36fb3a3f40..1b12f1580dd 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -6,7 +6,7 @@ # # mysql-test-run.pl # -# Tool used for executing a suite of .test file +# Tool used for executing a suite of .test files # # See the "MySQL Test framework manual" for more information # http://dev.mysql.com/doc/mysqltest/en/index.html @@ -14,114 +14,71 @@ # Please keep the test framework tools identical in all versions! # ############################################################################## -# -# Coding style directions for this perl script -# -# - To make this Perl script easy to alter even for those that not -# code Perl that often, keeep the coding style as close as possible to -# the C/C++ MySQL coding standard. -# -# - All lists of arguments to send to commands are Perl lists/arrays, -# not strings we append args to. Within reason, most string -# concatenation for arguments should be avoided. -# -# - Functions defined in the main program are not to be prefixed, -# functions in "library files" are to be prefixed with "mtr_" (for -# Mysql-Test-Run). There are some exceptions, code that fits best in -# the main program, but are put into separate files to avoid -# clutter, may be without prefix. -# -# - All stat/opendir/-f/ is to be kept in collect_test_cases(). It -# will create a struct that the rest of the program can use to get -# the information. This separates the "find information" from the -# "do the work" and makes the program more easy to maintain. -# -# - The rule when it comes to the logic of this program is -# -# command_line_setup() - is to handle the logic between flags -# collect_test_cases() - is to do its best to select what tests -# to run, dig out options, if needs restart etc. -# run_testcase() - is to run a single testcase, and follow the -# logic set in both above. No, or rare file -# system operations. If a test seems complex, -# it should probably not be here. -# -# A nice way to trace the execution of this script while debugging -# is to use the Devel::Trace package found at -# "http://www.plover.com/~mjd/perl/Trace/" and run this script like -# "perl -d:Trace mysql-test-run.pl" -# - -use lib "lib/"; - -$Devel::Trace::TRACE= 0; # Don't trace boring init stuff - -#require 5.6.1; -use File::Path; -use File::Basename; -use File::Copy; -use File::Temp qw /tempdir/; -use Cwd; -use Getopt::Long; -use IO::Socket; -use IO::Socket::INET; use strict; use warnings; -select(STDOUT); -$| = 1; # Automatically flush STDOUT +BEGIN { + # Check that mysql-test-run.pl is started from mysql-test/ + unless ( -f "mysql-test-run.pl" ) + { + print "**** ERROR **** ", + "You must start mysql-test-run from the mysql-test/ directory\n"; + exit(1); + } + # Check that lib exist + unless ( -d "lib/" ) + { + print "**** ERROR **** ", + "Could not find the lib/ directory \n"; + exit(1); + } -our $glob_win32_perl= ($^O eq "MSWin32"); # ActiveState Win32 Perl -our $glob_cygwin_perl= ($^O eq "cygwin"); # Cygwin Perl -our $glob_win32= ($glob_win32_perl or $glob_cygwin_perl); -our $glob_netware= ($^O eq "NetWare"); # NetWare + # Include settings that control how the script behaves + require "lib/mtr_settings.pl"; +} + + +use lib "lib"; +use Cwd; +use Getopt::Long; +use My::File::Path; # Patched version of File::Path +use File::Basename; +use File::Copy; +use File::Temp qw / tempdir /; +use My::SafeProcess; +use My::ConfigFactory; +use mtr_cases; + +our $is_win32_perl= ($^O eq "MSWin32"); # ActiveState Win32 Perl +our $is_cygwin= ($^O eq "cygwin"); # Cygwin Perl +our $is_win32= ($is_win32_perl or $is_cygwin); -require "lib/mtr_cases.pl"; -require "lib/mtr_im.pl"; require "lib/mtr_process.pl"; -require "lib/mtr_timer.pl"; require "lib/mtr_io.pl"; require "lib/mtr_gcov.pl"; -require "lib/mtr_gprof.pl"; require "lib/mtr_report.pl"; require "lib/mtr_match.pl"; require "lib/mtr_misc.pl"; -require "lib/mtr_stress.pl"; require "lib/mtr_unique.pl"; -$Devel::Trace::TRACE= 1; +$SIG{INT}= sub { mtr_error("Got ^C signal"); }; -############################################################################## -# -# Default settings -# -############################################################################## - -# Misc global variables our $mysql_version_id; -our $glob_mysql_test_dir= undef; -our $glob_mysql_bench_dir= undef; -our $glob_scriptname= undef; -our $glob_timers= undef; -our $glob_use_embedded_server= 0; -our @glob_test_mode; - -our $glob_basedir; +our $glob_mysql_test_dir; +our $basedir; our $path_charsetsdir; our $path_client_bindir; -our $path_share; our $path_language; our $path_timefile; -our $path_snapshot; -our $path_mysqltest_log; our $path_current_test_log; -our $path_my_basedir; -our $opt_vardir; # A path but set directly on cmd line -our $path_vardir_trace; # unix formatted opt_vardir for trace files -our $opt_tmpdir; # A path but set directly on cmd line +our $default_vardir; +our $opt_vardir; # Path to use for var/ dir +my $path_vardir_trace; # unix formatted opt_vardir for trace files +my $opt_tmpdir; # Path to use for tmp/ dir +my $path_config_file; # The generated config file, var/my.cnf # Visual Studio produces executables in different sub-directories based on the # configuration used to build them. To make life easier, an environment @@ -129,46 +86,21 @@ our $opt_tmpdir; # A path but set directly on cmd line # executables will be used by the test suite. our $opt_vs_config = $ENV{'MTR_VS_CONFIG'}; -our $default_vardir; +our $opt_suites= DEFAULT_SUITES; -our $opt_usage; -our $opt_suites= "main,binlog,rpl,rpl_ndb,ndb"; # Default suites to run - -our $opt_script_debug= 0; # Script debugging, enable with --script-debug our $opt_verbose= 0; # Verbose output, enable with --verbose -our $exe_master_mysqld; +my $exe_mysqld; our $exe_mysql; our $exe_mysqladmin; -our $exe_mysql_upgrade; -our $exe_mysqlbinlog; -our $exe_mysql_client_test; -our $exe_bug25714; -our $exe_mysqld; -our $exe_mysqlcheck; -our $exe_mysqldump; -our $exe_mysqlslap; -our $exe_mysqlimport; -our $exe_mysqlshow; -our $exe_mysql_fix_system_tables; -our $file_mysql_fix_privilege_tables; our $exe_mysqltest; our $exe_ndbd; -our $exe_ndb_mgmd; -our $exe_slave_mysqld; -our $exe_im; -our $exe_my_print_defaults; -our $exe_perror; -our $lib_udf_example; -our $lib_example_plugin; +our $exe_ndb_mgmd= ""; our $exe_libtool; -our $opt_bench= 0; -our $opt_small_bench= 0; our $opt_big_test= 0; our @opt_combinations; -our $opt_skip_combination; our @opt_extra_mysqld_opt; @@ -182,17 +114,16 @@ our $opt_cursor_protocol; our $opt_view_protocol; our $opt_debug; -our $opt_do_test; our @opt_cases; # The test cases names in argv -our $opt_embedded_server; +my $opt_embedded_server; -our $opt_extern= 0; -our $opt_socket; +# Options used when connecting to an already running server +my %opts_extern; +sub using_extern { return (keys %opts_extern > 0);}; -our $opt_fast; +our $opt_fast= 0; our $opt_force; our $opt_reorder= 0; -our $opt_enable_disabled; our $opt_mem= $ENV{'MTR_MEM'}; our $opt_gcov; @@ -207,102 +138,63 @@ our $opt_client_ddd; our $opt_manual_gdb; our $opt_manual_ddd; our $opt_manual_debug; -our $opt_mtr_build_thread=0; our $opt_debugger; our $opt_client_debugger; -our $opt_gprof; -our $opt_gprof_dir; -our $opt_gprof_master; -our $opt_gprof_slave; +my $config; # The currently running config +my $current_config_name; # The currently running config file template -our $master; -our $slave; -our $clusters; +my $opt_baseport; +my $opt_mtr_build_thread= $ENV{'MTR_BUILD_THREAD'} || "auto"; -our $instance_manager; - -our $opt_master_myport; -our $opt_slave_myport; -our $im_port; -our $im_mysqld1_port; -our $im_mysqld2_port; -our $opt_ndbcluster_port; -our $opt_ndbconnectstring; -our $opt_ndbcluster_port_slave; -our $opt_ndbconnectstring_slave; - -our $opt_record; +my $opt_record; my $opt_report_features; -our $opt_check_testcases; -our $opt_mark_progress; +my $opt_check_testcases; +my $opt_mark_progress; -our $opt_skip_rpl; -our $max_slave_num= 0; -our $max_master_num= 1; -our $use_innodb; -our $opt_skip_test; -our $opt_skip_im; +my $opt_sleep; -our $opt_sleep; +my $opt_testcase_timeout= 15; # 15 minutes +my $opt_suite_timeout = 180; # 3 hours +my $opt_shutdown_timeout= 10; # 10 seconds +my $opt_start_timeout = 30; # 30 seconds -our $opt_testcase_timeout; -our $opt_suite_timeout; -my $default_testcase_timeout= 15; # 15 min max -my $default_suite_timeout= 180; # 3 hours max +my $opt_start; +my $opt_start_dirty; -our $opt_start_and_exit; -our $opt_start_dirty; -our $opt_start_from; - -our $opt_strace_client; +my $opt_strace_client; our $opt_timer= 1; our $opt_user; -our $opt_valgrind= 0; -our $opt_valgrind_mysqld= 0; -our $opt_valgrind_mysqltest= 0; -our $default_valgrind_options= "--show-reachable=yes"; -our $opt_valgrind_options; -our $opt_valgrind_path; -our $opt_callgrind; +my $opt_valgrind= 0; +my $opt_valgrind_mysqld= 0; +my $opt_valgrind_mysqltest= 0; +my @default_valgrind_args= ("--show-reachable=yes"); +my @valgrind_args; +my $opt_valgrind_path; +my $opt_callgrind; -our $opt_stress= ""; -our $opt_stress_suite= "main"; -our $opt_stress_mode= "random"; -our $opt_stress_threads= 5; -our $opt_stress_test_count= 0; -our $opt_stress_loop_count= 0; -our $opt_stress_test_duration= 0; -our $opt_stress_init_file= ""; -our $opt_stress_test_file= ""; - -our $opt_warnings; +our $opt_warnings= 1; our $opt_skip_ndbcluster= 0; our $opt_skip_ndbcluster_slave= 0; our $opt_with_ndbcluster= 0; -our $opt_with_ndbcluster_only= 0; our $glob_ndbcluster_supported= 0; our $opt_ndb_extra_test= 0; our $opt_skip_master_binlog= 0; our $opt_skip_slave_binlog= 0; -our $exe_ndb_mgm; +our $exe_ndb_mgm=""; our $exe_ndb_waiter; -our $path_ndb_tools_dir; -our $path_ndb_examples_dir; -our $exe_ndb_example; +our $path_ndb_tools_dir= ""; +our $path_ndb_examples_dir= ""; +our $exe_ndb_example= ""; our $path_ndb_testrun_log; our $path_sql_dir; -our @data_dir_lst; - -our $used_binlog_format; -our $used_default_engine; our $debug_compiled_binaries; our %mysqld_variables; @@ -312,63 +204,17 @@ my $source_dist= 0; our $opt_max_save_core= 5; my $num_saved_cores= 0; # Number of core files saved in vardir/log/ so far. -###################################################################### -# -# Function declarations -# -###################################################################### - -sub main (); -sub initial_setup (); -sub command_line_setup (); -sub set_mtr_build_thread_ports($); -sub datadir_list_setup (); -sub executable_setup (); -sub environment_setup (); -sub kill_running_servers (); -sub remove_stale_vardir (); -sub setup_vardir (); -sub check_ssl_support ($); -sub check_running_as_root(); -sub check_ndbcluster_support ($); -sub rm_ndbcluster_tables ($); -sub ndbcluster_start_install ($); -sub ndbcluster_start ($$); -sub ndbcluster_wait_started ($$); -sub mysqld_wait_started($); -sub run_benchmarks ($); -sub initialize_servers (); -sub mysql_install_db (); -sub install_db ($$); -sub copy_install_db ($$); -sub run_testcase ($); -sub run_testcase_stop_servers ($$$); -sub run_testcase_start_servers ($); -sub run_testcase_check_skip_test($); -sub report_failure_and_restart ($); -sub do_before_start_master ($); -sub do_before_start_slave ($); -sub ndbd_start ($$$); -sub ndb_mgmd_start ($); -sub mysqld_start ($$$); -sub mysqld_arguments ($$$$); -sub stop_all_servers (); -sub run_mysqltest ($); -sub usage ($); - - -###################################################################### -# -# Main program -# -###################################################################### +select(STDOUT); +$| = 1; # Automatically flush STDOUT main(); -sub main () { +sub main { command_line_setup(); + mtr_report("Checking supported features..."); + check_ndbcluster_support(\%mysqld_variables); check_ssl_support(\%mysqld_variables); check_debug_support(\%mysqld_variables); @@ -376,133 +222,50 @@ sub main () { executable_setup(); environment_setup(); - signal_setup(); if ( $opt_gcov ) { gcov_prepare(); } - if ( $opt_gprof ) - { - gprof_prepare(); + # Figure out which tests we are going to run + mtr_report("Collecting tests..."); + my $tests= collect_test_cases($opt_suites); + + initialize_servers(); + + if ( $opt_report_features ) { + # Put "report features" as the first test to run + my $tinfo = {}; + $tinfo->{'name'} = 'report_features'; + $tinfo->{'result_file'} = undef; # Prints result + $tinfo->{'path'} = 'include/report-features.test'; + $tinfo->{'master_opt'} = []; + $tinfo->{'slave_opt'} = []; + unshift(@$tests, $tinfo); } - if ( $opt_bench ) - { - initialize_servers(); - run_benchmarks(shift); # Shift what? Extra arguments?! - } - elsif ( $opt_stress ) - { - initialize_servers(); - run_stress_test() - } - else - { - # Figure out which tests we are going to run - my $tests= collect_test_cases($opt_suites); - - # Turn off NDB and other similar options if no tests use it - my ($need_ndbcluster,$need_im); - foreach my $test (@$tests) - { - next if $test->{skip}; - - if (!$opt_extern) - { - $need_ndbcluster||= $test->{ndb_test}; - $need_im||= $test->{component_id} eq 'im'; - - # Count max number of slaves used by a test case - if ( $test->{slave_num} > $max_slave_num) { - $max_slave_num= $test->{slave_num}; - mtr_error("Too many slaves") if $max_slave_num > 3; - } - - # Count max number of masters used by a test case - if ( $test->{master_num} > $max_master_num) { - $max_master_num= $test->{master_num}; - mtr_error("Too many masters") if $max_master_num > 2; - mtr_error("Too few masters") if $max_master_num < 1; - } - } - $use_innodb||= $test->{'innodb_test'}; - } - - # Check if cluster can be skipped - if ( !$need_ndbcluster ) - { - $opt_skip_ndbcluster= 1; - $opt_skip_ndbcluster_slave= 1; - } - - # Check if slave cluster can be skipped - if ($max_slave_num == 0) - { - $opt_skip_ndbcluster_slave= 1; - } - - # Check if im can be skipped - if ( ! $need_im ) - { - $opt_skip_im= 1; - } - - initialize_servers(); - - if ( $opt_report_features ) { - run_report_features(); - } - - run_tests($tests); + if ( using_extern() ) { + create_config_file_for_extern(%opts_extern); } - mtr_exit(0); + run_tests($tests); + + exit(0); } -############################################################################## -# -# Default settings -# -############################################################################## - -sub command_line_setup () { - - # These are defaults for things that are set on the command line +sub command_line_setup { my $opt_comment; - - $opt_master_myport= 9306; - $opt_slave_myport= 9308; - $opt_ndbcluster_port= 9310; - $opt_ndbcluster_port_slave= 9311; - $im_port= 9312; - $im_mysqld1_port= 9313; - $im_mysqld2_port= 9314; - - # If so requested, we try to avail ourselves of a unique build thread number. - if ( $ENV{'MTR_BUILD_THREAD'} ) { - if ( lc($ENV{'MTR_BUILD_THREAD'}) eq 'auto' ) { - print "Requesting build thread... "; - $ENV{'MTR_BUILD_THREAD'} = mtr_require_unique_id_and_wait("/tmp/mysql-test-ports", 200, 299); - print "got ".$ENV{'MTR_BUILD_THREAD'}."\n"; - } - } - - if ( $ENV{'MTR_BUILD_THREAD'} ) - { - set_mtr_build_thread_ports($ENV{'MTR_BUILD_THREAD'}); - } + my $opt_usage; # This is needed for test log evaluation in "gen-build-status-page" # in all cases where the calling tool does not log the commands # directly before it executes them, like "make test-force-pl" in RPM builds. - print "Logging: $0 ", join(" ", @ARGV), "\n"; + mtr_report("Logging: $0 ", join(" ", @ARGV)); - # Read the command line + # Read the command line options # Note: Keep list, and the order, in sync with usage at end of this file - Getopt::Long::Configure("pass_through"); GetOptions( # Control what engine/variation to run @@ -514,38 +277,33 @@ sub command_line_setup () { 'ssl|with-openssl' => \$opt_ssl, 'skip-ssl' => \$opt_skip_ssl, 'compress' => \$opt_compress, - 'bench' => \$opt_bench, - 'small-bench' => \$opt_small_bench, 'with-ndbcluster|ndb' => \$opt_with_ndbcluster, - 'vs-config' => \$opt_vs_config, + 'vs-config' => \$opt_vs_config, + + # Config file to use as template for all tests + 'defaults-file=s' => \&collect_option, + # Extra config file to append to all generated configs + 'defaults-extra-file=s' => \&collect_option, # Control what test suites or cases to run 'force' => \$opt_force, - 'with-ndbcluster-only' => \$opt_with_ndbcluster_only, + 'with-ndbcluster-only' => \&collect_option, 'skip-ndbcluster|skip-ndb' => \$opt_skip_ndbcluster, 'skip-ndbcluster-slave|skip-ndb-slave' => \$opt_skip_ndbcluster_slave, 'ndb-extra-test' => \$opt_ndb_extra_test, 'skip-master-binlog' => \$opt_skip_master_binlog, 'skip-slave-binlog' => \$opt_skip_slave_binlog, - 'do-test=s' => \$opt_do_test, - 'start-from=s' => \$opt_start_from, 'suite|suites=s' => \$opt_suites, - 'skip-rpl' => \$opt_skip_rpl, - 'skip-im' => \$opt_skip_im, - 'skip-test=s' => \$opt_skip_test, + 'skip-rpl' => \&collect_option, + 'skip-test=s' => \&collect_option, + 'do-test=s' => \&collect_option, + 'start-from=s' => \&collect_option, 'big-test' => \$opt_big_test, - 'combination=s' => \@opt_combinations, - 'skip-combination' => \$opt_skip_combination, + 'combination=s' => \@opt_combinations, + 'skip-combination' => \&collect_option, # Specify ports - 'master_port=i' => \$opt_master_myport, - 'slave_port=i' => \$opt_slave_myport, - 'ndbcluster-port|ndbcluster_port=i' => \$opt_ndbcluster_port, - 'ndbcluster-port-slave=i' => \$opt_ndbcluster_port_slave, - 'im-port=i' => \$im_port, # Instance Manager port. - 'im-mysqld1-port=i' => \$im_mysqld1_port, # Port of mysqld, controlled by IM - 'im-mysqld2-port=i' => \$im_mysqld2_port, # Port of mysqld, controlled by IM 'mtr-build-thread=i' => \$opt_mtr_build_thread, # Test case authoring @@ -557,11 +315,10 @@ sub command_line_setup () { 'mysqld=s' => \@opt_extra_mysqld_opt, # Run test on running server - 'extern' => \$opt_extern, - 'ndb-connectstring=s' => \$opt_ndbconnectstring, - 'ndb-connectstring-slave=s' => \$opt_ndbconnectstring_slave, + 'extern=s' => \%opts_extern, # Append to hash # Debugging + 'debug' => \$opt_debug, 'gdb' => \$opt_gdb, 'client-gdb' => \$opt_client_gdb, 'manual-gdb' => \$opt_manual_gdb, @@ -571,82 +328,59 @@ sub command_line_setup () { 'manual-ddd' => \$opt_manual_ddd, 'debugger=s' => \$opt_debugger, 'client-debugger=s' => \$opt_client_debugger, - 'strace-client' => \$opt_strace_client, - 'master-binary=s' => \$exe_master_mysqld, - 'slave-binary=s' => \$exe_slave_mysqld, + 'strace-client:s' => \$opt_strace_client, 'max-save-core=i' => \$opt_max_save_core, # Coverage, profiling etc 'gcov' => \$opt_gcov, - 'gprof' => \$opt_gprof, 'valgrind|valgrind-all' => \$opt_valgrind, 'valgrind-mysqltest' => \$opt_valgrind_mysqltest, 'valgrind-mysqld' => \$opt_valgrind_mysqld, - 'valgrind-options=s' => \$opt_valgrind_options, + 'valgrind-options=s' => sub { + my ($opt, $value)= @_; + # Deprecated option unless it's what we know pushbuild uses + if ($value eq "--gen-suppressions=all --show-reachable=yes") { + push(@valgrind_args, $_) for (split(' ', $value)); + return; + } + die("--valgrind-options=s is deprecated. Use ", + "--valgrind-option=s, to be specified several", + " times if necessary"); + }, + 'valgrind-option=s' => \@valgrind_args, 'valgrind-path=s' => \$opt_valgrind_path, 'callgrind' => \$opt_callgrind, - # Stress testing - 'stress' => \$opt_stress, - 'stress-suite=s' => \$opt_stress_suite, - 'stress-threads=i' => \$opt_stress_threads, - 'stress-test-file=s' => \$opt_stress_test_file, - 'stress-init-file=s' => \$opt_stress_init_file, - 'stress-mode=s' => \$opt_stress_mode, - 'stress-loop-count=i' => \$opt_stress_loop_count, - 'stress-test-count=i' => \$opt_stress_test_count, - 'stress-test-duration=i' => \$opt_stress_test_duration, - # Directories 'tmpdir=s' => \$opt_tmpdir, 'vardir=s' => \$opt_vardir, - 'benchdir=s' => \$glob_mysql_bench_dir, 'mem' => \$opt_mem, # Misc 'report-features' => \$opt_report_features, 'comment=s' => \$opt_comment, - 'debug' => \$opt_debug, 'fast' => \$opt_fast, 'reorder' => \$opt_reorder, - 'enable-disabled' => \$opt_enable_disabled, - 'script-debug' => \$opt_script_debug, - 'verbose' => \$opt_verbose, + 'enable-disabled' => \&collect_option, + 'verbose+' => \$opt_verbose, 'sleep=i' => \$opt_sleep, - 'socket=s' => \$opt_socket, 'start-dirty' => \$opt_start_dirty, - 'start-and-exit' => \$opt_start_and_exit, + 'start' => \$opt_start, + 'print-testcases' => \&collect_option, +# TODO 'repeat' +# TODO 'retry' 'timer!' => \$opt_timer, 'user=s' => \$opt_user, 'testcase-timeout=i' => \$opt_testcase_timeout, 'suite-timeout=i' => \$opt_suite_timeout, - 'warnings|log-warnings' => \$opt_warnings, + 'shutdown-timeout=i' => \$opt_shutdown_timeout, + 'warnings!' => \$opt_warnings, 'help|h' => \$opt_usage, ) or usage("Can't read options"); usage("") if $opt_usage; - $glob_scriptname= basename($0); - - if ($opt_mtr_build_thread != 0) - { - set_mtr_build_thread_ports($opt_mtr_build_thread) - } - elsif ($ENV{'MTR_BUILD_THREAD'}) - { - $opt_mtr_build_thread= $ENV{'MTR_BUILD_THREAD'}; - } - - # We require that we are in the "mysql-test" directory - # to run mysql-test-run - if (! -f $glob_scriptname) - { - mtr_error("Can't find the location for the mysql-test-run script\n" . - "Go to to the mysql-test directory and execute the script " . - "as follows:\n./$glob_scriptname"); - } - if ( -d "../sql" ) { $source_dist= 1; @@ -654,69 +388,26 @@ sub command_line_setup () { # Find the absolute path to the test directory $glob_mysql_test_dir= cwd(); - if ( $glob_cygwin_perl ) + if ( $is_cygwin ) { # Windows programs like 'mysqld' needs Windows paths $glob_mysql_test_dir= `cygpath -m "$glob_mysql_test_dir"`; chomp($glob_mysql_test_dir); } - $default_vardir= "$glob_mysql_test_dir/var"; # In most cases, the base directory we find everything relative to, # is the parent directory of the "mysql-test" directory. For source # distributions, TAR binary distributions and some other packages. - $glob_basedir= dirname($glob_mysql_test_dir); + $basedir= dirname($glob_mysql_test_dir); # In the RPM case, binaries and libraries are installed in the # default system locations, instead of having our own private base # directory. And we install "/usr/share/mysql-test". Moving up one # more directory relative to "mysql-test" gives us a usable base # directory for RPM installs. - if ( ! $source_dist and ! -d "$glob_basedir/bin" ) + if ( ! $source_dist and ! -d "$basedir/bin" ) { - $glob_basedir= dirname($glob_basedir); - } - - # Expect mysql-bench to be located adjacent to the source tree, by default - $glob_mysql_bench_dir= "$glob_basedir/../mysql-bench" - unless defined $glob_mysql_bench_dir; - $glob_mysql_bench_dir= undef - unless -d $glob_mysql_bench_dir; - - $path_my_basedir= - $source_dist ? $glob_mysql_test_dir : $glob_basedir; - - $glob_timers= mtr_init_timers(); - - # -------------------------------------------------------------------------- - # Embedded server flag - # -------------------------------------------------------------------------- - if ( $opt_embedded_server ) - { - $glob_use_embedded_server= 1; - # Add the location for libmysqld.dll to the path. - if ( $glob_win32 ) - { - my $lib_mysqld= - mtr_path_exists(vs_config_dirs('libmysqld','')); - $lib_mysqld= $glob_cygwin_perl ? ":".`cygpath "$lib_mysqld"` - : ";".$lib_mysqld; - chomp($lib_mysqld); - $ENV{'PATH'}="$ENV{'PATH'}".$lib_mysqld; - } - - push(@glob_test_mode, "embedded"); - $opt_skip_rpl= 1; # We never run replication with embedded - $opt_skip_ndbcluster= 1; # Turn off use of NDB cluster - $opt_skip_ssl= 1; # Turn off use of SSL - - # Turn off use of bin log - push(@opt_extra_mysqld_opt, "--skip-log-bin"); - - if ( $opt_extern ) - { - mtr_error("Can't use --extern with --embedded-server"); - } + $basedir= dirname($basedir); } # @@ -725,51 +416,54 @@ sub command_line_setup () { # # Look for the client binaries directory - $path_client_bindir= mtr_path_exists("$glob_basedir/client_release", - "$glob_basedir/client_debug", + $path_client_bindir= mtr_path_exists("$basedir/client_release", + "$basedir/client_debug", vs_config_dirs('client', ''), - "$glob_basedir/client", - "$glob_basedir/bin"); + "$basedir/client", + "$basedir/bin"); # Look for language files and charsetsdir, use same share - $path_share= mtr_path_exists("$glob_basedir/share/mysql", - "$glob_basedir/sql/share", - "$glob_basedir/share"); + my $path_share= mtr_path_exists("$basedir/share/mysql", + "$basedir/sql/share", + "$basedir/share"); $path_language= mtr_path_exists("$path_share/english"); $path_charsetsdir= mtr_path_exists("$path_share/charsets"); - - if (!$opt_extern) + # Look for SQL scripts directory + if ( mtr_file_exists("$path_share/mysql_system_tables.sql") ne "") { - $exe_mysqld= mtr_exe_exists (vs_config_dirs('sql', 'mysqld'), - vs_config_dirs('sql', 'mysqld-debug'), - "$glob_basedir/sql/mysqld", - "$path_client_bindir/mysqld-max-nt", - "$path_client_bindir/mysqld-max", - "$path_client_bindir/mysqld-nt", - "$path_client_bindir/mysqld", - "$path_client_bindir/mysqld-debug", - "$path_client_bindir/mysqld-max", - "$glob_basedir/libexec/mysqld", - "$glob_basedir/bin/mysqld", - "$glob_basedir/sbin/mysqld"); - - # Use the mysqld found above to find out what features are available - collect_mysqld_features(); + # The SQL scripts are in path_share + $path_sql_dir= $path_share; } else { - $mysqld_variables{'port'}= 3306; - $mysqld_variables{'master-port'}= 3306; + $path_sql_dir= mtr_path_exists("$basedir/share", + "$basedir/scripts"); } + $exe_mysqld= mtr_exe_exists (vs_config_dirs('sql', 'mysqld'), + vs_config_dirs('sql', 'mysqld-debug'), + "$basedir/sql/mysqld", + "$path_client_bindir/mysqld-max-nt", + "$path_client_bindir/mysqld-max", + "$path_client_bindir/mysqld-nt", + "$path_client_bindir/mysqld", + "$path_client_bindir/mysqld-debug", + "$path_client_bindir/mysqld-max", + "$basedir/libexec/mysqld", + "$basedir/bin/mysqld", + "$basedir/sbin/mysqld"); + + # Use the mysqld found above to find out what features are available + collect_mysqld_features(); + if ( $opt_comment ) { - print "\n"; - print '#' x 78, "\n"; - print "# $opt_comment\n"; - print '#' x 78, "\n\n"; + mtr_report(); + mtr_print_thick_line('#'); + mtr_report("# $opt_comment"); + mtr_print_thick_line('#'); } foreach my $arg ( @ARGV ) @@ -797,22 +491,13 @@ sub command_line_setup () { # -------------------------------------------------------------------------- # Find out type of logging that are being used # -------------------------------------------------------------------------- - if (!$opt_extern && $mysql_version_id >= 50100 ) + foreach my $arg ( @opt_extra_mysqld_opt ) { - foreach my $arg ( @opt_extra_mysqld_opt ) + if ( $arg =~ /binlog[-_]format=(\S+)/ ) { - if ( $arg =~ /binlog[-_]format=(\S+)/ ) - { - $used_binlog_format= $1; - } - } - if (defined $used_binlog_format) - { - mtr_report("Using binlog format '$used_binlog_format'"); - } - else - { - mtr_report("Using dynamic switching of binlog format"); + # Save this for collect phase + collect_option('binlog-format', $1); + mtr_report("Using binlog format '$1'"); } } @@ -820,21 +505,15 @@ sub command_line_setup () { # -------------------------------------------------------------------------- # Find out default storage engine being used(if any) # -------------------------------------------------------------------------- - if ( $opt_with_ndbcluster ) - { - # --ndb or --with-ndbcluster turns on --default-storage-engine=ndbcluster - push(@opt_extra_mysqld_opt, "--default-storage-engine=ndbcluster"); - } - foreach my $arg ( @opt_extra_mysqld_opt ) { if ( $arg =~ /default-storage-engine=(\S+)/ ) { - $used_default_engine= $1; + # Save this for collect phase + collect_option('default-storage-engine', $1); + mtr_report("Using default engine '$1'") } } - mtr_report("Using default engine '$used_default_engine'") - if defined $used_default_engine; # -------------------------------------------------------------------------- # Check if we should speed up tests by trying to run on tmpfs @@ -855,7 +534,6 @@ sub command_line_setup () { { if ( -d $fs ) { - mtr_report("Using tmpfs in $fs"); $opt_mem= "$fs/var"; $opt_mem .= $opt_mtr_build_thread if $opt_mtr_build_thread; last; @@ -866,6 +544,7 @@ sub command_line_setup () { # -------------------------------------------------------------------------- # Set the "var/" directory, as it is the base for everything else # -------------------------------------------------------------------------- + $default_vardir= "$glob_mysql_test_dir/var"; if ( ! $opt_vardir ) { $opt_vardir= $default_vardir; @@ -876,7 +555,7 @@ sub command_line_setup () { # Version 4.1 and --vardir was specified # Only supported as a symlink from var/ # by setting up $opt_mem that symlink will be created - if ( ! $glob_win32 ) + if ( ! $is_win32 ) { # Only platforms that have native symlinks can use the vardir trick $opt_mem= $opt_vardir; @@ -892,12 +571,15 @@ sub command_line_setup () { # We make the path absolute, as the server will do a chdir() before usage unless ( $opt_vardir =~ m,^/, or - ($glob_win32 and $opt_vardir =~ m,^[a-z]:/,i) ) + ($is_win32 and $opt_vardir =~ m,^[a-z]:/,i) ) { # Make absolute path, relative test dir $opt_vardir= "$glob_mysql_test_dir/$opt_vardir"; } + # Location of my.cnf that all clients use + $path_config_file= "$opt_vardir/my.cnf"; + # -------------------------------------------------------------------------- # Set tmpdir # -------------------------------------------------------------------------- @@ -905,22 +587,10 @@ sub command_line_setup () { $opt_tmpdir =~ s,/+$,,; # Remove ending slash if any # -------------------------------------------------------------------------- - # Check im suport + # fast option # -------------------------------------------------------------------------- - if ($opt_extern) - { - mtr_report("Disable instance manager when running with extern mysqld"); - $opt_skip_im= 1; - } - elsif ( $mysql_version_id < 50000 ) - { - # Instance manager is not supported until 5.0 - $opt_skip_im= 1; - } - elsif ( $glob_win32 ) - { - mtr_report("Disable Instance manager - testing not supported on Windows"); - $opt_skip_im= 1; + if ($opt_fast){ + $opt_shutdown_timeout= 0; # Kill processes instead of nice shutdown } # -------------------------------------------------------------------------- @@ -931,25 +601,36 @@ sub command_line_setup () { mtr_error("Will not run in record mode without a specific test case"); } - if ( $opt_record ) + # -------------------------------------------------------------------------- + # Embedded server flag + # -------------------------------------------------------------------------- + if ( $opt_embedded_server ) { - $opt_skip_combination = 1; - } + $opt_embedded_server= 1; + if ( $is_win32 ) + { + # Add the location for libmysqld.dll to the path. + my $separator= ";"; + my $lib_mysqld= + mtr_path_exists(vs_config_dirs('libmysqld','')); + if ( $is_cygwin ) + { + $lib_mysqld= `cygpath "$lib_mysqld"`; + chomp($lib_mysqld); + $separator= ":"; + } + $ENV{'PATH'}= "$ENV{'PATH'}".$separator.$lib_mysqld; + } + $opt_skip_ndbcluster= 1; # Turn off use of NDB cluster + $opt_skip_ssl= 1; # Turn off use of SSL - # -------------------------------------------------------------------------- - # ps protcol flag - # -------------------------------------------------------------------------- - if ( $opt_ps_protocol ) - { - push(@glob_test_mode, "ps-protocol"); - } + # Turn off use of bin log + push(@opt_extra_mysqld_opt, "--skip-log-bin"); - # -------------------------------------------------------------------------- - # Bench flags - # -------------------------------------------------------------------------- - if ( $opt_small_bench ) - { - $opt_bench= 1; + if ( using_extern() ) + { + mtr_error("Can't use --extern with --embedded-server"); + } } # -------------------------------------------------------------------------- @@ -977,27 +658,27 @@ sub command_line_setup () { { # Indicate that we are using debugger $glob_debugger= 1; - if ( $opt_extern ) + if ( using_extern() ) { mtr_error("Can't use --extern when using debugger"); } } - # -------------------------------------------------------------------------- - # Check if special exe was selected for master or slave - # -------------------------------------------------------------------------- - $exe_master_mysqld= $exe_master_mysqld || $exe_mysqld; - $exe_slave_mysqld= $exe_slave_mysqld || $exe_mysqld; - # -------------------------------------------------------------------------- # Check valgrind arguments # -------------------------------------------------------------------------- - if ( $opt_valgrind or $opt_valgrind_path or defined $opt_valgrind_options) + if ( $opt_valgrind or $opt_valgrind_path or @valgrind_args) { mtr_report("Turning on valgrind for all executables"); $opt_valgrind= 1; $opt_valgrind_mysqld= 1; $opt_valgrind_mysqltest= 1; + + # Increase the timeouts when running with valgrind + $opt_testcase_timeout*= 10; + $opt_suite_timeout*= 6; + $opt_start_timeout*= 10; + } elsif ( $opt_valgrind_mysqld ) { @@ -1017,43 +698,23 @@ sub command_line_setup () { $opt_valgrind_mysqld= 1; # Set special valgrind options unless options passed on command line - $opt_valgrind_options="--trace-children=yes" - unless defined $opt_valgrind_options; + push(@valgrind_args, "--trace-children=yes") + unless @valgrind_args; } if ( $opt_valgrind ) { # Set valgrind_options to default unless already defined - $opt_valgrind_options=$default_valgrind_options - unless defined $opt_valgrind_options; + push(@valgrind_args, @default_valgrind_args) + unless @valgrind_args; - mtr_report("Running valgrind with options \"$opt_valgrind_options\""); - } - - if ( ! $opt_testcase_timeout ) - { - $opt_testcase_timeout= $default_testcase_timeout; - $opt_testcase_timeout*= 10 if $opt_valgrind; - $opt_testcase_timeout*= 10 if ($opt_debug and $glob_win32); - } - - if ( ! $opt_suite_timeout ) - { - $opt_suite_timeout= $default_suite_timeout; - $opt_suite_timeout*= 6 if $opt_valgrind; - $opt_suite_timeout*= 6 if ($opt_debug and $glob_win32); + mtr_report("Running valgrind with options \"", + join(" ", @valgrind_args), "\""); } if ( ! $opt_user ) { - if ( $opt_extern ) - { - $opt_user= "test"; - } - else - { - $opt_user= "root"; # We want to do FLUSH xxx commands - } + $opt_user= "root"; # We want to do FLUSH xxx commands } # On QNX, /tmp/dir/master.sock and /tmp/dir//master.sock seem to be @@ -1067,235 +728,18 @@ sub command_line_setup () { # socket path names. $sockdir = tempdir(CLEANUP => 0) if ( length($sockdir) >= 70 ); - $master->[0]= - { - pid => 0, - type => "master", - idx => 0, - path_myddir => "$opt_vardir/master-data", - path_myerr => "$opt_vardir/log/master.err", - path_pid => "$opt_vardir/run/master.pid", - path_sock => "$sockdir/master.sock", - port => $opt_master_myport, - start_timeout => 400, # enough time create innodb tables - cluster => 0, # index in clusters list - start_opts => [], - }; - - $master->[1]= - { - pid => 0, - type => "master", - idx => 1, - path_myddir => "$opt_vardir/master1-data", - path_myerr => "$opt_vardir/log/master1.err", - path_pid => "$opt_vardir/run/master1.pid", - path_sock => "$sockdir/master1.sock", - port => $opt_master_myport + 1, - start_timeout => 400, # enough time create innodb tables - cluster => 0, # index in clusters list - start_opts => [], - }; - - $slave->[0]= - { - pid => 0, - type => "slave", - idx => 0, - path_myddir => "$opt_vardir/slave-data", - path_myerr => "$opt_vardir/log/slave.err", - path_pid => "$opt_vardir/run/slave.pid", - path_sock => "$sockdir/slave.sock", - port => $opt_slave_myport, - start_timeout => 400, - - cluster => 1, # index in clusters list - start_opts => [], - }; - - $slave->[1]= - { - pid => 0, - type => "slave", - idx => 1, - path_myddir => "$opt_vardir/slave1-data", - path_myerr => "$opt_vardir/log/slave1.err", - path_pid => "$opt_vardir/run/slave1.pid", - path_sock => "$sockdir/slave1.sock", - port => $opt_slave_myport + 1, - start_timeout => 300, - cluster => -1, # index in clusters list - start_opts => [], - }; - - $slave->[2]= - { - pid => 0, - type => "slave", - idx => 2, - path_myddir => "$opt_vardir/slave2-data", - path_myerr => "$opt_vardir/log/slave2.err", - path_pid => "$opt_vardir/run/slave2.pid", - path_sock => "$sockdir/slave2.sock", - port => $opt_slave_myport + 2, - start_timeout => 300, - cluster => -1, # index in clusters list - start_opts => [], - }; - - $instance_manager= - { - path_err => "$opt_vardir/log/im.err", - path_log => "$opt_vardir/log/im.log", - path_pid => "$opt_vardir/run/im.pid", - path_angel_pid => "$opt_vardir/run/im.angel.pid", - path_sock => "$sockdir/im.sock", - port => $im_port, - start_timeout => $master->[0]->{'start_timeout'}, - admin_login => 'im_admin', - admin_password => 'im_admin_secret', - admin_sha1 => '*598D51AD2DFF7792045D6DF3DDF9AA1AF737B295', - password_file => "$opt_vardir/im.passwd", - defaults_file => "$opt_vardir/im.cnf", - }; - - $instance_manager->{'instances'}->[0]= - { - server_id => 1, - port => $im_mysqld1_port, - path_datadir => "$opt_vardir/im_mysqld_1.data", - path_sock => "$sockdir/mysqld_1.sock", - path_pid => "$opt_vardir/run/mysqld_1.pid", - start_timeout => 400, # enough time create innodb tables - old_log_format => 1 - }; - - $instance_manager->{'instances'}->[1]= - { - server_id => 2, - port => $im_mysqld2_port, - path_datadir => "$opt_vardir/im_mysqld_2.data", - path_sock => "$sockdir/mysqld_2.sock", - path_pid => "$opt_vardir/run/mysqld_2.pid", - nonguarded => 1, - start_timeout => 400, # enough time create innodb tables - old_log_format => 1 - }; - - my $data_dir= "$opt_vardir/ndbcluster-$opt_ndbcluster_port"; - $clusters->[0]= - { - name => "Master", - nodes => 2, - port => "$opt_ndbcluster_port", - data_dir => "$data_dir", - connect_string => "host=localhost:$opt_ndbcluster_port", - path_pid => "$data_dir/ndb_3.pid", # Nodes + 1 - pid => 0, # pid of ndb_mgmd - installed_ok => 0, - }; - - $data_dir= "$opt_vardir/ndbcluster-$opt_ndbcluster_port_slave"; - $clusters->[1]= - { - name => "Slave", - nodes => 1, - port => "$opt_ndbcluster_port_slave", - data_dir => "$data_dir", - connect_string => "host=localhost:$opt_ndbcluster_port_slave", - path_pid => "$data_dir/ndb_2.pid", # Nodes + 1 - pid => 0, # pid of ndb_mgmd - installed_ok => 0, - }; - - # Init pids of ndbd's - foreach my $cluster ( @{$clusters} ) - { - for ( my $idx= 0; $idx < $cluster->{'nodes'}; $idx++ ) - { - my $nodeid= $idx+1; - $cluster->{'ndbds'}->[$idx]= - { - pid => 0, - nodeid => $nodeid, - path_pid => "$cluster->{'data_dir'}/ndb_${nodeid}.pid", - path_fs => "$cluster->{'data_dir'}/ndb_${nodeid}_fs", - }; - } - } - - # -------------------------------------------------------------------------- - # extern - # -------------------------------------------------------------------------- - if ( $opt_extern ) - { - # Turn off features not supported when running with extern server - $opt_skip_rpl= 1; - $opt_skip_ndbcluster= 1; - - # Setup master->[0] with the settings for the extern server - $master->[0]->{'path_sock'}= $opt_socket ? $opt_socket : "/tmp/mysql.sock"; - mtr_report("Using extern server at '$master->[0]->{path_sock}'"); - } - else - { - mtr_error("--socket can only be used in combination with --extern") - if $opt_socket; - } - - - # -------------------------------------------------------------------------- - # ndbconnectstring and ndbconnectstring_slave - # -------------------------------------------------------------------------- - if ( $opt_ndbconnectstring ) - { - # ndbconnectstring was supplied by user, the tests shoudl be run - # against an already started cluster, change settings - my $cluster= $clusters->[0]; # Master cluster - $cluster->{'connect_string'}= $opt_ndbconnectstring; - $cluster->{'use_running'}= 1; - - mtr_error("Can't specify --ndb-connectstring and --skip-ndbcluster") - if $opt_skip_ndbcluster; - } - $ENV{'NDB_CONNECTSTRING'}= $clusters->[0]->{'connect_string'}; - - - if ( $opt_ndbconnectstring_slave ) - { - # ndbconnectstring-slave was supplied by user, the tests should be run - # agains an already started slave cluster, change settings - my $cluster= $clusters->[1]; # Slave cluster - $cluster->{'connect_string'}= $opt_ndbconnectstring_slave; - $cluster->{'use_running'}= 1; - - mtr_error("Can't specify ndb-connectstring_slave and " . - "--skip-ndbcluster-slave") - if $opt_skip_ndbcluster_slave; - } - - $path_timefile= "$opt_vardir/log/mysqltest-time"; - $path_mysqltest_log= "$opt_vardir/log/mysqltest.log"; $path_current_test_log= "$opt_vardir/log/current_test"; $path_ndb_testrun_log= "$opt_vardir/log/ndb_testrun.log"; - $path_snapshot= "$opt_tmpdir/snapshot_$opt_master_myport/"; + # -------------------------------------------------------------------------- + # Check mtr_build_thread and calculate baseport + # -------------------------------------------------------------------------- + set_mtr_build_thread_ports($opt_mtr_build_thread); - if ( $opt_valgrind and $opt_debug ) - { - # When both --valgrind and --debug is selected, send - # all output to the trace file, making it possible to - # see the exact location where valgrind complains - foreach my $mysqld (@{$master}, @{$slave}) - { - my $sidx= $mysqld->{idx} ? "$mysqld->{idx}" : ""; - $mysqld->{path_myerr}= - "$opt_vardir/log/" . $mysqld->{type} . "$sidx.trace"; - } - } } + # # To make it easier for different devs to work on the same host, # an environment variable can be used to control all ports. A small @@ -1311,70 +755,38 @@ sub command_line_setup () { # http://www.ncftp.com/ncftpd/doc/misc/ephemeral_ports.html # But a fairly safe range seems to be 5001 - 32767 # - sub set_mtr_build_thread_ports($) { - my $mtr_build_thread= shift; + my $mtr_build_thread= shift || 0; if ( lc($mtr_build_thread) eq 'auto' ) { print "Requesting build thread... "; - $ENV{'MTR_BUILD_THREAD'} = $mtr_build_thread = mtr_require_unique_id_and_wait("/tmp/mysql-test-ports", 200, 299); + $mtr_build_thread= + mtr_require_unique_id_and_wait("/tmp/mysql-test-ports", 200, 299); print "got ".$mtr_build_thread."\n"; } + $opt_mtr_build_thread= $mtr_build_thread; - # Up to two masters, up to three slaves - $opt_master_myport= $mtr_build_thread * 10 + 10000; # and 1 - $opt_slave_myport= $opt_master_myport + 2; # and 3 4 - $opt_ndbcluster_port= $opt_master_myport + 5; - $opt_ndbcluster_port_slave= $opt_master_myport + 6; - $im_port= $opt_master_myport + 7; - $im_mysqld1_port= $opt_master_myport + 8; - $im_mysqld2_port= $opt_master_myport + 9; - - if ( $opt_master_myport < 5001 or $opt_master_myport + 10 >= 32767 ) + # Calculate baseport + $opt_baseport= $mtr_build_thread * 10 + 10000; + if ( $opt_baseport < 5001 or $opt_baseport + 9 >= 32767 ) { mtr_error("MTR_BUILD_THREAD number results in a port", "outside 5001 - 32767", - "($opt_master_myport - $opt_master_myport + 10)"); + "($opt_baseport - $opt_baseport + 9)"); } + + mtr_report("Using MR_BUILD_THREAD $opt_mtr_build_thread,", + "with reserved ports $opt_baseport..".($opt_baseport+9)); + } -sub datadir_list_setup () { - - # Make a list of all data_dirs - for (my $idx= 0; $idx < $max_master_num; $idx++) - { - push(@data_dir_lst, $master->[$idx]->{'path_myddir'}); - } - - for (my $idx= 0; $idx < $max_slave_num; $idx++) - { - push(@data_dir_lst, $slave->[$idx]->{'path_myddir'}); - } - - unless ($opt_skip_im) - { - foreach my $instance (@{$instance_manager->{'instances'}}) - { - push(@data_dir_lst, $instance->{'path_datadir'}); - } - } -} - - -############################################################################## -# -# Set paths to various executable programs -# -############################################################################## - - -sub collect_mysqld_features () { +sub collect_mysqld_features { my $found_variable_list_start= 0; my $tmpdir= tempdir(CLEANUP => 0); # Directory removed by this function # - # Execute "mysqld --help --verbose" to get a list + # Execute "mysqld --no-defaults --help --verbose" to get a # list of all features and settings # # --no-defaults and --skip-grant-tables are to avoid loading @@ -1444,59 +856,12 @@ sub collect_mysqld_features () { } -sub run_query($$) { - my ($mysqld, $query)= @_; - - my $args; - mtr_init_args(\$args); - - mtr_add_arg($args, "--no-defaults"); - mtr_add_arg($args, "--user=%s", $opt_user); - mtr_add_arg($args, "--port=%d", $mysqld->{'port'}); - mtr_add_arg($args, "--socket=%s", $mysqld->{'path_sock'}); - mtr_add_arg($args, "--silent"); # Tab separated output - mtr_add_arg($args, "-e '%s'", $query); - - my $cmd= "$exe_mysql " . join(' ', @$args); - mtr_verbose("cmd: $cmd"); - return `$cmd`; -} - - -sub collect_mysqld_features_from_running_server () -{ - my $list= run_query($master->[0], "use mysql; SHOW VARIABLES"); - - foreach my $line (split('\n', $list)) - { - # Put variables into hash - if ( $line =~ /^([\S]+)[ \t]+(.*?)\r?$/ ) - { - print "$1=\"$2\"\n"; - $mysqld_variables{$1}= $2; - } - } -} - -sub executable_setup_im () { - - # Look for instance manager binary - mysqlmanager - $exe_im= - mtr_exe_maybe_exists( - "$glob_basedir/server-tools/instance-manager/mysqlmanager", - "$glob_basedir/libexec/mysqlmanager", - "$glob_basedir/bin/mysqlmanager", - "$glob_basedir/sbin/mysqlmanager"); - - return ($exe_im eq ""); -} - sub executable_setup_ndb () { # Look for ndb tols and binaries - my $ndb_path= mtr_file_exists("$glob_basedir/ndb", - "$glob_basedir/storage/ndb", - "$glob_basedir/bin"); + my $ndb_path= mtr_file_exists("$basedir/ndb", + "$basedir/storage/ndb", + "$basedir/bin"); $exe_ndbd= mtr_exe_maybe_exists("$ndb_path/src/kernel/ndbd", @@ -1528,6 +893,7 @@ sub executable_setup_ndb () { $exe_ndb_waiter eq ""); } + sub executable_setup () { # @@ -1545,104 +911,27 @@ sub executable_setup () { } } - # Look for my_print_defaults - $exe_my_print_defaults= - mtr_exe_exists(vs_config_dirs('extra', 'my_print_defaults'), - "$path_client_bindir/my_print_defaults", - "$glob_basedir/extra/my_print_defaults"); - - # Look for perror - $exe_perror= mtr_exe_exists(vs_config_dirs('extra', 'perror'), - "$glob_basedir/extra/perror", - "$path_client_bindir/perror"); # Look for the client binaries - $exe_mysqlcheck= mtr_exe_exists("$path_client_bindir/mysqlcheck"); - $exe_mysqldump= mtr_exe_exists("$path_client_bindir/mysqldump"); - $exe_mysqlimport= mtr_exe_exists("$path_client_bindir/mysqlimport"); - $exe_mysqlshow= mtr_exe_exists("$path_client_bindir/mysqlshow"); - $exe_mysqlbinlog= mtr_exe_exists("$path_client_bindir/mysqlbinlog"); $exe_mysqladmin= mtr_exe_exists("$path_client_bindir/mysqladmin"); $exe_mysql= mtr_exe_exists("$path_client_bindir/mysql"); - if (!$opt_extern) - { - # Look for SQL scripts directory - if ( mtr_file_exists("$path_share/mysql_system_tables.sql") ne "") - { - # The SQL scripts are in path_share - $path_sql_dir= $path_share; + if ( ! $opt_skip_ndbcluster and executable_setup_ndb()) { + mtr_warning("Could not find all required ndb binaries, " . + "all ndb tests will fail, use --skip-ndbcluster to " . + "skip testing it."); + + foreach my $cluster ( clusters()) { + $cluster->{"executable_setup_failed"}= 1; } - else - { - $path_sql_dir= mtr_path_exists("$glob_basedir/share", - "$glob_basedir/scripts"); - } - - if ( $mysql_version_id >= 50100 ) - { - $exe_mysqlslap= mtr_exe_exists("$path_client_bindir/mysqlslap"); - } - if ( $mysql_version_id >= 50000 and !$glob_use_embedded_server ) - { - $exe_mysql_upgrade= mtr_exe_exists("$path_client_bindir/mysql_upgrade") - } - else - { - $exe_mysql_upgrade= ""; - } - - if ( ! $glob_win32 ) - { - # Look for mysql_fix_system_table script - $exe_mysql_fix_system_tables= - mtr_script_exists("$glob_basedir/scripts/mysql_fix_privilege_tables", - "$path_client_bindir/mysql_fix_privilege_tables"); - } - - # Look for mysql_fix_privilege_tables.sql script - $file_mysql_fix_privilege_tables= - mtr_file_exists("$glob_basedir/scripts/mysql_fix_privilege_tables.sql", - "$glob_basedir/share/mysql_fix_privilege_tables.sql"); - - if ( ! $opt_skip_ndbcluster and executable_setup_ndb()) - { - mtr_warning("Could not find all required ndb binaries, " . - "all ndb tests will fail, use --skip-ndbcluster to " . - "skip testing it."); - - foreach my $cluster (@{$clusters}) - { - $cluster->{"executable_setup_failed"}= 1; - } - } - - if ( ! $opt_skip_im and executable_setup_im()) - { - mtr_warning("Could not find all required instance manager binaries, " . - "all im tests will fail, use --skip-im to " . - "continue without instance manager"); - $instance_manager->{"executable_setup_failed"}= 1; - } - - # Look for the udf_example library - $lib_udf_example= - mtr_file_exists(vs_config_dirs('sql', 'udf_example.dll'), - "$glob_basedir/sql/.libs/udf_example.so",); - - # Look for the ha_example library - $lib_example_plugin= - mtr_file_exists(vs_config_dirs('storage/example', 'ha_example.dll'), - "$glob_basedir/storage/example/.libs/ha_example.so",); - } # Look for mysqltest executable - if ( $glob_use_embedded_server ) + if ( $opt_embedded_server ) { $exe_mysqltest= mtr_exe_exists(vs_config_dirs('libmysqld/examples','mysqltest_embedded'), - "$glob_basedir/libmysqld/examples/mysqltest_embedded", + "$basedir/libmysqld/examples/mysqltest_embedded", "$path_client_bindir/mysqltest_embedded"); } else @@ -1650,119 +939,115 @@ sub executable_setup () { $exe_mysqltest= mtr_exe_exists("$path_client_bindir/mysqltest"); } - # Look for mysql_client_test executable which may _not_ exist in - # some versions, test using it should be skipped - if ( $glob_use_embedded_server ) - { - $exe_mysql_client_test= - mtr_exe_maybe_exists( - vs_config_dirs('libmysqld/examples', 'mysql_client_test_embedded'), - "$glob_basedir/libmysqld/examples/mysql_client_test_embedded"); - } - else - { - $exe_mysql_client_test= - mtr_exe_maybe_exists(vs_config_dirs('tests', 'mysql_client_test'), - "$glob_basedir/tests/mysql_client_test", - "$glob_basedir/bin/mysql_client_test"); - } - - # Look for bug25714 executable which may _not_ exist in - # some versions, test using it should be skipped - $exe_bug25714= - mtr_exe_maybe_exists(vs_config_dirs('tests', 'bug25714'), - "$glob_basedir/tests/bug25714"); } -sub generate_cmdline_mysqldump ($) { - my($mysqld) = @_; - return - mtr_native_path($exe_mysqldump) . - " --no-defaults -uroot --debug-check " . - "--port=$mysqld->{'port'} " . - "--socket=$mysqld->{'path_sock'} --password="; + +sub client_debug_arg($$) { + my ($args, $client_name)= @_; + + if ( $opt_debug ) { + mtr_add_arg($args, + "--debug=d:t:A,%s/log/%s.trace", + $path_vardir_trace, $client_name) + } } -############################################################################## -# -# Set environment to be used by childs of this process for -# things that are constant duting the whole lifetime of mysql-test-run.pl -# -############################################################################## +sub mysql_fix_arguments () { -sub mysql_client_test_arguments() -{ - my $exe= $exe_mysql_client_test; + return "" if ( $is_win32 ); + + my $exe= + mtr_script_exists("$basedir/scripts/mysql_fix_privilege_tables", + "$path_client_bindir/mysql_fix_privilege_tables"); + my $args; + mtr_init_args(\$args); + mtr_add_arg($args, "--defaults-file=%s", $path_config_file); + + mtr_add_arg($args, "--basedir=", $basedir); + mtr_add_arg($args, "--bindir=", $path_client_bindir); + mtr_add_arg($args, "--verbose"); + return mtr_args2str($exe, @$args); +} + + +sub client_arguments ($) { + my $client_name= shift; + my $client_exe= mtr_exe_exists("$path_client_bindir/$client_name"); my $args; mtr_init_args(\$args); - if ( $opt_valgrind_mysqltest ) - { + mtr_add_arg($args, "--defaults-file=%s", $path_config_file); + client_debug_arg($args, $client_name); + return mtr_args2str($client_exe, @$args); +} + + +sub mysqlslap_arguments () { + my $exe= mtr_exe_maybe_exists("$path_client_bindir/mysqlslap"); + if ( $exe eq "" ) { + # mysqlap was not found + + if (defined $mysql_version_id and $mysql_version_id >= 50100 ) { + mtr_error("Could not find the mysqlslap binary"); + } + return ""; # Don't care about mysqlslap + } + + my $args; + mtr_init_args(\$args); + mtr_add_arg($args, "--defaults-file=%s", $path_config_file); + client_debug_arg($args, "mysqlslap"); + return mtr_args2str($exe, @$args); +} + + +sub mysqldump_arguments ($) { + my($group_suffix) = @_; + my $exe= mtr_exe_exists("$path_client_bindir/mysqldump"); + + my $args; + mtr_init_args(\$args); + mtr_add_arg($args, "--defaults-file=%s", $path_config_file); + mtr_add_arg($args, "--defaults-group-suffix=_%s", $group_suffix); + client_debug_arg($args, "mysqldump-$group_suffix"); + return mtr_args2str($exe, @$args); +} + + +sub mysql_client_test_arguments(){ + my $exe; + # mysql_client_test executable may _not_ exist + if ( $opt_embedded_server ) { + $exe= mtr_exe_maybe_exists( + vs_config_dirs('libmysqld/examples','mysql_client_test_embedded'), + "$basedir/libmysqld/examples/mysql_client_test_embedded"); + } else { + $exe= mtr_exe_maybe_exists(vs_config_dirs('tests', 'mysql_client_test'), + "$basedir/tests/mysql_client_test", + "$basedir/bin/mysql_client_test"); + } + + my $args; + mtr_init_args(\$args); + if ( $opt_valgrind_mysqltest ) { valgrind_arguments($args, \$exe); } - - mtr_add_arg($args, "--no-defaults"); + mtr_add_arg($args, "--defaults-file=%s", $path_config_file); mtr_add_arg($args, "--testcase"); - mtr_add_arg($args, "--user=root"); - mtr_add_arg($args, "--port=$master->[0]->{'port'}"); - mtr_add_arg($args, "--socket=$master->[0]->{'path_sock'}"); + mtr_add_arg($args, "--vardir=$opt_vardir"); + client_debug_arg($args,"mysql_client_test"); - if ( $opt_extern || $mysql_version_id >= 50000 ) - { - mtr_add_arg($args, "--vardir=$opt_vardir") - } - - if ( $opt_debug ) - { - mtr_add_arg($args, - "--debug=d:t:A,$path_vardir_trace/log/mysql_client_test.trace"); - } - - if ( $glob_use_embedded_server ) - { - mtr_add_arg($args, - " -A --language=$path_language"); - mtr_add_arg($args, - " -A --datadir=$slave->[0]->{'path_myddir'}"); - mtr_add_arg($args, - " -A --character-sets-dir=$path_charsetsdir"); - } - - return join(" ", $exe, @$args); + return mtr_args2str($exe, @$args); } -sub mysql_upgrade_arguments() -{ - my $exe= $exe_mysql_upgrade; - my $args; - mtr_init_args(\$args); -# if ( $opt_valgrind_mysql_ugrade ) -# { -# valgrind_arguments($args, \$exe); -# } - - mtr_add_arg($args, "--no-defaults"); - mtr_add_arg($args, "--user=root"); - mtr_add_arg($args, "--port=$master->[0]->{'port'}"); - mtr_add_arg($args, "--socket=$master->[0]->{'path_sock'}"); - mtr_add_arg($args, "--datadir=$master->[0]->{'path_myddir'}"); - mtr_add_arg($args, "--basedir=$glob_basedir"); - - if ( $opt_debug ) - { - mtr_add_arg($args, - "--debug=d:t:A,$path_vardir_trace/log/mysql_upgrade.trace"); - } - - return join(" ", $exe, @$args); -} - -# Note that some env is setup in spawn/run, in "mtr_process.pl" - -sub environment_setup () { +# +# Set environment to be used by childs of this process for +# things that are constant during the whole lifetime of mysql-test-run +# +sub environment_setup { umask(022); @@ -1774,21 +1059,52 @@ sub environment_setup () { # -------------------------------------------------------------------------- if ( $source_dist ) { - push(@ld_library_paths, "$glob_basedir/libmysql/.libs/", - "$glob_basedir/libmysql_r/.libs/", - "$glob_basedir/zlib.libs/"); + push(@ld_library_paths, "$basedir/libmysql/.libs/", + "$basedir/libmysql_r/.libs/", + "$basedir/zlib.libs/"); } else { - push(@ld_library_paths, "$glob_basedir/lib"); + push(@ld_library_paths, "$basedir/lib"); } - # -------------------------------------------------------------------------- + # -------------------------------------------------------------------------- # Add the path where libndbclient can be found # -------------------------------------------------------------------------- if ( $glob_ndbcluster_supported ) { - push(@ld_library_paths, "$glob_basedir/storage/ndb/src/.libs"); + push(@ld_library_paths, "$basedir/storage/ndb/src/.libs"); + } + + # -------------------------------------------------------------------------- + # Add the path where mysqld will find udf_example.so + # -------------------------------------------------------------------------- + my $lib_udf_example= + mtr_file_exists(vs_config_dirs('sql', 'udf_example.dll'), + "$basedir/sql/.libs/udf_example.so",); + + if ( $lib_udf_example ) + { + push(@ld_library_paths, dirname($lib_udf_example)); + } + + $ENV{'UDF_EXAMPLE_LIB'}= + ($lib_udf_example ? basename($lib_udf_example) : ""); + $ENV{'UDF_EXAMPLE_LIB_OPT'}= + ($lib_udf_example ? "--plugin_dir=" . dirname($lib_udf_example) : ""); + + # -------------------------------------------------------------------------- + # Add the path where mysqld will find ha_example.so + # -------------------------------------------------------------------------- + if ($mysql_version_id >= 50100) { + my $lib_example_plugin= + mtr_file_exists(vs_config_dirs('storage/example', 'ha_example.dll'), + "$basedir/storage/example/.libs/ha_example.so",); + $ENV{'EXAMPLE_PLUGIN'}= + ($lib_example_plugin ? basename($lib_example_plugin) : ""); + $ENV{'EXAMPLE_PLUGIN_OPT'}= + ($lib_example_plugin ? + "--plugin_dir=" . dirname($lib_example_plugin) : ""); } # -------------------------------------------------------------------------- @@ -1805,7 +1121,8 @@ sub environment_setup () { my $deb_version; if ( $opt_valgrind and -d $debug_libraries_path and (! -e '/etc/debian_version' or - ($deb_version= mtr_grab_file('/etc/debian_version')) !~ /^[0-9]+\.[0-9]$/ or + ($deb_version= + mtr_grab_file('/etc/debian_version')) !~ /^[0-9]+\.[0-9]$/ or $deb_version > 3.1 ) ) { push(@ld_library_paths, $debug_libraries_path); @@ -1833,14 +1150,10 @@ sub environment_setup () { split(':', $ENV{'LIBPATH'}) : ()); mtr_debug("LIBPATH: $ENV{'LIBPATH'}"); - # -------------------------------------------------------------------------- - # Also command lines in .opt files may contain env vars - # -------------------------------------------------------------------------- - $ENV{'CHARSETSDIR'}= $path_charsetsdir; $ENV{'UMASK'}= "0660"; # The octal *string* $ENV{'UMASK_DIR'}= "0770"; # The octal *string* - + # # MySQL tests can produce output in various character sets # (especially, ctype_xxx.test). To avoid confusing Perl @@ -1851,289 +1164,75 @@ sub environment_setup () { # $ENV{'LC_ALL'}= "C"; $ENV{'LC_CTYPE'}= "C"; - + $ENV{'LC_COLLATE'}= "C"; - $ENV{'USE_RUNNING_SERVER'}= $opt_extern; + $ENV{'USE_RUNNING_SERVER'}= using_extern(); $ENV{'MYSQL_TEST_DIR'}= $glob_mysql_test_dir; $ENV{'MYSQLTEST_VARDIR'}= $opt_vardir; - $ENV{'MYSQL_TMP_DIR'}= $opt_tmpdir; - $ENV{'MASTER_MYSOCK'}= $master->[0]->{'path_sock'}; - $ENV{'MASTER_MYSOCK1'}= $master->[1]->{'path_sock'}; - $ENV{'MASTER_MYPORT'}= $master->[0]->{'port'}; - $ENV{'MASTER_MYPORT1'}= $master->[1]->{'port'}; - $ENV{'SLAVE_MYSOCK'}= $slave->[0]->{'path_sock'}; - $ENV{'SLAVE_MYPORT'}= $slave->[0]->{'port'}; - $ENV{'SLAVE_MYPORT1'}= $slave->[1]->{'port'}; - $ENV{'SLAVE_MYPORT2'}= $slave->[2]->{'port'}; - $ENV{'MYSQL_TCP_PORT'}= $mysqld_variables{'port'}; - $ENV{'DEFAULT_MASTER_PORT'}= $mysqld_variables{'master-port'}; - - $ENV{'IM_PATH_SOCK'}= $instance_manager->{path_sock}; - $ENV{'IM_USERNAME'}= $instance_manager->{admin_login}; - $ENV{'IM_PASSWORD'}= $instance_manager->{admin_password}; - $ENV{MTR_BUILD_THREAD}= $opt_mtr_build_thread; - - $ENV{'EXE_MYSQL'}= $exe_mysql; - + $ENV{'DEFAULT_MASTER_PORT'}= $mysqld_variables{'master-port'} || 3306; # ---------------------------------------------------- # Setup env for NDB # ---------------------------------------------------- - if ( ! $opt_skip_ndbcluster ) - { - $ENV{'NDB_MGM'}= $exe_ndb_mgm; - - $ENV{'NDBCLUSTER_PORT'}= $opt_ndbcluster_port; - $ENV{'NDBCLUSTER_PORT_SLAVE'}= $opt_ndbcluster_port_slave; - - $ENV{'NDB_EXTRA_TEST'}= $opt_ndb_extra_test; - - $ENV{'NDB_BACKUP_DIR'}= $clusters->[0]->{'data_dir'}; - $ENV{'NDB_DATA_DIR'}= $clusters->[0]->{'data_dir'}; - $ENV{'NDB_TOOLS_DIR'}= $path_ndb_tools_dir; - $ENV{'NDB_TOOLS_OUTPUT'}= $path_ndb_testrun_log; - - if ( $mysql_version_id >= 50000 ) - { - $ENV{'NDB_EXAMPLES_DIR'}= $path_ndb_examples_dir; - $ENV{'MY_NDB_EXAMPLES_BINARY'}= $exe_ndb_example; - } - $ENV{'NDB_EXAMPLES_OUTPUT'}= $path_ndb_testrun_log; - } + $ENV{'NDB_MGM'}= $exe_ndb_mgm; + $ENV{'NDB_EXTRA_TEST'}= $opt_ndb_extra_test; + $ENV{'NDB_TOOLS_DIR'}= $path_ndb_tools_dir; + $ENV{'NDB_TOOLS_OUTPUT'}= $path_ndb_testrun_log; + $ENV{'NDB_EXAMPLES_DIR'}= $path_ndb_examples_dir; + $ENV{'NDB_EXAMPLES_BINARY'}= $exe_ndb_example; + $ENV{'NDB_EXAMPLES_OUTPUT'}= $path_ndb_testrun_log; # ---------------------------------------------------- - # Setup env for IM + # mysql clients # ---------------------------------------------------- - if ( ! $opt_skip_im ) - { - $ENV{'IM_EXE'}= $exe_im; - $ENV{'IM_PATH_PID'}= $instance_manager->{path_pid}; - $ENV{'IM_PATH_ANGEL_PID'}= $instance_manager->{path_angel_pid}; - $ENV{'IM_PORT'}= $instance_manager->{port}; - $ENV{'IM_DEFAULTS_PATH'}= $instance_manager->{defaults_file}; - $ENV{'IM_PASSWORD_PATH'}= $instance_manager->{password_file}; - - $ENV{'IM_MYSQLD1_SOCK'}= - $instance_manager->{instances}->[0]->{path_sock}; - $ENV{'IM_MYSQLD1_PORT'}= - $instance_manager->{instances}->[0]->{port}; - $ENV{'IM_MYSQLD1_PATH_PID'}= - $instance_manager->{instances}->[0]->{path_pid}; - $ENV{'IM_MYSQLD2_SOCK'}= - $instance_manager->{instances}->[1]->{path_sock}; - $ENV{'IM_MYSQLD2_PORT'}= - $instance_manager->{instances}->[1]->{port}; - $ENV{'IM_MYSQLD2_PATH_PID'}= - $instance_manager->{instances}->[1]->{path_pid}; - } + $ENV{'MYSQL_CHECK'}= client_arguments("mysqlcheck"); + $ENV{'MYSQL_DUMP'}= mysqldump_arguments(".1"); + $ENV{'MYSQL_DUMP_SLAVE'}= mysqldump_arguments(".2"); + $ENV{'MYSQL_SLAP'}= mysqlslap_arguments(); + $ENV{'MYSQL_IMPORT'}= client_arguments("mysqlimport"); + $ENV{'MYSQL_SHOW'}= client_arguments("mysqlshow"); + $ENV{'MYSQL_BINLOG'}= client_arguments("mysqlbinlog"); + $ENV{'MYSQL'}= client_arguments("mysql"); + $ENV{'MYSQL_UPGRADE'}= client_arguments("mysql_upgrade"); + $ENV{'MYSQLADMIN'}= mtr_native_path($exe_mysqladmin); + $ENV{'MYSQL_CLIENT_TEST'}= mysql_client_test_arguments(); + $ENV{'MYSQL_FIX_SYSTEM_TABLES'}= mysql_fix_arguments(); + $ENV{'EXE_MYSQL'}= $exe_mysql; # ---------------------------------------------------- - # Setup env so childs can execute mysqlcheck + # bug25714 executable may _not_ exist in + # some versions, test using it should be skipped # ---------------------------------------------------- - my $cmdline_mysqlcheck= - mtr_native_path($exe_mysqlcheck) . - " --no-defaults --debug-check -uroot " . - "--port=$master->[0]->{'port'} " . - "--socket=$master->[0]->{'path_sock'} --password="; - - if ( $opt_debug ) - { - $cmdline_mysqlcheck .= - " --debug=d:t:A,$path_vardir_trace/log/mysqlcheck.trace"; - } - $ENV{'MYSQL_CHECK'}= $cmdline_mysqlcheck; + my $exe_bug25714= + mtr_exe_maybe_exists(vs_config_dirs('tests', 'bug25714'), + "$basedir/tests/bug25714"); + $ENV{'MYSQL_BUG25714'}= mtr_native_path($exe_bug25714); # ---------------------------------------------------- - # Setup env to childs can execute myqldump + # mysql_fix_privilege_tables.sql # ---------------------------------------------------- - my $cmdline_mysqldump= generate_cmdline_mysqldump($master->[0]); - my $cmdline_mysqldumpslave= generate_cmdline_mysqldump($slave->[0]); - - if ( $opt_debug ) - { - $cmdline_mysqldump .= - " --debug=d:t:A,$path_vardir_trace/log/mysqldump-master.trace"; - $cmdline_mysqldumpslave .= - " --debug=d:t:A,$path_vardir_trace/log/mysqldump-slave.trace"; - } - $ENV{'MYSQL_DUMP'}= $cmdline_mysqldump; - $ENV{'MYSQL_DUMP_SLAVE'}= $cmdline_mysqldumpslave; - - - # ---------------------------------------------------- - # Setup env so childs can execute mysqlslap - # ---------------------------------------------------- - if ( $exe_mysqlslap ) - { - my $cmdline_mysqlslap= - mtr_native_path($exe_mysqlslap) . - " -uroot " . - "--port=$master->[0]->{'port'} " . - "--socket=$master->[0]->{'path_sock'} --password= "; - - if ( $opt_debug ) - { - $cmdline_mysqlslap .= - " --debug=d:t:A,$path_vardir_trace/log/mysqlslap.trace"; - } - $ENV{'MYSQL_SLAP'}= $cmdline_mysqlslap; - } - - # ---------------------------------------------------- - # Setup env so childs can execute mysqlimport - # ---------------------------------------------------- - my $cmdline_mysqlimport= - mtr_native_path($exe_mysqlimport) . - " -uroot --debug-check " . - "--port=$master->[0]->{'port'} " . - "--socket=$master->[0]->{'path_sock'} --password="; - - if ( $opt_debug ) - { - $cmdline_mysqlimport .= - " --debug=d:t:A,$path_vardir_trace/log/mysqlimport.trace"; - } - $ENV{'MYSQL_IMPORT'}= $cmdline_mysqlimport; - - - # ---------------------------------------------------- - # Setup env so childs can execute mysqlshow - # ---------------------------------------------------- - my $cmdline_mysqlshow= - mtr_native_path($exe_mysqlshow) . - " -uroot --debug-check " . - "--port=$master->[0]->{'port'} " . - "--socket=$master->[0]->{'path_sock'} --password="; - - if ( $opt_debug ) - { - $cmdline_mysqlshow .= - " --debug=d:t:A,$path_vardir_trace/log/mysqlshow.trace"; - } - $ENV{'MYSQL_SHOW'}= $cmdline_mysqlshow; - - # ---------------------------------------------------- - # Setup env so childs can execute mysqlbinlog - # ---------------------------------------------------- - my $cmdline_mysqlbinlog= - mtr_native_path($exe_mysqlbinlog) . - " --no-defaults --disable-force-if-open --debug-check"; - if ( !$opt_extern && $mysql_version_id >= 50000 ) - { - $cmdline_mysqlbinlog .=" --character-sets-dir=$path_charsetsdir"; - } - - if ( $opt_debug ) - { - $cmdline_mysqlbinlog .= - " --debug=d:t:A,$path_vardir_trace/log/mysqlbinlog.trace"; - } - $ENV{'MYSQL_BINLOG'}= $cmdline_mysqlbinlog; - - # ---------------------------------------------------- - # Setup env so childs can execute mysql - # ---------------------------------------------------- - my $cmdline_mysql= - mtr_native_path($exe_mysql) . - " --no-defaults --debug-check --host=localhost --user=root --password= " . - "--port=$master->[0]->{'port'} " . - "--socket=$master->[0]->{'path_sock'} ". - "--character-sets-dir=$path_charsetsdir"; - - $ENV{'MYSQL'}= $cmdline_mysql; - - # ---------------------------------------------------- - # Setup env so childs can execute bug25714 - # ---------------------------------------------------- - $ENV{'MYSQL_BUG25714'}= $exe_bug25714; - - # ---------------------------------------------------- - # Setup env so childs can execute mysql_client_test - # ---------------------------------------------------- - $ENV{'MYSQL_CLIENT_TEST'}= mysql_client_test_arguments(); - - # ---------------------------------------------------- - # Setup env so childs can execute mysql_upgrade - # ---------------------------------------------------- - if ( !$opt_extern && $mysql_version_id >= 50000 ) - { - $ENV{'MYSQL_UPGRADE'}= mysql_upgrade_arguments(); - } - - # ---------------------------------------------------- - # Setup env so childs can execute mysql_fix_system_tables - # ---------------------------------------------------- - if ( !$opt_extern && ! $glob_win32 ) - { - my $cmdline_mysql_fix_system_tables= - "$exe_mysql_fix_system_tables --no-defaults --host=localhost " . - "--user=root --password= " . - "--basedir=$glob_basedir --bindir=$path_client_bindir --verbose " . - "--port=$master->[0]->{'port'} " . - "--socket=$master->[0]->{'path_sock'}"; - $ENV{'MYSQL_FIX_SYSTEM_TABLES'}= $cmdline_mysql_fix_system_tables; - - } + my $file_mysql_fix_privilege_tables= + mtr_file_exists("$basedir/scripts/mysql_fix_privilege_tables.sql", + "$basedir/share/mysql_fix_privilege_tables.sql"); $ENV{'MYSQL_FIX_PRIVILEGE_TABLES'}= $file_mysql_fix_privilege_tables; # ---------------------------------------------------- - # Setup env so childs can execute my_print_defaults + # my_print_defaults # ---------------------------------------------------- + my $exe_my_print_defaults= + mtr_exe_exists(vs_config_dirs('extra', 'my_print_defaults'), + "$path_client_bindir/my_print_defaults", + "$basedir/extra/my_print_defaults"); $ENV{'MYSQL_MY_PRINT_DEFAULTS'}= mtr_native_path($exe_my_print_defaults); # ---------------------------------------------------- - # Setup env so childs can execute mysqladmin - # ---------------------------------------------------- - $ENV{'MYSQLADMIN'}= mtr_native_path($exe_mysqladmin); - - # ---------------------------------------------------- - # Setup env so childs can execute perror + # perror # ---------------------------------------------------- + my $exe_perror= mtr_exe_exists(vs_config_dirs('extra', 'perror'), + "$basedir/extra/perror", + "$path_client_bindir/perror"); $ENV{'MY_PERROR'}= mtr_native_path($exe_perror); - # ---------------------------------------------------- - # Add the path where mysqld will find udf_example.so - # ---------------------------------------------------- - $ENV{'UDF_EXAMPLE_LIB'}= - ($lib_udf_example ? basename($lib_udf_example) : ""); - $ENV{'UDF_EXAMPLE_LIB_OPT'}= - ($lib_udf_example ? "--plugin_dir=" . dirname($lib_udf_example) : ""); - - # ---------------------------------------------------- - # Add the path where mysqld will find ha_example.so - # ---------------------------------------------------- - $ENV{'EXAMPLE_PLUGIN'}= - ($lib_example_plugin ? basename($lib_example_plugin) : ""); - $ENV{'EXAMPLE_PLUGIN_OPT'}= - ($lib_example_plugin ? "--plugin_dir=" . dirname($lib_example_plugin) : ""); - - # ---------------------------------------------------- - # We are nice and report a bit about our settings - # ---------------------------------------------------- - if (!$opt_extern) - { - print "Using MTR_BUILD_THREAD = $ENV{MTR_BUILD_THREAD}\n"; - print "Using MASTER_MYPORT = $ENV{MASTER_MYPORT}\n"; - print "Using MASTER_MYPORT1 = $ENV{MASTER_MYPORT1}\n"; - print "Using SLAVE_MYPORT = $ENV{SLAVE_MYPORT}\n"; - print "Using SLAVE_MYPORT1 = $ENV{SLAVE_MYPORT1}\n"; - print "Using SLAVE_MYPORT2 = $ENV{SLAVE_MYPORT2}\n"; - if ( ! $opt_skip_ndbcluster ) - { - print "Using NDBCLUSTER_PORT = $ENV{NDBCLUSTER_PORT}\n"; - if ( ! $opt_skip_ndbcluster_slave ) - { - print "Using NDBCLUSTER_PORT_SLAVE = $ENV{NDBCLUSTER_PORT_SLAVE}\n"; - } - } - if ( ! $opt_skip_im ) - { - print "Using IM_PORT = $ENV{IM_PORT}\n"; - print "Using IM_MYSQLD1_PORT = $ENV{IM_MYSQLD1_PORT}\n"; - print "Using IM_MYSQLD2_PORT = $ENV{IM_MYSQLD2_PORT}\n"; - } - } - # Create an environment variable to make it possible # to detect that valgrind is being used from test cases $ENV{'VALGRIND_TEST'}= $opt_valgrind; @@ -2141,52 +1240,6 @@ sub environment_setup () { } -############################################################################## -# -# If we get a ^C, we try to clean up before termination -# -############################################################################## -# FIXME check restrictions what to do in a signal handler - -sub signal_setup () { - $SIG{INT}= \&handle_int_signal; -} - - -sub handle_int_signal () { - $SIG{INT}= 'DEFAULT'; # If we get a ^C again, we die... - mtr_warning("got INT signal, cleaning up....."); - stop_all_servers(); - mtr_error("We die from ^C signal from user"); -} - - -############################################################################## -# -# Handle left overs from previous runs -# -############################################################################## - -sub kill_running_servers () { - - if ( $opt_fast or $glob_use_embedded_server ) - { - # FIXME is embedded server really using PID files?! - unlink($master->[0]->{'path_pid'}); - unlink($master->[1]->{'path_pid'}); - unlink($slave->[0]->{'path_pid'}); - unlink($slave->[1]->{'path_pid'}); - unlink($slave->[2]->{'path_pid'}); - } - else - { - # Ensure that no old mysqld test servers are running - # This is different from terminating processes we have - # started from this run of the script, this is terminating - # leftovers from previous runs. - mtr_kill_leftovers(); - } -} # # Remove var and any directories in var/ created by previous @@ -2194,11 +1247,11 @@ sub kill_running_servers () { # sub remove_stale_vardir () { - mtr_report("Removing Stale Files"); + mtr_report("Removing old var directory..."); # Safety! mtr_error("No, don't remove the vardir when running with --extern") - if $opt_extern; + if using_extern(); mtr_verbose("opt_vardir: $opt_vardir"); if ( $opt_vardir eq $default_vardir ) @@ -2214,7 +1267,7 @@ sub remove_stale_vardir () { { # Remove the directory which the link points at mtr_verbose("Removing " . readlink($opt_vardir)); - mtr_rmtree(readlink($opt_vardir)); + rmtree(readlink($opt_vardir)); # Remove the "var" symlink mtr_verbose("unlink($opt_vardir)"); @@ -2223,7 +1276,7 @@ sub remove_stale_vardir () { elsif ( $opt_mem ) { # Just remove the "var" symlink - mtr_report("WARNING: Removing '$opt_vardir' symlink it's wrong"); + mtr_report(" - WARNING: Removing '$opt_vardir' symlink it's wrong"); mtr_verbose("unlink($opt_vardir)"); unlink($opt_vardir); @@ -2233,7 +1286,7 @@ sub remove_stale_vardir () { # Some users creates a soft link in mysql-test/var to another area # - allow it, but remove all files in it - mtr_report("WARNING: Using the 'mysql-test/var' symlink"); + mtr_report(" - WARNING: Using the 'mysql-test/var' symlink"); # Make sure the directory where it points exist mtr_error("The destination for symlink $opt_vardir does not exist") @@ -2242,7 +1295,7 @@ sub remove_stale_vardir () { foreach my $bin ( glob("$opt_vardir/*") ) { mtr_verbose("Removing bin $bin"); - mtr_rmtree($bin); + rmtree($bin); } } } @@ -2250,7 +1303,7 @@ sub remove_stale_vardir () { { # Remove the entire "var" dir mtr_verbose("Removing $opt_vardir/"); - mtr_rmtree("$opt_vardir/"); + rmtree("$opt_vardir/"); } if ( $opt_mem ) @@ -2259,7 +1312,7 @@ sub remove_stale_vardir () { # remove the $opt_mem dir to assure the symlink # won't point at an old directory mtr_verbose("Removing $opt_mem"); - mtr_rmtree($opt_mem); + rmtree($opt_mem); } } @@ -2272,19 +1325,21 @@ sub remove_stale_vardir () { # Remove the var/ dir in mysql-test dir if any # this could be an old symlink that shouldn't be there mtr_verbose("Removing $default_vardir"); - mtr_rmtree($default_vardir); + rmtree($default_vardir); # Remove the "var" dir mtr_verbose("Removing $opt_vardir/"); - mtr_rmtree("$opt_vardir/"); + rmtree("$opt_vardir/"); } } + + # # Create var and the directories needed in var # sub setup_vardir() { - mtr_report("Creating Directories"); + mtr_report("Creating var directory..."); if ( $opt_vardir eq $default_vardir ) { @@ -2305,7 +1360,7 @@ sub setup_vardir() { mtr_verbose("Creating $opt_mem"); mkpath($opt_mem); - mtr_report("Symlinking 'var' to '$opt_mem'"); + mtr_report(" - symlinking 'var' to '$opt_mem'"); symlink($opt_mem, $opt_vardir); } } @@ -2328,30 +1383,9 @@ sub setup_vardir() { mkpath("$opt_vardir/tmp"); mkpath($opt_tmpdir) if $opt_tmpdir ne "$opt_vardir/tmp"; - # Create new data dirs - foreach my $data_dir (@data_dir_lst) - { - mkpath("$data_dir/mysql"); - mkpath("$data_dir/test"); - } - - # Make a link std_data_ln in var/ that points to std_data - if ( ! $glob_win32 ) - { - symlink("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data_ln"); - } - else - { - # on windows, copy all files from std_data into var/std_data_ln - mkpath("$opt_vardir/std_data_ln"); - opendir(DIR, "$glob_mysql_test_dir/std_data") - or mtr_error("Can't find the std_data directory: $!"); - for(readdir(DIR)) { - next if -d "$glob_mysql_test_dir/std_data/$_"; - copy("$glob_mysql_test_dir/std_data/$_", "$opt_vardir/std_data_ln/$_"); - } - closedir(DIR); - } + # copy all files from std_data into var/std_data + # and make them writable + copytree("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data"); # Remove old log files foreach my $name (glob("r/*.progress r/*.log r/*.warnings")) @@ -2361,9 +1395,11 @@ sub setup_vardir() { } +# +# Check if running as root +# i.e a file can be read regardless what mode we set it to +# sub check_running_as_root () { - # Check if running as root - # i.e a file can be read regardless what mode we set it to my $test_file= "$opt_vardir/test_running_as_root.txt"; mtr_tofile($test_file, "MySQL"); chmod(oct("0000"), $test_file); @@ -2391,19 +1427,15 @@ sub check_running_as_root () { chmod(oct("0755"), $test_file); unlink($test_file); - } sub check_ssl_support ($) { my $mysqld_variables= shift; - if ($opt_skip_ssl || $opt_extern) + if ($opt_skip_ssl) { - if (!$opt_extern) - { - mtr_report("Skipping SSL"); - } + mtr_report(" - skipping SSL"); $opt_ssl_supported= 0; $opt_ssl= 0; return; @@ -2416,12 +1448,12 @@ sub check_ssl_support ($) { mtr_error("Couldn't find support for SSL"); return; } - mtr_report("Skipping SSL, mysqld not compiled with SSL"); + mtr_report(" - skipping SSL, mysqld not compiled with SSL"); $opt_ssl_supported= 0; $opt_ssl= 0; return; } - mtr_report("Setting mysqld to support SSL connections"); + mtr_report(" - SSL connections supported"); $opt_ssl_supported= 1; } @@ -2431,7 +1463,7 @@ sub check_debug_support ($) { if ( ! $mysqld_variables->{'debug'} ) { - #mtr_report("Binaries are not debug compiled"); + #mtr_report(" - binaries are not debug compiled"); $debug_compiled_binaries= 0; if ( $opt_debug ) @@ -2440,11 +1472,11 @@ sub check_debug_support ($) { } return; } - mtr_report("Binaries are debug compiled"); + mtr_report(" - binaries are debug compiled"); $debug_compiled_binaries= 1; } -############################################################################## + # # Helper function to handle configuration-based subdirectories which Visual # Studio uses for storing binaries. If opt_vs_config is set, this returns @@ -2453,51 +1485,45 @@ sub check_debug_support ($) { # # $exe can be undefined, if the directory itself will be used # -############################################################################### - sub vs_config_dirs ($$) { my ($path_part, $exe) = @_; $exe = "" if not defined $exe; + # Don't look in these dirs when not on windows + return () unless $is_win32; + if ($opt_vs_config) { - return ("$glob_basedir/$path_part/$opt_vs_config/$exe"); + return ("$basedir/$path_part/$opt_vs_config/$exe"); } - return ("$glob_basedir/$path_part/release/$exe", - "$glob_basedir/$path_part/relwithdebinfo/$exe", - "$glob_basedir/$path_part/debug/$exe"); + return ("$basedir/$path_part/release/$exe", + "$basedir/$path_part/relwithdebinfo/$exe", + "$basedir/$path_part/debug/$exe"); } -############################################################################## -# -# Start the ndb cluster -# -############################################################################## sub check_ndbcluster_support ($) { my $mysqld_variables= shift; - if ($opt_skip_ndbcluster || $opt_extern) + if ($opt_skip_ndbcluster) { - if (!$opt_extern) - { - mtr_report("Skipping ndbcluster"); - } + mtr_report(" - skipping ndbcluster"); $opt_skip_ndbcluster_slave= 1; return; } - if ( ! $mysqld_variables->{'ndb-connectstring'} ) + if ( ! $mysqld_variables{'ndb-connectstring'} ) { - mtr_report("Skipping ndbcluster, mysqld not compiled with ndbcluster"); + mtr_report(" - skipping ndbcluster, mysqld not compiled with ndbcluster"); $opt_skip_ndbcluster= 1; $opt_skip_ndbcluster_slave= 1; return; } + $glob_ndbcluster_supported= 1; - mtr_report("Using ndbcluster when necessary, mysqld supports it"); + mtr_report(" - using ndbcluster when necessary, mysqld supports it"); if ( $mysql_version_id < 50100 ) { @@ -2510,97 +1536,15 @@ sub check_ndbcluster_support ($) { } -sub ndbcluster_start_install ($) { - my $cluster= shift; - - mtr_report("Installing $cluster->{'name'} Cluster"); - - mkdir($cluster->{'data_dir'}); - - # Create a config file from template - my $ndb_no_ord=512; - my $ndb_no_attr=2048; - my $ndb_con_op=105000; - my $ndb_dmem="80M"; - my $ndb_imem="24M"; - my $ndb_pbmem="32M"; - my $nodes= $cluster->{'nodes'}; - my $ndb_host= "localhost"; - my $ndb_diskless= 0; - - if (!$opt_bench) - { - # Use a smaller configuration - if ( $mysql_version_id < 50100 ) - { - # 4.1 and 5.0 is using a "larger" --small configuration - $ndb_no_ord=128; - $ndb_con_op=10000; - $ndb_dmem="40M"; - $ndb_imem="12M"; - } - else - { - $ndb_no_ord=32; - $ndb_con_op=10000; - $ndb_dmem="20M"; - $ndb_imem="1M"; - $ndb_pbmem="4M"; - } - } - - my $config_file_template= "ndb/ndb_config_${nodes}_node.ini"; - my $config_file= "$cluster->{'data_dir'}/config.ini"; - - open(IN, $config_file_template) - or mtr_error("Can't open $config_file_template: $!"); - open(OUT, ">", $config_file) - or mtr_error("Can't write to $config_file: $!"); - while () - { - chomp; - - s/CHOOSE_MaxNoOfAttributes/$ndb_no_attr/; - s/CHOOSE_MaxNoOfOrderedIndexes/$ndb_no_ord/; - s/CHOOSE_MaxNoOfConcurrentOperations/$ndb_con_op/; - s/CHOOSE_DataMemory/$ndb_dmem/; - s/CHOOSE_IndexMemory/$ndb_imem/; - s/CHOOSE_Diskless/$ndb_diskless/; - s/CHOOSE_HOSTNAME_.*/$ndb_host/; - s/CHOOSE_FILESYSTEM/$cluster->{'data_dir'}/; - s/CHOOSE_PORT_MGM/$cluster->{'port'}/; - if ( $mysql_version_id < 50000 ) - { - my $base_port= $cluster->{'port'} + 1; - s/CHOOSE_PORT_TRANSPORTER/$base_port/; - } - s/CHOOSE_DiskPageBufferMemory/$ndb_pbmem/; - - print OUT "$_ \n"; - } - close OUT; - close IN; - - - # Start cluster with "--initial" - - ndbcluster_start($cluster, "--initial"); - - return 0; -} - - sub ndbcluster_wait_started($$){ my $cluster= shift; my $ndb_waiter_extra_opt= shift; - my $path_waiter_log= "$cluster->{'data_dir'}/ndb_waiter.log"; + my $path_waitlog= join('/', $opt_vardir, $cluster->name(), "ndb_waiter.log"); + my $args; - mtr_init_args(\$args); - - mtr_add_arg($args, "--no-defaults"); - mtr_add_arg($args, "--core"); - mtr_add_arg($args, "--ndb-connectstring=%s", $cluster->{'connect_string'}); + mtr_add_arg($args, "--defaults-file=%s", $path_config_file); + mtr_add_arg($args, "--defaults-group-suffix=%s", $cluster->suffix()); mtr_add_arg($args, "--timeout=60"); if ($ndb_waiter_extra_opt) @@ -2611,29 +1555,45 @@ sub ndbcluster_wait_started($$){ # Start the ndb_waiter which will connect to the ndb_mgmd # and poll it for state of the ndbd's, will return when # all nodes in the cluster is started - my $res= mtr_run($exe_ndb_waiter, $args, - "", $path_waiter_log, $path_waiter_log, ""); - mtr_verbose("ndbcluster_wait_started, returns: $res") if $res; - return $res; -} + my $res= My::SafeProcess->run + ( + name => "ndb_waiter ".$cluster->name(), + path => $exe_ndb_waiter, + args => \$args, + output => $path_waitlog, + error => $path_waitlog, + append => 1, + ); - -sub mysqld_wait_started($){ - my $mysqld= shift; - - if (sleep_until_file_created($mysqld->{'path_pid'}, - $mysqld->{'start_timeout'}, - $mysqld->{'pid'}) == 0) + # Check that ndb_mgmd(s) are still alive + foreach my $ndb_mgmd ( in_cluster($cluster, ndb_mgmds()) ) { - # Failed to wait for pid file - return 1; + my $proc= $ndb_mgmd->{proc}; + if ( ! $proc->wait_one(0) ) + { + mtr_warning("$proc died"); + return 2; + } } - # Get the "real pid" of the process, it will be used for killing - # the process in ActiveState's perl on windows - $mysqld->{'real_pid'}= mtr_get_pid_from_file($mysqld->{'path_pid'}); + # Check that all started ndbd(s) are still alive + foreach my $ndbd ( in_cluster($cluster, ndbds()) ) + { + my $proc= $ndbd->{proc}; + next unless defined $proc; + if ( ! $proc->wait_one(0) ) + { + mtr_warning("$proc died"); + return 3; + } + } + if ($res) + { + mtr_verbose("ndbcluster_wait_started failed"); + return 1; + } return 0; } @@ -2642,214 +1602,140 @@ sub ndb_mgmd_wait_started($) { my ($cluster)= @_; my $retries= 100; - while (ndbcluster_wait_started($cluster, "--no-contact") and - $retries) + while ($retries) { - # Millisceond sleep emulated with select - select(undef, undef, undef, (0.1)); + my $result= ndbcluster_wait_started($cluster, "--no-contact"); + if ($result == 0) + { + # ndb_mgmd is started + mtr_verbose("ndb_mgmd is started"); + return 0; + } + elsif ($result > 1) + { + mtr_warning("Cluster process failed while waiting for start"); + return $result; + } + mtr_milli_sleep(100); $retries--; } - return $retries == 0; - + return 1; } -sub ndb_mgmd_start ($) { - my $cluster= shift; - my $args; # Arg vector - my $pid= -1; +sub ndb_mgmd_start ($$) { + my ($cluster, $ndb_mgmd)= @_; + mtr_verbose("ndb_mgmd_start"); + + my $dir= $ndb_mgmd->value("DataDir"); + mkpath($dir) unless -d $dir; + + my $args; mtr_init_args(\$args); - mtr_add_arg($args, "--no-defaults"); - mtr_add_arg($args, "--core"); + mtr_add_arg($args, "--defaults-file=%s", $path_config_file); + mtr_add_arg($args, "--defaults-group-suffix=%s", $cluster->suffix()); + mtr_add_arg($args, "--mycnf"); mtr_add_arg($args, "--nodaemon"); - mtr_add_arg($args, "--config-file=%s", "$cluster->{'data_dir'}/config.ini"); + my $path_ndb_mgmd_log= "$dir/ndb_mgmd.log"; - my $path_ndb_mgmd_log= "$cluster->{'data_dir'}/\l$cluster->{'name'}_ndb_mgmd.log"; - $pid= mtr_spawn($exe_ndb_mgmd, $args, "", - $path_ndb_mgmd_log, - $path_ndb_mgmd_log, - "", - { append_log_file => 1 }); + $ndb_mgmd->{'proc'}= My::SafeProcess->new + ( + name => $ndb_mgmd->after('cluster_config.'), + path => $exe_ndb_mgmd, + args => \$args, + output => $path_ndb_mgmd_log, + error => $path_ndb_mgmd_log, + append => 1, + verbose => $opt_verbose, + ); + mtr_verbose("Started $ndb_mgmd->{proc}"); # FIXME Should not be needed # Unfortunately the cluster nodes will fail to start # if ndb_mgmd has not started properly if (ndb_mgmd_wait_started($cluster)) { - mtr_error("Failed to wait for start of ndb_mgmd"); - } - - # Remember pid of ndb_mgmd - $cluster->{'pid'}= $pid; - - mtr_verbose("ndb_mgmd_start, pid: $pid"); - - return $pid; -} - - -sub ndbd_start ($$$) { - my $cluster= shift; - my $idx= shift; - my $extra_args= shift; - - my $args; # Arg vector - my $pid= -1; - - mtr_init_args(\$args); - mtr_add_arg($args, "--no-defaults"); - mtr_add_arg($args, "--core"); - mtr_add_arg($args, "--ndb-connectstring=%s", "$cluster->{'connect_string'}"); - if ( $mysql_version_id >= 50000) - { - mtr_add_arg($args, "--character-sets-dir=%s", "$path_charsetsdir"); - } - mtr_add_arg($args, "--nodaemon"); - mtr_add_arg($args, "$extra_args"); - - my $nodeid= $cluster->{'ndbds'}->[$idx]->{'nodeid'}; - my $path_ndbd_log= "$cluster->{'data_dir'}/ndb_${nodeid}.log"; - $pid= mtr_spawn($exe_ndbd, $args, "", - $path_ndbd_log, - $path_ndbd_log, - "", - { append_log_file => 1 }); - - # Add pid to list of pids for this cluster - $cluster->{'ndbds'}->[$idx]->{'pid'}= $pid; - - # Rememeber options used when starting - $cluster->{'ndbds'}->[$idx]->{'start_extra_args'}= $extra_args; - $cluster->{'ndbds'}->[$idx]->{'idx'}= $idx; - - mtr_verbose("ndbd_start, pid: $pid"); - - return $pid; -} - - -sub ndbcluster_start ($$) { - my $cluster= shift; - my $extra_args= shift; - - mtr_verbose("ndbcluster_start '$cluster->{'name'}'"); - - if ( $cluster->{'use_running'} ) - { - return 0; - } - - if ( $cluster->{'pid'} ) - { - mtr_error("Cluster '$cluster->{'name'}' already started"); - } - - ndb_mgmd_start($cluster); - - for ( my $idx= 0; $idx < $cluster->{'nodes'}; $idx++ ) - { - ndbd_start($cluster, $idx, $extra_args); + mtr_warning("Failed to wait for start of ndb_mgmd"); + return 1; } return 0; } -sub rm_ndbcluster_tables ($) { - my $dir= shift; - foreach my $bin ( glob("$dir/mysql/ndb_apply_status*"), - glob("$dir/mysql/ndb_schema*")) - { - unlink($bin); - } -} +sub ndbd_start { + my ($cluster, $ndbd)= @_; + mtr_verbose("ndbd_start"); -############################################################################## -# -# Run the benchmark suite -# -############################################################################## - -sub run_benchmarks ($) { - my $benchmark= shift; + my $dir= $ndbd->value("DataDir"); + mkpath($dir) unless -d $dir; my $args; - - if ( ! $glob_use_embedded_server ) - { - mysqld_start($master->[0],[],[]); - if ( ! $master->[0]->{'pid'} ) - { - mtr_error("Can't start the mysqld server"); - } - } - mtr_init_args(\$args); + mtr_add_arg($args, "--defaults-file=%s", $path_config_file); + mtr_add_arg($args, "--defaults-group-suffix=%s", $cluster->suffix()); + mtr_add_arg($args, "--nodaemon"); - mtr_add_arg($args, "--socket=%s", $master->[0]->{'path_sock'}); - mtr_add_arg($args, "--user=%s", $opt_user); +# > 5.0 { 'character-sets-dir' => \&fix_charset_dir }, - if ( $opt_small_bench ) - { - mtr_add_arg($args, "--small-test"); - mtr_add_arg($args, "--small-tables"); - } - if ( $opt_with_ndbcluster ) - { - mtr_add_arg($args, "--create-options=TYPE=ndb"); - } + my $path_ndbd_log= "$dir/ndbd.log"; + my $proc= My::SafeProcess->new + ( + name => $ndbd->after('cluster_config.'), + path => $exe_ndbd, + args => \$args, + output => $path_ndbd_log, + error => $path_ndbd_log, + append => 1, + verbose => $opt_verbose, + ); + mtr_verbose("Started $proc"); - chdir($glob_mysql_bench_dir) - or mtr_error("Couldn't chdir to '$glob_mysql_bench_dir': $!"); + $ndbd->{proc}= $proc; - if ( ! $benchmark ) - { - mtr_add_arg($args, "--log"); - mtr_run("$glob_mysql_bench_dir/run-all-tests", $args, "", "", "", ""); - # FIXME check result code?! - } - elsif ( -x $benchmark ) - { - mtr_run("$glob_mysql_bench_dir/$benchmark", $args, "", "", "", ""); - # FIXME check result code?! - } - else - { - mtr_error("Benchmark $benchmark not found"); - } - - chdir($glob_mysql_test_dir); # Go back - - if ( ! $glob_use_embedded_server ) - { - stop_masters(); - } + return; } -############################################################################## -# -# Run the tests -# -############################################################################## +sub ndbcluster_start ($) { + my $cluster= shift; -sub run_tests () { + mtr_verbose("ndbcluster_start '".$cluster->name()."'"); + + foreach my $ndb_mgmd ( in_cluster($cluster, ndb_mgmds()) ) + { + next if started($ndb_mgmd); + ndb_mgmd_start($cluster, $ndb_mgmd); + } + + foreach my $ndbd ( in_cluster($cluster, ndbds()) ) + { + next if started($ndbd); + ndbd_start($cluster, $ndbd); + } + + return 0; +} + + +# +# Run the collected tests +# +my $suite_timeout_proc; +sub run_tests { my ($tests)= @_; + mtr_report(); mtr_print_thick_line(); - - mtr_timer_start($glob_timers,"suite", 60 * $opt_suite_timeout); - - mtr_report_tests_not_skipped_though_disabled($tests); - mtr_print_header(); + $suite_timeout_proc= My::SafeProcess->timer($opt_suite_timeout* 60); foreach my $tinfo ( @$tests ) { if (run_testcase_check_skip_test($tinfo)) @@ -2857,52 +1743,149 @@ sub run_tests () { next; } - mtr_timer_start($glob_timers,"testcase", 60 * $opt_testcase_timeout); run_testcase($tinfo); - mtr_timer_stop($glob_timers,"testcase"); } + # Kill the test suite timer + $suite_timeout_proc->kill(); mtr_print_line(); - if ( ! $glob_debugger and - ! $opt_extern and - ! $glob_use_embedded_server ) - { - stop_all_servers(); - } + stop_all_servers(); if ( $opt_gcov ) { gcov_collect(); # collect coverage information } - if ( $opt_gprof ) - { - gprof_collect(); # collect coverage information - } mtr_report_stats($tests); - mtr_timer_stop($glob_timers,"suite"); } -############################################################################## +sub create_config_file_for_extern { + my %opts= + ( + socket => '/tmp/mysqld.sock', + port => 3306, + user => 'test', + password => '', + @_ + ); + + mtr_report("Creating my.cnf file for extern server..."); + my $F= IO::File->new($path_config_file, "w") + or mtr_error("Can't write to $path_config_file: $!"); + + print $F "[client]\n"; + while (my ($option, $value)= each( %opts )) { + print $F "$option= $value\n"; + mtr_report(" $option= $value"); + } + + print $F < 0 and $check_counter--) { + mtr_milli_sleep(100); + $ret= kill(0, $pid); + } + mtr_report($check_counter ? " ok!" : " failed!"); + } + else + { + mtr_warning("Found non pid file '$elem' in '$rundir'") + if -f "$rundir/$elem"; + } + } + closedir(RUNDIR); +} + +# +# Check that all the ports that are going to +# be used are free +# +sub check_ports_free +{ + my @ports_to_check; + for ($opt_baseport..$opt_baseport+9){ + push(@ports_to_check, $_); + } + mtr_report("Checking ports..."); + # print "@ports_to_check\n"; + foreach my $port (@ports_to_check){ + if (mtr_ping_port($port)){ + mtr_report(" - 'localhost:$port' was not free"); + return 1; # One port was not free + } + } + + return 0; # All ports free +} + + +sub initialize_servers { + + if ( using_extern() ) { # Running against an already started server, if the specified # vardir does not already exist it should be created if ( ! -d $opt_vardir ) { - mtr_report("Creating '$opt_vardir'"); setup_vardir(); } else @@ -2912,7 +1895,14 @@ sub initialize_servers () { } else { - kill_running_servers(); + # Kill leftovers from previous run + # using any pidfiles found in var/run + kill_leftovers("$opt_vardir/run"); + + if (check_ports_free()){ + # Some port was not free(which one has already been printed) + mtr_error("Some port(s) was not free") + } if ( ! $opt_start_dirty ) { @@ -2920,126 +1910,39 @@ sub initialize_servers () { setup_vardir(); mysql_install_db(); - if ( $opt_force ) - { - # Save a snapshot of the freshly installed db - # to make it possible to restore to a known point in time - save_installed_db(); - } } } check_running_as_root(); mtr_log_init("$opt_vardir/log/mysql-test-run.log"); - -} - -sub mysql_install_db () { - - install_db('master', $master->[0]->{'path_myddir'}); - - if ($max_master_num > 1) - { - copy_install_db('master', $master->[1]->{'path_myddir'}); - } - - # Install the number of slave databses needed - for (my $idx= 0; $idx < $max_slave_num; $idx++) - { - copy_install_db("slave".($idx+1), $slave->[$idx]->{'path_myddir'}); - } - - if ( ! $opt_skip_im ) - { - im_prepare_env($instance_manager); - } - - my $cluster_started_ok= 1; # Assume it can be started - - my $cluster= $clusters->[0]; # Master cluster - if ($opt_skip_ndbcluster || - $cluster->{'use_running'} || - $cluster->{executable_setup_failed}) - { - # Don't install master cluster - } - elsif (ndbcluster_start_install($cluster)) - { - mtr_warning("Failed to start install of $cluster->{name}"); - $cluster_started_ok= 0; - } - - $cluster= $clusters->[1]; # Slave cluster - if ($max_slave_num == 0 || - $opt_skip_ndbcluster_slave || - $cluster->{'use_running'} || - $cluster->{executable_setup_failed}) - { - # Don't install slave cluster - } - elsif (ndbcluster_start_install($cluster)) - { - mtr_warning("Failed to start install of $cluster->{name}"); - $cluster_started_ok= 0; - } - - foreach $cluster (@{$clusters}) - { - - next if !$cluster->{'pid'}; - - $cluster->{'installed_ok'}= 1; # Assume install suceeds - - if (ndbcluster_wait_started($cluster, "")) - { - # failed to install, disable usage and flag that its no ok - mtr_report("ndbcluster_install of $cluster->{'name'} failed"); - $cluster->{"installed_ok"}= 0; - - $cluster_started_ok= 0; - } - } - - if ( ! $cluster_started_ok ) - { - if ( $opt_force) - { - # Continue without cluster - } - else - { - mtr_error("To continue, re-run with '--force'."); - } - } - - return 0; } -sub copy_install_db ($$) { - my $type= shift; - my $data_dir= shift; +# +# Copy the reference database into selected datadir +# +sub copy_install_db ($) { + my $path_data_dir= shift; - mtr_report("Installing \u$type Database"); - - # Just copy the installed db from first master - mtr_copy_dir($master->[0]->{'path_myddir'}, $data_dir); + # Don't install over another db + mtr_error("There is already an installed db in '$path_data_dir'") + if -d $path_data_dir; + # copy the installed db into place + copytree("$opt_vardir/install.db", $path_data_dir); } -sub install_db ($$) { - my $type= shift; - my $data_dir= shift; - - mtr_report("Installing \u$type Database"); +sub mysql_install_db { + my $data_dir= "$opt_vardir/install.db"; + mtr_report("Installing system database..."); my $args; mtr_init_args(\$args); mtr_add_arg($args, "--no-defaults"); mtr_add_arg($args, "--bootstrap"); - mtr_add_arg($args, "--basedir=%s", $path_my_basedir); + mtr_add_arg($args, "--basedir=%s", $basedir); mtr_add_arg($args, "--datadir=%s", $data_dir); mtr_add_arg($args, "--loose-skip-innodb"); mtr_add_arg($args, "--loose-skip-ndbcluster"); @@ -3048,15 +1951,12 @@ sub install_db ($$) { if ( $opt_debug ) { - mtr_add_arg($args, "--debug=d:t:i:A,%s/log/bootstrap_%s.trace", - $path_vardir_trace, $type); + mtr_add_arg($args, "--debug=d:t:i:A,%s/log/bootstrap.trace", + $path_vardir_trace); } - if ( ! $glob_netware ) - { - mtr_add_arg($args, "--language=%s", $path_language); - mtr_add_arg($args, "--character-sets-dir=%s", $path_charsetsdir); - } + mtr_add_arg($args, "--language=%s", $path_language); + mtr_add_arg($args, "--character-sets-dir=%s", $path_charsetsdir); # If DISABLE_GRANT_OPTIONS is defined when the server is compiled (e.g., # configure --disable-grant-options), mysqld will not recognize the @@ -3109,11 +2009,20 @@ sub install_db ($$) { mtr_tofile($path_bootstrap_log, "$exe_mysqld_bootstrap " . join(" ", @$args) . "\n"); + # Create directories mysql and test + mkpath("$data_dir/mysql"); + mkpath("$data_dir/test"); - if ( mtr_run($exe_mysqld_bootstrap, $args, $bootstrap_sql_file, - $path_bootstrap_log, $path_bootstrap_log, - "", { append_log_file => 1 }) != 0 ) - + if ( My::SafeProcess->run + ( + name => "bootstrap", + path => $exe_mysqld_bootstrap, + args => \$args, + input => $bootstrap_sql_file, + output => $path_bootstrap_log, + error => $path_bootstrap_log, + append => 1, + ) != 0) { mtr_error("Error executing mysqld --bootstrap\n" . "Could not install system database from $bootstrap_sql_file\n" . @@ -3122,125 +2031,6 @@ sub install_db ($$) { } -sub im_prepare_env($) { - my $instance_manager = shift; - - im_create_passwd_file($instance_manager); - im_prepare_data_dir($instance_manager); -} - - -sub im_create_passwd_file($) { - my $instance_manager = shift; - - my $pwd_file_path = $instance_manager->{'password_file'}; - - mtr_report("Creating IM password file ($pwd_file_path)"); - - open(OUT, ">", $pwd_file_path) - or mtr_error("Can't write to $pwd_file_path: $!"); - - print OUT $instance_manager->{'admin_login'}, ":", - $instance_manager->{'admin_sha1'}, "\n"; - - close(OUT); -} - - -sub im_create_defaults_file($) { - my $instance_manager = shift; - - my $defaults_file = $instance_manager->{'defaults_file'}; - - open(OUT, ">", $defaults_file) - or mtr_error("Can't write to $defaults_file: $!"); - - print OUT <{path_pid} -angel-pid-file = $instance_manager->{path_angel_pid} -socket = $instance_manager->{path_sock} -port = $instance_manager->{port} -password-file = $instance_manager->{password_file} -default-mysqld-path = $exe_mysqld - -EOF -; - - foreach my $instance (@{$instance_manager->{'instances'}}) - { - my $server_id = $instance->{'server_id'}; - - print OUT <{path_sock} -pid-file = $instance->{path_pid} -port = $instance->{port} -datadir = $instance->{path_datadir} -log = $instance->{path_datadir}/mysqld$server_id.log -log-error = $instance->{path_datadir}/mysqld$server_id.err.log -log-slow-queries = $instance->{path_datadir}/mysqld$server_id.slow.log -language = $path_language -character-sets-dir = $path_charsetsdir -basedir = $path_my_basedir -server_id = $server_id -shutdown-delay = 10 -skip-stack-trace -loose-skip-innodb -loose-skip-ndbcluster -EOF -; - if ( $mysql_version_id < 50100 ) - { - print OUT "skip-bdb\n"; - } - print OUT "nonguarded\n" if $instance->{'nonguarded'}; - if ( $mysql_version_id >= 50100 ) - { - print OUT "log-output=FILE\n" if $instance->{'old_log_format'}; - } - print OUT "\n"; - } - - close(OUT); -} - - -sub im_prepare_data_dir($) { - my $instance_manager = shift; - - foreach my $instance (@{$instance_manager->{'instances'}}) - { - copy_install_db( - 'im_mysqld_' . $instance->{'server_id'}, - $instance->{'path_datadir'}); - } -} - - - -# -# Restore snapshot of the installed slave databases -# if the snapshot exists -# -sub restore_slave_databases ($) { - my ($num_slaves)= @_; - - if ( -d $path_snapshot) - { - for (my $idx= 0; $idx < $num_slaves; $idx++) - { - my $data_dir= $slave->[$idx]->{'path_myddir'}; - my $name= basename($data_dir); - mtr_rmtree($data_dir); - mtr_copy_dir("$path_snapshot/$name", $data_dir); - } - } -} - - sub run_testcase_check_skip_test($) { my ($tinfo)= @_; @@ -3254,69 +2044,61 @@ sub run_testcase_check_skip_test($) if ( $tinfo->{'skip'} ) { - mtr_report_test_name($tinfo); mtr_report_test_skipped($tinfo); return 1; } if ($tinfo->{'ndb_test'}) { - foreach my $cluster (@{$clusters}) + foreach my $cluster ( clusters() ) { - # Slave cluster is skipped and thus not - # installed, no need to perform checks - last if ($opt_skip_ndbcluster_slave and - $cluster->{'name'} eq 'Slave'); - - # Using running cluster - no need - # to check if test should be skipped - # will be done by test itself - last if ($cluster->{'use_running'}); - # If test needs this cluster, check binaries was found ok if ( $cluster->{'executable_setup_failed'} ) { - mtr_report_test_name($tinfo); $tinfo->{comment}= "Failed to find cluster binaries"; mtr_report_test_failed($tinfo); return 1; } - - # If test needs this cluster, check it was installed ok - if ( !$cluster->{'installed_ok'} ) - { - mtr_report_test_name($tinfo); - $tinfo->{comment}= - "Cluster $cluster->{'name'} was not installed ok"; - mtr_report_test_failed($tinfo); - return 1; - } - - } - } - - if ( $tinfo->{'component_id'} eq 'im' ) - { - # If test needs im, check binaries was found ok - if ( $instance_manager->{'executable_setup_failed'} ) - { - mtr_report_test_name($tinfo); - $tinfo->{comment}= - "Failed to find MySQL manager binaries"; - mtr_report_test_failed($tinfo); - return 1; } } return 0; } +sub dynamic_binlog_format_switch { + my ($tinfo)= @_; + # Dynamically switch binlog format started MySQL servers + foreach my $mysqld ( mysqlds() ) + { + # Skip servers that are restarted between each test + next if $mysqld->option('#!force-restart'); + + my $sql= "include/set_binlog_format_".$tinfo->{binlog_format_switch}.".sql"; + my $args; + mtr_init_args(\$args); + mtr_add_arg($args, "--defaults-file=%s", $path_config_file); + mtr_add_arg($args, "--defaults-group-suffix=%s", $mysqld->after('mysqld')); + mtr_verbose("Dynamically switching binlog format to:", + $tinfo->{binlog_format_switch}); + my $res= My::SafeProcess->run + ( + name => "switch binlog format ".$mysqld->name(), + path => $exe_mysql, + args => \$args, + input => $sql, + ); + + if ($res != 0) + { + mtr_error("Failed to switch binlog format"); + } + } +} sub do_before_run_mysqltest($) { my $tinfo= shift; - my $args; # Remove old files produced by mysqltest my $base_file= mtr_match_extension($tinfo->{'result_file'}, @@ -3326,80 +2108,43 @@ sub do_before_run_mysqltest($) unlink("$base_file.log"); unlink("$base_file.warnings"); - if (!$opt_extern) + if ( $mysql_version_id < 50000 ) { + # Set environment variable NDB_STATUS_OK to 1 + # if script decided to run mysqltest cluster _is_ installed ok + $ENV{'NDB_STATUS_OK'} = "1"; + } elsif ( $mysql_version_id < 50100 ) { + # Set environment variable NDB_STATUS_OK to YES + # if script decided to run mysqltest cluster _is_ installed ok + $ENV{'NDB_STATUS_OK'} = "YES"; + } +} + + +sub run_check_testcase_all($$) +{ + my ($tinfo, $mode)= @_; + + foreach my $mysqld ( mysqlds() ) { - if ( $mysql_version_id < 50000 ) { - # Set environment variable NDB_STATUS_OK to 1 - # if script decided to run mysqltest cluster _is_ installed ok - $ENV{'NDB_STATUS_OK'} = "1"; - } elsif ( $mysql_version_id < 50100 ) { - # Set environment variable NDB_STATUS_OK to YES - # if script decided to run mysqltest cluster _is_ installed ok - $ENV{'NDB_STATUS_OK'} = "YES"; - } - if (defined $tinfo->{binlog_format} and $mysql_version_id > 50100 ) + if ( defined $mysqld->{'proc'} ) { - # Dynamically switch binlog format of - # master, slave is always restarted - foreach my $server ( @$master ) + if (run_check_testcase($tinfo, $mode, $mysqld)) { - next unless ($server->{'pid'}); - - mtr_init_args(\$args); - mtr_add_arg($args, "--no-defaults"); - mtr_add_arg($args, "--user=root"); - mtr_add_arg($args, "--port=$server->{'port'}"); - mtr_add_arg($args, "--socket=$server->{'path_sock'}"); - - my $sql= "include/set_binlog_format_".$tinfo->{binlog_format}.".sql"; - mtr_verbose("Setting binlog format:", $tinfo->{binlog_format}); - if (mtr_run($exe_mysql, $args, $sql, "", "", "") != 0) - { - mtr_error("Failed to switch binlog format"); - } + # Check failed, mark the test case with that info + $tinfo->{'check_testcase_failed'}= 1; } } } } -sub do_after_run_mysqltest($) -{ - my $tinfo= shift; - # Save info from this testcase run to mysqltest.log - mtr_appendfile_to_file($path_current_test_log, $path_mysqltest_log) - if -f $path_current_test_log; - mtr_appendfile_to_file($path_timefile, $path_mysqltest_log) - if -f $path_timefile; +sub mark_log { + my ($log, $tinfo)= @_; + my $log_msg= "CURRENT_TEST: $tinfo->{name}\n"; + mtr_tofile($log, $log_msg); } -sub run_testcase_mark_logs($$) -{ - my ($tinfo, $log_msg)= @_; - - # Write a marker to all log files - - # The file indicating current test name - mtr_tonewfile($path_current_test_log, $log_msg); - - # each mysqld's .err file - foreach my $mysqld (@{$master}, @{$slave}) - { - mtr_tofile($mysqld->{path_myerr}, $log_msg); - } - - if ( $tinfo->{'component_id'} eq 'im') - { - mtr_tofile($instance_manager->{path_err}, $log_msg); - mtr_tofile($instance_manager->{path_log}, $log_msg); - } - - # ndbcluster log file - mtr_tofile($path_ndb_testrun_log, $log_msg); - -} - sub find_testcase_skipped_reason($) { my ($tinfo)= @_; @@ -3430,145 +2175,279 @@ sub find_testcase_skipped_reason($) } -############################################################################## +# Return timezone value of tinfo or default value +sub timezone { + my ($tinfo)= @_; + return $tinfo->{timezone} || "GMT-3"; +} + + +# Storage for changed environment variables +my %old_env; + # -# Run a single test case +# Run a single test case # -############################################################################## - -# When we get here, we have already filtered out test cases that doesn't -# apply to the current setup, for example if we use a running server, test -# cases that restart the server are dropped. So this function should mostly -# be about doing things, not a lot of logic. - -# We don't start and kill the servers for each testcase. But some -# testcases needs a restart, because they specify options to start -# mysqld with. After that testcase, we need to restart again, to set -# back the normal options. - sub run_testcase ($) { my $tinfo= shift; + mtr_verbose("Running test:", $tinfo->{name}); + # ------------------------------------------------------- # Init variables that can change between each test case # ------------------------------------------------------- + my $timezone= timezone($tinfo); + $ENV{'TZ'}= $timezone; + mtr_verbose("Setting timezone: $timezone"); - $ENV{'TZ'}= $tinfo->{'timezone'}; - mtr_verbose("Setting timezone: $tinfo->{'timezone'}"); - - my $master_restart= run_testcase_need_master_restart($tinfo); - my $slave_restart= run_testcase_need_slave_restart($tinfo); - - if ($master_restart or $slave_restart) + if ( ! using_extern() ) { - # Can't restart a running server that may be in use - if ( $opt_extern ) - { - mtr_report_test_name($tinfo); - $tinfo->{comment}= "Can't restart a running server"; - mtr_report_test_skipped($tinfo); - return; + my @restart= servers_need_restart($tinfo); + if ( @restart != 0) { + stop_servers($tinfo, @restart ); } - run_testcase_stop_servers($tinfo, $master_restart, $slave_restart); - } - - # Write to all log files to indicate start of testcase - run_testcase_mark_logs($tinfo, "CURRENT_TEST: $tinfo->{name}\n"); - - my $died= mtr_record_dead_children(); - if ($died or $master_restart or $slave_restart) - { - if (run_testcase_start_servers($tinfo)) + if ( started(all_servers()) == 0 ) + { + # Restore old ENV + while (my ($option, $value)= each( %old_env )) { + if (defined $value){ + mtr_verbose("Restoring $option to $value"); + $ENV{$option}= $value; + } else { + mtr_verbose("Removing $option"); + delete($ENV{$option}); + } + } + %old_env= (); + + mtr_verbose("Generating my.cnf from '$tinfo->{template_path}'"); + + # Generate new config file from template + $config= My::ConfigFactory->new_config + ( { + basedir => $basedir, + template_path => $tinfo->{template_path}, + extra_template_path => $tinfo->{extra_template_path}, + vardir => $opt_vardir, + tmpdir => $opt_tmpdir, + baseport => $opt_baseport, + #hosts => [ 'host1', 'host2' ], + user => $opt_user, + password => '', + } + ); + + # Write the new my.cnf + $config->save($path_config_file); + + # Remember current config so a restart can occur when a test need + # to use a different one + $current_config_name= $tinfo->{template_path}; + + # + # Set variables in the ENV section + # + foreach my $option ($config->options_in_group("ENV")) + { + # Save old value to restore it before next time + $old_env{$option->name()}= $ENV{$option->name()}; + + mtr_verbose($option->name(), "=",$option->value()); + $ENV{$option->name()}= $option->value(); + } + } + + # Write start of testcase to log + mark_log($path_current_test_log, $tinfo); + + if (start_servers($tinfo)) { - mtr_report_test_name($tinfo); report_failure_and_restart($tinfo); return 1; } } - elsif ($glob_use_embedded_server) - { - run_master_init_script($tinfo); - } - # ---------------------------------------------------------------------- - # If --start-and-exit or --start-dirty given, stop here to let user manually + # -------------------------------------------------------------------- + # If --start or --start-dirty given, stop here to let user manually # run tests # ---------------------------------------------------------------------- - if ( $opt_start_and_exit or $opt_start_dirty ) + if ( $opt_start or $opt_start_dirty ) { - mtr_timer_stop_all($glob_timers); - mtr_report("\nServers started, exiting"); + mtr_report("\nServers started, sleeping"); + sleep(1) while (1); exit(0); } + my $test_timeout_proc= My::SafeProcess->timer($opt_testcase_timeout * 60); + + do_before_run_mysqltest($tinfo); + + if (defined $tinfo->{binlog_format_switch} ) { - do_before_run_mysqltest($tinfo); - - my $res= run_mysqltest($tinfo); - mtr_report_test_name($tinfo); - - do_after_run_mysqltest($tinfo); - - if ( $res == 0 ) - { - mtr_report_test_passed($tinfo); - } - elsif ( $res == 62 ) - { - # Testcase itself tell us to skip this one - - # Try to get reason from mysqltest.log - find_testcase_skipped_reason($tinfo); - mtr_report_test_skipped($tinfo); - } - elsif ( $res == 63 ) - { - $tinfo->{'timeout'}= 1; # Mark as timeout - report_failure_and_restart($tinfo); - } - elsif ( $res == 1 ) - { - # Test case failure reported by mysqltest - report_failure_and_restart($tinfo); - } - else - { - # mysqltest failed, probably crashed - $tinfo->{comment}= - "mysqltest returned unexpected code $res, it has probably crashed"; - report_failure_and_restart($tinfo); - } + dynamic_binlog_format_switch($tinfo) } - # Remove the file that mysqltest writes info to - unlink($path_timefile); - - # ---------------------------------------------------------------------- - # Stop Instance Manager if we are processing an IM-test case. - # ---------------------------------------------------------------------- - if ( $tinfo->{'component_id'} eq 'im' and - !mtr_im_stop($instance_manager, $tinfo->{'name'})) + if ( $opt_check_testcases ) { - mtr_error("Failed to stop Instance Manager.") + run_check_testcase_all($tinfo, "before") + } + + my $test= start_mysqltest($tinfo); + + while (1) + { + my $proc= My::SafeProcess->wait_any(); + unless ( defined $proc ) + { + mtr_error("wait_any failed"); + } + mtr_verbose("Got $proc"); + + # ---------------------------------------------------- + # Stop the test case timer + # ---------------------------------------------------- + $test_timeout_proc->kill(); + + # ---------------------------------------------------- + # Was it the test program that exited + # ---------------------------------------------------- + if ($proc eq $test) + { + my $res= $test->exit_status(); + + if ( $res == 0 ) + { + mtr_report_test_passed($tinfo, $opt_timer); + + if ( $opt_check_testcases ) + { + run_check_testcase_all($tinfo, "after"); + } + } + elsif ( $res == 62 ) + { + # Testcase itself tell us to skip this one + $tinfo->{skip_detected_by_test}= 1; + # Try to get reason from mysqltest.log + find_testcase_skipped_reason($tinfo); + mtr_report_test_skipped($tinfo); + } + elsif ( $res == 65 ) + { + # Testprogram killed by signal + $tinfo->{comment}= + "testprogram crashed(returned code $res)"; + report_failure_and_restart($tinfo); + } + elsif ( $res == 1 ) + { + # Test case failure reported by mysqltest + report_failure_and_restart($tinfo); + } + else + { + # mysqltest failed, probably crashed + $tinfo->{comment}= + "mysqltest failed with unexpected return code $res"; + report_failure_and_restart($tinfo); + } + + # Save info from this testcase run to mysqltest.log + my $path_mysqltest_log= "$opt_vardir/log/mysqltest.log"; + mtr_appendfile_to_file($path_current_test_log, $path_mysqltest_log) + if -f $path_current_test_log; + mtr_appendfile_to_file($path_timefile, $path_mysqltest_log) + if -f $path_timefile; + + # Remove the file that mysqltest writes info to + unlink($path_timefile); + # Remove the file that mysql-test-run writes info to + unlink($path_current_test_log); + + return; + + } + + # ---------------------------------------------------- + # Check if it was an expected crash + # ---------------------------------------------------- + if ( check_expected_crash_and_restart($proc) ) + { + next; + } + + # ---------------------------------------------------- + # It's not mysqltest that has exited, kill it + # ---------------------------------------------------- + $test->kill(); + + # ---------------------------------------------------- + # Check if it was a server that died + # ---------------------------------------------------- + if ( grep($proc eq $_, started(all_servers())) ) + { + # Server failed, probably crashed + $tinfo->{comment}= + "Server failed during test run"; + + report_failure_and_restart($tinfo); + return; + } + + # ---------------------------------------------------- + # Check if testcase timer expired + # ---------------------------------------------------- + if ( $proc eq $test_timeout_proc ) + { + mtr_report("Test case timeout!"); + $tinfo->{'timeout'}= 1; # Mark as timeout + report_failure_and_restart($tinfo); + return; + } + + # ---------------------------------------------------- + # Check if test suite timer expired + # ---------------------------------------------------- + if ( $proc eq $suite_timeout_proc ) + { + mtr_report("Test suite timeout! Terminating..."); + exit(1); + } + + mtr_error("Unhandled process $proc exited"); } } # -# Save a snapshot of the installed test db(s) -# I.e take a snapshot of the var/ dir +# Loop through our list of processes and look for and entry +# with the provided pid, if found check for the file indicating +# expected crash and restart it. # -sub save_installed_db () { +sub check_expected_crash_and_restart { + my ($proc)= @_; - mtr_report("Saving snapshot of installed databases"); - mtr_rmtree($path_snapshot); - - foreach my $data_dir (@data_dir_lst) + foreach my $mysqld ( mysqlds() ) { - my $name= basename($data_dir); - mtr_copy_dir("$data_dir", "$path_snapshot/$name"); + next unless ( $mysqld->{proc} eq $proc ); + + # Check if crash expected by looking at the .expect file + # in var/tmp + my $expect_file= "$opt_vardir/tmp/".$mysqld->name().".expect"; + if ( -f $expect_file ) + { + mtr_verbose("Crash was expected, file $expect_file exists"); + # Start server with same settings as last time + mysqld_start($mysqld, $mysqld->{'started_opts'}); + unlink($expect_file); + } + + return 1; } + + # Not an expected crash + return 0; } @@ -3576,7 +2455,7 @@ sub save_installed_db () { # Save any interesting files in the data_dir # before the data dir is removed. # -sub save_files_before_restore($$) { +sub save_files_after_test_failure($$) { my $test_name= shift; my $data_dir= shift; my $save_name= "$opt_vardir/log/$test_name"; @@ -3586,213 +2465,121 @@ sub save_files_before_restore($$) { { last if $opt_max_save_core > 0 && $num_saved_cores >= $opt_max_save_core; my $core_name= basename($core_file); - mtr_report("Saving $core_name"); - mkdir($save_name) if ! -d $save_name; + mtr_report(" - saving '$core_name'"); + mkpath($save_name) if ! -d $save_name; rename("$core_file", "$save_name/$core_name"); ++$num_saved_cores; } } -# -# Restore snapshot of the installed test db(s) -# if the snapshot exists -# -sub restore_installed_db ($) { +sub after_test_failure ($) { my $test_name= shift; - if ( -d $path_snapshot) + mtr_report("Cleaning datadirs..."); + + foreach my $mysqld ( mysqlds() ) { - mtr_report("Restoring snapshot of databases"); + my $data_dir= $mysqld->value('datadir'); + my $name= basename($data_dir); + save_files_after_test_failure($test_name, $data_dir); + mtr_debug("Removing '$data_dir'"); + rmtree($data_dir); + } - foreach my $data_dir (@data_dir_lst) + # Remove the ndb_*_fs dirs for all ndbd nodes + # forcing a clean start of ndb next time + foreach my $cluster ( clusters() ) + { + foreach my $ndbd ( ndbds($cluster) ) { - my $name= basename($data_dir); - save_files_before_restore($test_name, $data_dir); - mtr_rmtree("$data_dir"); - mtr_copy_dir("$path_snapshot/$name", "$data_dir"); - } - - # Remove the ndb_*_fs dirs for all ndbd nodes - # forcing a clean start of ndb - foreach my $cluster (@{$clusters}) - { - foreach my $ndbd (@{$cluster->{'ndbds'}}) - { - mtr_rmtree("$ndbd->{'path_fs'}" ); + my $datadir= $ndbd->value('DataDir'); + foreach my $fs_dir ( glob("$datadir/ndb_*_fs") ) { + if (-d $fs_dir) { + rmtree($fs_dir); + mtr_debug("Removing '$fs_dir'"); + } } } } - else - { - # No snapshot existed - mtr_error("No snapshot existed"); - } } + sub report_failure_and_restart ($) { my $tinfo= shift; - mtr_report_test_failed($tinfo); + mtr_report_test_failed($tinfo, $path_timefile); print "\n"; if ( $opt_force ) { # Stop all servers that are known to be running stop_all_servers(); - # Restore the snapshot of the installed test db - restore_installed_db($tinfo->{'name'}); - mtr_report("Resuming Tests\n"); + after_test_failure($tinfo->{'name'}); + mtr_report("Resuming tests...\n"); return; } - - my $test_mode= join(" ", @::glob_test_mode) || "default"; - mtr_report("Aborting: $tinfo->{'name'} failed in $test_mode mode. "); - mtr_report("To continue, re-run with '--force'."); - if ( ! $glob_debugger and - ! $opt_extern and - ! $glob_use_embedded_server ) - { - stop_all_servers(); - } - mtr_exit(1); - + mtr_error("Test '$tinfo->{'name'}' failed.", + "To continue, re-run with '--force'"); } -sub run_master_init_script ($) { - my ($tinfo)= @_; - my $init_script= $tinfo->{'master_sh'}; +sub run_sh_script { + my ($script)= @_; - # Run master initialization shell script if one exists - if ( $init_script ) - { - my $ret= mtr_run("/bin/sh", [$init_script], "", "", "", ""); - if ( $ret != 0 ) - { - # FIXME rewrite those scripts to return 0 if successful - # mtr_warning("$init_script exited with code $ret"); - } - } + return 0 unless defined $script; + + mtr_verbose("Running '$script'"); + my $ret= system("/bin/sh $script") >> 8; + return $ret; } -############################################################################## -# -# Start and stop servers -# -############################################################################## +sub mysqld_stop { + my $mysqld= shift or die "usage: mysqld_stop()"; + my $args; + mtr_init_args(\$args); -sub do_before_start_master ($) { - my ($tinfo)= @_; + mtr_add_arg($args, "--no-defaults"); + mtr_add_arg($args, "--user=%s", $opt_user); + mtr_add_arg($args, "--password="); + mtr_add_arg($args, "--port=%d", $mysqld->value('port')); + mtr_add_arg($args, "--host=%s", $mysqld->value('#host')); + mtr_add_arg($args, "--connect_timeout=20"); + mtr_add_arg($args, "--protocol=tcp"); - my $tname= $tinfo->{'name'}; + mtr_add_arg($args, "shutdown"); - # FIXME what about second master..... + My::SafeProcess->run + ( + name => "mysqladmin shutdown ".$mysqld->name(), + path => $exe_mysqladmin, + args => \$args, + error => "/dev/null", - # Don't delete anything if starting dirty - return if ($opt_start_dirty); - - foreach my $bin ( glob("$opt_vardir/log/master*-bin*") ) - { - unlink($bin); - } - - # FIXME only remove the ones that are tied to this master - # Remove old master.info and relay-log.info files - unlink("$master->[0]->{'path_myddir'}/master.info"); - unlink("$master->[0]->{'path_myddir'}/relay-log.info"); - unlink("$master->[1]->{'path_myddir'}/master.info"); - unlink("$master->[1]->{'path_myddir'}/relay-log.info"); - - run_master_init_script($tinfo); + ); } -sub do_before_start_slave ($) { - my ($tinfo)= @_; - - my $tname= $tinfo->{'name'}; - my $init_script= $tinfo->{'master_sh'}; - - # Don't delete anything if starting dirty - return if ($opt_start_dirty); - - foreach my $bin ( glob("$opt_vardir/log/slave*-bin*") ) - { - unlink($bin); - } - - unlink("$slave->[0]->{'path_myddir'}/master.info"); - unlink("$slave->[0]->{'path_myddir'}/relay-log.info"); - - # Run slave initialization shell script if one exists - if ( $init_script ) - { - my $ret= mtr_run("/bin/sh", [$init_script], "", "", "", ""); - if ( $ret != 0 ) - { - # FIXME rewrite those scripts to return 0 if successful - # mtr_warning("$init_script exited with code $ret"); - } - } - - foreach my $bin ( glob("$slave->[0]->{'path_myddir'}/log.*") ) - { - unlink($bin); - } -} - - -sub mysqld_arguments ($$$$) { +sub mysqld_arguments ($$$) { my $args= shift; my $mysqld= shift; my $extra_opt= shift; - my $slave_master_info= shift; - - my $idx= $mysqld->{'idx'}; - my $sidx= ""; # Index as string, 0 is empty string - if ( $idx> 0 ) - { - $sidx= $idx; - } my $prefix= ""; # If mysqltest server arg - if ( $glob_use_embedded_server ) + if ( $opt_embedded_server ) { $prefix= "--server-arg="; } - mtr_add_arg($args, "%s--no-defaults", $prefix); - - mtr_add_arg($args, "%s--basedir=%s", $prefix, $path_my_basedir); - mtr_add_arg($args, "%s--character-sets-dir=%s", $prefix, $path_charsetsdir); - - if ( $mysql_version_id >= 50036) - { - # By default, prevent the started mysqld to access files outside of vardir - mtr_add_arg($args, "%s--secure-file-priv=%s", $prefix, $opt_vardir); - } - - if ( $mysql_version_id >= 50000 ) - { - mtr_add_arg($args, "%s--log-bin-trust-function-creators", $prefix); - } - - mtr_add_arg($args, "%s--default-character-set=latin1", $prefix); - mtr_add_arg($args, "%s--language=%s", $prefix, $path_language); - mtr_add_arg($args, "%s--tmpdir=$opt_tmpdir", $prefix); - - # Increase default connect_timeout to avoid intermittent - # disconnects when test servers are put under load - # see BUG#28359 - mtr_add_arg($args, "%s--connect-timeout=60", $prefix); + mtr_add_arg($args, "%s--defaults-file=%s", $prefix, $path_config_file); + mtr_add_arg($args, "--defaults-group-suffix=%s", $mysqld->after('mysqld')); # When mysqld is run by a root user(euid is 0), it will fail # to start unless we specify what user to run as, see BUG#30630 my $euid= $>; - if (!$glob_win32 and $euid == 0 and + if (!$is_win32 and $euid == 0 and (grep(/^--user/, @$extra_opt, @opt_extra_mysqld_opt)) == 0) { mtr_add_arg($args, "%s--user=root", $prefix); } @@ -3807,172 +2594,22 @@ sub mysqld_arguments ($$$$) { } } - mtr_add_arg($args, "%s--pid-file=%s", $prefix, - $mysqld->{'path_pid'}); - - mtr_add_arg($args, "%s--port=%d", $prefix, - $mysqld->{'port'}); - - mtr_add_arg($args, "%s--socket=%s", $prefix, - $mysqld->{'path_sock'}); - - mtr_add_arg($args, "%s--datadir=%s", $prefix, - $mysqld->{'path_myddir'}); - - if ( $mysql_version_id >= 50106 ) { - # Turn on logging to bothe tables and file + # Turn on logging to both tables and file mtr_add_arg($args, "%s--log-output=table,file", $prefix); } - my $log_base_path= "$opt_vardir/log/$mysqld->{'type'}$sidx"; - mtr_add_arg($args, "%s--log=%s.log", $prefix, $log_base_path); - mtr_add_arg($args, - "%s--log-slow-queries=%s-slow.log", $prefix, $log_base_path); - # Check if "extra_opt" contains --skip-log-bin my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt, @opt_extra_mysqld_opt); - if ( $mysqld->{'type'} eq 'master' ) - { - if (! ($opt_skip_master_binlog || $skip_binlog) ) - { - mtr_add_arg($args, "%s--log-bin=%s/log/master-bin%s", $prefix, - $opt_vardir, $sidx); - } - - mtr_add_arg($args, "%s--server-id=%d", $prefix, - $idx > 0 ? $idx + 101 : 1); - - mtr_add_arg($args, "%s--loose-innodb_data_file_path=ibdata1:10M:autoextend", - $prefix); - - mtr_add_arg($args, "%s--local-infile", $prefix); - - if ( $idx > 0 or !$use_innodb) - { - mtr_add_arg($args, "%s--loose-skip-innodb", $prefix); - } - - my $cluster= $clusters->[$mysqld->{'cluster'}]; - if ( $cluster->{'pid'} || # Cluster is started - $cluster->{'use_running'} ) # Using running cluster - { - mtr_add_arg($args, "%s--ndbcluster", $prefix); - mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix, - $cluster->{'connect_string'}); - if ( $mysql_version_id >= 50100 ) - { - mtr_add_arg($args, "%s--ndb-extra-logging", $prefix); - } - } - else - { - mtr_add_arg($args, "%s--loose-skip-ndbcluster", $prefix); - } - } - else - { - mtr_error("unknown mysqld type") - unless $mysqld->{'type'} eq 'slave'; - - mtr_add_arg($args, "%s--init-rpl-role=slave", $prefix); - if (! ( $opt_skip_slave_binlog || $skip_binlog )) - { - mtr_add_arg($args, "%s--log-bin=%s/log/slave%s-bin", $prefix, - $opt_vardir, $sidx); # FIXME use own dir for binlogs - mtr_add_arg($args, "%s--log-slave-updates", $prefix); - } - - mtr_add_arg($args, "%s--master-retry-count=10", $prefix); - - mtr_add_arg($args, "%s--relay-log=%s/log/slave%s-relay-bin", $prefix, - $opt_vardir, $sidx); - mtr_add_arg($args, "%s--report-host=127.0.0.1", $prefix); - mtr_add_arg($args, "%s--report-port=%d", $prefix, - $mysqld->{'port'}); - mtr_add_arg($args, "%s--report-user=root", $prefix); - mtr_add_arg($args, "%s--loose-skip-innodb", $prefix); - mtr_add_arg($args, "%s--skip-slave-start", $prefix); - - # Directory where slaves find the dumps generated by "load data" - # on the server. The path need to have constant length otherwise - # test results will vary, thus a relative path is used. - my $slave_load_path= "../tmp"; - mtr_add_arg($args, "%s--slave-load-tmpdir=%s", $prefix, - $slave_load_path); - mtr_add_arg($args, "%s--set-variable=slave_net_timeout=120", $prefix); - - if ( @$slave_master_info ) - { - foreach my $arg ( @$slave_master_info ) - { - mtr_add_arg($args, "%s%s", $prefix, $arg); - } - } - else - { - if ($mysql_version_id < 50200) - { - mtr_add_arg($args, "%s--master-user=root", $prefix); - mtr_add_arg($args, "%s--master-connect-retry=1", $prefix); - mtr_add_arg($args, "%s--master-host=127.0.0.1", $prefix); - mtr_add_arg($args, "%s--master-password=", $prefix); - mtr_add_arg($args, "%s--master-port=%d", $prefix, - $master->[0]->{'port'}); # First master - } - my $slave_server_id= 2 + $idx; - my $slave_rpl_rank= $slave_server_id; - mtr_add_arg($args, "%s--server-id=%d", $prefix, $slave_server_id); - mtr_add_arg($args, "%s--rpl-recovery-rank=%d", $prefix, $slave_rpl_rank); - } - - my $cluster= $clusters->[$mysqld->{'cluster'}]; - if ( $cluster->{'pid'} || # Slave cluster is started - $cluster->{'use_running'} ) # Using running slave cluster - { - mtr_add_arg($args, "%s--ndbcluster", $prefix); - mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix, - $cluster->{'connect_string'}); - - if ( $mysql_version_id >= 50100 ) - { - mtr_add_arg($args, "%s--ndb-extra-logging", $prefix); - } - } - else - { - mtr_add_arg($args, "%s--loose-skip-ndbcluster", $prefix); - } - - } # end slave if ( $opt_debug ) { - mtr_add_arg($args, "%s--debug=d:t:i:A,%s/log/%s%s.trace", - $prefix, $path_vardir_trace, $mysqld->{'type'}, $sidx); + mtr_add_arg($args, "%s--debug=d:t:i:A,%s/log/%s.trace", + $prefix, $path_vardir_trace, $mysqld->name()); } - mtr_add_arg($args, "%s--key_buffer_size=1M", $prefix); - mtr_add_arg($args, "%s--sort_buffer=256K", $prefix); - mtr_add_arg($args, "%s--max_heap_table_size=1M", $prefix); - - if ( $opt_ssl_supported ) - { - mtr_add_arg($args, "%s--ssl-ca=%s/std_data/cacert.pem", $prefix, - $glob_mysql_test_dir); - mtr_add_arg($args, "%s--ssl-cert=%s/std_data/server-cert.pem", $prefix, - $glob_mysql_test_dir); - mtr_add_arg($args, "%s--ssl-key=%s/std_data/server-key.pem", $prefix, - $glob_mysql_test_dir); - } - - if ( $opt_warnings ) - { - mtr_add_arg($args, "%s--log-warnings", $prefix); - } - - # Indicate to "mysqld" it will be debugged in debugger + # Indicate to mysqld it will be debugged in debugger if ( $glob_debugger ) { mtr_add_arg($args, "%s--gdb", $prefix); @@ -4000,55 +2637,25 @@ sub mysqld_arguments ($$$$) { mtr_add_arg($args, "%s%s", $prefix, "--core-file"); } - if ( $opt_bench ) - { - mtr_add_arg($args, "%s--rpl-recovery-rank=1", $prefix); - mtr_add_arg($args, "%s--init-rpl-role=master", $prefix); - } - elsif ( $mysqld->{'type'} eq 'master' ) - { - mtr_add_arg($args, "%s--open-files-limit=1024", $prefix); + if ( $is_win32 ){ + mtr_add_arg($args, "%s--log-error=%s", $prefix, $mysqld->{"path_myerr"}); } return $args; } -############################################################################## -# -# Start mysqld and return the PID -# -############################################################################## - -sub mysqld_start ($$$) { +sub mysqld_start ($$) { my $mysqld= shift; my $extra_opt= shift; - my $slave_master_info= shift; - my $args; # Arg vector - my $exe; - my $pid= -1; + my $exe= $exe_mysqld; my $wait_for_pid_file= 1; - my $type= $mysqld->{'type'}; - my $idx= $mysqld->{'idx'}; - mtr_error("Internal error: mysqld should never be started for embedded") - if $glob_use_embedded_server; - - if ( $type eq 'master' ) - { - $exe= $exe_master_mysqld; - } - elsif ( $type eq 'slave' ) - { - $exe= $exe_slave_mysqld; - } - else - { - mtr_error("Unknown 'type' \"$type\" passed to mysqld_start"); - } + if $opt_embedded_server; + my $args; mtr_init_args(\$args); if ( $opt_valgrind_mysqld ) @@ -4056,23 +2663,23 @@ sub mysqld_start ($$$) { valgrind_arguments($args, \$exe); } - mysqld_arguments($args,$mysqld,$extra_opt,$slave_master_info); + mysqld_arguments($args,$mysqld,$extra_opt); - if ( $opt_gdb || $opt_manual_gdb) + if ( $opt_gdb || $opt_manual_gdb ) { - gdb_arguments(\$args, \$exe, "$type"."_$idx"); + gdb_arguments(\$args, \$exe, $mysqld->name()); } elsif ( $opt_ddd || $opt_manual_ddd ) { - ddd_arguments(\$args, \$exe, "$type"."_$idx"); + ddd_arguments(\$args, \$exe, $mysqld->name()); } elsif ( $opt_debugger ) { - debugger_arguments(\$args, \$exe, "$type"."_$idx"); + debugger_arguments(\$args, \$exe, $mysqld->name()); } elsif ( $opt_manual_debug ) { - print "\nStart $type in your debugger\n" . + print "\nStart $mysqld->name() in your debugger\n" . "dir: $glob_mysql_test_dir\n" . "exe: $exe\n" . "args: " . join(" ", @$args) . "\n\n" . @@ -4087,550 +2694,386 @@ sub mysqld_start ($$$) { $wait_for_pid_file= 0; } - # Remove the pidfile - unlink($mysqld->{'path_pid'}); + # Remove the old pidfile if any + unlink($mysqld->value('pid-file')); + + my $output= $mysqld->value('log-error'); + if ( $opt_valgrind and $opt_debug ) + { + # When both --valgrind and --debug is selected, send + # all output to the trace file, making it possible to + # see the exact location where valgrind complains + $output= "$opt_vardir/log/".$mysqld->name().".trace"; + } if ( defined $exe ) { - $pid= mtr_spawn($exe, $args, "", - $mysqld->{'path_myerr'}, - $mysqld->{'path_myerr'}, - "", - { append_log_file => 1 }); + $mysqld->{'proc'}= My::SafeProcess->new + ( + name => $mysqld->name(), + path => $exe, + args => \$args, + output => $output, + error => $output, + append => 1, + verbose => $opt_verbose, + host => undef, + shutdown => sub { mysqld_stop($mysqld) }, + ); + mtr_verbose("Started $mysqld->{proc}"); } - - if ( $wait_for_pid_file && !sleep_until_file_created($mysqld->{'path_pid'}, - $mysqld->{'start_timeout'}, - $pid)) + if ( $wait_for_pid_file && + !sleep_until_file_created($mysqld->value('pid-file'), + $opt_start_timeout, + $mysqld->{'proc'})) { - - mtr_error("Failed to start mysqld $mysqld->{'type'}"); + mtr_error("Failed to start mysqld $mysqld->name()"); } - - # Remember pid of the started process - $mysqld->{'pid'}= $pid; - # Remember options used when starting - $mysqld->{'start_opts'}= $extra_opt; - $mysqld->{'start_slave_master_info'}= $slave_master_info; + $mysqld->{'started_opts'}= $extra_opt; - mtr_verbose("mysqld pid: $pid"); - return $pid; + return; } sub stop_all_servers () { - mtr_report("Stopping All Servers"); + mtr_report("Stopping all servers..."); - if ( ! $opt_skip_im ) - { - mtr_report("Shutting-down Instance Manager"); - unless (mtr_im_stop($instance_manager, "stop_all_servers")) - { - mtr_error("Failed to stop Instance Manager.") - } - } + # Kill all started servers + My::SafeProcess::shutdown(0, # shutdown timeout 0 => kill + started(all_servers())); - my %admin_pids; # hash of admin processes that requests shutdown - my @kill_pids; # list of processes to shutdown/kill - my $pid; + # Mark servers as stopped + map($_->{proc}= undef, all_servers()); - # Start shutdown of all started masters - foreach my $mysqld (@{$slave}, @{$master}) - { - if ( $mysqld->{'pid'} ) - { - $pid= mtr_mysqladmin_start($mysqld, "shutdown", 70); - $admin_pids{$pid}= 1; - - push(@kill_pids,{ - pid => $mysqld->{'pid'}, - real_pid => $mysqld->{'real_pid'}, - pidfile => $mysqld->{'path_pid'}, - sockfile => $mysqld->{'path_sock'}, - port => $mysqld->{'port'}, - errfile => $mysqld->{'path_myerr'}, - }); - - $mysqld->{'pid'}= 0; # Assume we are done with it - } - } - - # Start shutdown of clusters - foreach my $cluster (@{$clusters}) - { - if ( $cluster->{'pid'} ) - { - $pid= mtr_ndbmgm_start($cluster, "shutdown"); - $admin_pids{$pid}= 1; - - push(@kill_pids,{ - pid => $cluster->{'pid'}, - pidfile => $cluster->{'path_pid'} - }); - - $cluster->{'pid'}= 0; # Assume we are done with it - - foreach my $ndbd (@{$cluster->{'ndbds'}}) - { - if ( $ndbd->{'pid'} ) - { - push(@kill_pids,{ - pid => $ndbd->{'pid'}, - pidfile => $ndbd->{'path_pid'}, - }); - $ndbd->{'pid'}= 0; - } - } - } - } - - # Wait blocking until all shutdown processes has completed - mtr_wait_blocking(\%admin_pids); - - # Make sure that process has shutdown else try to kill them - mtr_check_stop_servers(\@kill_pids); - - foreach my $mysqld (@{$master}, @{$slave}) - { - rm_ndbcluster_tables($mysqld->{'path_myddir'}); - } } -sub run_testcase_need_master_restart($) -{ - my ($tinfo)= @_; - # We try to find out if we are to restart the master(s) - my $do_restart= 0; # Assumes we don't have to +# Find out if server should be restarted for this test +sub server_need_restart { + my ($tinfo, $server)= @_; - if ( $glob_use_embedded_server ) + if ( using_extern() ) { - mtr_verbose("Never start or restart for embedded server"); - return $do_restart; + mtr_verbose("No restart: using extern"); + return 0; } - elsif ( $tinfo->{'master_sh'} ) + + if ( $opt_embedded_server ) { - $do_restart= 1; # Always restart if script to run - mtr_verbose("Restart master: Always restart if script to run"); + mtr_verbose("No start or restart for embedded server"); + return 0; } - if ( $tinfo->{'force_restart'} ) + + if ( $server->option('#!force-restart') ) { + mtr_verbose("Restart: forced in configuration"); + return 1; + } + + if ( $tinfo->{'force_restart'} ) { + mtr_verbose("Restart: forced in .opt file"); + return 1; + } + + if ( $tinfo->{template_path} ne $current_config_name) { - $do_restart= 1; # Always restart if --force-restart in -opt file - mtr_verbose("Restart master: Restart forced with --force-restart"); + mtr_verbose("Restart: using different config file"); + return 1; } - elsif ( ! $opt_skip_ndbcluster and - !$tinfo->{'ndb_test'} and - $clusters->[0]->{'pid'} != 0 ) + + if ( $tinfo->{'master_sh'} || $tinfo->{'slave_sh'} ) { - $do_restart= 1; # Restart without cluster - mtr_verbose("Restart master: Test does not need cluster"); + mtr_verbose("Restart: script to run"); + return 1; } - elsif ( ! $opt_skip_ndbcluster and - $tinfo->{'ndb_test'} and - $clusters->[0]->{'pid'} == 0 ) + + if ( ! started($server) ) { - $do_restart= 1; # Restart with cluster - mtr_verbose("Restart master: Test need cluster"); + mtr_verbose("Restart: not started"); + return 1; } - elsif( $tinfo->{'component_id'} eq 'im' ) + + my $started_tinfo= $server->{'started_tinfo'}; + if ( defined $started_tinfo ) { - $do_restart= 1; - mtr_verbose("Restart master: Always restart for im tests"); + + # Check if timezone of test that server was started + # with differs from timezone of next test + if ( timezone($started_tinfo) ne timezone($tinfo) ) + { + mtr_verbose("Restart: Different timezone"); + return 1; + } } - elsif ( $master->[0]->{'running_master_options'} and - $master->[0]->{'running_master_options'}->{'timezone'} ne - $tinfo->{'timezone'}) - { - $do_restart= 1; - mtr_verbose("Restart master: Different timezone"); - } - # Check that running master was started with same options + + # Check that running process was started with same options # as the current test requires - elsif (! mtr_same_opts($master->[0]->{'start_opts'}, - $tinfo->{'master_opt'}) ) + my $extra_opt= get_extra_opt($server, $tinfo); + my $started_opts= $server->{'started_opts'}; + if (defined $started_opts and $extra_opt and + ! mtr_same_opts($started_opts, $extra_opt) ) { - # Chech that diff is binlog format only - my $diff_opts= mtr_diff_opts($master->[0]->{'start_opts'},$tinfo->{'master_opt'}); - if (scalar(@$diff_opts) eq 2) + # Check if diff is binlog format only + my @diff_opts= mtr_diff_opts($started_opts, $extra_opt); + if (@diff_opts == 2 and + $diff_opts[0] =~/^--binlog-format=/ and + $diff_opts[1] =~/^--binlog-format=/) { - $do_restart= 1 unless ($diff_opts->[0] =~/^--binlog-format=/ and $diff_opts->[1] =~/^--binlog-format=/); + mtr_verbose("Using dynamic switch of binlog format from ", + $diff_opts[0],"to", $diff_opts[1]); + + die "Binlog format to switch to is not set" + unless defined $tinfo->{binlog_format_switch}; } else { - $do_restart= 1; - mtr_verbose("Restart master: running with different options '" . - join(" ", @{$tinfo->{'master_opt'}}) . "' != '" . - join(" ", @{$master->[0]->{'start_opts'}}) . "'" ); + + mtr_verbose("Restart: running with different options '" . + join(" ", @{$extra_opt}) . "' != '" . + join(" ", @{$server->{'started_opts'}}) . "'" ); + return 1; } } - elsif( ! $master->[0]->{'pid'} ) - { - if ( $opt_extern ) - { - $do_restart= 0; - mtr_verbose("No restart: using extern master"); - } - else - { - $do_restart= 1; - mtr_verbose("Restart master: master is not started"); - } - } - return $do_restart; + + # Default, no restart + return 0; } -sub run_testcase_need_slave_restart($) -{ + +sub servers_need_restart($) { my ($tinfo)= @_; + return grep { server_need_restart($tinfo, $_); } all_servers(); +} - # We try to find out if we are to restart the slaves - my $do_slave_restart= 0; # Assumes we don't have to - if ( $glob_use_embedded_server ) + +# +# Return list of specific servers +# - there is no servers in an empty config +# +sub _like { return $config ? $config->like($_[0]) : (); } +sub mysqlds { return _like('mysqld.'); } +sub ndbds { return _like('cluster_config.ndbd.');} +sub ndb_mgmds { return _like('cluster_config.ndb_mgmd.'); } +sub clusters { return _like('mysql_cluster.'); } +sub all_servers { return ( mysqlds(), ndb_mgmds(), ndbds() ); } + + +# +# Filter a list of servers and return only those that are part +# of the specified cluster +# +sub in_cluster { + my ($cluster)= shift; + # Return only processes for a specific cluster + return grep { $_->suffix() eq $cluster->suffix() } @_; +} + + + +# +# Filter a list of servers and return the SafeProcess +# for only those that are started or stopped +# +sub started { return grep(defined $_, map($_->{proc}, @_)); } +sub stopped { return grep(!defined $_, map($_->{proc}, @_)); } + + +sub get_extra_opt { + my ($mysqld, $tinfo)= @_; + + return + $mysqld->option("#!use-slave-opt") ? + $tinfo->{slave_opt} : $tinfo->{master_opt}; +} + + +sub stop_servers($$) { + my ($tinfo, @servers)= @_; + + # Remember if we restarted for this test case (count restarts) + $tinfo->{'restarted'}= 1; + + if ( join('|', @servers) eq join('|', all_servers()) ) { - mtr_verbose("Never start or restart for embedded server"); - return $do_slave_restart; - } - elsif ( $max_slave_num == 0) - { - mtr_verbose("Skip slave restart: No testcase use slaves"); + # All servers are going down, use some kind of order to + # avoid too many warnings in the log files + + mtr_verbose("All servers are going down"); + + # mysqld processes + My::SafeProcess::shutdown( $opt_shutdown_timeout, started(mysqlds()) ); + + # cluster processes + My::SafeProcess::shutdown( $opt_shutdown_timeout, + started(ndbds(), ndb_mgmds()) ); } else { - - # Check if any slave is currently started - my $any_slave_started= 0; - foreach my $mysqld (@{$slave}) - { - if ( $mysqld->{'pid'} ) - { - $any_slave_started= 1; - last; - } - } - - if ($any_slave_started) - { - mtr_verbose("Restart slave: Slave is started, always restart"); - $do_slave_restart= 1; - } - elsif ( $tinfo->{'slave_num'} ) - { - mtr_verbose("Restart slave: Test need slave"); - $do_slave_restart= 1; - } + # Stop only some servers + My::SafeProcess::shutdown( $opt_shutdown_timeout, + started(@servers) ); } - return $do_slave_restart; - -} - -# ---------------------------------------------------------------------- -# If not using a running servers we may need to stop and restart. -# We restart in the case we have initiation scripts, server options -# etc to run. But we also restart again after the test first restart -# and test is run, to get back to normal server settings. -# -# To make the code a bit more clean, we actually only stop servers -# here, and mark this to be done. Then a generic "start" part will -# start up the needed servers again. -# ---------------------------------------------------------------------- - -sub run_testcase_stop_servers($$$) { - my ($tinfo, $do_restart, $do_slave_restart)= @_; - my $pid; - my %admin_pids; # hash of admin processes that requests shutdown - my @kill_pids; # list of processes to shutdown/kill - - # Remember if we restarted for this test case (count restarts) - $tinfo->{'restarted'}= $do_restart; - - if ( $do_restart ) + foreach my $server (@servers) { - delete $master->[0]->{'running_master_options'}; # Forget history - - # Start shutdown of all started masters - foreach my $mysqld (@{$master}) + # Remove datadir + if ( $server->option('#!remove-datadir') ) { - if ( $mysqld->{'pid'} ) - { - $pid= mtr_mysqladmin_start($mysqld, "shutdown", 20); - - $admin_pids{$pid}= 1; - - push(@kill_pids,{ - pid => $mysqld->{'pid'}, - real_pid => $mysqld->{'real_pid'}, - pidfile => $mysqld->{'path_pid'}, - sockfile => $mysqld->{'path_sock'}, - port => $mysqld->{'port'}, - errfile => $mysqld->{'path_myerr'}, - }); - - $mysqld->{'pid'}= 0; # Assume we are done with it - } + my $datadir= $server->value('datadir'); + mtr_debug("Removing '$datadir'"); + rmtree($datadir); } - # Start shutdown of master cluster - my $cluster= $clusters->[0]; - if ( $cluster->{'pid'} ) - { - $pid= mtr_ndbmgm_start($cluster, "shutdown"); - $admin_pids{$pid}= 1; + # Mark server as stopped + $server->{proc}= undef; - push(@kill_pids,{ - pid => $cluster->{'pid'}, - pidfile => $cluster->{'path_pid'} - }); - - $cluster->{'pid'}= 0; # Assume we are done with it - - foreach my $ndbd (@{$cluster->{'ndbds'}}) - { - push(@kill_pids,{ - pid => $ndbd->{'pid'}, - pidfile => $ndbd->{'path_pid'}, - }); - $ndbd->{'pid'}= 0; # Assume we are done with it - } - } - } - - if ( $do_restart || $do_slave_restart ) - { - - delete $slave->[0]->{'running_slave_options'}; # Forget history - - # Start shutdown of all started slaves - foreach my $mysqld (@{$slave}) - { - if ( $mysqld->{'pid'} ) - { - $pid= mtr_mysqladmin_start($mysqld, "shutdown", 20); - - $admin_pids{$pid}= 1; - - push(@kill_pids,{ - pid => $mysqld->{'pid'}, - real_pid => $mysqld->{'real_pid'}, - pidfile => $mysqld->{'path_pid'}, - sockfile => $mysqld->{'path_sock'}, - port => $mysqld->{'port'}, - errfile => $mysqld->{'path_myerr'}, - }); - - - $mysqld->{'pid'}= 0; # Assume we are done with it - } - } - - # Start shutdown of slave cluster - my $cluster= $clusters->[1]; - if ( $cluster->{'pid'} ) - { - $pid= mtr_ndbmgm_start($cluster, "shutdown"); - - $admin_pids{$pid}= 1; - - push(@kill_pids,{ - pid => $cluster->{'pid'}, - pidfile => $cluster->{'path_pid'} - }); - - $cluster->{'pid'}= 0; # Assume we are done with it - - foreach my $ndbd (@{$cluster->{'ndbds'}} ) - { - push(@kill_pids,{ - pid => $ndbd->{'pid'}, - pidfile => $ndbd->{'path_pid'}, - }); - $ndbd->{'pid'}= 0; # Assume we are done with it - } - } - } - - # ---------------------------------------------------------------------- - # Shutdown has now been started and lists for the shutdown processes - # and the processes to be killed has been created - # ---------------------------------------------------------------------- - - # Wait blocking until all shutdown processes has completed - mtr_wait_blocking(\%admin_pids); - - - # Make sure that process has shutdown else try to kill them - mtr_check_stop_servers(\@kill_pids); - - foreach my $mysqld (@{$master}, @{$slave}) - { - if ( ! $mysqld->{'pid'} ) - { - # Remove ndbcluster tables if server is stopped - rm_ndbcluster_tables($mysqld->{'path_myddir'}); - } + # Forget history + delete $server->{'started_tinfo'}; + delete $server->{'started_opts'}; + delete $server->{'started_cnf'}; } } # -# run_testcase_start_servers +# start_servers # -# Start the servers needed by this test case +# Start servers not already started # # RETURN # 0 OK # 1 Start failed # +sub start_servers($) { + my ($tinfo)= @_; -sub run_testcase_start_servers($) { - my $tinfo= shift; - my $tname= $tinfo->{'name'}; - - if ( $tinfo->{'component_id'} eq 'mysqld' ) + # Start clusters + foreach my $cluster ( clusters() ) { - if ( ! $opt_skip_ndbcluster and - !$clusters->[0]->{'pid'} and - $tinfo->{'ndb_test'} ) + ndbcluster_start($cluster); + } + + # Start mysqlds + foreach my $mysqld ( mysqlds() ) + { + if ( $mysqld->{proc} ) { - # Test need cluster, cluster is not started, start it - ndbcluster_start($clusters->[0], ""); + # Already started + + # Write start of testcase to log file + mark_log($mysqld->value('log-error'), $tinfo); + + next; } - if ( !$master->[0]->{'pid'} ) + my $datadir= $mysqld->value('datadir'); + + # Don't delete anything if starting dirty + if (!$opt_start_dirty) { - # Master mysqld is not started - do_before_start_master($tinfo); + # Remove old datadir before starting process + if ($mysqld->option('#!fresh-datadir') and -d $datadir) { + mtr_debug("Removing old datadir: '$datadir'"); + rmdir($datadir); + } - mysqld_start($master->[0],$tinfo->{'master_opt'},[]); + my @options= ('log-bin', 'relay-log'); - } + foreach my $option_name ( @options ) { + next unless $mysqld->option($option_name); - if ( $clusters->[0]->{'pid'} || $clusters->[0]->{'use_running'} - and ! $master->[1]->{'pid'} and - $tinfo->{'master_num'} > 1 ) - { - # Test needs cluster, start an extra mysqld connected to cluster + my $value= $mysqld->value($option_name); - if ( $mysql_version_id >= 50100 ) - { - # First wait for first mysql server to have created ndb system - # tables ok FIXME This is a workaround so that only one mysqld - # create the tables - if ( ! sleep_until_file_created( - "$master->[0]->{'path_myddir'}/mysql/ndb_apply_status.ndb", - $master->[0]->{'start_timeout'}, - $master->[0]->{'pid'})) + foreach my $file ( glob("$datadir/$value*") ) { - - $tinfo->{'comment'}= "Failed to create 'mysql/ndb_apply_status' table"; - return 1; + #print "removing: $file\n"; + mtr_debug("Removing '$file'"); + unlink($file); } } - mysqld_start($master->[1],$tinfo->{'master_opt'},[]); + + # Remove old master.info and relay-log.info files + # from the servers datadir + unlink("$datadir/master.info"); + unlink("$datadir/relay-log.info"); } - # Save this test case information, so next can examine it - $master->[0]->{'running_master_options'}= $tinfo; - } - elsif ( ! $opt_skip_im and $tinfo->{'component_id'} eq 'im' ) - { - # We have to create defaults file every time, in order to ensure that it - # will be the same for each test. The problem is that test can change the - # file (by SET/UNSET commands), so w/o recreating the file, execution of - # one test can affect the other. + # Copy datadir from installed system db + copy_install_db($datadir) unless -d $datadir; - im_create_defaults_file($instance_manager); + # Write start of testcase to log file + mark_log($mysqld->value('log-error'), $tinfo); - if ( ! mtr_im_start($instance_manager, $tinfo->{im_opts}) ) + # Run -master.sh + if ($mysqld->option('#!run-master-sh') and + run_sh_script($tinfo->{master_sh}) ) { - $tinfo->{'comment'}= "Failed to start Instance Manager. "; + $tinfo->{'comment'}= "Failed to execute '$tinfo->{master_sh}'"; return 1; } - } - # ---------------------------------------------------------------------- - # Start slaves - if needed - # ---------------------------------------------------------------------- - if ( $tinfo->{'slave_num'} ) - { - restore_slave_databases($tinfo->{'slave_num'}); - - do_before_start_slave($tinfo); - - if ( ! $opt_skip_ndbcluster_slave and - !$clusters->[1]->{'pid'} and - $tinfo->{'ndb_test'} ) + # Run -slave.sh + if ($mysqld->option('#!run-slave-sh') and + run_sh_script($tinfo->{slave_sh})) { - # Test need slave cluster, cluster is not started, start it - ndbcluster_start($clusters->[1], ""); + $tinfo->{'comment'}= "Failed to execute '$tinfo->{slave_sh}'"; + return 1; } - for ( my $idx= 0; $idx < $tinfo->{'slave_num'}; $idx++ ) - { - if ( ! $slave->[$idx]->{'pid'} ) - { - mysqld_start($slave->[$idx],$tinfo->{'slave_opt'}, - $tinfo->{'slave_mi'}); - - } - } + my $extra_opt= get_extra_opt($mysqld, $tinfo); + mysqld_start($mysqld,$extra_opt); # Save this test case information, so next can examine it - $slave->[0]->{'running_slave_options'}= $tinfo; + $mysqld->{'started_tinfo'}= $tinfo; } # Wait for clusters to start - foreach my $cluster (@{$clusters}) + foreach my $cluster ( clusters() ) { - - next if !$cluster->{'pid'}; - if (ndbcluster_wait_started($cluster, "")) { # failed to start - $tinfo->{'comment'}= "Start of $cluster->{'name'} cluster failed"; + $tinfo->{'comment'}= "Start of '".$cluster->name()."' cluster failed"; return 1; } } - # Wait for mysqld's to start - foreach my $mysqld (@{$master},@{$slave}) + # Wait for mysqlds to start + foreach my $mysqld ( mysqlds() ) { - - next if !$mysqld->{'pid'}; - - if (mysqld_wait_started($mysqld)) - { - # failed to start - $tinfo->{'comment'}= - "Failed to start $mysqld->{'type'} mysqld $mysqld->{'idx'}"; + if (sleep_until_file_created($mysqld->value('pid-file'), + $opt_start_timeout, + $mysqld->{'proc'}) == 0) { + $tinfo->{comment}= + "Failed to start ".$mysqld->name(); return 1; } } return 0; } + # # Run include/check-testcase.test -# Before a testcase, run in record mode, save result file to var +# Before a testcase, run in record mode and save result file to var/tmp # After testcase, run and compare with the recorded file, they should be equal! # # RETURN VALUE # 0 OK # 1 Check failed # -sub run_check_testcase ($$) { - +sub run_check_testcase ($$$) { + my $tinfo= shift; my $mode= shift; my $mysqld= shift; - my $name= "check-" . $mysqld->{'type'} . $mysqld->{'idx'}; + my $name= "check-".$mysqld->name(); + my $tname= $tinfo->{name}; my $args; mtr_init_args(\$args); @@ -4641,84 +3084,59 @@ sub run_check_testcase ($$) { mtr_add_arg($args, "--tmpdir=%s", $opt_tmpdir); mtr_add_arg($args, "--character-sets-dir=%s", $path_charsetsdir); - mtr_add_arg($args, "--socket=%s", $mysqld->{'path_sock'}); - mtr_add_arg($args, "--port=%d", $mysqld->{'port'}); + mtr_add_arg($args, "--socket=%s", $mysqld->value('socket')); + mtr_add_arg($args, "--port=%d", $mysqld->value('port')); mtr_add_arg($args, "--database=test"); mtr_add_arg($args, "--user=%s", $opt_user); mtr_add_arg($args, "--password="); - mtr_add_arg($args, "-R"); - mtr_add_arg($args, "$opt_vardir/tmp/$name.result"); + mtr_add_arg($args, "--result-file=%s", "$opt_vardir/tmp/$name.result"); + mtr_add_arg($args, "--test-file=%s", "include/check-testcase.test"); if ( $mode eq "before" ) { mtr_add_arg($args, "--record"); } + my $errfile= "$opt_vardir/tmp/$name.err"; + my $res= My::SafeProcess->run + ( + name => $name, + path => $exe_mysqltest, + error => $errfile, + args => \$args, + ); - my $res = mtr_run_test($exe_mysqltest,$args, - "include/check-testcase.test", "", "", ""); - - if ( $res == 1 and $mode eq "after") + if ( $mode eq "after" and $res == 1 ) { - mtr_run("diff",["-u", - "$opt_vardir/tmp/$name.result", - "$opt_vardir/tmp/$name.reject"], - "", "", "", ""); + mtr_report("\nThe check of testcase '$tname' failed, this is the\n", + "diff between before and after:\n"); + # Test failed, display the report mysqltest has created + mtr_printfile("$opt_vardir/tmp/$name.err"); } elsif ( $res ) { - mtr_error("Could not execute 'check-testcase' $mode testcase"); + mtr_report("\nCould not execute 'check-testcase' $mode testcase '$tname':"); + mtr_printfile("$opt_vardir/tmp/$name.err"); + mtr_report(); } return $res; } -############################################################################## -# -# Report the features that were compiled in -# -############################################################################## -sub run_report_features () { - my $args; - - if ( ! $glob_use_embedded_server ) - { - mysqld_start($master->[0],[],[]); - if ( ! $master->[0]->{'pid'} ) - { - mtr_error("Can't start the mysqld server"); - } - mysqld_wait_started($master->[0]); - } - - my $tinfo = {}; - $tinfo->{'name'} = 'report features'; - $tinfo->{'result_file'} = undef; - $tinfo->{'component_id'} = 'mysqld'; - $tinfo->{'path'} = 'include/report-features.test'; - $tinfo->{'timezone'}= "GMT-3"; - $tinfo->{'slave_num'} = 0; - $tinfo->{'master_opt'} = []; - $tinfo->{'slave_opt'} = []; - $tinfo->{'slave_mi'} = []; - $tinfo->{'comment'} = 'report server features'; - run_mysqltest($tinfo); - - if ( ! $glob_use_embedded_server ) - { - stop_all_servers(); - } +sub run_mysqltest ($) { + my $proc= start_mysqltest(@_); + $proc->wait(); } -sub run_mysqltest ($) { +sub start_mysqltest ($) { my ($tinfo)= @_; my $exe= $exe_mysqltest; my $args; mtr_init_args(\$args); - mtr_add_arg($args, "--no-defaults"); + mtr_add_arg($args, "--defaults-file=%s", $path_config_file); mtr_add_arg($args, "--silent"); mtr_add_arg($args, "--skip-safemalloc"); mtr_add_arg($args, "--tmpdir=%s", $opt_tmpdir); @@ -4729,21 +3147,7 @@ sub run_mysqltest ($) { mtr_add_arg($args, "--mark-progress") if $opt_mark_progress; - if ($tinfo->{'component_id'} eq 'im') - { - mtr_add_arg($args, "--socket=%s", $instance_manager->{'path_sock'}); - mtr_add_arg($args, "--port=%d", $instance_manager->{'port'}); - mtr_add_arg($args, "--user=%s", $instance_manager->{'admin_login'}); - mtr_add_arg($args, "--password=%s", $instance_manager->{'admin_password'}); - } - else # component_id == mysqld - { - mtr_add_arg($args, "--socket=%s", $master->[0]->{'path_sock'}); - mtr_add_arg($args, "--port=%d", $master->[0]->{'port'}); - mtr_add_arg($args, "--database=test"); - mtr_add_arg($args, "--user=%s", $opt_user); - mtr_add_arg($args, "--password="); - } + mtr_add_arg($args, "--database=test"); if ( $opt_ps_protocol ) { @@ -4767,7 +3171,7 @@ sub run_mysqltest ($) { if ( $opt_strace_client ) { - $exe= "strace"; # FIXME there are ktrace, .... + $exe= $opt_strace_client || "strace"; mtr_add_arg($args, "-o"); mtr_add_arg($args, "%s/log/mysqltest.strace", $opt_vardir); mtr_add_arg($args, "$exe_mysqltest"); @@ -4788,21 +3192,7 @@ sub run_mysqltest ($) { mtr_add_arg($args, "--sleep=%d", $opt_sleep); } - if ( $opt_debug ) - { - mtr_add_arg($args, "--debug=d:t:A,%s/log/mysqltest.trace", - $path_vardir_trace); - } - - if ( $opt_ssl_supported ) - { - mtr_add_arg($args, "--ssl-ca=%s/std_data/cacert.pem", - $glob_mysql_test_dir); - mtr_add_arg($args, "--ssl-cert=%s/std_data/client-cert.pem", - $glob_mysql_test_dir); - mtr_add_arg($args, "--ssl-key=%s/std_data/client-key.pem", - $glob_mysql_test_dir); - } + client_debug_arg($args, "mysqltest"); if ( $opt_ssl ) { @@ -4814,15 +3204,6 @@ sub run_mysqltest ($) { mtr_add_arg($args, "--skip-ssl"); } - # ---------------------------------------------------------------------- - # If embedded server, we create server args to give mysqltest to pass on - # ---------------------------------------------------------------------- - - if ( $glob_use_embedded_server ) - { - mysqld_arguments($args,$master->[0],$tinfo->{'master_opt'},[]); - } - # ---------------------------------------------------------------------- # export MYSQL_TEST variable containing /mysqltest # ---------------------------------------------------------------------- @@ -4832,7 +3213,6 @@ sub run_mysqltest ($) { # ---------------------------------------------------------------------- # Add arguments that should not go into the MYSQL_TEST env var # ---------------------------------------------------------------------- - if ( $opt_valgrind_mysqltest ) { # Prefix the Valgrind options to the argument list. @@ -4869,38 +3249,19 @@ sub run_mysqltest ($) { elsif ( $opt_client_debugger ) { debugger_arguments(\$args, \$exe, "client"); - } + } - if ( $opt_check_testcases ) - { - foreach my $mysqld (@{$master}, @{$slave}) - { - if ($mysqld->{'pid'}) - { - run_check_testcase("before", $mysqld); - } - } - } - - my $res = mtr_run_test($exe,$args,"","",$path_timefile,""); - - if ( $opt_check_testcases ) - { - foreach my $mysqld (@{$master}, @{$slave}) - { - if ($mysqld->{'pid'}) - { - if (run_check_testcase("after", $mysqld)) - { - # Check failed, mark the test case with that info - $tinfo->{'check_testcase_failed'}= 1; - } - } - } - } - - return $res; + my $proc= My::SafeProcess->new + ( + name => "mysqltest", + path => $exe, + args => \$args, + error => $path_timefile, + verbose => $opt_verbose, + ); + mtr_verbose("Started $proc"); + return $proc; } @@ -5102,7 +3463,7 @@ sub valgrind_arguments { } # Add valgrind options, can be overriden by user - mtr_add_arg($args, '%s', $opt_valgrind_options); + mtr_add_arg($args, '%s', $_) for (@valgrind_args); mtr_add_arg($args, $$exe); @@ -5118,12 +3479,9 @@ sub valgrind_arguments { } -############################################################################## # -# Usage +# Usage # -############################################################################## - sub usage ($) { my $message= shift; @@ -5147,12 +3505,15 @@ Options to control what engine/variation to run compress Use the compressed protocol between client and server ssl Use ssl protocol between client and server skip-ssl Dont start server with support for ssl connections - bench Run the benchmark suite - small-bench Run the benchmarks with --small-tests --small-tables ndb|with-ndbcluster Use cluster as default table type vs-config Visual Studio configuration used to create executables (default: MTR_VS_CONFIG environment variable) + config|defaults-file= Use fixed config template for all + tests + extra_defaults_file= Extra config template to add to + all generated configs + Options to control directories to use benchdir=DIR The directory where the benchmark suite is stored (default: ../../mysql-bench) @@ -5186,21 +3547,16 @@ Options to control what test suites or cases to run list of suite names. The default is: "$opt_suites" skip-rpl Skip the replication test cases. - skip-im Don't start IM, and skip the IM test cases big-test Set the environment variable BIG_TEST, which can be checked from test cases. - combination="ARG1 .. ARG2" Specify a set of "mysqld" arguments for one - combination. - skip-combination Skip any combination options and combinations files Options that specify ports - master_port=PORT Specify the port number used by the first master - slave_port=PORT Specify the port number used by the first slave - ndbcluster-port=PORT Specify the port number used by cluster - ndbcluster-port-slave=PORT Specify the port number used by slave cluster - mtr-build-thread=# Specify unique collection of ports. Can also be set by - setting the environment variable MTR_BUILD_THREAD. + baseport=PORT Specify the first port number used + mtr-build-thread=# Specify unique number to calculate port number(s) from. + Can be set in environment variable MTR_BUILD_THREAD. + Set MTR_BUILD_THREAD="auto" to automatically aquire + a build thread id that is unique to current host Options for test case authoring @@ -5214,9 +3570,12 @@ Options that pass on options Options to run test on running server - extern Use running server for tests - ndb-connectstring=STR Use running cluster, and connect using STR - ndb-connectstring-slave=STR Use running slave cluster, and connect using STR + extern option=value Run only the tests against an already started server + the options to use for connection to the extern server + must be specified using name-value pair notation + For example: + ./$0 --extern socket=/tmp/mysqld.sock + user=USER User for connection to extern server socket=PATH Socket for connection to extern server @@ -5235,24 +3594,24 @@ Options for debugging the product test(s) manual-ddd Let user manually start mysqld in ddd, before running test(s) - master-binary=PATH Specify the master "mysqld" to use - slave-binary=PATH Specify the slave "mysqld" to use - strace-client Create strace output for mysqltest client + strace-client=[path] Create strace output for mysqltest client, optionally + specifying name and path to the trace program to use. + Example: $0 --strace-client=ktrace max-save-core Limit the number of core files saved (to avoid filling up disks for heavily crashing server). Defaults to $opt_max_save_core, set to 0 for no limit. -Options for coverage, profiling etc +Options for valgrind - gcov FIXME - gprof FIXME valgrind Run the "mysqltest" and "mysqld" executables using - valgrind with options($default_valgrind_options) + valgrind with default options valgrind-all Synonym for --valgrind valgrind-mysqltest Run the "mysqltest" and "mysql_client_test" executable with valgrind valgrind-mysqld Run the "mysqld" executable with valgrind - valgrind-options=ARGS Options to give valgrind, replaces default options + valgrind-options=ARGS Deprecated, use --valgrind-option + valgrind-option=ARGS Option to give valgrind, replaces default option(s), + can be specified more then once valgrind-path=[EXE] Path to the valgrind executable callgrind Instruct valgrind to use callgrind @@ -5260,27 +3619,29 @@ Misc options comment=STR Write STR to the output notimer Don't show test case execution time - script-debug Debug this script itself - verbose More verbose output - start-and-exit Only initialize and start the servers, using the - startup settings for the specified test case (if any) + verbose More verbose output(use multiple times for even more) + start Only initialize and start the servers, using the + startup settings for the first specified test case + Example: + $0 --start alias & start-dirty Only start the servers (without initialization) for - the specified test case (if any) - fast Don't try to clean up from earlier runs + the first specified test case + fast Run as fast as possible, dont't wait for servers + to shutdown etc. reorder Reorder tests to get fewer server restarts help Get this help text - testcase-timeout=MINUTES Max test case run time (default $default_testcase_timeout) - suite-timeout=MINUTES Max test suite run time (default $default_suite_timeout) - warnings | log-warnings Pass --log-warnings to mysqld + testcase-timeout=MINUTES Max test case run time (default $opt_testcase_timeout) + suite-timeout=MINUTES Max test suite run time (default $opt_suite_timeout) + shutdown-timeout=SECONDS Max number of seconds to wait for server shutdown + before killing servers (default $opt_shutdown_timeout) + warnings Scan the log files for warnings. Use --nowarnings + to turn off. sleep=SECONDS Passed to mysqltest, will be used as fixed sleep time -Deprecated options - with-openssl Deprecated option for ssl - - HERE - mtr_exit(1); + exit(1); } + diff --git a/mysql-test/ndb/Makefile.am b/mysql-test/ndb/Makefile.am deleted file mode 100644 index 4ddf61cf5cc..00000000000 --- a/mysql-test/ndb/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ - -benchdir_root= $(prefix) -testdir = $(benchdir_root)/mysql-test/ndb - -EXTRA_DIST = ndbcluster.sh -CLEANFILES = ndbcluster -dist_test_DATA = ndb_config_2_node.ini ndb_config_1_node.ini -test_SCRIPTS = ndbcluster - -SUFFIXES = .sh - -.sh: - @RM@ -f $@ $@-t - @SED@ \ - -e 's!@''ndb_port''@!$(ndb_port)!g' \ - -e 's!@''ndbbindir''@!$(ndbbindir)!g' \ - -e 's!@''ndbtoolsdir''@!$(ndbtoolsdir)!g' \ - $< > $@-t - @CHMOD@ +x $@-t - @MV@ $@-t $@ - -# Don't update the files from bitkeeper -%::SCCS/s.% diff --git a/mysql-test/ndb/basic.result b/mysql-test/ndb/basic.result deleted file mode 100644 index 9d2b18881b9..00000000000 --- a/mysql-test/ndb/basic.result +++ /dev/null @@ -1,69 +0,0 @@ --- NDB Cluster -- Management Client -- ---------------------------------------------------------------------------- - NDB Cluster -- Management Client -- Help ---------------------------------------------------------------------------- -HELP Print help text -HELP SHOW Help for SHOW command -HELP DEBUG Help for debug compiled version -SHOW Print information about cluster -START BACKUP [NOWAIT | WAIT STARTED | WAIT COMPLETED] - Start backup (default WAIT COMPLETED) -ABORT BACKUP Abort backup -SHUTDOWN Shutdown all processes in cluster -CLUSTERLOG ON [] ... Enable Cluster logging -CLUSTERLOG OFF [] ... Disable Cluster logging -CLUSTERLOG TOGGLE [] ... Toggle severity filter on/off -CLUSTERLOG INFO Print cluster log information - START Start DB node (started with -n) - RESTART [-n] [-i] Restart DB node - STOP Stop DB node -ENTER SINGLE USER MODE Enter single user mode -EXIT SINGLE USER MODE Exit single user mode - STATUS Print status - CLUSTERLOG {=}+ Set log level for cluster log -PURGE STALE SESSIONS Reset reserved nodeid's in the mgmt server -CONNECT [] Connect to management server (reconnect if already connected) -QUIT Quit management client - - = ALERT | CRITICAL | ERROR | WARNING | INFO | DEBUG - = STARTUP | SHUTDOWN | STATISTICS | CHECKPOINT | NODERESTART | CONNECTION | INFO | ERROR | CONGESTION | DEBUG | BACKUP - = 0 - 15 - = ALL | Any database node id - -Connected to Management Server at: localhost:1186 -Node 1: started (Version 5.0.3) -Node 2: started (Version 5.0.3) - -Node 1: started (Version 5.0.3) - -Node 2: started (Version 5.0.3) - -Executing CLUSTERLOG on node 1 OK! -Executing CLUSTERLOG on node 2 OK! - -Executing CLUSTERLOG on node 1 OK! -Executing CLUSTERLOG on node 2 OK! - -Executing CLUSTERLOG on node 1 OK! -Executing CLUSTERLOG on node 2 OK! - -Executing CLUSTERLOG on node 1 OK! -Executing CLUSTERLOG on node 2 OK! - -Executing CLUSTERLOG on node 1 OK! -Executing CLUSTERLOG on node 2 OK! - -Executing CLUSTERLOG on node 1 OK! -Executing CLUSTERLOG on node 2 OK! - -Executing CLUSTERLOG on node 1 OK! -Executing CLUSTERLOG on node 2 OK! - -Executing CLUSTERLOG on node 1 OK! -Executing CLUSTERLOG on node 2 OK! - -Cluster logging is disabled -Cluster logging is enabled. -Cluster logging is disabled -ALL disabled -ALL enabled diff --git a/mysql-test/ndb/basic.test b/mysql-test/ndb/basic.test deleted file mode 100644 index 945bda94ff6..00000000000 --- a/mysql-test/ndb/basic.test +++ /dev/null @@ -1,17 +0,0 @@ -help -all status -1 status -2 status -all clusterlog connection=8 -all clusterlog startup=7 -all clusterlog checkpoint=7 -all clusterlog noderestart=15 -all clusterlog statistics=7 -all clusterlog error=7 -all clusterlog info=7 -all clusterlog backup=15 -clusterlog off -clusterlog toggle -clusterlog off -clusterlog off all -clusterlog on all diff --git a/mysql-test/ndb/basic_log.result b/mysql-test/ndb/basic_log.result deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/mysql-test/ndb/ndb_config_1_node.ini b/mysql-test/ndb/ndb_config_1_node.ini deleted file mode 100644 index 4e0be7796dc..00000000000 --- a/mysql-test/ndb/ndb_config_1_node.ini +++ /dev/null @@ -1,47 +0,0 @@ -[ndbd default] -NoOfReplicas= 1 -MaxNoOfConcurrentTransactions= 64 -MaxNoOfConcurrentOperations= CHOOSE_MaxNoOfConcurrentOperations -DataMemory= CHOOSE_DataMemory -IndexMemory= CHOOSE_IndexMemory -Diskless= CHOOSE_Diskless -TimeBetweenWatchDogCheck= 30000 -DataDir= CHOOSE_FILESYSTEM -MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes -MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes -TimeBetweenGlobalCheckpoints= 500 -NoOfFragmentLogFiles= 8 -FragmentLogFileSize= 6M -DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory - -# -# Increase timeouts to cater for slow test-machines -# (possibly running several tests in parallell) -# -HeartbeatIntervalDbDb= 30000 -HeartbeatIntervalDbApi= 30000 -#TransactionDeadlockDetectionTimeout= 7500 - -[ndbd] -HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress - -[ndb_mgmd] -HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress -DataDir= CHOOSE_FILESYSTEM # -PortNumber= CHOOSE_PORT_MGM - -[mysqld] - -[mysqld] - -[mysqld] - -[mysqld] - -[mysqld] - -[mysqld] - -[mysqld] - -[mysqld] diff --git a/mysql-test/ndb/ndb_config_2_node.ini b/mysql-test/ndb/ndb_config_2_node.ini deleted file mode 100644 index 57e4d049ad6..00000000000 --- a/mysql-test/ndb/ndb_config_2_node.ini +++ /dev/null @@ -1,55 +0,0 @@ -[ndbd default] -NoOfReplicas= 2 -MaxNoOfConcurrentTransactions= 64 -MaxNoOfConcurrentOperations= CHOOSE_MaxNoOfConcurrentOperations -DataMemory= CHOOSE_DataMemory -IndexMemory= CHOOSE_IndexMemory -Diskless= CHOOSE_Diskless -TimeBetweenWatchDogCheck= 30000 -DataDir= CHOOSE_FILESYSTEM -MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes -MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes -TimeBetweenGlobalCheckpoints= 500 -NoOfFragmentLogFiles= 4 -FragmentLogFileSize=12M -DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory -# O_DIRECT has issues on 2.4 whach have not been handled, Bug #29612 -#ODirect= 1 -# the following parametes just function as a small regression -# test that the parameter exists -InitialNoOfOpenFiles= 27 - -# -# Increase timeouts to cater for slow test-machines -# (possibly running several tests in parallell) -# -HeartbeatIntervalDbDb= 30000 -HeartbeatIntervalDbApi= 30000 -#TransactionDeadlockDetectionTimeout= 7500 - -[ndbd] -HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress - -[ndbd] -HostName= CHOOSE_HOSTNAME_2 # hostname is a valid network adress - -[ndb_mgmd] -HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress -DataDir= CHOOSE_FILESYSTEM # -PortNumber= CHOOSE_PORT_MGM - -[mysqld] - -[mysqld] - -[mysqld] - -[mysqld] - -[mysqld] - -[mysqld] - -[mysqld] - -[mysqld] diff --git a/mysql-test/ndb/ndb_config_4_node.ini b/mysql-test/ndb/ndb_config_4_node.ini deleted file mode 100644 index d7c66cf177a..00000000000 --- a/mysql-test/ndb/ndb_config_4_node.ini +++ /dev/null @@ -1,55 +0,0 @@ -[ndbd default] -NoOfReplicas= 2 -MaxNoOfConcurrentTransactions= 64 -MaxNoOfConcurrentOperations= CHOOSE_MaxNoOfConcurrentOperations -DataMemory= CHOOSE_DataMemory -IndexMemory= CHOOSE_IndexMemory -Diskless= CHOOSE_Diskless -TimeBetweenWatchDogCheck= 30000 -DataDir= CHOOSE_FILESYSTEM -MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes -MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes -TimeBetweenGlobalCheckpoints= 500 -NoOfFragmentLogFiles= 3 -DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory - -# -# Increase timeouts to cater for slow test-machines -# (possibly running several tests in parallell) -# -HeartbeatIntervalDbDb= 30000 -HeartbeatIntervalDbApi= 30000 -#TransactionDeadlockDetectionTimeout= 7500 - -[ndbd] -HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress - -[ndbd] -HostName= CHOOSE_HOSTNAME_2 # hostname is a valid network adress - -[ndbd] -HostName= CHOOSE_HOSTNAME_3 # hostname is a valid network adress - -[ndbd] -HostName= CHOOSE_HOSTNAME_4 # hostname is a valid network adress - -[ndb_mgmd] -HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress -DataDir= CHOOSE_FILESYSTEM # -PortNumber= CHOOSE_PORT_MGM - -[mysqld] - -[mysqld] - -[mysqld] - -[mysqld] - -[mysqld] - -[mysqld] - -[mysqld] - -[mysqld] diff --git a/mysql-test/ndb/ndbcluster.sh b/mysql-test/ndb/ndbcluster.sh deleted file mode 100644 index 2d550294c84..00000000000 --- a/mysql-test/ndb/ndbcluster.sh +++ /dev/null @@ -1,414 +0,0 @@ -#!/bin/sh -# Copyright (C) 2004 MySQL AB -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# This scripts starts the table handler ndbcluster - -# configurable parameters, make sure to change in mysqlcluterd as well -port=@ndb_port@ -fsdir=`pwd` -# end configurable parameters - -#BASEDIR is always one above mysql-test directory -CWD=`pwd` -cd .. -BASEDIR=`pwd` -cd $CWD - -# Are we using a source or a binary distribution? -if [ -d ../sql ] ; then - SOURCE_DIST=1 - ndbtop=$BASEDIR/storage/ndb - exec_ndb=$ndbtop/src/kernel/ndbd - exec_mgmtsrvr=$ndbtop/src/mgmsrv/ndb_mgmd - exec_waiter=$ndbtop/tools/ndb_waiter - exec_test=$ndbtop/tools/ndb_test_platform - exec_test_ndberror=$ndbtop/src/ndbapi/ndberror_check - exec_mgmtclient=$ndbtop/src/mgmclient/ndb_mgm -else - BINARY_DIST=1 - if test -x "$BASEDIR/libexec/ndbd" - then - exec_ndb=$BASEDIR/libexec/ndbd - exec_mgmtsrvr=$BASEDIR/libexec/ndb_mgmd - else - exec_ndb=$BASEDIR/bin/ndbd - exec_mgmtsrvr=$BASEDIR/bin/ndb_mgmd - fi - exec_waiter=$BASEDIR/bin/ndb_waiter - exec_test=$BASEDIR/bin/ndb_test_platform - exec_test_ndberror= - exec_mgmtclient=$BASEDIR/bin/ndb_mgm -fi - -if $exec_test ; then :; else - echo "ndb not correctly compiled to support this platform" - exit 1 -fi - -if [ $exec_test_ndberror ] ; then -if $exec_test_ndberror ; then :; else - echo "please fix in ndberror.c" - exit 1 -fi -fi - -pidfile=ndbcluster.pid -cfgfile=Ndb.cfg -test_ndb= -stop_ndb= -initial_ndb= -status_ndb= -ndb_diskless=0 -ndbd_nodes=2 -relative_config_data_dir= -opt_core= - -ndb_no_ord=512 -ndb_no_attr=2048 -ndb_con_op=105000 -ndb_dmem=80M -ndb_imem=24M -ndb_pbmem=32M - -VERBOSE=100 -NDB_MGM_EXTRA_OPTS= -NDB_MGMD_EXTRA_OPTS= -NDBD_EXTRA_OPTS= -CHARSETSDIR= - -while test $# -gt 0; do - case "$1" in - --test) - test_ndb=1 - ;; - --stop) - stop_ndb=1 - ;; - --initial) - flags_ndb="$flags_ndb --initial" - initial_ndb=1 - ;; - --debug*) - flags_ndb="$flags_ndb $1" - ;; - --ndbd-nodes=*) - ndbd_nodes=`echo "$1" | sed -e "s;--ndbd-nodes=;;"` - ;; - --status) - status_ndb=1 - ;; - --small) - ndb_no_ord=32 - ndb_con_op=5000 - ndb_dmem=20M - ndb_imem=1M - ndb_pbmem=4M - ;; - --diskless) - ndb_diskless=1 - ;; - --data-dir=*) - fsdir=`echo "$1" | sed -e "s;--data-dir=;;"` - ;; - --relative-config-data-dir) - relative_config_data_dir=1 - ;; - --port=*) - port=`echo "$1" | sed -e "s;--port=;;"` - ;; - --port-base=*) - $ECHO "--port-base option depricated. Ignored." - ;; - --ndb_mgm-extra-opts=*) - NDB_MGM_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndb_mgm-extra-opts=;;"` - ;; - --ndb_mgmd-extra-opts=*) - NDB_MGMD_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndb_mgmd-extra-opts=;;"` - ;; - --ndbd-extra-opts=*) - NDBD_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndbd-extra-opts=;;"` - ;; - --character-sets-dir=*) - CHARSETSDIR=`echo "$1" | sed -e "s;--character-sets-dir=;;"` - ;; - --core) - opt_core="--core" - ;; - --verbose=*) - VERBOSE=`echo "$1" | sed -e "s;--verbose=;;"` - ;; - -- ) shift; break ;; - --* ) $ECHO "Unrecognized option: $1"; exit 1 ;; - * ) break ;; - esac - shift -done - -fs_ndb="$fsdir/ndbcluster-$port" -config_ini=ndb/ndb_config_${ndbd_nodes}_node.ini - -NDB_HOME= -if [ ! -d "$fsdir" ]; then - echo "$fsdir missing" - exit 1 -fi -if [ ! -x "$exec_ndb" ]; then - echo "$exec_ndb missing" - exit 1 -fi -if [ ! -x "$exec_mgmtsrvr" ]; then - echo "$exec_mgmtsrvr missing" - exit 1 -fi -if [ ! -x "$exec_waiter" ]; then - echo "$exec_waiter missing" - exit 1 -fi -if [ ! -f "$config_ini" ]; then - echo "$config_ini missing, unsupported number of nodes" - exit 1 -fi - -exec_mgmtclient="$exec_mgmtclient --no-defaults $opt_core $NDB_MGM_EXTRA_OPTS" -exec_mgmtsrvr="$exec_mgmtsrvr --no-defaults $opt_core $NDB_MGMD_EXTRA_OPTS" -exec_ndb="$exec_ndb --no-defaults $opt_core $NDBD_EXTRA_OPTS --character-sets-dir=$CHARSETSDIR" -exec_waiter="$exec_waiter --no-defaults $opt_core" - -ndb_host="localhost" -ndb_mgmd_port=$port -NDB_CONNECTSTRING="host=$ndb_host:$ndb_mgmd_port" -export NDB_CONNECTSTRING - -sleep_until_file_created () { - file=$1 - loop=$2 - org_time=$2 - message=$3 - while (test $loop -gt 0) - do - if [ -r $file ] - then - return 0 - fi - sleep 1 - loop=`expr $loop - 1` - done - if [ $message ] - then - echo $message - fi - echo "ERROR: $file was not created in $org_time seconds; Aborting" - return 1; -} - -start_default_ndbcluster() { - -# do some checks - -if [ "$initial_ndb" ] ; then - [ -d "$fs_ndb" ] || mkdir "$fs_ndb" -fi -if [ -d "$fs_ndb" ]; then :; else - echo "$fs_ndb filesystem directory does not exist" - exit 1 -fi - -# Start management server as deamon - -# Edit file system path and ports in config file -if [ $relative_config_data_dir ] ; then - config_fs_ndb="." -else - config_fs_ndb=$fs_ndb -fi -if [ $initial_ndb ] ; then - rm -rf $fs_ndb/ndb_* 2>&1 | cat > /dev/null - sed \ - -e s,"CHOOSE_MaxNoOfAttributes","$ndb_no_attr",g \ - -e s,"CHOOSE_MaxNoOfOrderedIndexes","$ndb_no_ord",g \ - -e s,"CHOOSE_MaxNoOfConcurrentOperations","$ndb_con_op",g \ - -e s,"CHOOSE_DataMemory","$ndb_dmem",g \ - -e s,"CHOOSE_IndexMemory","$ndb_imem",g \ - -e s,"CHOOSE_Diskless","$ndb_diskless",g \ - -e s,"CHOOSE_HOSTNAME_".*,"$ndb_host",g \ - -e s,"CHOOSE_FILESYSTEM","$config_fs_ndb",g \ - -e s,"CHOOSE_PORT_MGM","$ndb_mgmd_port",g \ - -e s,"CHOOSE_DiskPageBufferMemory","$ndb_pbmem",g \ - < "$config_ini" \ - > "$fs_ndb/config.ini" -fi - -rm -f "$cfgfile" 2>&1 | cat > /dev/null -rm -f "$fs_ndb/$cfgfile" 2>&1 | cat > /dev/null - -if ( cd "$fs_ndb" ; $exec_mgmtsrvr -f config.ini ) ; then :; else - echo "Unable to start $exec_mgmtsrvr from `pwd`" - exit 1 -fi -if sleep_until_file_created $fs_ndb/ndb_`expr $ndbd_nodes + 1`.pid 120 -then :; else - exit 1 -fi -cat `find "$fs_ndb" -name 'ndb_*.pid'` > "$fs_ndb/$pidfile" - -# Start database node - -id=1 -while [ $id -le $ndbd_nodes ] -do - if [ `expr $VERBOSE \> 1` = 1 ] ; then - echo "Starting ndbd $id($ndbd_nodes)" - fi - ( cd "$fs_ndb" ; $exec_ndb $flags_ndb & ) - if sleep_until_file_created $fs_ndb/ndb_${id}.pid 120 - then :; else - stop_default_ndbcluster - exit 1 - fi - cat `find "$fs_ndb" -name 'ndb_*.pid'` > "$fs_ndb/$pidfile" - id=`expr $id + 1` -done - -# test if Ndb Cluster starts properly - -if [ `expr $VERBOSE \> 1` = 1 ] ; then - echo "Waiting for NDB data nodes to start..." -fi -if ( $exec_waiter ) | grep "NDBT_ProgramExit: 0 - OK" > /dev/null 2>&1 ; then :; else - if [ `expr $VERBOSE \> 0` = 1 ] ; then - echo "Ndbcluster startup failed" - fi - stop_default_ndbcluster - exit 1 -fi -if [ `expr $VERBOSE \> 1` = 1 ] ; then - echo "Ok" -fi - -cat `find "$fs_ndb" -name 'ndb_*.pid'` > $fs_ndb/$pidfile - -if [ `expr $VERBOSE \> 2` = 1 ] ; then - status_ndbcluster -fi -} - -status_ndbcluster() { - # Start management client - $exec_mgmtclient -e show -} - -stop_default_ndbcluster() { - -# Start management client - -exec_mgmtclient="$exec_mgmtclient --try-reconnect=1" - -$exec_mgmtclient -e shutdown 2>&1 | cat > /dev/null - -if [ -f "$fs_ndb/$pidfile" ] ; then - kill_pids=`cat "$fs_ndb/$pidfile"` - attempt=0 - while [ $attempt -lt 10 ] ; do - new_kill_pid="" - kill_pids2="" - for p in $kill_pids ; do - kill -0 $p 2> /dev/null - if [ $? -eq 0 ] ; then - new_kill_pid="$p $new_kill_pid" - kill_pids2="-$p $kill_pids2" - fi - done - kill_pids=$new_kill_pid - if [ -z "$kill_pids" ] ; then - break - fi - sleep 1 - attempt=`expr $attempt + 1` - done - if [ "$kill_pids2" != "" ] ; then - echo "Failed to shutdown ndbcluster, executing kill "$kill_pids2 - kill -9 -- $kill_pids2 2> /dev/null - /bin/kill -9 -- $kill_pids2 2> /dev/null - /usr/bin/kill -9 -- $kill_pids2 2> /dev/null - kill -9 $kill_pids2 2> /dev/null - /bin/kill -9 $kill_pids2 2> /dev/null - /usr/bin/kill -9 $kill_pids2 2> /dev/null - fi - rm "$fs_ndb/$pidfile" -fi -} - -initialize_ndb_test () -{ - fs_result=$fs_ndb/r - rm -rf $fs_result - mkdir $fs_result - echo ------------------ - echo starting ndb tests - echo ------------------ -} - -do_ndb_test () -{ - test_name=$1 - - clusterlog=$fs_ndb/ndb_3_cluster.log - - test_log_result=$fs_result/${test_name}_log.result - test_log_reject=$fs_result/${test_name}_log.reject - test_result=$fs_result/${test_name}.result - test_reject=$fs_result/${test_name}.reject - - clean_log='s/.*\[MgmSrvr\]//' - - cat $clusterlog ndb/${test_name}_log.result | sed -e $clean_log > $test_log_result - - cp ndb/${test_name}.result $test_result - - cat ndb/${test_name}.test | $exec_mgmtclient > $test_reject - cat $clusterlog | sed -e $clean_log > $test_log_reject - - t="pass" - diff -C 5 $test_result $test_reject || t="fail" - printf "ndb_mgm output %20s [%s]\n" $test_name $t - t="pass" - diff -C 5 $test_log_result $test_log_reject || t="fail" - printf "clusterlog output %20s [%s]\n" $test_name $t -} - -if [ $status_ndb ] ; then - status_ndbcluster - exit 0 -fi - -if [ $stop_ndb ] ; then - stop_default_ndbcluster -else - start_default_ndbcluster -fi - -if [ $test_ndb ] ; then - initialize_ndb_test - all_tests=`ls ndb/*.test | sed "s#ndb/##" | sed "s#.test##"` - for a in $all_tests ; do - do_ndb_test $a - done - echo ------------------ - echo shutting down cluster - stop_default_ndbcluster -fi - -exit 0 diff --git a/mysql-test/ndb/restart.result b/mysql-test/ndb/restart.result deleted file mode 100644 index efa1399b5d9..00000000000 --- a/mysql-test/ndb/restart.result +++ /dev/null @@ -1,16 +0,0 @@ --- NDB Cluster -- Management Client -- -Connected to Management Server at: localhost:1186 -ALL disabled -Cluster logging is enabled. -ALERT enabled -Executing CLUSTERLOG on node 1 OK! -Executing CLUSTERLOG on node 2 OK! - -Node 1 is being restarted. - -Executing CLUSTERLOG on node 1 OK! -Executing CLUSTERLOG on node 2 OK! - -Node 1 is being restarted. - -ALL enabled diff --git a/mysql-test/ndb/restart.test b/mysql-test/ndb/restart.test deleted file mode 100644 index 4b4584dd739..00000000000 --- a/mysql-test/ndb/restart.test +++ /dev/null @@ -1,12 +0,0 @@ -clusterlog off all -clusterlog on -clusterlog on alert -all clusterlog connection=0 -sleep 1 -1 restart -sleep 5 -all clusterlog connection=8 -sleep 1 -1 restart -sleep 10 -clusterlog on all diff --git a/mysql-test/ndb/restart_log.result b/mysql-test/ndb/restart_log.result deleted file mode 100644 index 2b25fc7b5b6..00000000000 --- a/mysql-test/ndb/restart_log.result +++ /dev/null @@ -1,20 +0,0 @@ - ALERT -- Node 2: Network partitioning - arbitration required - ALERT -- Node 2: Arbitration won - positive reply from node 3 - ALERT -- Node 2: Node 1 has failed. The Node state at failure was 0 - ALERT -- Node 2: Node failure of 1 DBLQH completed - ALERT -- Node 2: Node failure of 1 DBDICT completed - ALERT -- Node 2: Node failure of 1 DBDIH completed - ALERT -- Node 2: Node failure of 1 DBTC completed - ALERT -- Node 2: Node 2 completed failure of Node 1 - ALERT -- Node 2: All nodes completed failure of Node 1 - ALERT -- Node 3: Node 1 Disconnected - ALERT -- Node 2: Node 1 Disconnected - ALERT -- Node 2: Network partitioning - arbitration required - ALERT -- Node 2: Arbitration won - positive reply from node 3 - ALERT -- Node 2: Node 1 has failed. The Node state at failure was 0 - ALERT -- Node 2: Node failure of 1 DBLQH completed - ALERT -- Node 2: Node failure of 1 DBDICT completed - ALERT -- Node 2: Node failure of 1 DBDIH completed - ALERT -- Node 2: Node failure of 1 DBTC completed - ALERT -- Node 2: Node 2 completed failure of Node 1 - ALERT -- Node 2: All nodes completed failure of Node 1 diff --git a/mysql-test/r/backup.result b/mysql-test/r/backup.result index 4de599f3af7..b657c620805 100644 --- a/mysql-test/r/backup.result +++ b/mysql-test/r/backup.result @@ -1,24 +1,24 @@ set SQL_LOG_BIN=0; drop table if exists t1, t2, t3, t4; create table t4(n int); -backup table t4 to '../bogus'; +backup table t4 to '../../bogus'; Table Op Msg_type Msg_text test.t4 backup error Failed copying .frm file (errno: X) test.t4 backup Warning The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead test.t4 backup Error Can't create/write to file 'MYSQLTEST_VARDIR/bogus/t4.frm' (Errcode: X) test.t4 backup status Operation failed -backup table t4 to '../tmp'; +backup table t4 to '../../tmp'; Table Op Msg_type Msg_text test.t4 backup Warning The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead test.t4 backup status OK -backup table t4 to '../tmp'; +backup table t4 to '../../tmp'; Table Op Msg_type Msg_text test.t4 backup error Failed copying .frm file (errno: X) test.t4 backup Warning The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead test.t4 backup Error Can't create/write to file 'MYSQLTEST_VARDIR/tmp/t4.frm' (Errcode: X) test.t4 backup status Operation failed drop table t4; -restore table t4 from '../tmp'; +restore table t4 from '../../tmp'; Table Op Msg_type Msg_text test.t4 restore Warning The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead test.t4 restore status OK @@ -27,18 +27,18 @@ count(*) 0 create table t1(n int); insert into t1 values (23),(45),(67); -backup table t1 to '../tmp'; +backup table t1 to '../../tmp'; Table Op Msg_type Msg_text test.t1 backup Warning The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead test.t1 backup status OK drop table t1; -restore table t1 from '../bogus'; +restore table t1 from '../../bogus'; Table Op Msg_type Msg_text t1 restore error Failed copying .frm file Warnings: Warning 1287 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead Error 29 File 'MYSQLTEST_VARDIR/bogus/t1.frm' not found (Errcode: X) -restore table t1 from '../tmp'; +restore table t1 from '../../tmp'; Table Op Msg_type Msg_text test.t1 restore Warning The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead test.t1 restore status OK @@ -51,13 +51,13 @@ create table t2(m int not null primary key); create table t3(k int not null primary key); insert into t2 values (123),(145),(167); insert into t3 values (223),(245),(267); -backup table t2,t3 to '../tmp'; +backup table t2,t3 to '../../tmp'; Table Op Msg_type Msg_text test.t2 backup Warning The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead test.t2 backup status OK test.t3 backup status OK drop table t1,t2,t3; -restore table t1,t2,t3 from '../tmp'; +restore table t1,t2,t3 from '../../tmp'; Table Op Msg_type Msg_text test.t1 restore Warning The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead test.t1 restore status OK @@ -79,13 +79,13 @@ k 245 267 drop table t1,t2,t3,t4; -restore table t1 from '../tmp'; +restore table t1 from '../../tmp'; Table Op Msg_type Msg_text test.t1 restore Warning The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead test.t1 restore status OK rename table t1 to t5; lock tables t5 write; -backup table t5 to '../tmp'; +backup table t5 to '../../tmp'; unlock tables; Table Op Msg_type Msg_text test.t5 backup Warning The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead @@ -94,12 +94,12 @@ drop table t5; DROP TABLE IF EXISTS `t+1`; CREATE TABLE `t+1` (c1 INT); INSERT INTO `t+1` VALUES (1), (2), (3); -BACKUP TABLE `t+1` TO '../tmp'; +BACKUP TABLE `t+1` TO '../../tmp'; Table Op Msg_type Msg_text test.t+1 backup Warning The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead test.t+1 backup status OK DROP TABLE `t+1`; -RESTORE TABLE `t+1` FROM '../tmp'; +RESTORE TABLE `t+1` FROM '../../tmp'; Table Op Msg_type Msg_text test.t+1 restore Warning The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead test.t+1 restore status OK diff --git a/mysql-test/r/ctype_big5.result b/mysql-test/r/ctype_big5.result index b190273cc64..c948aa646f6 100644 --- a/mysql-test/r/ctype_big5.result +++ b/mysql-test/r/ctype_big5.result @@ -211,8 +211,8 @@ create table t1 (a blob); insert into t1 values (0xEE00); select * into outfile 'test/t1.txt' from t1; delete from t1; -select hex(load_file('MYSQLTEST_VARDIR/master-data/test/t1.txt'));; -hex(load_file('MYSQLTEST_VARDIR/master-data/test/t1.txt')) +select hex(load_file('MYSQLD_DATADIR/test/t1.txt'));; +hex(load_file('MYSQLD_DATADIR/test/t1.txt')) 5CEE5C300A load data infile 't1.txt' into table t1; select hex(a) from t1; diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index 61394409947..3793aacaed4 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -685,7 +685,7 @@ asbinary(g) drop table t1; create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b)); alter table t1 disable keys; -load data infile '../std_data_ln/bad_gis_data.dat' into table t1; +load data infile '../../std_data/bad_gis_data.dat' into table t1; ERROR 22004: Column set to default value; NULL supplied to NOT NULL column 'b' at row 1 alter table t1 enable keys; drop table t1; diff --git a/mysql-test/r/have_bug25714.require b/mysql-test/r/have_bug25714.require deleted file mode 100644 index 5acc378dcf7..00000000000 --- a/mysql-test/r/have_bug25714.require +++ /dev/null @@ -1,2 +0,0 @@ -have_bug25714_exe -1 diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result index 98e221b0dea..a18cef792c5 100644 --- a/mysql-test/r/loaddata.result +++ b/mysql-test/r/loaddata.result @@ -1,6 +1,6 @@ drop table if exists t1, t2; create table t1 (a date, b date, c date not null, d date); -load data infile '../std_data_ln/loaddata1.dat' into table t1 fields terminated by ','; +load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ','; Warnings: Warning 1265 Data truncated for column 'a' at row 1 Warning 1265 Data truncated for column 'c' at row 1 @@ -8,7 +8,7 @@ Warning 1265 Data truncated for column 'd' at row 1 Warning 1265 Data truncated for column 'a' at row 2 Warning 1265 Data truncated for column 'b' at row 2 Warning 1265 Data truncated for column 'd' at row 2 -load data infile '../std_data_ln/loaddata1.dat' into table t1 fields terminated by ',' IGNORE 2 LINES; +load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',' IGNORE 2 LINES; SELECT * from t1; a b c d 0000-00-00 NULL 0000-00-00 0000-00-00 @@ -16,7 +16,7 @@ a b c d 2003-03-03 2003-03-03 2003-03-03 NULL 2003-03-03 2003-03-03 2003-03-03 NULL truncate table t1; -load data infile '../std_data_ln/loaddata1.dat' into table t1 fields terminated by ',' LINES STARTING BY ',' (b,c,d); +load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',' LINES STARTING BY ',' (b,c,d); Warnings: Warning 1265 Data truncated for column 'c' at row 1 Warning 1265 Data truncated for column 'd' at row 1 @@ -29,7 +29,7 @@ NULL 0000-00-00 0000-00-00 0000-00-00 NULL 2003-03-03 2003-03-03 NULL drop table t1; create table t1 (a text, b text); -load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by ''''; +load data infile '../../std_data/loaddata2.dat' into table t1 fields terminated by ',' enclosed by ''''; Warnings: Warning 1261 Row 3 doesn't contain data for all columns select concat('|',a,'|'), concat('|',b,'|') from t1; @@ -41,7 +41,7 @@ Field 3,'Field 4| |Field 6| | 'Field 7'| drop table t1; create table t1 (a int, b char(10)); -load data infile '../std_data_ln/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines; +load data infile '../../std_data/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines; Warnings: Warning 1366 Incorrect integer value: 'error ' for column 'a' at row 3 Warning 1262 Row 3 was truncated; it contained more data than there were input columns @@ -55,7 +55,7 @@ a b 3 row 3 0 1234567890 truncate table t1; -load data infile '../std_data_ln/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines; +load data infile '../../std_data/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines; Warnings: Warning 1366 Incorrect integer value: ' ' for column 'a' at row 4 @@ -79,7 +79,7 @@ id SET @@SQL_MODE=@OLD_SQL_MODE; drop table t1; create table t1 (a varchar(20), b varchar(20)); -load data infile '../std_data_ln/loaddata_dq.dat' into table t1 fields terminated by ',' enclosed by '"' escaped by '"' (a,b); +load data infile '../../std_data/loaddata_dq.dat' into table t1 fields terminated by ',' enclosed by '"' escaped by '"' (a,b); select * from t1; a b field1 field2 @@ -141,25 +141,25 @@ SELECT t1.id, c1, c2 FROM t1 RIGHT JOIN t2 ON t1.id=t2.id WHERE c1 != c2; id c1 c2 DROP TABLE t1,t2; create table t1 (a int default 100, b int, c varchar(60)); -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (a, @b) set b=@b+10, c=concat("b=",@b); +load data infile '../../std_data/rpl_loaddata.dat' into table t1 (a, @b) set b=@b+10, c=concat("b=",@b); select * from t1; a b c NULL 20 b=10 NULL 25 b=15 truncate table t1; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (a, @b) set c= if(a is null,"oops",a); +load data infile '../../std_data/rpl_loaddata.dat' into table t1 (a, @b) set c= if(a is null,"oops",a); select * from t1; a b c NULL NULL oops NULL NULL oops truncate table t1; set @c:=123; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (@a, b) set c= if(@a is null,@c,b); +load data infile '../../std_data/rpl_loaddata.dat' into table t1 (@a, b) set c= if(@a is null,@c,b); select * from t1; a b c 100 10 123 100 15 123 -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (@a, @b); +load data infile '../../std_data/rpl_loaddata.dat' into table t1 (@a, @b); select * from t1; a b c 100 10 123 @@ -170,7 +170,7 @@ select @a, @b; @a @b NULL 15 truncate table t1; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 set c=b; +load data infile '../../std_data/rpl_loaddata.dat' into table t1 set c=b; Warnings: Warning 1261 Row 1 doesn't contain data for all columns Warning 1261 Row 2 doesn't contain data for all columns @@ -179,25 +179,25 @@ a b c NULL 10 10 NULL 15 15 truncate table t1; -load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, b) set c="Wow"; +load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, b) set c="Wow"; select * from t1; a b c 1 2 Wow 3 4 Wow 5 6 Wow truncate table t1; -load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, b) set c=concat(a,"+",b,"+",@c,"+",b,"+",if(c is null,"NIL",c)); +load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, b) set c=concat(a,"+",b,"+",@c,"+",b,"+",if(c is null,"NIL",c)); select * from t1; a b c 1 2 1+2+123+2+NIL 3 4 3+4+123+4+NIL 5 6 5+6+123+6+NIL -load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, @b); +load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, @b); ERROR HY000: Can't load value from file with fixed size rows to variable create table t2 (num int primary key, str varchar(10)); insert into t2 values (10,'Ten'), (15,'Fifteen'); truncate table t1; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (@dummy,@n) set a= @n, c= (select str from t2 where num=@n); +load data infile '../../std_data/rpl_loaddata.dat' into table t1 (@dummy,@n) set a= @n, c= (select str from t2 where num=@n); select * from t1; a b c 10 NULL Ten diff --git a/mysql-test/r/loaddata_autocom_innodb.result b/mysql-test/r/loaddata_autocom_innodb.result index 11a07cdb783..c1e6b7f2fba 100644 --- a/mysql-test/r/loaddata_autocom_innodb.result +++ b/mysql-test/r/loaddata_autocom_innodb.result @@ -2,7 +2,7 @@ SET SESSION STORAGE_ENGINE = InnoDB; drop table if exists t1; create table t1 (id int unsigned not null auto_increment primary key, a text, b text); start transaction; -load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''' (a, b); +load data infile 'LOAD_FILE' into table t1 fields terminated by ',' enclosed by '''' (a, b); Warnings: Warning 1261 Row 3 doesn't contain data for all columns commit; @@ -11,7 +11,7 @@ count(*) 4 truncate table t1; start transaction; -load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''' (a, b); +load data infile 'LOAD_FILE' into table t1 fields terminated by ',' enclosed by '''' (a, b); Warnings: Warning 1261 Row 3 doesn't contain data for all columns rollback; diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result index cb8760279eb..7f500c88c26 100644 --- a/mysql-test/r/mysqlbinlog.result +++ b/mysql-test/r/mysqlbinlog.result @@ -4,11 +4,11 @@ create table t1 (word varchar(20)); create table t2 (id int auto_increment not null primary key); insert into t1 values ("abirvalg"); insert into t2 values (); -load data infile '../std_data_ln/words.dat' into table t1; -load data infile '../std_data_ln/words.dat' into table t1; -load data infile '../std_data_ln/words.dat' into table t1; -load data infile '../std_data_ln/words.dat' into table t1; -load data infile '../std_data_ln/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; insert into t1 values ("Alas"); flush logs; @@ -257,17 +257,17 @@ call p1(); drop procedure p1; flush logs; create table t1 (a varchar(64) character set utf8); -load data infile '../std_data_ln/loaddata6.dat' into table t1; +load data infile '../../std_data/loaddata6.dat' into table t1; set character_set_database=koi8r; -load data infile '../std_data_ln/loaddata6.dat' into table t1; +load data infile '../../std_data/loaddata6.dat' into table t1; set character_set_database=latin1; -load data infile '../std_data_ln/loaddata6.dat' into table t1; -load data infile '../std_data_ln/loaddata6.dat' into table t1; +load data infile '../../std_data/loaddata6.dat' into table t1; +load data infile '../../std_data/loaddata6.dat' into table t1; set character_set_database=koi8r; -load data infile '../std_data_ln/loaddata6.dat' into table t1; +load data infile '../../std_data/loaddata6.dat' into table t1; set character_set_database=latin1; -load data infile '../std_data_ln/loaddata6.dat' into table t1; -load data infile '../std_data_ln/loaddata6.dat' into table t1 character set koi8r; +load data infile '../../std_data/loaddata6.dat' into table t1; +load data infile '../../std_data/loaddata6.dat' into table t1 character set koi8r; select hex(a) from t1; hex(a) C3BF diff --git a/mysql-test/r/mysqlbinlog_base64.result b/mysql-test/r/mysqlbinlog_base64.result index b62023e0ccf..436b165cfa3 100644 --- a/mysql-test/r/mysqlbinlog_base64.result +++ b/mysql-test/r/mysqlbinlog_base64.result @@ -5,7 +5,7 @@ insert into t1 values (3); update t1 set a=a+2 where a=2; update t1 set a=a+2 where a=3; create table t2 (word varchar(20)); -load data infile '../std_data_ln/words.dat' into table t2; +load data infile '../../std_data/words.dat' into table t2; flush logs; drop table t1; drop table t2; @@ -89,7 +89,7 @@ aberration flush logs; drop table t2; create table t2 (word varchar(20)); -load data infile '../std_data_ln/words.dat' into table t2; +load data infile '../../std_data/words.dat' into table t2; insert into t2 select * from t2; insert into t2 select * from t2; insert into t2 select * from t2; diff --git a/mysql-test/r/outfile.result b/mysql-test/r/outfile.result index 8503df545d2d0bfc67d5c8aa9e6e8a51ca23d5ca..bbd8088834fed998e0b627663bf535fa53941ba5 100644 GIT binary patch delta 33 rcmV++0N(%C5atlD)&Y~#0X&lo0z9)t0;~hG?gdW)lkNqoljH|;>17S2 delta 33 rcmV++0N(%R5Z4f})&Y~*0XdTu0y(o$0;vPD{RK<`ll=v!lk*32>=X^& diff --git a/mysql-test/r/partition_error.result b/mysql-test/r/partition_error.result index 46532cb32ab..9bee70e9fb5 100644 --- a/mysql-test/r/partition_error.result +++ b/mysql-test/r/partition_error.result @@ -74,8 +74,8 @@ partitions 3 partition x2 tablespace ts2, partition x3 tablespace ts3); ERROR HY000: Field in list of fields for partition function not found in table -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); -load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par') +select load_file('$MYSQLD_DATADIR/test/t1.par'); +load_file('$MYSQLD_DATADIR/test/t1.par') NULL CREATE TABLE t1 ( a int not null, @@ -151,8 +151,8 @@ partitions 2 (partition x1 values less than (4), partition x2 values less than (5)); ERROR HY000: Only RANGE PARTITIONING can use VALUES LESS THAN in partition definition -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); -load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par') +select load_file('$MYSQLD_DATADIR/test/t1.par'); +load_file('$MYSQLD_DATADIR/test/t1.par') NULL CREATE TABLE t1 ( a int not null, @@ -164,8 +164,8 @@ partitions 2 (partition x1 values in (4), partition x2 values in (5)); ERROR HY000: Only LIST PARTITIONING can use VALUES IN in partition definition -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); -load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par') +select load_file('$MYSQLD_DATADIR/test/t1.par'); +load_file('$MYSQLD_DATADIR/test/t1.par') NULL CREATE TABLE t1 ( a int not null, @@ -177,8 +177,8 @@ partitions 2 (partition x1 values in (4,6), partition x2 values in (5,7)); ERROR HY000: Only LIST PARTITIONING can use VALUES IN in partition definition -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); -load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par') +select load_file('$MYSQLD_DATADIR/test/t1.par'); +load_file('$MYSQLD_DATADIR/test/t1.par') NULL CREATE TABLE t1 ( a int not null, @@ -188,8 +188,8 @@ primary key (a,b)) partition by key (a) subpartition by key (b); ERROR HY000: It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); -load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par') +select load_file('$MYSQLD_DATADIR/test/t1.par'); +load_file('$MYSQLD_DATADIR/test/t1.par') NULL CREATE TABLE t1 ( a int not null, @@ -199,8 +199,8 @@ primary key (a,b)) partition by key (a) subpartition by key (a, b); ERROR HY000: It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); -load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par') +select load_file('$MYSQLD_DATADIR/test/t1.par'); +load_file('$MYSQLD_DATADIR/test/t1.par') NULL CREATE TABLE t1 ( a int not null, @@ -210,8 +210,8 @@ primary key (a,b)) partition by key (a) subpartition by hash (a+b); ERROR HY000: It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); -load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par') +select load_file('$MYSQLD_DATADIR/test/t1.par'); +load_file('$MYSQLD_DATADIR/test/t1.par') NULL CREATE TABLE t1 ( a int not null, @@ -221,8 +221,8 @@ primary key (a,b)) partition by key (a) subpartition by key (b); ERROR HY000: It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); -load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par') +select load_file('$MYSQLD_DATADIR/test/t1.par'); +load_file('$MYSQLD_DATADIR/test/t1.par') NULL CREATE TABLE t1 ( a int not null, @@ -232,8 +232,8 @@ primary key (a,b)) partition by key (a) subpartition by key (a, b); ERROR HY000: It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); -load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par') +select load_file('$MYSQLD_DATADIR/test/t1.par'); +load_file('$MYSQLD_DATADIR/test/t1.par') NULL CREATE TABLE t1 ( a int not null, @@ -243,8 +243,8 @@ primary key (a,b)) partition by key (a) subpartition by hash (a+b); ERROR HY000: It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); -load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par') +select load_file('$MYSQLD_DATADIR/test/t1.par'); +load_file('$MYSQLD_DATADIR/test/t1.par') NULL CREATE TABLE t1 ( a int not null, @@ -264,8 +264,8 @@ subpartition by hash (sin(a+b)) (partition x1 (subpartition x11, subpartition x12), partition x2 (subpartition x21, subpartition x22)); ERROR HY000: It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); -load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par') +select load_file('$MYSQLD_DATADIR/test/t1.par'); +load_file('$MYSQLD_DATADIR/test/t1.par') NULL CREATE TABLE t1 ( a int not null, @@ -289,8 +289,8 @@ subpartition by key (a,d) (partition x1 values less than (1) (subpartition x11, subpartition x12), partition x2 values less than (2) (subpartition x21, subpartition x22)); ERROR HY000: Field in list of fields for partition function not found in table -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); -load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par') +select load_file('$MYSQLD_DATADIR/test/t1.par'); +load_file('$MYSQLD_DATADIR/test/t1.par') NULL CREATE TABLE t1 ( a int not null, @@ -317,8 +317,8 @@ c int not null, primary key(a,b)) partition by range (a); ERROR HY000: For RANGE partitions each partition must be defined -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); -load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par') +select load_file('$MYSQLD_DATADIR/test/t1.par'); +load_file('$MYSQLD_DATADIR/test/t1.par') NULL CREATE TABLE t1 ( a int not null, diff --git a/mysql-test/r/partition_not_windows.result b/mysql-test/r/partition_not_windows.result index 31ea300e8ed..be2c896dca3 100644 --- a/mysql-test/r/partition_not_windows.result +++ b/mysql-test/r/partition_not_windows.result @@ -1,13 +1,13 @@ create table t1 (a int) engine myisam partition by range (a) subpartition by hash (a) -(partition p0 VALUES LESS THAN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/tmpdata' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/tmpinx' +(partition p0 VALUES LESS THAN (1) DATA DIRECTORY = 'MYSQLD_DATADIR/tmpdata' INDEX DIRECTORY = 'MYSQLD_DATADIR/tmpinx' (SUBPARTITION subpart00, SUBPARTITION subpart01)); Checking if file exists before alter ALTER TABLE t1 REORGANIZE PARTITION p0 INTO -(partition p1 VALUES LESS THAN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/tmpdata' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/tmpinx' +(partition p1 VALUES LESS THAN (1) DATA DIRECTORY = 'MYSQLD_DATADIR/tmpdata' INDEX DIRECTORY = 'MYSQLD_DATADIR/tmpinx' (SUBPARTITION subpart10, SUBPARTITION subpart11), -partition p2 VALUES LESS THAN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/tmpdata' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/tmpinx' +partition p2 VALUES LESS THAN (2) DATA DIRECTORY = 'MYSQLD_DATADIR/tmpdata' INDEX DIRECTORY = 'MYSQLD_DATADIR/tmpinx' (SUBPARTITION subpart20, SUBPARTITION subpart21)); Checking if file exists after alter drop table t1; diff --git a/mysql-test/r/partition_symlink.result b/mysql-test/r/partition_symlink.result index 20e841d2e0e..68f7a8a0c96 100644 --- a/mysql-test/r/partition_symlink.result +++ b/mysql-test/r/partition_symlink.result @@ -13,11 +13,11 @@ USE test; CREATE TABLE t1 (a INT) PARTITION BY LIST (a) ( PARTITION p0 VALUES IN (0) -DATA DIRECTORY 'MYSQLTEST_VARDIR/master-data/mysqltest2' - INDEX DIRECTORY 'MYSQLTEST_VARDIR/master-data/mysqltest2', +DATA DIRECTORY 'MYSQLD_DATADIR/mysqltest2' + INDEX DIRECTORY 'MYSQLD_DATADIR/mysqltest2', PARTITION p1 VALUES IN (1) -DATA DIRECTORY 'MYSQLTEST_VARDIR/master-data/test' - INDEX DIRECTORY 'MYSQLTEST_VARDIR/master-data/test', +DATA DIRECTORY 'MYSQLD_DATADIR/test' + INDEX DIRECTORY 'MYSQLD_DATADIR/test', PARTITION p2 VALUES IN (2) ); # without the patch for bug#32091 this would create @@ -49,32 +49,32 @@ USE mysqltest2; CREATE TABLE t1 (a INT) PARTITION BY LIST (a) ( PARTITION p0 VALUES IN (0) -DATA DIRECTORY 'MYSQLTEST_VARDIR/master-data/mysqltest2' - INDEX DIRECTORY 'MYSQLTEST_VARDIR/master-data/mysqltest2', +DATA DIRECTORY 'MYSQLD_DATADIR/mysqltest2' + INDEX DIRECTORY 'MYSQLD_DATADIR/mysqltest2', PARTITION p1 VALUES IN (1) -DATA DIRECTORY 'MYSQLTEST_VARDIR/master-data/test' - INDEX DIRECTORY 'MYSQLTEST_VARDIR/master-data/test' +DATA DIRECTORY 'MYSQLD_DATADIR/test' + INDEX DIRECTORY 'MYSQLD_DATADIR/test' ); # user mysqltest_1: USE test; CREATE TABLE t1 (a INT) PARTITION BY LIST (a) ( PARTITION p0 VALUES IN (0) -DATA DIRECTORY 'MYSQLTEST_VARDIR/master-data/mysqltest2' - INDEX DIRECTORY 'MYSQLTEST_VARDIR/master-data/mysqltest2', +DATA DIRECTORY 'MYSQLD_DATADIR/mysqltest2' + INDEX DIRECTORY 'MYSQLD_DATADIR/mysqltest2', PARTITION p1 VALUES IN (1) -DATA DIRECTORY 'MYSQLTEST_VARDIR/master-data/test' - INDEX DIRECTORY 'MYSQLTEST_VARDIR/master-data/test' +DATA DIRECTORY 'MYSQLD_DATADIR/test' + INDEX DIRECTORY 'MYSQLD_DATADIR/test' ); Got one of the listed errors CREATE TABLE t1 (a INT) PARTITION BY LIST (a) ( PARTITION p0 VALUES IN (0) -DATA DIRECTORY 'MYSQLTEST_VARDIR/master-data/test' - INDEX DIRECTORY 'MYSQLTEST_VARDIR/master-data/test', +DATA DIRECTORY 'MYSQLD_DATADIR/test' + INDEX DIRECTORY 'MYSQLD_DATADIR/test', PARTITION p1 VALUES IN (1) -DATA DIRECTORY 'MYSQLTEST_VARDIR/master-data/mysqltest2' - INDEX DIRECTORY 'MYSQLTEST_VARDIR/master-data/mysqltest2' +DATA DIRECTORY 'MYSQLD_DATADIR/mysqltest2' + INDEX DIRECTORY 'MYSQLD_DATADIR/mysqltest2' ); Got one of the listed errors # user root (cleanup): diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result index 1a728354c7b..473d120839c 100644 --- a/mysql-test/r/query_cache.result +++ b/mysql-test/r/query_cache.result @@ -669,7 +669,7 @@ word show status like "Qcache_queries_in_cache"; Variable_name Value Qcache_queries_in_cache 1 -load data infile 'MYSQLTEST_VARDIR/std_data_ln/words.dat' into table t1; +load data infile 'MYSQLTEST_VARDIR/std_data/words.dat' into table t1; show status like "Qcache_queries_in_cache"; Variable_name Value Qcache_queries_in_cache 0 diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index 68aa278585f..357bd28f23d 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -544,7 +544,7 @@ drop procedure if exists into_outfile| create procedure into_outfile(x char(16), y int) begin insert into test.t1 values (x, y); -select * into outfile "../tmp/spout" from test.t1; +select * into outfile "MYSQLTEST_VARDIR/tmp/spout" from test.t1; insert into test.t1 values (concat(x, "2"), y+2); end| call into_outfile("ofile", 1)| @@ -554,7 +554,7 @@ drop procedure if exists into_dumpfile| create procedure into_dumpfile(x char(16), y int) begin insert into test.t1 values (x, y); -select * into dumpfile "../tmp/spdump" from test.t1 limit 1; +select * into dumpfile "MYSQLTEST_VARDIR/tmp/spdump" from test.t1 limit 1; insert into test.t1 values (concat(x, "2"), y+2); end| call into_dumpfile("dfile", 1)| @@ -4401,9 +4401,9 @@ drop procedure if exists bug13012| create procedure bug13012() BEGIN REPAIR TABLE t1; -BACKUP TABLE t1 to '../tmp'; +BACKUP TABLE t1 to '../../tmp'; DROP TABLE t1; -RESTORE TABLE t1 FROM '../tmp'; +RESTORE TABLE t1 FROM '../../tmp'; END| call bug13012()| Table Op Msg_type Msg_text diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result index 4eece9d5b5a..6ac5242bcf0 100644 --- a/mysql-test/r/symlink.result +++ b/mysql-test/r/symlink.result @@ -100,10 +100,10 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; CREATE TABLE t1(a INT) -DATA DIRECTORY='TEST_DIR/master-data/mysql' -INDEX DIRECTORY='TEST_DIR/master-data/mysql'; +DATA DIRECTORY='MYSQLD_DATADIR/mysql' +INDEX DIRECTORY='MYSQLD_DATADIR/mysql'; RENAME TABLE t1 TO user; -ERROR HY000: Can't create/write to file 'TEST_DIR/master-data/mysql/user.MYI' (Errcode: 17) +ERROR HY000: Can't create/write to file 'MYSQLD_DATADIR/mysql/user.MYI' (Errcode: 17) DROP TABLE t1; show create table t1; Table Create Table diff --git a/mysql-test/r/system_mysql_db.result b/mysql-test/r/system_mysql_db.result index d1aff0fa657..2af9fdd53c3 100644 --- a/mysql-test/r/system_mysql_db.result +++ b/mysql-test/r/system_mysql_db.result @@ -1,4 +1,3 @@ -drop table if exists t1,t1aa,t2aa; show tables; Tables_in_db columns_priv diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result index 47ffc90e3cd..db5ebb73702 100644 --- a/mysql-test/r/trigger.result +++ b/mysql-test/r/trigger.result @@ -406,13 +406,13 @@ create table t1 (i int, j int, k int); create trigger trg1 before insert on t1 for each row set new.k = new.i; create trigger trg2 after insert on t1 for each row set @b:= "Fired"; set @b:=""; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (@a, i); +load data infile '../../std_data/rpl_loaddata.dat' into table t1 (@a, i); select *, @b from t1; i j k @b 10 NULL 10 Fired 15 NULL 15 Fired set @b:=""; -load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, j); +load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, j); select *, @b from t1; i j k @b 10 NULL 10 Fired @@ -449,7 +449,7 @@ ERROR 42S22: Unknown column 'at' in 'OLD' select * from t1; i k 1 1 -load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, k); +load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, k); ERROR 42S22: Unknown column 'at' in 'NEW' select * from t1; i k @@ -524,7 +524,7 @@ select * from t1; i k 1 1 2 2 -load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, k); +load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, k); ERROR 42S22: Unknown column 'bt' in 'NEW' select * from t1; i k @@ -998,7 +998,7 @@ insert into t1 (a) values create trigger t2_ai after insert on t2 for each row set @a:= (select max(a) from t2); insert into t2 select * from t1; -load data infile '../std_data_ln/words.dat' into table t1 (a); +load data infile '../../std_data/words.dat' into table t1 (a); drop trigger t1_ai; drop trigger t2_ai; create function f1() returns int return (select max(b) from t1); @@ -1007,7 +1007,7 @@ insert into t1 values ("And",f1()),("the",f1()),("mome", f1()),("raths",f1()),("outgrabe",f1()); create function f2() returns int return (select max(b) from t2); insert into t2 select a, f2() from t1; -load data infile '../std_data_ln/words.dat' into table t1 (a) set b:= f1(); +load data infile '../../std_data/words.dat' into table t1 (a) set b:= f1(); drop function f1; drop function f2; drop table t1, t2; diff --git a/mysql-test/r/type_blob.result b/mysql-test/r/type_blob.result index 869efb535e6..3409a9a143c 100644 --- a/mysql-test/r/type_blob.result +++ b/mysql-test/r/type_blob.result @@ -507,25 +507,25 @@ Warnings: Warning 1101 BLOB/TEXT column 'imagem' can't have a default value insert into t1 (id) values (1); select -charset(load_file('../std_data_ln/words.dat')), -collation(load_file('../std_data_ln/words.dat')), -coercibility(load_file('../std_data_ln/words.dat')); -charset(load_file('../std_data_ln/words.dat')) collation(load_file('../std_data_ln/words.dat')) coercibility(load_file('../std_data_ln/words.dat')) +charset(load_file('../../std_data/words.dat')), +collation(load_file('../../std_data/words.dat')), +coercibility(load_file('../../std_data/words.dat')); +charset(load_file('../../std_data/words.dat')) collation(load_file('../../std_data/words.dat')) coercibility(load_file('../../std_data/words.dat')) binary binary 4 explain extended select -charset(load_file('MYSQLTEST_VARDIR/std_data_ln/words.dat')), -collation(load_file('MYSQLTEST_VARDIR/std_data_ln/words.dat')), -coercibility(load_file('MYSQLTEST_VARDIR/std_data_ln/words.dat')); +charset(load_file('MYSQLTEST_VARDIR/std_data/words.dat')), +collation(load_file('MYSQLTEST_VARDIR/std_data/words.dat')), +coercibility(load_file('MYSQLTEST_VARDIR/std_data/words.dat')); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used Warnings: -Note 1003 select charset(load_file(_latin1'MYSQLTEST_VARDIR/std_data_ln/words.dat')) AS `charset(load_file('MYSQLTEST_VARDIR/std_data_ln/words.dat'))`,collation(load_file(_latin1'MYSQLTEST_VARDIR/std_data_ln/words.dat')) AS `collation(load_file('MYSQLTEST_VARDIR/std_data_ln/words.dat'))`,coercibility(load_file(_latin1'MYSQLTEST_VARDIR/std_data_ln/words.dat')) AS `coercibility(load_file('MYSQLTEST_VARDIR/std_data_ln/words.dat'))` -update t1 set imagem=load_file('MYSQLTEST_VARDIR/std_data_ln/words.dat') where id=1; +Note 1003 select charset(load_file(_latin1'MYSQLTEST_VARDIR/std_data/words.dat')) AS `charset(load_file('MYSQLTEST_VARDIR/std_data/words.dat'))`,collation(load_file(_latin1'MYSQLTEST_VARDIR/std_data/words.dat')) AS `collation(load_file('MYSQLTEST_VARDIR/std_data/words.dat'))`,coercibility(load_file(_latin1'MYSQLTEST_VARDIR/std_data/words.dat')) AS `coercibility(load_file('MYSQLTEST_VARDIR/std_data/words.dat'))` +update t1 set imagem=load_file('MYSQLTEST_VARDIR/std_data/words.dat') where id=1; select if(imagem is null, "ERROR", "OK"),length(imagem) from t1 where id = 1; if(imagem is null, "ERROR", "OK") length(imagem) OK 581 drop table t1; -create table t1 select load_file('MYSQLTEST_VARDIR/std_data_ln/words.dat') l; +create table t1 select load_file('MYSQLTEST_VARDIR/std_data/words.dat') l; show full fields from t1; Field Type Collation Null Key Default Extra Privileges Comment l longblob NULL YES NULL # diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index 60c3ff68e67..fafbccb7b12 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -1314,7 +1314,7 @@ drop view v2, v1; drop table t1; create table t1 (a int, b char(10)); create view v1 as select * from t1 where a != 0 with check option; -load data infile '../std_data_ln/loaddata3.dat' into table v1 fields terminated by '' enclosed by '' ignore 1 lines; +load data infile '../../std_data/loaddata3.dat' into table v1 fields terminated by '' enclosed by '' ignore 1 lines; ERROR HY000: CHECK OPTION failed 'test.v1' select * from t1; a b @@ -1325,7 +1325,7 @@ a b 1 row 1 2 row 2 delete from t1; -load data infile '../std_data_ln/loaddata3.dat' ignore into table v1 fields terminated by '' enclosed by '' ignore 1 lines; +load data infile '../../std_data/loaddata3.dat' ignore into table v1 fields terminated by '' enclosed by '' ignore 1 lines; Warnings: Warning 1366 Incorrect integer value: 'error ' for column 'a' at row 3 Error 1369 CHECK OPTION failed 'test.v1' @@ -1345,14 +1345,14 @@ drop view v1; drop table t1; create table t1 (a text, b text); create view v1 as select * from t1 where a <> 'Field A' with check option; -load data infile '../std_data_ln/loaddata2.dat' into table v1 fields terminated by ',' enclosed by ''''; +load data infile '../../std_data/loaddata2.dat' into table v1 fields terminated by ',' enclosed by ''''; ERROR HY000: CHECK OPTION failed 'test.v1' select concat('|',a,'|'), concat('|',b,'|') from t1; concat('|',a,'|') concat('|',b,'|') select concat('|',a,'|'), concat('|',b,'|') from v1; concat('|',a,'|') concat('|',b,'|') delete from t1; -load data infile '../std_data_ln/loaddata2.dat' ignore into table v1 fields terminated by ',' enclosed by ''''; +load data infile '../../std_data/loaddata2.dat' ignore into table v1 fields terminated by ',' enclosed by ''''; Warnings: Error 1369 CHECK OPTION failed 'test.v1' Warning 1261 Row 2 doesn't contain data for all columns diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index 2929328a9b1..2ff1b181e9b 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -70,7 +70,7 @@ select @@warning_count; 1 drop table t1; create table t1(a tinyint, b int not null, c date, d char(5)); -load data infile '../std_data_ln/warnings_loaddata.dat' into table t1 fields terminated by ','; +load data infile '../../std_data/warnings_loaddata.dat' into table t1 fields terminated by ','; Warnings: Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'b' at row 2 Warning 1265 Data truncated for column 'd' at row 3 diff --git a/mysql-test/resolve-stack b/mysql-test/resolve-stack deleted file mode 100755 index cdbe362c752..00000000000 --- a/mysql-test/resolve-stack +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/sh -# A shortcut for resolving stacks when debugging when -# we cannot duplicate the crash in a debugger and have to -# resort to using stack traces - -nm --numeric-sort ../sql/mysqld > var/tmp/mysqld.sym -echo "Please type or paste the numeric stack trace,Ctrl-C to quit:" -../extra/resolve_stack_dump -s var/tmp/mysqld.sym diff --git a/mysql-test/std_data/ndb_config_config.ini b/mysql-test/std_data/ndb_config_config.ini new file mode 100644 index 00000000000..c325952d322 --- /dev/null +++ b/mysql-test/std_data/ndb_config_config.ini @@ -0,0 +1,55 @@ +[ndbd default] +NoOfReplicas= 2 +MaxNoOfConcurrentTransactions= 64 +MaxNoOfConcurrentOperations= 10000 +DataMemory= 20M +IndexMemory= 1M +Diskless= 0 +TimeBetweenWatchDogCheck= 30000 +DataDir= /data/msvensson/mysql/mysql-5.1-new-maint/mysql-test/var/ndbcluster-10095 +MaxNoOfOrderedIndexes= 32 +MaxNoOfAttributes= 2048 +TimeBetweenGlobalCheckpoints= 500 +NoOfFragmentLogFiles= 4 +FragmentLogFileSize=12M +DiskPageBufferMemory= 4M +# O_DIRECT has issues on 2.4 whach have not been handled, Bug #29612 +#ODirect= 1 +# the following parametes just function as a small regression +# test that the parameter exists +InitialNoOfOpenFiles= 27 + +# +# Increase timeouts to cater for slow test-machines +# (possibly running several tests in parallell) +# +HeartbeatIntervalDbDb= 30000 +HeartbeatIntervalDbApi= 30000 +#TransactionDeadlockDetectionTimeout= 7500 + +[ndbd] +HostName= localhost + +[ndbd] +HostName= localhost + +[ndb_mgmd] +HostName= localhost +DataDir= /data/msvensson/mysql/mysql-5.1-new-maint/mysql-test/var/ndbcluster-10095 # +PortNumber= 10095 + +[mysqld] + +[mysqld] + +[mysqld] + +[mysqld] + +[mysqld] + +[mysqld] + +[mysqld] + +[mysqld] diff --git a/mysql-test/suite/binlog/r/binlog_killed_simulate.result b/mysql-test/suite/binlog/r/binlog_killed_simulate.result index f6a5ddade51..a6f8f75dc15 100644 --- a/mysql-test/suite/binlog/r/binlog_killed_simulate.result +++ b/mysql-test/suite/binlog/r/binlog_killed_simulate.result @@ -14,12 +14,12 @@ select 1 /* must return 1 as query completed before got killed*/; 1 create table t2 (a int, b int) ENGINE=MyISAM; reset master; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */; +load data infile '../../std_data/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */; ERROR 70100: Query execution was interrupted show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Begin_load_query # # ;file_id=1;block_len=12 -master-bin.000001 # Execute_load_query # # use `test`; load data infile '../std_data_ln/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */ ;file_id=1 +master-bin.000001 # Execute_load_query # # use `test`; load data infile '../../std_data/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */ ;file_id=1 select (@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) is not null; diff --git a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result index f69d5717a1f..9b15a832dca 100644 --- a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result +++ b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result @@ -628,7 +628,7 @@ delete from t1; create table t4 (a int default 0, b int primary key) engine=innodb; insert into t4 values (0, 17); reset master; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2); +load data infile '../../std_data/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2); ERROR 23000: Duplicate entry '17' for key 'PRIMARY' select * from t4; a b @@ -641,7 +641,7 @@ Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Intvar # # INSERT_ID=10 master-bin.000001 # Begin_load_query # # ;file_id=1;block_len=12 master-bin.000001 # Intvar # # INSERT_ID=10 -master-bin.000001 # Execute_load_query # # use `test`; load data infile '../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2) ;file_id=1 +master-bin.000001 # Execute_load_query # # use `test`; load data infile '../../std_data/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2) ;file_id=1 master-bin.000001 # Query # # use `test`; ROLLBACK drop trigger trg_del_t2; drop table t1,t2,t3,t4,t5; diff --git a/mysql-test/suite/binlog/r/binlog_stm_blackhole.result b/mysql-test/suite/binlog/r/binlog_stm_blackhole.result index a1c83ffc73d..295272eb45e 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_blackhole.result +++ b/mysql-test/suite/binlog/r/binlog_stm_blackhole.result @@ -92,7 +92,7 @@ insert into t1 values(1); insert ignore into t1 values(1); replace into t1 values(100); create table t2 (a varchar(200)) engine=blackhole; -load data infile '../std_data_ln/words.dat' into table t2; +load data infile '../../std_data/words.dat' into table t2; alter table t1 add b int; alter table t1 drop b; create table t3 like t1; @@ -115,7 +115,7 @@ master-bin.000001 # Query # # use `test`; insert ignore into t1 values(1) master-bin.000001 # Query # # use `test`; replace into t1 values(100) master-bin.000001 # Query # # use `test`; create table t2 (a varchar(200)) engine=blackhole master-bin.000001 # Begin_load_query # # ;file_id=1;block_len=581 -master-bin.000001 # Execute_load_query # # use `test`; load data infile '../std_data_ln/words.dat' into table t2 ;file_id=1 +master-bin.000001 # Execute_load_query # # use `test`; load data infile '../../std_data/words.dat' into table t2 ;file_id=1 master-bin.000001 # Query # # use `test`; alter table t1 add b int master-bin.000001 # Query # # use `test`; alter table t1 drop b master-bin.000001 # Query # # use `test`; create table t3 like t1 diff --git a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result index c15478bc826..268767163c3 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result +++ b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result @@ -602,7 +602,7 @@ delete from t1; create table t4 (a int default 0, b int primary key) engine=innodb; insert into t4 values (0, 17); reset master; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2); +load data infile '../../std_data/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2); ERROR 23000: Duplicate entry '17' for key 'PRIMARY' select * from t4; a b @@ -615,7 +615,7 @@ Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Intvar # # INSERT_ID=10 master-bin.000001 # Begin_load_query # # ;file_id=1;block_len=12 master-bin.000001 # Intvar # # INSERT_ID=10 -master-bin.000001 # Execute_load_query # # use `test`; load data infile '../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2) ;file_id=1 +master-bin.000001 # Execute_load_query # # use `test`; load data infile '../../std_data/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2) ;file_id=1 master-bin.000001 # Query # # use `test`; ROLLBACK drop trigger trg_del_t2; drop table t1,t2,t3,t4,t5; diff --git a/mysql-test/suite/binlog/t/binlog_killed.test b/mysql-test/suite/binlog/t/binlog_killed.test index e5f7288b17c..2ba8afe7148 100644 --- a/mysql-test/suite/binlog/t/binlog_killed.test +++ b/mysql-test/suite/binlog/t/binlog_killed.test @@ -39,7 +39,8 @@ connection con2; reap; let $rows= `select count(*) from t2 /* must be 2 or 0 */`; ---exec $MYSQL_BINLOG --start-position=134 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog +let $MYSQLD_DATADIR= `select @@datadir`; +--exec $MYSQL_BINLOG --start-position=134 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval select (@a:=load_file("$MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog")) @@ -250,7 +251,7 @@ source include/show_binlog_events.inc; # a proof the query is binlogged with an error ---exec $MYSQL_BINLOG --start-position=106 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog +--exec $MYSQL_BINLOG --start-position=106 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval select (@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) @@ -296,7 +297,7 @@ source include/show_binlog_events.inc; # a proof the query is binlogged with an error ---exec $MYSQL_BINLOG --start-position=106 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog +--exec $MYSQL_BINLOG --start-position=106 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval select (@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) diff --git a/mysql-test/suite/binlog/t/binlog_killed_simulate.test b/mysql-test/suite/binlog/t/binlog_killed_simulate.test index 2121a90dc8c..955457c143f 100644 --- a/mysql-test/suite/binlog/t/binlog_killed_simulate.test +++ b/mysql-test/suite/binlog/t/binlog_killed_simulate.test @@ -23,7 +23,8 @@ update t1 set a=2 /* will be "killed" after work has been done */; #todo: introduce a suite private macro that provides numeric values # for some constants like the offset of the first real event # that is different between severs versions. ---exec $MYSQL_BINLOG --start-position=106 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog +let $MYSQLD_DATADIR= `select @@datadir`; +--exec $MYSQL_BINLOG --start-position=106 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval select (@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) @@ -44,14 +45,14 @@ system rm $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog; create table t2 (a int, b int) ENGINE=MyISAM; reset master; --error ER_QUERY_INTERRUPTED -load data infile '../std_data_ln/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */; +load data infile '../../std_data/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */; # a proof the query is binlogged with an error source include/show_binlog_events.inc; ---exec $MYSQL_BINLOG --start-position=98 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog +--exec $MYSQL_BINLOG --start-position=98 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval select (@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) diff --git a/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test b/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test index 3148cc50fd0..7700f20cc83 100644 --- a/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test +++ b/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test @@ -20,7 +20,8 @@ # ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction # and does not make slave to stop) flush logs; ---exec $MYSQL_BINLOG --start-position=524 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output +let $MYSQLD_DATADIR= `select @@datadir`; +--exec $MYSQL_BINLOG --start-position=524 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval select (@a:=load_file("$MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output")) diff --git a/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test b/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test index e7149e03b87..f6d7daf5179 100644 --- a/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test +++ b/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test @@ -12,7 +12,8 @@ # ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction # and does not make slave to stop) flush logs; ---exec $MYSQL_BINLOG --start-position=555 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output +let $MYSQLD_DATADIR= `select @@datadir`; +--exec $MYSQL_BINLOG --start-position=555 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval select (@a:=load_file("$MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output")) diff --git a/mysql-test/suite/federated/disabled.def b/mysql-test/suite/federated/disabled.def new file mode 100644 index 00000000000..9a9149ec80a --- /dev/null +++ b/mysql-test/suite/federated/disabled.def @@ -0,0 +1,12 @@ +############################################################################## +# +# List the test cases that are to be disabled temporarily. +# +# Separate the test case name and the comment with ':'. +# +# : BUG# +# +# Do not use any TAB characters for whitespace. +# +############################################################################## +federated_transactions : Bug#29523 Transactions do not work diff --git a/mysql-test/suite/federated/federated.inc b/mysql-test/suite/federated/federated.inc new file mode 100644 index 00000000000..548a37249de --- /dev/null +++ b/mysql-test/suite/federated/federated.inc @@ -0,0 +1,16 @@ +--source have_federated_db.inc + +connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,); +connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,); + +connection master; +--disable_warnings +DROP DATABASE IF EXISTS federated; +--enable_warnings +CREATE DATABASE federated; + +connection slave; +--disable_warnings +DROP DATABASE IF EXISTS federated; +--enable_warnings +CREATE DATABASE federated; diff --git a/mysql-test/r/federated.result b/mysql-test/suite/federated/federated.result similarity index 99% rename from mysql-test/r/federated.result rename to mysql-test/suite/federated/federated.result index 8f1fe20ea3b..d408a3e9a37 100644 --- a/mysql-test/r/federated.result +++ b/mysql-test/suite/federated/federated.result @@ -1,10 +1,3 @@ -stop slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -reset master; -reset slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -start slave; -stop slave; DROP DATABASE IF EXISTS federated; CREATE DATABASE federated; DROP DATABASE IF EXISTS federated; @@ -1667,7 +1660,7 @@ a b c 13 17 221 19 23 437 delete from federated.t1; -load data infile '../std_data_ln/loaddata5.dat' into table federated.t1 fields terminated by '' enclosed by '' ignore 1 lines (a, b); +load data infile '../../std_data/loaddata5.dat' into table federated.t1 fields terminated by '' enclosed by '' ignore 1 lines (a, b); select * from federated.t1 order by a; a b c 3 4 12 diff --git a/mysql-test/t/federated.test b/mysql-test/suite/federated/federated.test similarity index 99% rename from mysql-test/t/federated.test rename to mysql-test/suite/federated/federated.test index 90f1fa36bb4..08a4613b4e8 100644 --- a/mysql-test/t/federated.test +++ b/mysql-test/suite/federated/federated.test @@ -1,6 +1,4 @@ -# should work with embedded server after mysqltest is fixed ---source include/not_embedded.inc ---source include/federated.inc +--source federated.inc connection slave; DROP TABLE IF EXISTS federated.t1; @@ -1461,7 +1459,7 @@ insert into federated.t1 (a, b) select * from federated.t2; select * from federated.t1 order by a; delete from federated.t1; # load -load data infile '../std_data_ln/loaddata5.dat' into table federated.t1 fields terminated by '' enclosed by '' ignore 1 lines (a, b); +load data infile '../../std_data/loaddata5.dat' into table federated.t1 fields terminated by '' enclosed by '' ignore 1 lines (a, b); select * from federated.t1 order by a; drop tables federated.t1, federated.t2; @@ -1766,4 +1764,4 @@ DROP TABLE federated.t1; --echo End of 5.1 tests -source include/federated_cleanup.inc; +source federated_cleanup.inc; diff --git a/mysql-test/r/federated_archive.result b/mysql-test/suite/federated/federated_archive.result similarity index 89% rename from mysql-test/r/federated_archive.result rename to mysql-test/suite/federated/federated_archive.result index 3fd7cb2acd4..c7e3ee205f3 100644 --- a/mysql-test/r/federated_archive.result +++ b/mysql-test/suite/federated/federated_archive.result @@ -1,10 +1,3 @@ -stop slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -reset master; -reset slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -start slave; -stop slave; DROP DATABASE IF EXISTS federated; CREATE DATABASE federated; DROP DATABASE IF EXISTS federated; diff --git a/mysql-test/t/federated_archive.test b/mysql-test/suite/federated/federated_archive.test similarity index 87% rename from mysql-test/t/federated_archive.test rename to mysql-test/suite/federated/federated_archive.test index f8df5f1c51a..1bde23889be 100644 --- a/mysql-test/t/federated_archive.test +++ b/mysql-test/suite/federated/federated_archive.test @@ -1,7 +1,5 @@ -# should work with embedded server after mysqltest is fixed --- source include/not_embedded.inc source include/have_archive.inc; -source include/federated.inc; +source federated.inc; connection slave; @@ -56,5 +54,5 @@ connection slave; DROP TABLE federated.archive_table; -source include/federated_cleanup.inc; +source federated_cleanup.inc; diff --git a/mysql-test/r/federated_bug_13118.result b/mysql-test/suite/federated/federated_bug_13118.result similarity index 83% rename from mysql-test/r/federated_bug_13118.result rename to mysql-test/suite/federated/federated_bug_13118.result index cc14dae87d9..a9023d8e9bc 100644 --- a/mysql-test/r/federated_bug_13118.result +++ b/mysql-test/suite/federated/federated_bug_13118.result @@ -1,10 +1,3 @@ -stop slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -reset master; -reset slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -start slave; -stop slave; DROP DATABASE IF EXISTS federated; CREATE DATABASE federated; DROP DATABASE IF EXISTS federated; diff --git a/mysql-test/t/federated_bug_13118.test b/mysql-test/suite/federated/federated_bug_13118.test similarity index 81% rename from mysql-test/t/federated_bug_13118.test rename to mysql-test/suite/federated/federated_bug_13118.test index e429a660489..fad6be75dac 100644 --- a/mysql-test/t/federated_bug_13118.test +++ b/mysql-test/suite/federated/federated_bug_13118.test @@ -1,7 +1,4 @@ -# should work with embedded server after mysqltest is fixed --- source include/not_embedded.inc -source include/federated.inc; - +source federated.inc; connection slave; --disable_warnings @@ -40,5 +37,5 @@ connection slave; DROP TABLE federated.bug_13118_table; -source include/federated_cleanup.inc; +source federated_cleanup.inc; diff --git a/mysql-test/r/federated_bug_25714.result b/mysql-test/suite/federated/federated_bug_25714.result similarity index 86% rename from mysql-test/r/federated_bug_25714.result rename to mysql-test/suite/federated/federated_bug_25714.result index 12554f7af3a..20caaa55742 100644 --- a/mysql-test/r/federated_bug_25714.result +++ b/mysql-test/suite/federated/federated_bug_25714.result @@ -1,10 +1,3 @@ -stop slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -reset master; -reset slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -start slave; -stop slave; DROP DATABASE IF EXISTS federated; CREATE DATABASE federated; DROP DATABASE IF EXISTS federated; diff --git a/mysql-test/t/federated_bug_25714.test b/mysql-test/suite/federated/federated_bug_25714.test similarity index 82% rename from mysql-test/t/federated_bug_25714.test rename to mysql-test/suite/federated/federated_bug_25714.test index 9c185181511..3e1c3f4058e 100644 --- a/mysql-test/t/federated_bug_25714.test +++ b/mysql-test/suite/federated/federated_bug_25714.test @@ -1,6 +1,10 @@ ---source include/have_bug25714.inc -source include/federated.inc; +source federated.inc; + # Check that path to the specific test program has been setup +if (`select LENGTH("$MYSQL_BUG25714") = 0`) +{ + skip Need bug25714 test program; +} connection slave; --disable_warnings @@ -43,5 +47,5 @@ connection slave; DROP TABLE federated.t1; -source include/federated_cleanup.inc; +source federated_cleanup.inc; diff --git a/mysql-test/include/federated_cleanup.inc b/mysql-test/suite/federated/federated_cleanup.inc similarity index 100% rename from mysql-test/include/federated_cleanup.inc rename to mysql-test/suite/federated/federated_cleanup.inc diff --git a/mysql-test/t/federated_innodb-slave.opt b/mysql-test/suite/federated/federated_innodb-slave.opt similarity index 100% rename from mysql-test/t/federated_innodb-slave.opt rename to mysql-test/suite/federated/federated_innodb-slave.opt diff --git a/mysql-test/r/federated_innodb.result b/mysql-test/suite/federated/federated_innodb.result similarity index 85% rename from mysql-test/r/federated_innodb.result rename to mysql-test/suite/federated/federated_innodb.result index 70ba3acb279..786997afa8d 100644 --- a/mysql-test/r/federated_innodb.result +++ b/mysql-test/suite/federated/federated_innodb.result @@ -1,10 +1,3 @@ -stop slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -reset master; -reset slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -start slave; -stop slave; DROP DATABASE IF EXISTS federated; CREATE DATABASE federated; DROP DATABASE IF EXISTS federated; diff --git a/mysql-test/t/federated_innodb.test b/mysql-test/suite/federated/federated_innodb.test similarity index 92% rename from mysql-test/t/federated_innodb.test rename to mysql-test/suite/federated/federated_innodb.test index 772e37a2929..6f1ad941f82 100644 --- a/mysql-test/t/federated_innodb.test +++ b/mysql-test/suite/federated/federated_innodb.test @@ -1,4 +1,4 @@ -source include/federated.inc; +source federated.inc; source include/have_innodb.inc; # @@ -31,4 +31,4 @@ connection slave; drop table federated.t1; -source include/federated_cleanup.inc; +source federated_cleanup.inc; diff --git a/mysql-test/r/federated_server.result b/mysql-test/suite/federated/federated_server.result similarity index 98% rename from mysql-test/r/federated_server.result rename to mysql-test/suite/federated/federated_server.result index 32717b4f0e3..b5f25d3345b 100644 --- a/mysql-test/r/federated_server.result +++ b/mysql-test/suite/federated/federated_server.result @@ -1,10 +1,3 @@ -stop slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -reset master; -reset slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -start slave; -stop slave; DROP DATABASE IF EXISTS federated; CREATE DATABASE federated; DROP DATABASE IF EXISTS federated; diff --git a/mysql-test/t/federated_server.test b/mysql-test/suite/federated/federated_server.test similarity index 97% rename from mysql-test/t/federated_server.test rename to mysql-test/suite/federated/federated_server.test index 444285ac045..4b8d51a60f4 100644 --- a/mysql-test/t/federated_server.test +++ b/mysql-test/suite/federated/federated_server.test @@ -1,9 +1,6 @@ # WL #3031 This test tests the new servers table as well as # if federated can utilise the servers table -# should work with embedded server after mysqltest is fixed --- source include/not_embedded.inc --- source include/federated.inc --- source include/big_test.inc +-- source federated.inc connection slave; create database first_db; @@ -334,4 +331,4 @@ drop procedure p1; drop server if exists s; -source include/federated_cleanup.inc; +source federated_cleanup.inc; diff --git a/mysql-test/t/federated_transactions-slave.opt b/mysql-test/suite/federated/federated_transactions-slave.opt similarity index 100% rename from mysql-test/t/federated_transactions-slave.opt rename to mysql-test/suite/federated/federated_transactions-slave.opt diff --git a/mysql-test/r/federated_transactions.result b/mysql-test/suite/federated/federated_transactions.result similarity index 100% rename from mysql-test/r/federated_transactions.result rename to mysql-test/suite/federated/federated_transactions.result diff --git a/mysql-test/t/federated_transactions.test b/mysql-test/suite/federated/federated_transactions.test similarity index 86% rename from mysql-test/t/federated_transactions.test rename to mysql-test/suite/federated/federated_transactions.test index 2fc737730bf..cd08d310273 100644 --- a/mysql-test/t/federated_transactions.test +++ b/mysql-test/suite/federated/federated_transactions.test @@ -1,7 +1,5 @@ -# should work with embedded server after mysqltest is fixed --- source include/not_embedded.inc source include/have_innodb.inc; -source include/federated.inc; +source federated.inc; connection slave; DROP TABLE IF EXISTS federated.t1; @@ -37,4 +35,4 @@ INSERT INTO federated.t1 (id, name) VALUES (6, 'fig'); SELECT * FROM federated.t1; DELETE FROM federated.t1; -source include/federated_cleanup.inc; +source federated_cleanup.inc; diff --git a/mysql-test/suite/federated/have_federated_db.inc b/mysql-test/suite/federated/have_federated_db.inc new file mode 100644 index 00000000000..69cb20c46f0 --- /dev/null +++ b/mysql-test/suite/federated/have_federated_db.inc @@ -0,0 +1,4 @@ +if (`select (support = 'YES' or support = 'DEFAULT')=0 from information_schema.engines where engine = 'federated'`) +{ + skip Need federated engine; +} diff --git a/mysql-test/suite/federated/my.cnf b/mysql-test/suite/federated/my.cnf new file mode 100644 index 00000000000..3e84845b945 --- /dev/null +++ b/mysql-test/suite/federated/my.cnf @@ -0,0 +1,12 @@ +# Use default setting for mysqld processes +!include include/default_mysqld.cnf + +[mysqld.1] +log-bin= master-bin + +[mysqld.2] + + +[ENV] +MASTER_MYPORT= @mysqld.1.port +SLAVE_MYPORT= @mysqld.2.port diff --git a/mysql-test/suite/ndb/my.cnf b/mysql-test/suite/ndb/my.cnf new file mode 100644 index 00000000000..60769272ada --- /dev/null +++ b/mysql-test/suite/ndb/my.cnf @@ -0,0 +1,20 @@ +!include include/default_mysqld.cnf +!include include/default_ndbd.cnf + +[cluster_config.1] +NoOfReplicas= 2 +ndbd=, +ndb_mgmd= +mysqld=, + +[mysqld] +# Make all mysqlds use cluster +ndbcluster + +[ENV] +NDB_CONNECTSTRING= @mysql_cluster.1.ndb_connectstring +MASTER_MYPORT= @mysqld.1.1.port +MASTER_MYPORT1= @mysqld.2.1.port + +NDB_BACKUP_DIR= @cluster_config.ndbd.1.1.BackupDataDir + diff --git a/mysql-test/suite/ndb/r/loaddata_autocom_ndb.result b/mysql-test/suite/ndb/r/loaddata_autocom_ndb.result index f98e6a76981..b4d0b0b81a7 100644 --- a/mysql-test/suite/ndb/r/loaddata_autocom_ndb.result +++ b/mysql-test/suite/ndb/r/loaddata_autocom_ndb.result @@ -2,7 +2,7 @@ SET SESSION STORAGE_ENGINE = ndbcluster; drop table if exists t1; create table t1 (id int unsigned not null auto_increment primary key, a text, b text); start transaction; -load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''' (a, b); +load data infile 'LOAD_FILE' into table t1 fields terminated by ',' enclosed by '''' (a, b); Warnings: Warning 1261 Row 3 doesn't contain data for all columns commit; @@ -11,7 +11,7 @@ count(*) 4 truncate table t1; start transaction; -load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''' (a, b); +load data infile 'LOAD_FILE' into table t1 fields terminated by ',' enclosed by '''' (a, b); Warnings: Warning 1261 Row 3 doesn't contain data for all columns rollback; diff --git a/mysql-test/suite/ndb/r/ndb_config.result b/mysql-test/suite/ndb/r/ndb_config.result index 9495af29df6..e12741212d6 100644 --- a/mysql-test/suite/ndb/r/ndb_config.result +++ b/mysql-test/suite/ndb/r/ndb_config.result @@ -1,4 +1,4 @@ -ndbd,1,localhost ndbd,2,localhost ndb_mgmd,3,localhost mysqld,4, mysqld,5, mysqld,6, mysqld,7, mysqld,8, mysqld,9, mysqld,10, mysqld,11, +ndbd,1,localhost ndbd,2,localhost ndb_mgmd,3,localhost mysqld,4,localhost mysqld,5,localhost mysqld,6,localhost 1,localhost,20971520,1048576 2,localhost,20971520,1048576 1 localhost 20971520 1048576 2 localhost 20971520 1048576 diff --git a/mysql-test/suite/ndb/r/ndb_dd_backuprestore.result b/mysql-test/suite/ndb/r/ndb_dd_backuprestore.result index c82fe560121..7c9601c819f 100644 --- a/mysql-test/suite/ndb/r/ndb_dd_backuprestore.result +++ b/mysql-test/suite/ndb/r/ndb_dd_backuprestore.result @@ -27,12 +27,8 @@ pk1 c2 c3 hex(c4) 3 Sweden 498 1 4 Sweden 497 1 5 Sweden 496 1 -CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; -DELETE FROM test.backup_info; -LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; -SELECT @the_backup_id:=backup_id FROM test.backup_info; -@the_backup_id:=backup_id - +CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP; +LOAD DATA INFILE 'DUMP_FILE' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; DROP TABLE test.backup_info; DROP TABLE test.t1; ALTER TABLESPACE table_space1 @@ -95,12 +91,8 @@ LENGTH(data) SELECT LENGTH(data) FROM test.t4 WHERE c1 = 2; LENGTH(data) 16384 -CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; -DELETE FROM test.backup_info; -LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; -SELECT @the_backup_id:=backup_id FROM test.backup_info; -@the_backup_id:=backup_id - +CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP; +LOAD DATA INFILE 'DUMP_FILE' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; DROP TABLE test.backup_info; DROP TABLE test.t1; DROP TABLE test.t2; @@ -308,12 +300,8 @@ pk1 c2 c3 hex(c4) 248 TEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXAS, ITALY, Kyle, JO, JBM,TU 4 1 247 TEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXAS, ITALY, Kyle, JO, JBM,TU 6 1 246 TEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXAS, ITALY, Kyle, JO, JBM,TU 8 1 -CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; -DELETE FROM test.backup_info; -LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; -SELECT @the_backup_id:=backup_id FROM test.backup_info; -@the_backup_id:=backup_id - +CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP; +LOAD DATA INFILE 'DUMP_FILE' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; DROP TABLE test.backup_info; DROP TABLE test.t1; DROP TABLE test.t2; diff --git a/mysql-test/suite/ndb/r/ndb_load.result b/mysql-test/suite/ndb/r/ndb_load.result index 416a350066b..f990b12e735 100644 --- a/mysql-test/suite/ndb/r/ndb_load.result +++ b/mysql-test/suite/ndb/r/ndb_load.result @@ -1,10 +1,10 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=NDB; -LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1 ; +LOAD DATA INFILE '../../../std_data/words.dat' INTO TABLE t1 ; ERROR 23000: Can't write; duplicate key in table 't1' DROP TABLE t1; CREATE TABLE t1 (word CHAR(20) NOT NULL) ENGINE=NDB; -LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1 ; +LOAD DATA INFILE '../../../std_data/words.dat' INTO TABLE t1 ; SELECT * FROM t1 ORDER BY word; word Aarhus diff --git a/mysql-test/suite/ndb/r/ndb_loaddatalocal.result b/mysql-test/suite/ndb/r/ndb_loaddatalocal.result index 1d15c608f03..71d1b143089 100644 --- a/mysql-test/suite/ndb/r/ndb_loaddatalocal.result +++ b/mysql-test/suite/ndb/r/ndb_loaddatalocal.result @@ -1,19 +1,19 @@ DROP TABLE IF EXISTS t1; create table t1(a int) engine=myisam; -select * into outfile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1; +select * into outfile 'MYSQLD_DATADIR/ndb_loaddatalocal.select_outfile' from t1; drop table t1; create table t1(a int) engine=ndb; -load data local infile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1; +load data local infile 'MYSQLD_DATADIR/ndb_loaddatalocal.select_outfile' into table t1; select count(*) from t1; count(*) 10000 drop table t1; create table t1(a int) engine=myisam; insert into t1 values (1), (2), (2), (3); -select * into outfile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1; +select * into outfile 'MYSQLD_DATADIR/ndb_loaddatalocal.select_outfile' from t1; drop table t1; create table t1(a int primary key) engine=ndb; -load data local infile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1; +load data local infile 'MYSQLD_DATADIR/ndb_loaddatalocal.select_outfile' into table t1; select * from t1 order by a; a 1 @@ -22,10 +22,10 @@ a drop table t1; create table t1(a int) engine=myisam; insert into t1 values (1), (1), (2), (3); -select * into outfile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1; +select * into outfile 'MYSQLD_DATADIR/ndb_loaddatalocal.select_outfile' from t1; drop table t1; create table t1(a int primary key) engine=ndb; -load data local infile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1; +load data local infile 'MYSQLD_DATADIR/ndb_loaddatalocal.select_outfile' into table t1; select * from t1 order by a; a 1 @@ -34,10 +34,10 @@ a drop table t1; create table t1(a int) engine=myisam; insert into t1 values (1), (2), (3), (3); -select * into outfile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1; +select * into outfile 'MYSQLD_DATADIR/ndb_loaddatalocal.select_outfile' from t1; drop table t1; create table t1(a int primary key) engine=ndb; -load data local infile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1; +load data local infile 'MYSQLD_DATADIR/ndb_loaddatalocal.select_outfile' into table t1; select * from t1 order by a; a 1 diff --git a/mysql-test/suite/ndb/r/ndb_replace.result b/mysql-test/suite/ndb/r/ndb_replace.result index 23844ce3bff..ba78017ef7b 100644 --- a/mysql-test/suite/ndb/r/ndb_replace.result +++ b/mysql-test/suite/ndb/r/ndb_replace.result @@ -72,7 +72,7 @@ pk apk data 3 3 3 delete from t1; insert into t1 values (1, 1, 1), (4, 4, 4), (6, 6, 6); -load data infile '../std_data_ln/loaddata5.dat' replace into table t1 fields terminated by '' enclosed by '' ignore 1 lines (pk, apk); +load data infile '../../../std_data/loaddata5.dat' replace into table t1 fields terminated by '' enclosed by '' ignore 1 lines (pk, apk); select * from t1 order by pk; pk apk data 1 1 1 @@ -80,7 +80,7 @@ pk apk data 5 6 NULL delete from t1; insert into t1 values (1, 1, 1), (3, 3, 3), (5, 5, 5); -load data infile '../std_data_ln/loaddata5.dat' replace into table t1 fields terminated by '' enclosed by '' ignore 1 lines (pk, apk); +load data infile '../../../std_data/loaddata5.dat' replace into table t1 fields terminated by '' enclosed by '' ignore 1 lines (pk, apk); select * from t1 order by pk; pk apk data 1 1 1 diff --git a/mysql-test/suite/ndb/r/ndb_restore.result b/mysql-test/suite/ndb/r/ndb_restore.result index aba6997d218..71d2c4d24e4 100644 --- a/mysql-test/suite/ndb/r/ndb_restore.result +++ b/mysql-test/suite/ndb/r/ndb_restore.result @@ -131,12 +131,8 @@ create table t9 engine=myisam as select * from t9_c; create table t10 engine=myisam as select * from t10_c; ForceVarPart: 0 ForceVarPart: 1 -CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; -DELETE FROM test.backup_info; -LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; -SELECT @the_backup_id:=backup_id FROM test.backup_info; -@the_backup_id:=backup_id - +CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP; +LOAD DATA INFILE 'DUMP_FILE' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; DROP TABLE test.backup_info; drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c,t10_c; ForceVarPart: 0 @@ -270,12 +266,8 @@ Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length I X X X X X X X X X X 10001 X X X X X X X ALTER TABLE t7_c PARTITION BY LINEAR KEY (`dardtestard`); -CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; -DELETE FROM test.backup_info; -LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; -SELECT @the_backup_id:=backup_id FROM test.backup_info; -@the_backup_id:=backup_id - +CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP; +LOAD DATA INFILE 'DUMP_FILE' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; DROP TABLE test.backup_info; drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c,t10_c; select count(*) from t1; @@ -478,13 +470,9 @@ select * from t9_c) a; count(*) 3 drop table t1_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c,t10_c; -CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; -DELETE FROM test.backup_info; -LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; -SELECT @the_backup_id:=backup_id FROM test.backup_info; -@the_backup_id:=backup_id - +CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP; +LOAD DATA INFILE 'DUMP_FILE' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; DROP TABLE test.backup_info; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10; -drop table if exists t2_c; +drop table t1,t2,t3,t4,t5,t6,t7,t8,t9,t10; +drop table t2_c; 520093696, diff --git a/mysql-test/suite/ndb/r/ndb_restore_partition.result b/mysql-test/suite/ndb/r/ndb_restore_partition.result index 7dc4057e615..58a35437a2e 100644 --- a/mysql-test/suite/ndb/r/ndb_restore_partition.result +++ b/mysql-test/suite/ndb/r/ndb_restore_partition.result @@ -125,12 +125,8 @@ create table t6 engine=myisam as select * from t6_c; create table t7 engine=myisam as select * from t7_c; create table t8 engine=myisam as select * from t8_c; create table t9 engine=myisam as select * from t9_c; -CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; -DELETE FROM test.backup_info; -LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; -SELECT @the_backup_id:=backup_id FROM test.backup_info; -@the_backup_id:=backup_id - +CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP; +LOAD DATA INFILE 'DUMP_FILE' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; DROP TABLE test.backup_info; drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c; select count(*) from t1; @@ -248,12 +244,8 @@ PARTITION BY LINEAR HASH (`relatta`) PARTITIONS 4; ALTER TABLE t7_c PARTITION BY LINEAR KEY (`dardtestard`); -CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; -DELETE FROM test.backup_info; -LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; -SELECT @the_backup_id:=backup_id FROM test.backup_info; -@the_backup_id:=backup_id - +CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP; +LOAD DATA INFILE 'DUMP_FILE' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; DROP TABLE test.backup_info; drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c; select count(*) from t1; @@ -456,12 +448,8 @@ select * from t9_c) a; count(*) 3 drop table t1_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c; -CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; -DELETE FROM test.backup_info; -LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; -SELECT @the_backup_id:=backup_id FROM test.backup_info; -@the_backup_id:=backup_id - +CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP; +LOAD DATA INFILE 'DUMP_FILE' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; DROP TABLE test.backup_info; Create table test/def/t2_c failed: Translate frm error drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; diff --git a/mysql-test/suite/ndb/r/ndb_restore_print.result b/mysql-test/suite/ndb/r/ndb_restore_print.result index e05f8e43d1a..7ff15652b3f 100644 --- a/mysql-test/suite/ndb/r/ndb_restore_print.result +++ b/mysql-test/suite/ndb/r/ndb_restore_print.result @@ -227,12 +227,8 @@ hex(h3) NULL hex(i1) NULL hex(i2) NULL hex(i3) NULL -CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; -DELETE FROM test.backup_info; -LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; -SELECT @the_backup_id:=backup_id FROM test.backup_info; -@the_backup_id:=backup_id - +CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP; +LOAD DATA INFILE 'DUMP_FILE' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; DROP TABLE test.backup_info; 1;0x1;0x17;0x789A;0x789ABCDE;0xFEDC0001;127;255;32767;65535;2147483647;4294967295;9223372036854775807;18446744073709551615;1;12345678901234567890123456789012;123456789;1;12345678901234567890123456789012;123456789;0x12;0x123456789ABCDEF0;0x012345;0x12;0x123456789ABCDEF0;0x00123450 2;0x0;0x0;0x0;0x0;0x0;-128;0;-32768;0;-2147483648;0;-9223372036854775808;0;;;;;;;0x0;0x0;0x0;0x0;0x0;0x0 @@ -261,12 +257,8 @@ create table t4 (pk int key, a int) engine ndb; insert into t2 values (1,11),(2,12),(3,13),(4,14),(5,15); insert into t3 values (1,21),(2,22),(3,23),(4,24),(5,25); insert into t4 values (1,31),(2,32),(3,33),(4,34),(5,35); -CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; -DELETE FROM test.backup_info; -LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; -SELECT @the_backup_id:=backup_id FROM test.backup_info; -@the_backup_id:=backup_id - +CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP; +LOAD DATA INFILE 'DUMP_FILE' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; DROP TABLE test.backup_info; '1' '1' '12345678901234567890123456789012' '123456789' '1' '12345678901234567890123456789012' '123456789' '0x20' '0x123456789ABCDEF020' '0x012345000020' '0x1200000020' '0x123456789ABCDEF000000020' '0x00123450000020' @@ -305,12 +297,8 @@ create table t1 insert into t1 values(1, 8388607, 16777215); insert into t1 values(2, -8388608, 0); insert into t1 values(3, -1, 1); -CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; -DELETE FROM test.backup_info; -LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; -SELECT @the_backup_id:=backup_id FROM test.backup_info; -@the_backup_id:=backup_id - +CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP; +LOAD DATA INFILE 'DUMP_FILE' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; DROP TABLE test.backup_info; 1;8388607;16777215 2;-8388608;0 diff --git a/mysql-test/suite/ndb/r/ndb_trigger.result b/mysql-test/suite/ndb/r/ndb_trigger.result index d074ad01c22..cc3e27df852 100644 --- a/mysql-test/suite/ndb/r/ndb_trigger.result +++ b/mysql-test/suite/ndb/r/ndb_trigger.result @@ -120,7 +120,7 @@ d 1 2.050000000000000000000000000000 delete from t1; delete from t2; insert into t1 values (3, 1, 1.05), (5, 2, 2.05); -load data infile '../std_data_ln/loaddata5.dat' replace into table t1 fields terminated by '' enclosed by '' ignore 1 lines (id, a); +load data infile '../../../std_data/loaddata5.dat' replace into table t1 fields terminated by '' enclosed by '' ignore 1 lines (id, a); select * from t1 order by id; id a b 3 4 0.000000000000000000000000000000 diff --git a/mysql-test/suite/ndb/t/ndb_alter_table.test b/mysql-test/suite/ndb/t/ndb_alter_table.test index 082fe726927..6dc3088137d 100644 --- a/mysql-test/suite/ndb/t/ndb_alter_table.test +++ b/mysql-test/suite/ndb/t/ndb_alter_table.test @@ -362,7 +362,8 @@ CREATE TABLE t1 ( CREATE TEMPORARY TABLE ndb_show_tables (id INT, type VARCHAR(20), state VARCHAR(20), logging VARCHAR(20), _database VARCHAR(255), _schema VARCHAR(20), name VARCHAR(255)); --disable_warnings ---exec $NDB_TOOLS_DIR/ndb_show_tables --p > $MYSQLTEST_VARDIR/master-data/test/tmp.dat +let $MYSQLD_DATADIR= `select @@datadir`; +--exec $NDB_TOOLS_DIR/ndb_show_tables --p > $MYSQLD_DATADIR/test/tmp.dat LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables; --enable_warnings @@ -372,7 +373,7 @@ truncate ndb_show_tables; alter table t1 change tiny new_tiny tinyint(4) DEFAULT '0' NOT NULL; --disable_warnings ---exec $NDB_TOOLS_DIR/ndb_show_tables --p > $MYSQLTEST_VARDIR/master-data/test/tmp.dat +--exec $NDB_TOOLS_DIR/ndb_show_tables --p > $MYSQLD_DATADIR/test/tmp.dat LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables; --enable_warnings @@ -386,9 +387,9 @@ alter table t1 add index i2(new_tiny); drop index i1 on t1; --disable_warnings ---exec $NDB_TOOLS_DIR/ndb_show_tables --p > $MYSQLTEST_VARDIR/master-data/test/tmp.dat +--exec $NDB_TOOLS_DIR/ndb_show_tables --p > $MYSQLD_DATADIR/test/tmp.dat LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables; ---exec rm $MYSQLTEST_VARDIR/master-data/test/tmp.dat || true +--exec rm $MYSQLD_DATADIR/test/tmp.dat || true --enable_warnings select 'no_copy' from ndb_show_tables where id = @t1_id and name like '%t1%'; diff --git a/mysql-test/suite/ndb/t/ndb_config.test b/mysql-test/suite/ndb/t/ndb_config.test index f63c0087c1e..08d1226953c 100644 --- a/mysql-test/suite/ndb/t/ndb_config.test +++ b/mysql-test/suite/ndb/t/ndb_config.test @@ -6,7 +6,7 @@ --exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=nodeid,host,DataMemory,IndexMemory --type=ndbd 2> /dev/null --exec $NDB_TOOLS_DIR/ndb_config --no-defaults -r \\\n -f " " --query=nodeid,host,DataMemory,IndexMemory --type=ndbd 2> /dev/null --exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=nodeid --type=ndbd --host=localhost 2> /dev/null ---exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=type,nodeid,host --config-file=$NDB_BACKUP_DIR/config.ini 2> /dev/null +--exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=type,nodeid,host --config-file=$MYSQL_TEST_DIR/std_data/ndb_config_config.ini 2> /dev/null # End of 4.1 tests @@ -18,6 +18,6 @@ --exec $NDB_TOOLS_DIR/ndb_config --defaults-group-suffix=.cluster2 --defaults-file=$MYSQL_TEST_DIR/std_data/ndb_config_mycnf2.cnf --ndb-shm --connections --query=type,nodeid1,nodeid2,group,nodeidserver --mycnf 2> /dev/null ---exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=nodeid --host=localhost --config-file=$NDB_BACKUP_DIR/config.ini 2> /dev/null ---exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=nodeid --host=1.2.3.4 --config-file=$NDB_BACKUP_DIR/config.ini 2> /dev/null ---exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=nodeid --host=127.0.0.1 --config-file=$NDB_BACKUP_DIR/config.ini 2> /dev/null +--exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=nodeid --host=localhost --config-file=$MYSQL_TEST_DIR/std_data/ndb_config_config.ini 2> /dev/null +--exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=nodeid --host=1.2.3.4 --config-file=$MYSQL_TEST_DIR/std_data/ndb_config_config.ini 2> /dev/null +--exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=nodeid --host=127.0.0.1 --config-file=$MYSQL_TEST_DIR/std_data/ndb_config_config.ini 2> /dev/null diff --git a/mysql-test/suite/ndb/t/ndb_load.test b/mysql-test/suite/ndb/t/ndb_load.test index af2df70b74e..aa48b3dfdcf 100644 --- a/mysql-test/suite/ndb/t/ndb_load.test +++ b/mysql-test/suite/ndb/t/ndb_load.test @@ -12,12 +12,12 @@ DROP TABLE IF EXISTS t1; # should give duplicate key CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=NDB; --error 1022 -LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1 ; +LOAD DATA INFILE '../../../std_data/words.dat' INTO TABLE t1 ; DROP TABLE t1; # now without a primary key we should be ok CREATE TABLE t1 (word CHAR(20) NOT NULL) ENGINE=NDB; -LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1 ; +LOAD DATA INFILE '../../../std_data/words.dat' INTO TABLE t1 ; SELECT * FROM t1 ORDER BY word; DROP TABLE t1; diff --git a/mysql-test/suite/ndb/t/ndb_loaddatalocal.test b/mysql-test/suite/ndb/t/ndb_loaddatalocal.test index 3eae3891f43..257a26087b7 100644 --- a/mysql-test/suite/ndb/t/ndb_loaddatalocal.test +++ b/mysql-test/suite/ndb/t/ndb_loaddatalocal.test @@ -15,55 +15,56 @@ while ($1) dec $1; } set SQL_LOG_BIN=1; +let $MYSQLD_DATADIR= `select @@datadir`; enable_query_log; ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR -eval select * into outfile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1; +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR +eval select * into outfile '$MYSQLD_DATADIR/ndb_loaddatalocal.select_outfile' from t1; #This will generate a 20KB file, now test LOAD DATA LOCAL drop table t1; create table t1(a int) engine=ndb; ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR -eval load data local infile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1; +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR +eval load data local infile '$MYSQLD_DATADIR/ndb_loaddatalocal.select_outfile' into table t1; select count(*) from t1; ---remove_file $MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile +--remove_file $MYSQLD_DATADIR/ndb_loaddatalocal.select_outfile drop table t1; create table t1(a int) engine=myisam; insert into t1 values (1), (2), (2), (3); ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR -eval select * into outfile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1; +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR +eval select * into outfile '$MYSQLD_DATADIR/ndb_loaddatalocal.select_outfile' from t1; drop table t1; create table t1(a int primary key) engine=ndb; ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR -eval load data local infile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1; ---remove_file $MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR +eval load data local infile '$MYSQLD_DATADIR/ndb_loaddatalocal.select_outfile' into table t1; +--remove_file $MYSQLD_DATADIR/ndb_loaddatalocal.select_outfile select * from t1 order by a; drop table t1; create table t1(a int) engine=myisam; insert into t1 values (1), (1), (2), (3); ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR -eval select * into outfile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1; +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR +eval select * into outfile '$MYSQLD_DATADIR/ndb_loaddatalocal.select_outfile' from t1; drop table t1; create table t1(a int primary key) engine=ndb; ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR -eval load data local infile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1; ---remove_file $MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR +eval load data local infile '$MYSQLD_DATADIR/ndb_loaddatalocal.select_outfile' into table t1; +--remove_file $MYSQLD_DATADIR/ndb_loaddatalocal.select_outfile select * from t1 order by a; drop table t1; create table t1(a int) engine=myisam; insert into t1 values (1), (2), (3), (3); ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR -eval select * into outfile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1; +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR +eval select * into outfile '$MYSQLD_DATADIR/ndb_loaddatalocal.select_outfile' from t1; drop table t1; create table t1(a int primary key) engine=ndb; ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR -eval load data local infile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1; ---remove_file $MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR +eval load data local infile '$MYSQLD_DATADIR/ndb_loaddatalocal.select_outfile' into table t1; +--remove_file $MYSQLD_DATADIR/ndb_loaddatalocal.select_outfile select * from t1 order by a; drop table t1; diff --git a/mysql-test/suite/ndb/t/ndb_replace.test b/mysql-test/suite/ndb/t/ndb_replace.test index aa2072b98dd..432cf7f2dcd 100644 --- a/mysql-test/suite/ndb/t/ndb_replace.test +++ b/mysql-test/suite/ndb/t/ndb_replace.test @@ -85,12 +85,12 @@ select * from t1 order by pk; delete from t1; # Test for load data replace which updates pk insert into t1 values (1, 1, 1), (4, 4, 4), (6, 6, 6); -load data infile '../std_data_ln/loaddata5.dat' replace into table t1 fields terminated by '' enclosed by '' ignore 1 lines (pk, apk); +load data infile '../../../std_data/loaddata5.dat' replace into table t1 fields terminated by '' enclosed by '' ignore 1 lines (pk, apk); select * from t1 order by pk; delete from t1; # Now test for load data replace which doesn't touch pk insert into t1 values (1, 1, 1), (3, 3, 3), (5, 5, 5); -load data infile '../std_data_ln/loaddata5.dat' replace into table t1 fields terminated by '' enclosed by '' ignore 1 lines (pk, apk); +load data infile '../../../std_data/loaddata5.dat' replace into table t1 fields terminated by '' enclosed by '' ignore 1 lines (pk, apk); select * from t1 order by pk; delete from t1; # Finally test for both types of replace ... select diff --git a/mysql-test/suite/ndb/t/ndb_restore.test b/mysql-test/suite/ndb/t/ndb_restore.test index 18efa66ebe0..75af879faa8 100644 --- a/mysql-test/suite/ndb/t/ndb_restore.test +++ b/mysql-test/suite/ndb/t/ndb_restore.test @@ -394,10 +394,8 @@ drop table t1_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c,t10_c; # Cleanup # ---disable_warnings -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10; -drop table if exists t2_c; ---enable_warnings +drop table t1,t2,t3,t4,t5,t6,t7,t8,t9,t10; +drop table t2_c; # # Test BUG#10287 diff --git a/mysql-test/suite/ndb/t/ndb_single_user.test b/mysql-test/suite/ndb/t/ndb_single_user.test index 07925b25917..76a4307f226 100644 --- a/mysql-test/suite/ndb/t/ndb_single_user.test +++ b/mysql-test/suite/ndb/t/ndb_single_user.test @@ -15,8 +15,8 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10; --eval set @node_id= SUBSTRING('$node_id', 20)+0 --enable_query_log --let $node_id= `SELECT @node_id` ---exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "enter single user mode $node_id" >> $NDB_TOOLS_OUTPUT ---exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" --single-user >> $NDB_TOOLS_OUTPUT +--exec $NDB_MGM --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -e "enter single user mode $node_id" >> $NDB_TOOLS_OUTPUT +--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" --single-user >> $NDB_TOOLS_OUTPUT # verify that we are indeed in single user mode # and test that some operations give correct errors @@ -124,7 +124,7 @@ update t1 set b=b+100; --error 1296 update t1 set b=b+100 where a > 7; ---exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "exit single user mode" >> $NDB_TOOLS_OUTPUT +--exec $NDB_MGM --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -e "exit single user mode" >> $NDB_TOOLS_OUTPUT --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults >> $NDB_TOOLS_OUTPUT # @@ -139,8 +139,8 @@ BEGIN; update t1 set b=b+100 where a=2; # enter single user mode ---exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "enter single user mode $node_id" >> $NDB_TOOLS_OUTPUT ---exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" --single-user >> $NDB_TOOLS_OUTPUT +--exec $NDB_MGM --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -e "enter single user mode $node_id" >> $NDB_TOOLS_OUTPUT +--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" --single-user >> $NDB_TOOLS_OUTPUT --connection server1 update t1 set b=b+100 where a=3; @@ -160,7 +160,7 @@ create table t2 (a int) engine myisam; alter table t2 add column (b int); # exit single user mode ---exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "exit single user mode" >> $NDB_TOOLS_OUTPUT +--exec $NDB_MGM --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -e "exit single user mode" >> $NDB_TOOLS_OUTPUT --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults >> $NDB_TOOLS_OUTPUT # cleanup diff --git a/mysql-test/suite/ndb/t/ndb_trigger.test b/mysql-test/suite/ndb/t/ndb_trigger.test index 2e944174fd0..9f01157fc93 100644 --- a/mysql-test/suite/ndb/t/ndb_trigger.test +++ b/mysql-test/suite/ndb/t/ndb_trigger.test @@ -98,7 +98,7 @@ delete from t1; delete from t2; # Check for load data replace insert into t1 values (3, 1, 1.05), (5, 2, 2.05); -load data infile '../std_data_ln/loaddata5.dat' replace into table t1 fields terminated by '' enclosed by '' ignore 1 lines (id, a); +load data infile '../../../std_data/loaddata5.dat' replace into table t1 fields terminated by '' enclosed by '' ignore 1 lines (id, a); select * from t1 order by id; select * from t2 order by op, a, b; update t4 set b = 10 where a = 1; diff --git a/mysql-test/suite/ndb/t/ndbapi.test b/mysql-test/suite/ndb/t/ndbapi.test index 3424513f8af..398a2cbfbfa 100644 --- a/mysql-test/suite/ndb/t/ndbapi.test +++ b/mysql-test/suite/ndb/t/ndbapi.test @@ -7,28 +7,28 @@ drop database if exists mysqltest; --enable_warnings --exec echo Running ndbapi_simple ---exec $NDB_EXAMPLES_DIR/ndbapi_simple/ndbapi_simple $MASTER_MYSOCK "localhost:$NDBCLUSTER_PORT" >> $NDB_EXAMPLES_OUTPUT +--exec $NDB_EXAMPLES_DIR/ndbapi_simple/ndbapi_simple $MASTER_MYSOCK "$NDB_CONNECTSTRING" >> $NDB_EXAMPLES_OUTPUT --exec echo Running ndbapi_simple_index ---exec $NDB_EXAMPLES_DIR/ndbapi_simple_index/ndbapi_simple_index $MASTER_MYSOCK "localhost:$NDBCLUSTER_PORT" >> $NDB_EXAMPLES_OUTPUT +--exec $NDB_EXAMPLES_DIR/ndbapi_simple_index/ndbapi_simple_index $MASTER_MYSOCK "$NDB_CONNECTSTRING" >> $NDB_EXAMPLES_OUTPUT --exec echo Running ndbapi_scan ---exec $NDB_EXAMPLES_DIR/ndbapi_scan/ndbapi_scan $MASTER_MYSOCK "localhost:$NDBCLUSTER_PORT" >> $NDB_EXAMPLES_OUTPUT +--exec $NDB_EXAMPLES_DIR/ndbapi_scan/ndbapi_scan $MASTER_MYSOCK "$NDB_CONNECTSTRING" >> $NDB_EXAMPLES_OUTPUT --exec echo Running ndbapi_retries ---exec $NDB_EXAMPLES_DIR/ndbapi_retries/ndbapi_retries $MASTER_MYSOCK "localhost:$NDBCLUSTER_PORT" >> $NDB_EXAMPLES_OUTPUT +--exec $NDB_EXAMPLES_DIR/ndbapi_retries/ndbapi_retries $MASTER_MYSOCK "$NDB_CONNECTSTRING" >> $NDB_EXAMPLES_OUTPUT --exec echo Running ndbapi_async ---exec $NDB_EXAMPLES_DIR/ndbapi_async/ndbapi_async $MASTER_MYSOCK "localhost:$NDBCLUSTER_PORT" >> $NDB_EXAMPLES_OUTPUT +--exec $NDB_EXAMPLES_DIR/ndbapi_async/ndbapi_async $MASTER_MYSOCK "$NDB_CONNECTSTRING" >> $NDB_EXAMPLES_OUTPUT --exec echo Running ndbapi_async1 ---exec $NDB_EXAMPLES_DIR/ndbapi_async1/ndbapi_async1 $MASTER_MYSOCK "localhost:$NDBCLUSTER_PORT" >> $NDB_EXAMPLES_OUTPUT +--exec $NDB_EXAMPLES_DIR/ndbapi_async1/ndbapi_async1 $MASTER_MYSOCK "$NDB_CONNECTSTRING" >> $NDB_EXAMPLES_OUTPUT use TEST_DB; create table t0(c0 int, c1 int, c2 char(4), c3 char(4), c4 text, primary key(c0, c2)) engine ndb charset latin1; #--exec echo Running ndbapi_event -#--exec $NDB_EXAMPLES_DIR/ndbapi_event/ndbapi_event "localhost:$NDBCLUSTER_PORT" 1 >> $NDB_EXAMPLES_OUTPUT +#--exec $NDB_EXAMPLES_DIR/ndbapi_event/ndbapi_event "$NDB_CONNECTSTRING" 1 >> $NDB_EXAMPLES_OUTPUT insert into t0 values (1, 2, 'a', 'b', null); insert into t0 values (3, 4, 'c', 'd', null); update t0 set c3 = 'e' where c0 = 1 and c2 = 'a'; -- use pk @@ -41,4 +41,4 @@ delete from t0; drop table t0; --exec echo Running mgmapi_logevent ---exec $NDB_EXAMPLES_DIR/mgmapi_logevent/mgmapi_logevent "localhost:$NDBCLUSTER_PORT" 1 >> $NDB_EXAMPLES_OUTPUT +--exec $NDB_EXAMPLES_DIR/mgmapi_logevent/mgmapi_logevent "$NDB_CONNECTSTRING" 1 >> $NDB_EXAMPLES_OUTPUT diff --git a/mysql-test/suite/rpl/include/rpl_mixed_dml.inc b/mysql-test/suite/rpl/include/rpl_mixed_dml.inc index 70db5b6cf83..b76d45c0eb0 100644 --- a/mysql-test/suite/rpl/include/rpl_mixed_dml.inc +++ b/mysql-test/suite/rpl/include/rpl_mixed_dml.inc @@ -51,8 +51,8 @@ DELETE FROM t2 WHERE a = 2; --echo --echo ******************** LOAD DATA INFILE ******************** ---exec cp ./suite/rpl/data/rpl_mixed.dat $MYSQLTEST_VARDIR/tmp/ -LOAD DATA INFILE '../tmp/rpl_mixed.dat' INTO TABLE t1 FIELDS TERMINATED BY '|' ; +--copy_file suite/rpl/data/rpl_mixed.dat $MYSQLTEST_VARDIR/tmp/rpl_mixed.dat +LOAD DATA INFILE '../../tmp/rpl_mixed.dat' INTO TABLE t1 FIELDS TERMINATED BY '|' ; --remove_file $MYSQLTEST_VARDIR/tmp/rpl_mixed.dat SELECT * FROM t1 ORDER BY a; --source suite/rpl/include/rpl_mixed_check_select.inc @@ -344,4 +344,4 @@ sync_slave_with_master; # will be created. You will need to go to the mysql-test dir and diff # the files your self to see what is not matching ---exec diff $MYSQLTEST_VARDIR/tmp/rpl_switch_stm_row_mixed_master.sql $MYSQLTEST_VARDIR/tmp/rpl_switch_stm_row_mixed_slave.sql +--diff_files $MYSQLTEST_VARDIR/tmp/rpl_switch_stm_row_mixed_master.sql $MYSQLTEST_VARDIR/tmp/rpl_switch_stm_row_mixed_slave.sql diff --git a/mysql-test/suite/rpl/my.cnf b/mysql-test/suite/rpl/my.cnf new file mode 100644 index 00000000000..c57cc775ec3 --- /dev/null +++ b/mysql-test/suite/rpl/my.cnf @@ -0,0 +1,14 @@ +# Use settings from rpl_1slave_raw.cnf +# add setting to connect the slave to the master by default +!include rpl_1slave_base.cnf + +[mysqld.2] +# Hardcode the host to 127.0.0.1 until running on more +# than one host and it need to be masked +# master-host= @mysqld.1.#host +master-host= 127.0.0.1 +master-port= @mysqld.1.port +master-password= @mysqld.1.#password +master-user= @mysqld.1.#user +master-connect-retry= 1 + diff --git a/mysql-test/suite/rpl/r/rpl_LD_INFILE.result b/mysql-test/suite/rpl/r/rpl_LD_INFILE.result index 70013f95d85..b092dd9e088 100644 --- a/mysql-test/suite/rpl/r/rpl_LD_INFILE.result +++ b/mysql-test/suite/rpl/r/rpl_LD_INFILE.result @@ -6,10 +6,10 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; DROP TABLE IF EXISTS test.t1; CREATE TABLE test.t1 (a VARCHAR(255), PRIMARY KEY(a)); -LOAD DATA INFILE '../std_data_ln/words2.dat' INTO TABLE test.t1; +LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1; DELETE FROM test.t1 WHERE a = 'abashed'; DELETE FROM test.t1; -LOAD DATA INFILE '../std_data_ln/words2.dat' INTO TABLE test.t1; +LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1; SELECT * FROM test.t1 ORDER BY a DESC; a aberration diff --git a/mysql-test/suite/rpl/r/rpl_flushlog_loop.result b/mysql-test/suite/rpl/r/rpl_flushlog_loop.result index ca06a5a328c..62a50dcc406 100644 --- a/mysql-test/suite/rpl/r/rpl_flushlog_loop.result +++ b/mysql-test/suite/rpl/r/rpl_flushlog_loop.result @@ -6,7 +6,7 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; show variables like 'relay_log%'; Variable_name Value -relay_log MYSQLTEST_VARDIR/master-data/relay-log +relay_log MYSQLD_DATADIR/relay-log relay_log_index relay_log_info_file relay-log.info relay_log_purge ON diff --git a/mysql-test/suite/rpl/r/rpl_innodb.result b/mysql-test/suite/rpl/r/rpl_innodb.result index 658f92f4d75..fb906dd6197 100644 --- a/mysql-test/suite/rpl/r/rpl_innodb.result +++ b/mysql-test/suite/rpl/r/rpl_innodb.result @@ -12,7 +12,7 @@ PRIMARY KEY (id), UNIQUE KEY unique_rec (name,number) ) ENGINE=InnoDB; LOAD DATA -INFILE '../std_data_ln/loaddata_pair.dat' +INFILE '../../std_data/loaddata_pair.dat' REPLACE INTO TABLE t4 (name,number); SELECT * FROM t4; @@ -24,7 +24,7 @@ id name number 1 XXX 12345 2 XXY 12345 LOAD DATA -INFILE '../std_data_ln/loaddata_pair.dat' +INFILE '../../std_data/loaddata_pair.dat' REPLACE INTO TABLE t4 (name,number); SELECT * FROM t4; diff --git a/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result b/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result index 0e11d132cc4..1f952dcd7c5 100644 --- a/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result +++ b/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result @@ -103,7 +103,7 @@ DELETE FROM t1; DELETE FROM t2; ******************** LOAD DATA INFILE ******************** -LOAD DATA INFILE '../tmp/rpl_mixed.dat' INTO TABLE t1 FIELDS TERMINATED BY '|' ; +LOAD DATA INFILE '../../tmp/rpl_mixed.dat' INTO TABLE t1 FIELDS TERMINATED BY '|' ; SELECT * FROM t1 ORDER BY a; a b 10 line A @@ -868,7 +868,7 @@ master-bin.000001 # Xid 1 # # master-bin.000001 # Query 1 # use `test_rpl`; DELETE FROM t2 master-bin.000001 # Xid 1 # # master-bin.000001 # Begin_load_query 1 # ;file_id=#;block_len=# -master-bin.000001 # Execute_load_query 1 # use `test_rpl`; LOAD DATA INFILE '../tmp/rpl_mixed.dat' INTO TABLE t1 FIELDS TERMINATED BY '|' ;file_id=# +master-bin.000001 # Execute_load_query 1 # use `test_rpl`; LOAD DATA INFILE '../../tmp/rpl_mixed.dat' INTO TABLE t1 FIELDS TERMINATED BY '|' ;file_id=# master-bin.000001 # Xid 1 # # master-bin.000001 # Query 1 # use `test_rpl`; DELETE FROM t1 master-bin.000001 # Xid 1 # # diff --git a/mysql-test/suite/rpl/r/rpl_load_table_from_master.result b/mysql-test/suite/rpl/r/rpl_load_table_from_master.result index c24f857d829..9d9a1d7d6cb 100644 --- a/mysql-test/suite/rpl/r/rpl_load_table_from_master.result +++ b/mysql-test/suite/rpl/r/rpl_load_table_from_master.result @@ -29,9 +29,9 @@ drop table t1; drop table t1; set SQL_LOG_BIN=0; create table t1 (word char(20) not null, index(word))ENGINE=MyISAM; -load data infile '../std_data_ln/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; create table t2 (word char(20) not null)ENGINE=MyISAM; -load data infile '../std_data_ln/words.dat' into table t2; +load data infile '../../std_data/words.dat' into table t2; create table t3 (word char(20) not null primary key)ENGINE=MyISAM; load table t1 from master; load table t2 from master; diff --git a/mysql-test/suite/rpl/r/rpl_loaddata.result b/mysql-test/suite/rpl/r/rpl_loaddata.result index b9bd2a22fd0..4f95a08a74a 100644 --- a/mysql-test/suite/rpl/r/rpl_loaddata.result +++ b/mysql-test/suite/rpl/r/rpl_loaddata.result @@ -9,12 +9,12 @@ select last_insert_id(); last_insert_id() 0 create table t1(a int not null auto_increment, b int, primary key(a) ); -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1; +load data infile '../../std_data/rpl_loaddata.dat' into table t1; select last_insert_id(); last_insert_id() 1 create temporary table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60)); -load data infile '../std_data_ln/rpl_loaddata2.dat' into table t2 fields terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by '\n##\n' starting by '>' ignore 1 lines; +load data infile '../../std_data/rpl_loaddata2.dat' into table t2 fields terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by '\n##\n' starting by '>' ignore 1 lines; create table t3 (day date,id int(9),category enum('a','b','c'),name varchar(60)); insert into t3 select * from t2; select * from t1; @@ -28,13 +28,13 @@ day id category name 2003-03-22 2416 a bbbbb show master status; File Position Binlog_Do_DB Binlog_Ignore_DB -slave-bin.000001 1280 +slave-bin.000001 1286 drop table t1; drop table t2; drop table t3; create table t1(a int, b int, unique(b)); insert into t1 values(1,10); -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1; +load data infile '../../std_data/rpl_loaddata.dat' into table t1; set global sql_slave_skip_counter=1; start slave; show slave status; @@ -43,7 +43,7 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File set sql_log_bin=0; delete from t1; set sql_log_bin=1; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1; +load data infile '../../std_data/rpl_loaddata.dat' into table t1; stop slave; change master to master_user='test'; change master to master_user='root'; @@ -55,7 +55,7 @@ start slave; set sql_log_bin=0; delete from t1; set sql_log_bin=1; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1; +load data infile '../../std_data/rpl_loaddata.dat' into table t1; stop slave; reset slave; show slave status; @@ -64,7 +64,7 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File reset master; create table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60), unique(day)) engine=MyISAM; -load data infile '../std_data_ln/rpl_loaddata2.dat' into table t2 fields +load data infile '../../std_data/rpl_loaddata2.dat' into table t2 fields terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by '\n##\n' starting by '>' ignore 1 lines; ERROR 23000: Duplicate entry '2003-03-22' for key 'day' @@ -79,7 +79,7 @@ day id category name 2003-03-22 2161 c asdf alter table t2 drop key day; delete from t2; -load data infile '../std_data_ln/rpl_loaddata2.dat' into table t2 fields +load data infile '../../std_data/rpl_loaddata2.dat' into table t2 fields terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by '\n##\n' starting by '>' ignore 1 lines; ERROR 23000: Duplicate entry '2003-03-22' for key 'day' @@ -87,6 +87,6 @@ drop table t2; drop table t2; drop table t1; CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=INNODB; -LOAD DATA INFILE "../std_data_ln/words.dat" INTO TABLE t1; +LOAD DATA INFILE "../../std_data/words.dat" INTO TABLE t1; ERROR 23000: Duplicate entry 'Aarhus' for key 'PRIMARY' DROP TABLE IF EXISTS t1; diff --git a/mysql-test/suite/rpl/r/rpl_loaddata_charset.result b/mysql-test/suite/rpl/r/rpl_loaddata_charset.result index 929d06e74cf..7ba67150cb9 100644 --- a/mysql-test/suite/rpl/r/rpl_loaddata_charset.result +++ b/mysql-test/suite/rpl/r/rpl_loaddata_charset.result @@ -5,17 +5,17 @@ reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; create table t1 (a varchar(10) character set utf8); -load data infile '../std_data_ln/loaddata6.dat' into table t1; +load data infile '../../std_data/loaddata6.dat' into table t1; set @@character_set_database=koi8r; -load data infile '../std_data_ln/loaddata6.dat' into table t1; +load data infile '../../std_data/loaddata6.dat' into table t1; set @@character_set_database=DEFAULT; -load data infile '../std_data_ln/loaddata6.dat' into table t1; -load data infile '../std_data_ln/loaddata6.dat' into table t1; -load data infile '../std_data_ln/loaddata6.dat' into table t1; +load data infile '../../std_data/loaddata6.dat' into table t1; +load data infile '../../std_data/loaddata6.dat' into table t1; +load data infile '../../std_data/loaddata6.dat' into table t1; set @@character_set_database=koi8r; -load data infile '../std_data_ln/loaddata6.dat' into table t1; +load data infile '../../std_data/loaddata6.dat' into table t1; set @@character_set_database=DEFAULT; -load data infile '../std_data_ln/loaddata6.dat' into table t1 character set koi8r; +load data infile '../../std_data/loaddata6.dat' into table t1 character set koi8r; select hex(a) from t1; hex(a) C3BF diff --git a/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result b/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result index a4d67754bd6..27fb8623e85 100644 --- a/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result +++ b/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result @@ -45,7 +45,7 @@ Last_IO_Errno # Last_IO_Error # Last_SQL_Errno 0 Last_SQL_Error -LOAD DATA INFILE '../std_data_ln/rpl_loaddata.dat' INTO TABLE t1; +LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE t1; SHOW SLAVE STATUS; Slave_IO_State # Master_Host 127.0.0.1 diff --git a/mysql-test/suite/rpl/r/rpl_loaddata_m.result b/mysql-test/suite/rpl/r/rpl_loaddata_m.result index 9dbae6d38c4..1d263a41e1b 100644 --- a/mysql-test/suite/rpl/r/rpl_loaddata_m.result +++ b/mysql-test/suite/rpl/r/rpl_loaddata_m.result @@ -7,14 +7,14 @@ start slave; drop database if exists mysqltest; USE test; CREATE TABLE t1(a INT, b INT, UNIQUE(b)); -LOAD DATA INFILE '../std_data_ln/rpl_loaddata.dat' INTO TABLE test.t1; +LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE test.t1; SELECT COUNT(*) FROM test.t1; COUNT(*) 2 CREATE DATABASE mysqltest; USE mysqltest; CREATE TABLE t1(a INT, b INT, UNIQUE(b)); -LOAD DATA INFILE '../std_data_ln/rpl_loaddata.dat' INTO TABLE mysqltest.t1; +LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE mysqltest.t1; SELECT COUNT(*) FROM mysqltest.t1; COUNT(*) 2 diff --git a/mysql-test/suite/rpl/r/rpl_loaddata_s.result b/mysql-test/suite/rpl/r/rpl_loaddata_s.result index 4fc33eee20d..779a3af9631 100644 --- a/mysql-test/suite/rpl/r/rpl_loaddata_s.result +++ b/mysql-test/suite/rpl/r/rpl_loaddata_s.result @@ -6,7 +6,7 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; reset master; create table test.t1(a int, b int, unique(b)); -load data infile '../std_data_ln/rpl_loaddata.dat' into table test.t1; +load data infile '../../std_data/rpl_loaddata.dat' into table test.t1; select count(*) from test.t1; count(*) 2 diff --git a/mysql-test/suite/rpl/r/rpl_loaddata_simple.result b/mysql-test/suite/rpl/r/rpl_loaddata_simple.result index 196093211b6..5e3923616ed 100644 --- a/mysql-test/suite/rpl/r/rpl_loaddata_simple.result +++ b/mysql-test/suite/rpl/r/rpl_loaddata_simple.result @@ -5,7 +5,7 @@ reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; CREATE TABLE t1 (word CHAR(20) NOT NULL); -LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1; +LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1; SELECT * FROM t1 ORDER BY word; word Aarhus diff --git a/mysql-test/suite/rpl/r/rpl_loaddatalocal.result b/mysql-test/suite/rpl/r/rpl_loaddatalocal.result index bb1b0610aa8..96de55e9dcf 100644 --- a/mysql-test/suite/rpl/r/rpl_loaddatalocal.result +++ b/mysql-test/suite/rpl/r/rpl_loaddatalocal.result @@ -5,19 +5,19 @@ reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; create table t1(a int); -select * into outfile 'MYSQLTEST_VARDIR/master-data/rpl_loaddatalocal.select_outfile' from t1; +select * into outfile 'MYSQLD_DATADIR/rpl_loaddatalocal.select_outfile' from t1; truncate table t1; -load data local infile 'MYSQLTEST_VARDIR/master-data/rpl_loaddatalocal.select_outfile' into table t1; +load data local infile 'MYSQLD_DATADIR/rpl_loaddatalocal.select_outfile' into table t1; select a,count(*) from t1 group by a; a count(*) 1 10000 drop table t1; create table t1(a int); insert into t1 values (1), (2), (2), (3); -select * into outfile 'MYSQLTEST_VARDIR/master-data/rpl_loaddatalocal.select_outfile' from t1; +select * into outfile 'MYSQLD_DATADIR/rpl_loaddatalocal.select_outfile' from t1; drop table t1; create table t1(a int primary key); -load data local infile 'MYSQLTEST_VARDIR/master-data/rpl_loaddatalocal.select_outfile' into table t1; +load data local infile 'MYSQLD_DATADIR/rpl_loaddatalocal.select_outfile' into table t1; SELECT * FROM t1 ORDER BY a; a 1 diff --git a/mysql-test/suite/rpl/r/rpl_loadfile.result b/mysql-test/suite/rpl/r/rpl_loadfile.result index 7487693a9f7..7a5a7bc50c9 100644 --- a/mysql-test/suite/rpl/r/rpl_loadfile.result +++ b/mysql-test/suite/rpl/r/rpl_loadfile.result @@ -8,11 +8,11 @@ DROP PROCEDURE IF EXISTS test.p1; DROP TABLE IF EXISTS test.t1; CREATE TABLE test.t1 (a INT, blob_column LONGBLOB, PRIMARY KEY(a)); INSERT INTO test.t1 VALUES(1,'test'); -UPDATE test.t1 SET blob_column=LOAD_FILE('../std_data_ln/words2.dat') WHERE a=1; +UPDATE test.t1 SET blob_column=LOAD_FILE('../../std_data/words2.dat') WHERE a=1; create procedure test.p1() begin INSERT INTO test.t1 VALUES(2,'test'); -UPDATE test.t1 SET blob_column=LOAD_FILE('../std_data_ln/words2.dat') WHERE a=2; +UPDATE test.t1 SET blob_column=LOAD_FILE('../../std_data/words2.dat') WHERE a=2; end| CALL test.p1(); SELECT * FROM test.t1 ORDER BY blob_column; diff --git a/mysql-test/suite/rpl/r/rpl_misc_functions.result b/mysql-test/suite/rpl/r/rpl_misc_functions.result index a8e5520ca8f..8025387b43e 100644 --- a/mysql-test/suite/rpl/r/rpl_misc_functions.result +++ b/mysql-test/suite/rpl/r/rpl_misc_functions.result @@ -15,7 +15,7 @@ insert into t1 values(3, 0, 0, 0, password('does_this_work?')); insert into t1 values(4, connection_id(), rand()*1000, rand()*1000, password('does_this_still_work?')); select * into outfile 'rpl_misc_functions.outfile' from t1; create table t2 like t1; -load data local infile 'MYSQLTEST_VARDIR/master-data/test/rpl_misc_functions.outfile' into table t2; +load data local infile 'MYSQLD_DATADIR/test/rpl_misc_functions.outfile' into table t2; select * from t1, t2 where (t1.id=t2.id) and not(t1.i=t2.i and t1.r1=t2.r1 and t1.r2=t2.r2 and t1.p=t2.p); id i r1 r2 p id i r1 r2 p drop table t1; @@ -41,9 +41,9 @@ CALL test_replication_sp2(); INSERT INTO t1 (col_a) VALUES (test_replication_sf()); INSERT INTO t1 (col_a) VALUES (test_replication_sf()); INSERT INTO t1 (col_a) VALUES (test_replication_sf()); -select * from t1 into outfile "../tmp/t1_slave.txt"; +select * from t1 into outfile "../../tmp/t1_slave.txt"; create temporary table t1_slave select * from t1 where 1=0; -load data infile '../tmp/t1_slave.txt' into table t1_slave; +load data infile '../../tmp/t1_slave.txt' into table t1_slave; select count(*) into @aux from t1 join t1_slave using (id) where ABS(t1.col_a - t1_slave.col_a) < 0.0000001 ; SELECT @aux; diff --git a/mysql-test/suite/rpl/r/rpl_replicate_do.result b/mysql-test/suite/rpl/r/rpl_replicate_do.result index d854a2d0f8d..33088ee2ec8 100644 --- a/mysql-test/suite/rpl/r/rpl_replicate_do.result +++ b/mysql-test/suite/rpl/r/rpl_replicate_do.result @@ -9,7 +9,7 @@ drop table if exists t11; create table t2 (n int); insert into t2 values(4); create table t2 (s char(20)); -load data infile '../std_data_ln/words.dat' into table t2; +load data infile '../../std_data/words.dat' into table t2; insert into t2 values('five'); create table t1 (m int); insert into t1 values(15),(16),(17); diff --git a/mysql-test/suite/rpl/r/rpl_rewrt_db.result b/mysql-test/suite/rpl/r/rpl_rewrt_db.result index 1b843bffdca..76dd574191f 100644 --- a/mysql-test/suite/rpl/r/rpl_rewrt_db.result +++ b/mysql-test/suite/rpl/r/rpl_rewrt_db.result @@ -24,7 +24,7 @@ drop database if exists rewrite; create database rewrite; use test; create table t1 (a date, b date, c date not null, d date); -load data infile '../std_data_ln/loaddata1.dat' into table t1 fields terminated by ','; +load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ','; Warnings: Warning 1265 Data truncated for column 'a' at row 1 Warning 1265 Data truncated for column 'c' at row 1 @@ -32,7 +32,7 @@ Warning 1265 Data truncated for column 'd' at row 1 Warning 1265 Data truncated for column 'a' at row 2 Warning 1265 Data truncated for column 'b' at row 2 Warning 1265 Data truncated for column 'd' at row 2 -load data infile '../std_data_ln/loaddata1.dat' into table t1 fields terminated by ',' IGNORE 2 LINES; +load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',' IGNORE 2 LINES; select * from rewrite.t1; a b c d 0000-00-00 NULL 0000-00-00 0000-00-00 @@ -40,7 +40,7 @@ a b c d 2003-03-03 2003-03-03 2003-03-03 NULL 2003-03-03 2003-03-03 2003-03-03 NULL truncate table t1; -load data infile '../std_data_ln/loaddata1.dat' into table t1 fields terminated by ',' LINES STARTING BY ',' (b,c,d); +load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',' LINES STARTING BY ',' (b,c,d); Warnings: Warning 1265 Data truncated for column 'c' at row 1 Warning 1265 Data truncated for column 'd' at row 1 @@ -53,7 +53,7 @@ NULL 0000-00-00 0000-00-00 0000-00-00 NULL 2003-03-03 2003-03-03 NULL drop table t1; create table t1 (a text, b text); -load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by ''''; +load data infile '../../std_data/loaddata2.dat' into table t1 fields terminated by ',' enclosed by ''''; Warnings: Warning 1261 Row 3 doesn't contain data for all columns select concat('|',a,'|'), concat('|',b,'|') from rewrite.t1; @@ -65,7 +65,7 @@ Field 3,'Field 4| |Field 6| | 'Field 7'| drop table t1; create table t1 (a int, b char(10)); -load data infile '../std_data_ln/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines; +load data infile '../../std_data/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines; Warnings: Warning 1366 Incorrect integer value: 'error ' for column 'a' at row 3 Warning 1262 Row 3 was truncated; it contained more data than there were input columns @@ -79,7 +79,7 @@ a b 3 row 3 0 1234567890 truncate table t1; -load data infile '../std_data_ln/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines; +load data infile '../../std_data/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines; Warnings: Warning 1366 Incorrect integer value: ' ' for column 'a' at row 4 diff --git a/mysql-test/suite/rpl/r/rpl_row_001.result b/mysql-test/suite/rpl/r/rpl_row_001.result index fad60af664f..b07a99644fc 100644 --- a/mysql-test/suite/rpl/r/rpl_row_001.result +++ b/mysql-test/suite/rpl/r/rpl_row_001.result @@ -5,7 +5,7 @@ reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; CREATE TABLE t1 (word CHAR(20) NOT NULL); -LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1; +LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1; LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1; SELECT * FROM t1 ORDER BY word LIMIT 10; word diff --git a/mysql-test/suite/rpl/r/rpl_row_loaddata_m.result b/mysql-test/suite/rpl/r/rpl_row_loaddata_m.result index 149efddaf8d..198e55c71d0 100644 --- a/mysql-test/suite/rpl/r/rpl_row_loaddata_m.result +++ b/mysql-test/suite/rpl/r/rpl_row_loaddata_m.result @@ -9,7 +9,7 @@ stop slave; create database mysqltest; use mysqltest; create table t1(a int, b int, unique(b)); -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1; +load data infile '../../std_data/rpl_loaddata.dat' into table t1; show binlog events from 102; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query 1 # # diff --git a/mysql-test/suite/rpl/r/rpl_row_log.result b/mysql-test/suite/rpl/r/rpl_row_log.result index 33a6c3b9781..c5e9cebcf23 100644 --- a/mysql-test/suite/rpl/r/rpl_row_log.result +++ b/mysql-test/suite/rpl/r/rpl_row_log.result @@ -12,7 +12,7 @@ create table t1(n int not null auto_increment primary key)ENGINE=MyISAM; insert into t1 values (NULL); drop table t1; create table t1 (word char(20) not null)ENGINE=MyISAM; -load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines; +load data infile '../../std_data/words.dat' into table t1 ignore 1 lines; select count(*) from t1; count(*) 69 diff --git a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result index 9ed35f34dc5..6ea0532fe25 100644 --- a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result +++ b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result @@ -12,7 +12,7 @@ create table t1(n int not null auto_increment primary key)ENGINE=InnoDB; insert into t1 values (NULL); drop table t1; create table t1 (word char(20) not null)ENGINE=InnoDB; -load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines; +load data infile '../../std_data/words.dat' into table t1 ignore 1 lines; select count(*) from t1; count(*) 69 diff --git a/mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result b/mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result index 0fd4ff86893..584a3af4543 100644 --- a/mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result +++ b/mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result @@ -5,7 +5,7 @@ reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; create table t1 (words varchar(20)) engine=myisam; -load data infile '../std_data_ln/words.dat' into table t1 (words); +load data infile '../../std_data/words.dat' into table t1 (words); select count(*) from t1; count(*) 70 diff --git a/mysql-test/suite/rpl/r/rpl_stm_000001.result b/mysql-test/suite/rpl/r/rpl_stm_000001.result index 3b4cd05f640..24e454eb876 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_000001.result +++ b/mysql-test/suite/rpl/r/rpl_stm_000001.result @@ -5,7 +5,7 @@ reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; create table t1 (word char(20) not null); -load data infile '../std_data_ln/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; load data local infile 'MYSQL_TEST_DIR/std_data/words.dat' into table t1; select * from t1 limit 10; word diff --git a/mysql-test/suite/rpl/r/rpl_stm_log.result b/mysql-test/suite/rpl/r/rpl_stm_log.result index 02f3dc9044a..3bbb60feca7 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_log.result +++ b/mysql-test/suite/rpl/r/rpl_stm_log.result @@ -12,7 +12,7 @@ create table t1(n int not null auto_increment primary key)ENGINE=MyISAM; insert into t1 values (NULL); drop table t1; create table t1 (word char(20) not null)ENGINE=MyISAM; -load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines; +load data infile '../../std_data/words.dat' into table t1 ignore 1 lines; select count(*) from t1; count(*) 69 @@ -25,7 +25,7 @@ master-bin.000001 # Query 1 # use `test`; insert into t1 values (NULL) master-bin.000001 # Query 1 # use `test`; drop table t1 master-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM master-bin.000001 # Begin_load_query 1 # ;file_id=1;block_len=581 -master-bin.000001 # Execute_load_query 1 # use `test`; load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines ;file_id=1 +master-bin.000001 # Execute_load_query 1 # use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=1 show binlog events from 106 limit 1; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM @@ -197,7 +197,7 @@ master-bin.000001 # Query # # use `test`; insert into t1 values (NULL) master-bin.000001 # Query # # use `test`; drop table t1 master-bin.000001 # Query # # use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM master-bin.000001 # Begin_load_query # # ;file_id=1;block_len=581 -master-bin.000001 # Execute_load_query # # use `test`; load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines ;file_id=1 +master-bin.000001 # Execute_load_query # # use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=1 master-bin.000001 # Rotate # # master-bin.000002;pos=4 show binlog events in 'master-bin.000002'; Log_name Pos Event_type Server_id End_log_pos Info @@ -212,7 +212,7 @@ master-bin.000002 392 start slave; show binary logs; Log_name File_size -slave-bin.000001 1447 +slave-bin.000001 1450 slave-bin.000002 293 show binlog events in 'slave-bin.000001' from 4; Log_name Pos Event_type Server_id End_log_pos Info @@ -223,7 +223,7 @@ slave-bin.000001 # Query 1 # use `test`; insert into t1 values (NULL) slave-bin.000001 # Query 1 # use `test`; drop table t1 slave-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM slave-bin.000001 # Begin_load_query 1 # ;file_id=1;block_len=581 -slave-bin.000001 # Execute_load_query 1 # use `test`; load data INFILE '../tmp/SQL_LOAD-2-1-1.data' INTO table t1 ignore 1 lines ;file_id=1 +slave-bin.000001 # Execute_load_query 1 # use `test`; load data INFILE '../../tmp/SQL_LOAD-2-1-1.data' INTO table t1 ignore 1 lines ;file_id=1 slave-bin.000001 # Query 1 # use `test`; create table t3 (a int)ENGINE=MyISAM slave-bin.000001 # Rotate 2 # slave-bin.000002;pos=4 show binlog events in 'slave-bin.000002' from 4; diff --git a/mysql-test/suite/rpl/r/rpl_timezone.result b/mysql-test/suite/rpl/r/rpl_timezone.result index cd71dbe628e..927756dd530 100644 --- a/mysql-test/suite/rpl/r/rpl_timezone.result +++ b/mysql-test/suite/rpl/r/rpl_timezone.result @@ -42,7 +42,7 @@ t n 2004-06-11 09:39:02 6 delete from t1; set time_zone='UTC'; -load data infile '../std_data_ln/rpl_timezone2.dat' into table t1; +load data infile '../../std_data/rpl_timezone2.dat' into table t1; Warnings: Warning 1265 Data truncated for column 't' at row 1 Warning 1261 Row 1 doesn't contain data for all columns diff --git a/mysql-test/suite/rpl/rpl_1slave_base.cnf b/mysql-test/suite/rpl/rpl_1slave_base.cnf new file mode 100644 index 00000000000..83b391f07c4 --- /dev/null +++ b/mysql-test/suite/rpl/rpl_1slave_base.cnf @@ -0,0 +1,56 @@ +# Use default setting for mysqld processes +!include include/default_mysqld.cnf + +[mysqld.1] + +# Run the master.sh script before starting this process +#!run-master-sh + +log-bin= master-bin + +[mysqld.2] +# Run the slave.sh script before starting this process +#!run-slave-sh + +# Append -slave.opt file to the list of argument used when +# starting the mysqld +#!use-slave-opt + +# Force restart between each test case +#!force-restart + +# Always install a fresh datadir before starting process +#!fresh-datadir + +log-bin= slave-bin +relay-log= slave-relay-bin + +init-rpl-role= slave +log-slave-updates +master-retry-count= 10 + +# Values reported by slave when it connect to master +# and shows up in SHOW SLAVE STATUS; +report-host= 127.0.0.1 +report-port= @mysqld.2.port +report-user= root + +skip-innodb +skip-slave-start + +# Directory where slaves find the dumps generated by "load data" +# on the server. The path need to have constant length otherwise +# test results will vary, thus a relative path is used. +slave-load-tmpdir= ../../tmp + + +rpl-recovery-rank= @mysqld.2.server-id + + +[ENV] +MASTER_MYPORT= @mysqld.1.port +MASTER_MYSOCK= @mysqld.1.socket + +SLAVE_MYPORT= @mysqld.2.port +SLAVE_MYSOCK= @mysqld.2.socket + diff --git a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def index b57c77b6ef5..ed3d4b6e01d 100644 --- a/mysql-test/suite/rpl/t/disabled.def +++ b/mysql-test/suite/rpl/t/disabled.def @@ -10,6 +10,6 @@ # ############################################################################## -rpl_ddl : BUG#26418 2007-03-01 mleich Slave out of sync after CREATE/DROP TEMPORARY TABLE + ROLLBACK on master -rpl_stm_extraColmaster_ndb : WL#3915 : Statement-based replication not supported in ndb. Enable test when supported. -rpl_innodb_bug28430 : Bug #32247 2007-11-27 mats Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table) +rpl_ddl : BUG#26418 Slave out of sync after CREATE/DROP TEMPORARY TABLE + ROLLBACK on master +rpl_stm_extraColmaster_ndb : WL#3915 Statement-based replication not supported in ndb. Enable test when supported. +rpl_innodb_bug28430 : Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table) diff --git a/mysql-test/suite/rpl/t/rpl000017-slave.sh b/mysql-test/suite/rpl/t/rpl000017-slave.sh index 17188aba0db..1d95798260a 100755 --- a/mysql-test/suite/rpl/t/rpl000017-slave.sh +++ b/mysql-test/suite/rpl/t/rpl000017-slave.sh @@ -1,6 +1,6 @@ rm -f $MYSQLTEST_VARDIR/log/*relay* -rm -f $MYSQLTEST_VARDIR/slave-data/relay-log.info -cat > $MYSQLTEST_VARDIR/slave-data/master.info < $MYSQLTEST_VARDIR/mysqld.2/data/master.info < $MYSQLTEST_VARDIR/tmp/master.sql ---exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/master.sql - ---exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000002 >> $MYSQLTEST_VARDIR/tmp/master.sql +--exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000002 >> $MYSQLTEST_VARDIR/tmp/master.sql # Now that we have our file, lets get rid of the current database. # Cleanup the master and the slave and try to recreate. @@ -160,7 +160,7 @@ connection master; # We should be gold by the time, so I will get rid of our file. ---exec rm $MYSQLTEST_VARDIR/tmp/master.sql +remove_file $MYSQLTEST_VARDIR/tmp/master.sql; # this test for position option @@ -168,8 +168,9 @@ connection master; --disable_query_log select "--- Test 2 position test --" as ""; --enable_query_log +let $MYSQLD_DATADIR= `select @@datadir;`; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR ---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=416 $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=416 $MYSQLD_DATADIR/master-bin.000001 # These are tests for remote binlog. # They should return the same as previous test. @@ -258,14 +259,15 @@ select "--- Test 5 LOAD DATA --" as ""; --disable_query_log select "--- Test 6 reading stdin --" as ""; --enable_query_log +let $MYSQLD_DATADIR= `select @@datadir;`; --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---exec $MYSQL_BINLOG --short-form - < $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --short-form - < $MYSQLD_DATADIR/master-bin.000001 --disable_query_log select "--- Test 7 reading stdin w/position --" as ""; --enable_query_log --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---exec $MYSQL_BINLOG --short-form --position=416 - < $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --short-form --position=416 - < $MYSQLD_DATADIR/master-bin.000001 # Bug#16217 (mysql client did not know how not switch its internal charset) --disable_query_log @@ -294,9 +296,10 @@ create table t4 (f text character set utf8); create table t5 (f text character set cp932); --exec $MYSQL --default-character-set=utf8 test -e "insert into t4 values(_utf8'ソ')" --exec $MYSQL --default-character-set=cp932 test -e "insert into t5 values(_cp932'ƒ\');" +let $MYSQLD_DATADIR= `select @@datadir;`; flush logs; rename table t4 to t04, t5 to t05; ---exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 | $MYSQL --default-character-set=utf8 +--exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001 | $MYSQL --default-character-set=utf8 # original and recovered data must be equal select HEX(f) from t04; select HEX(f) from t4; @@ -332,10 +335,12 @@ INSERT INTO t1 VALUES(1,1); SELECT * FROM t1; +let $MYSQLD_DATADIR= `select @@datadir;`; + FLUSH LOGS; --exec $MYSQL_BINLOG --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 > $MYSQLTEST_VARDIR/tmp/remote.sql ---exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/local.sql +--exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/local.sql --diff_files $MYSQLTEST_VARDIR/tmp/local.sql $MYSQLTEST_VARDIR/tmp/remote.sql diff --git a/mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test b/mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test index 29b3008e822..82c4b1a9936 100644 --- a/mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test +++ b/mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test @@ -9,7 +9,7 @@ connection master; create table t1 (words varchar(20)) engine=myisam; -load data infile '../std_data_ln/words.dat' into table t1 (words); +load data infile '../../std_data/words.dat' into table t1 (words); select count(*) from t1; save_master_pos; diff --git a/mysql-test/suite/rpl/t/rpl_timezone.test b/mysql-test/suite/rpl/t/rpl_timezone.test index dac21000a62..d65242f2a22 100644 --- a/mysql-test/suite/rpl/t/rpl_timezone.test +++ b/mysql-test/suite/rpl/t/rpl_timezone.test @@ -67,7 +67,7 @@ connection master; connection master; delete from t1; set time_zone='UTC'; -load data infile '../std_data_ln/rpl_timezone2.dat' into table t1; +load data infile '../../std_data/rpl_timezone2.dat' into table t1; SELECT * FROM t1 ORDER BY n; sync_slave_with_master; set time_zone='UTC'; diff --git a/mysql-test/suite/rpl/t/rpl_trigger.test b/mysql-test/suite/rpl/t/rpl_trigger.test index 4a496ea4923..9538333dcf2 100644 --- a/mysql-test/suite/rpl/t/rpl_trigger.test +++ b/mysql-test/suite/rpl/t/rpl_trigger.test @@ -296,8 +296,10 @@ STOP SLAVE; # Replace master's binlog. connection master; +let $MYSQLD_DATADIR= `select @@datadir`; FLUSH LOGS; -exec cp $MYSQL_TEST_DIR/std_data/bug16266.000001 $MYSQLTEST_VARDIR/log/master-bin.000001; +remove_file $MYSQLD_DATADIR/master-bin.000001; +copy_file $MYSQL_TEST_DIR/std_data/bug16266.000001 $MYSQLD_DATADIR/master-bin.000001; # Make the slave to replay the new binlog. diff --git a/mysql-test/suite/rpl_ndb/my.cnf b/mysql-test/suite/rpl_ndb/my.cnf new file mode 100644 index 00000000000..b37b163afee --- /dev/null +++ b/mysql-test/suite/rpl_ndb/my.cnf @@ -0,0 +1,75 @@ +!include include/default_mysqld.cnf +!include include/default_ndbd.cnf + +[cluster_config.1] +NoOfReplicas= 2 +ndbd=, +ndb_mgmd= +mysqld=, + +[cluster_config.slave] +NoOfReplicas= 1 +ndbd= +ndb_mgmd= +mysqld= + +[mysqld] +# Make all mysqlds use cluster +ndbcluster +# Turn on bin logging +log-bin= master-bin + +[mysqld.1.1] + +[mysqld.1.1] + +[mysqld.1.slave] + +# Append -slave.opt file to the list of argument used when +# starting the mysqld +#!use-slave-opt + +# Connect mysqld in the second cluster as save to first mysqld +# Hardcode the host to 127.0.0.1 until running on more +# than one host and it probably need to be masked anyway +# master-host= @mysqld.1.#host +master-host= 127.0.0.1 +master-port= @mysqld.1.1.port +master-password= @mysqld.1.1.#password +master-user= @mysqld.1.1.#user +master-connect-retry= 1 + +log-bin= slave-bin +relay-log= slave-relay-bin + +init-rpl-role= slave +log-slave-updates +master-retry-count= 10 + +# Values reported by slave when it connect to master +# and shows up in SHOW SLAVE STATUS; +report-host= 127.0.0.1 +report-port= @mysqld.1.slave.port +report-user= root + +skip-innodb +skip-slave-start + +# Directory where slaves find the dumps generated by "load data" +# on the server. The path need to have constant length otherwise +# test results will vary, thus a relative path is used. +slave-load-tmpdir= ../../../tmp + +rpl-recovery-rank= @mysqld.1.slave.server-id + + +[ENV] +NDB_CONNECTSTRING= @mysql_cluster.1.ndb_connectstring +MASTER_MYPORT= @mysqld.1.1.port +MASTER_MYPORT1= @mysqld.2.1.port + +NDB_CONNECTSTRING_SLAVE= @mysql_cluster.slave.ndb_connectstring +SLAVE_MYPORT= @mysqld.1.slave.port +SLAVE_MYSOCK= @mysqld.1.slave.socket + +NDB_BACKUP_DIR= @cluster_config.ndbd.1.1.BackupDataDir diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result index 7f26313894c..37188aeb1ca 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result @@ -265,13 +265,9 @@ COUNT(*) SELECT COUNT(*) FROM history; COUNT(*) 200 -CREATE TEMPORARY TABLE IF NOT EXISTS mysql.backup_info (id INT, backup_id INT) ENGINE = HEAP; -DELETE FROM mysql.backup_info; -LOAD DATA INFILE '../tmp.dat' INTO TABLE mysql.backup_info FIELDS TERMINATED BY ','; -SELECT @the_backup_id:=backup_id FROM mysql.backup_info; -@the_backup_id:=backup_id - -DROP TABLE IF EXISTS mysql.backup_info; +CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP; +LOAD DATA INFILE 'DUMP_FILE' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; +DROP TABLE test.backup_info; ************ Restore the slave ************************ CREATE DATABASE tpcb; ***** Check a few slave restore values *************** diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result index 148e6247b03..7c3f331958f 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result @@ -23,11 +23,11 @@ select count(*) from t2; count(*) 0 begin; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t2; +load data infile '../../../std_data/rpl_loaddata.dat' into table t2; Warnings: Warning 1262 Row 1 was truncated; it contained more data than there were input columns Warning 1262 Row 2 was truncated; it contained more data than there were input columns -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1; +load data infile '../../../std_data/rpl_loaddata.dat' into table t1; Warnings: Warning 1262 Row 1 was truncated; it contained more data than there were input columns Warning 1262 Row 2 was truncated; it contained more data than there were input columns @@ -49,11 +49,11 @@ count(*) delete from t1; delete from t2; begin; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t2; +load data infile '../../../std_data/rpl_loaddata.dat' into table t2; Warnings: Warning 1262 Row 1 was truncated; it contained more data than there were input columns Warning 1262 Row 2 was truncated; it contained more data than there were input columns -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1; +load data infile '../../../std_data/rpl_loaddata.dat' into table t1; Warnings: Warning 1262 Row 1 was truncated; it contained more data than there were input columns Warning 1262 Row 2 was truncated; it contained more data than there were input columns @@ -77,11 +77,11 @@ delete from t2; begin; insert into t2 values(3),(4); insert into t1 values(3),(4); -load data infile '../std_data_ln/rpl_loaddata.dat' into table t2; +load data infile '../../../std_data/rpl_loaddata.dat' into table t2; Warnings: Warning 1262 Row 1 was truncated; it contained more data than there were input columns Warning 1262 Row 2 was truncated; it contained more data than there were input columns -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1; +load data infile '../../../std_data/rpl_loaddata.dat' into table t1; Warnings: Warning 1262 Row 1 was truncated; it contained more data than there were input columns Warning 1262 Row 2 was truncated; it contained more data than there were input columns diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result index 326506b0396..438bdf91c09 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result @@ -12,7 +12,7 @@ create table t1(n int not null auto_increment primary key)ENGINE=NDB; insert into t1 values (NULL); drop table t1; create table t1 (word char(20) not null)ENGINE=NDB; -load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines; +load data infile '../../../std_data/words.dat' into table t1 ignore 1 lines; select count(*) from t1; count(*) 69 diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result index 760114f3639..2e267bf77c1 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result @@ -26,10 +26,10 @@ stop slave; SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1) FROM mysql.ndb_binlog_index WHERE epoch = ; @the_pos:=Position @the_file:=SUBSTRING_INDEX(FILE, '/', -1) -106 master-bin1.000001 +106 master-bin.000001 CHANGE MASTER TO master_port=, -master_log_file = 'master-bin1.000001', +master_log_file = 'master-bin.000001', master_log_pos = 106 ; start slave; INSERT INTO t1 VALUES ("row2","will go away",2),("row3","will change",3),("row4","D",4); diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result index 56bb31e329d..21fc33c577f 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result @@ -5,7 +5,7 @@ reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; CREATE TABLE t1 (word CHAR(20) NOT NULL); -LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1; +LOAD DATA INFILE '../../../std_data/words.dat' INTO TABLE t1; LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1; SELECT * FROM t1 ORDER BY word LIMIT 10; word diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result index f2a1ba410b9..c788893e055 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result @@ -25,12 +25,8 @@ hex(c2) hex(c3) c1 0 1 BCDEF 1 0 CD 0 0 DEFGHIJKL -CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; -DELETE FROM test.backup_info; -LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; -SELECT @the_backup_id:=backup_id FROM test.backup_info; -@the_backup_id:=backup_id - +CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP; +LOAD DATA INFILE 'DUMP_FILE' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; DROP TABLE test.backup_info; UPDATE t1 SET c2=0 WHERE c3="row2"; SELECT hex(c1),hex(c2),c3 FROM t1 ORDER BY c3; diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test index ce951f01212..b90e6fff8bc 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test @@ -73,7 +73,7 @@ CREATE TABLE ACCOUNT_TYPE ( ACCOUNT_TYPE_ID INT UNSIGNED NOT NULL, # # create "BANK" application # ---exec NDB_CONNECTSTRING=localhost:$NDBCLUSTER_PORT ../storage/ndb/test/ndbapi/bank/bankCreator >> $NDB_TOOLS_OUTPUT +--exec NDB_CONNECTSTRING=$NDB_CONNECTSTRING ../storage/ndb/test/ndbapi/bank/bankCreator >> $NDB_TOOLS_OUTPUT # # start main loop @@ -88,9 +88,9 @@ while ($2) # # start "BANK" application # ---exec NDB_CONNECTSTRING=localhost:$NDBCLUSTER_PORT ../storage/ndb/test/ndbapi/bank/bankTimer -w 5 >> $NDB_TOOLS_OUTPUT & ---exec NDB_CONNECTSTRING=localhost:$NDBCLUSTER_PORT ../storage/ndb/test/ndbapi/bank/bankMakeGL >> $NDB_TOOLS_OUTPUT & ---exec NDB_CONNECTSTRING=localhost:$NDBCLUSTER_PORT ../storage/ndb/test/ndbapi/bank/bankTransactionMaker >> $NDB_TOOLS_OUTPUT & +--exec NDB_CONNECTSTRING=$NDB_CONNECTSTRING ../storage/ndb/test/ndbapi/bank/bankTimer -w 5 >> $NDB_TOOLS_OUTPUT & +--exec NDB_CONNECTSTRING=$NDB_CONNECTSTRING ../storage/ndb/test/ndbapi/bank/bankMakeGL >> $NDB_TOOLS_OUTPUT & +--exec NDB_CONNECTSTRING=$NDB_CONNECTSTRING ../storage/ndb/test/ndbapi/bank/bankTransactionMaker >> $NDB_TOOLS_OUTPUT & # # let the "BANK" run for a while @@ -114,10 +114,10 @@ CREATE DATABASE BANK; # start by taking a backup on master --connection master RESET MASTER; ---exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "start backup" >> $NDB_TOOLS_OUTPUT +--exec $NDB_MGM --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -e "start backup" >> $NDB_TOOLS_OUTPUT # there is no neat way to find the backupid, this is a hack to find it... ---exec $NDB_TOOLS_DIR/ndb_select_all --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -d sys --delimiter=',' SYSTAB_0 | grep 520093696 > $MYSQLTEST_VARDIR/tmp.dat +--exec $NDB_TOOLS_DIR/ndb_select_all --ndb-connectstring="$NDB_CONNECTSTRING" -d sys --delimiter=',' SYSTAB_0 | grep 520093696 > $MYSQLTEST_VARDIR/tmp.dat CREATE TABLE IF NOT EXISTS mysql.backup_info (id INT, backup_id INT) ENGINE = HEAP; DELETE FROM mysql.backup_info; LOAD DATA INFILE '../tmp.dat' INTO TABLE mysql.backup_info FIELDS TERMINATED BY ','; @@ -128,8 +128,8 @@ let the_backup_id=`select @the_backup_id`; # restore on slave, first check that nothing is there --connection slave ---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT_SLAVE" -p 8 -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT ---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT_SLAVE" -p 8 -b $the_backup_id -n 2 -r -e --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT +--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING_SLAVE" -p 8 -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT +--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING_SLAVE" -p 8 -b $the_backup_id -n 2 -r -e --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT # # now setup replication to continue from last epoch @@ -150,7 +150,7 @@ while ($1) --replace_column 1 7 8 9 16 22 23 33 34 35 SHOW SLAVE STATUS; STOP SLAVE; - --exec NDB_CONNECTSTRING=localhost:$NDBCLUSTER_PORT_SLAVE ../storage/ndb/test/ndbapi/bank/bankValidateAllGLs >> $NDB_TOOLS_OUTPUT + --exec NDB_CONNECTSTRING=$NDB_CONNECTSTRING_SLAVE ../storage/ndb/test/ndbapi/bank/bankValidateAllGLs >> $NDB_TOOLS_OUTPUT START SLAVE; --dec $1 } diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test index a7e00262f5c..e08b1b6f701 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test @@ -9,8 +9,6 @@ --source include/have_binlog_format_mixed_or_row.inc --source include/ndb_default_cluster.inc --source include/not_embedded.inc -#--source include/big_test.inc -#--source include/have_ndb_extra.inc --source include/ndb_master-slave.inc #### Test start cleanup section ##### @@ -289,25 +287,7 @@ while ($j) SELECT COUNT(*) FROM history; -#RESET MASTER; ---exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "start backup" >> $NDB_TOOLS_OUTPUT - ---exec $NDB_TOOLS_DIR/ndb_select_all --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -d sys --delimiter=',' SYSTAB_0 | grep 520093696 > $MYSQLTEST_VARDIR/tmp.dat - -CREATE TEMPORARY TABLE IF NOT EXISTS mysql.backup_info (id INT, backup_id INT) ENGINE = HEAP; - -DELETE FROM mysql.backup_info; - -LOAD DATA INFILE '../tmp.dat' INTO TABLE mysql.backup_info FIELDS TERMINATED BY ','; ---exec rm $MYSQLTEST_VARDIR/tmp.dat || true ---replace_column 1 - -SELECT @the_backup_id:=backup_id FROM mysql.backup_info; - -let the_backup_id=`select @the_backup_id`; - -DROP TABLE IF EXISTS mysql.backup_info; -#RESET MASTER; +--source include/ndb_backup.inc --echo ************ Restore the slave ************************ connection slave; @@ -424,7 +404,7 @@ diff_files $MYSQLTEST_VARDIR/tmp/RPL_DD_ADV_M.sql $MYSQLTEST_VARDIR/tmp/RPL_DD_A ## Note: Ths files should only get removed, if the above diff succeeds. ---exec rm $MYSQLTEST_VARDIR/tmp/RPL_DD_ADV_M.sql ---exec rm $MYSQLTEST_VARDIR/tmp/RPL_DD_ADV_S.sql +remove_file $MYSQLTEST_VARDIR/tmp/RPL_DD_ADV_M.sql; +remove_file $MYSQLTEST_VARDIR/tmp/RPL_DD_ADV_S.sql; # End 5.1 test case diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test index 2f2414ba578..fcc2928c5e2 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test @@ -21,8 +21,8 @@ select count(*) from t2; connection master; begin; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t2; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1; +load data infile '../../../std_data/rpl_loaddata.dat' into table t2; +load data infile '../../../std_data/rpl_loaddata.dat' into table t1; rollback; select count(*) from t1; @@ -35,8 +35,8 @@ connection master; delete from t1; delete from t2; begin; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t2; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1; +load data infile '../../../std_data/rpl_loaddata.dat' into table t2; +load data infile '../../../std_data/rpl_loaddata.dat' into table t1; rollback; select count(*) from t1; @@ -51,8 +51,8 @@ delete from t2; begin; insert into t2 values(3),(4); insert into t1 values(3),(4); -load data infile '../std_data_ln/rpl_loaddata.dat' into table t2; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1; +load data infile '../../../std_data/rpl_loaddata.dat' into table t2; +load data infile '../../../std_data/rpl_loaddata.dat' into table t1; rollback; select count(*) from t1; diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test index a695eee3221..75fe2688b4a 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test @@ -62,5 +62,5 @@ CREATE TABLE SERVER # # start "load" application # ---exec NDB_CONNECTSTRING=localhost:$NDBCLUSTER_PORT ../storage/ndb/test/ndbapi/DbCreate >> $NDB_TOOLS_OUTPUT ---exec NDB_CONNECTSTRING=localhost:$NDBCLUSTER_PORT ../storage/ndb/test/ndbapi/DbAsyncGenerator >> $NDB_TOOLS_OUTPUT +--exec NDB_CONNECTSTRING=$NDB_CONNECTSTRING ../storage/ndb/test/ndbapi/DbCreate >> $NDB_TOOLS_OUTPUT +--exec NDB_CONNECTSTRING=$NDB_CONNECTSTRING ../storage/ndb/test/ndbapi/DbAsyncGenerator >> $NDB_TOOLS_OUTPUT diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test index 116f0879ca0..88572c3e9a2 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test @@ -39,8 +39,8 @@ SELECT hex(c1),hex(c2),c3 FROM t1 ORDER BY c3; # we should have no tables SHOW TABLES; ---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT_SLAVE" -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT ---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT_SLAVE" -b $the_backup_id -n 2 -r -e --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT +--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING_SLAVE" -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT +--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING_SLAVE" -b $the_backup_id -n 2 -r -e --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT # # BUG#11960 @@ -50,8 +50,8 @@ SHOW TABLES; DROP DATABASE ndbsynctest; CREATE DATABASE ndbsynctest; USE ndbsynctest; ---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT_SLAVE" -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT ---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT_SLAVE" -b $the_backup_id -n 2 -r -e --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT +--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING_SLAVE" -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT +--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING_SLAVE" -b $the_backup_id -n 2 -r -e --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT # continue test SHOW TABLES; diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test b/mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test index 5067722bb79..543393b980d 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test @@ -4,8 +4,8 @@ -- source include/ndb_master-slave.inc --exec echo Running ndbapi_simple_dual ---exec $NDB_EXAMPLES_DIR/ndbapi_simple_dual/ndbapi_simple_dual $MASTER_MYSOCK "localhost:$NDBCLUSTER_PORT" $SLAVE_MYSOCK "localhost:$NDBCLUSTER_PORT_SLAVE" >> $NDB_EXAMPLES_OUTPUT +--exec $NDB_EXAMPLES_DIR/ndbapi_simple_dual/ndbapi_simple_dual $MASTER_MYSOCK "$NDB_CONNECTSTRING" $SLAVE_MYSOCK "$NDB_CONNECTSTRING_SLAVE" >> $NDB_EXAMPLES_OUTPUT --exec echo Running mgmapi_logevent ---exec $NDB_EXAMPLES_DIR/mgmapi_logevent/mgmapi_logevent "localhost:$NDBCLUSTER_PORT" "localhost:$NDBCLUSTER_PORT_SLAVE" 1 >> $NDB_EXAMPLES_OUTPUT +--exec $NDB_EXAMPLES_DIR/mgmapi_logevent/mgmapi_logevent "$NDB_CONNECTSTRING" "$NDB_CONNECTSTRING_SLAVE" 1 >> $NDB_EXAMPLES_OUTPUT diff --git a/mysql-test/t/backup.test b/mysql-test/t/backup.test index cdbf7b69615..61e80ec682e 100644 --- a/mysql-test/t/backup.test +++ b/mysql-test/t/backup.test @@ -1,6 +1,6 @@ # The server need to be started in $MYSQLTEST_VARDIR since it -# uses ../std_data_ln/ +# uses ../../std_data/ -- source include/uses_vardir.inc # @@ -16,41 +16,41 @@ drop table if exists t1, t2, t3, t4; --enable_warnings create table t4(n int); --replace_result ": 1" ": X" ": 2" ": X" ": 22" ": X" ": 23" ": X" $MYSQLTEST_VARDIR MYSQLTEST_VARDIR -backup table t4 to '../bogus'; -backup table t4 to '../tmp'; +backup table t4 to '../../bogus'; +backup table t4 to '../../tmp'; --replace_result ": 7" ": X" ": 17" ": X" $MYSQLTEST_VARDIR MYSQLTEST_VARDIR -backup table t4 to '../tmp'; +backup table t4 to '../../tmp'; drop table t4; -restore table t4 from '../tmp'; +restore table t4 from '../../tmp'; select count(*) from t4; create table t1(n int); insert into t1 values (23),(45),(67); -backup table t1 to '../tmp'; +backup table t1 to '../../tmp'; drop table t1; --replace_result ": 1" ": X" ": 2" ": X" ": 22" ": X" ": 23" ": X" $MYSQLTEST_VARDIR MYSQLTEST_VARDIR -restore table t1 from '../bogus'; -restore table t1 from '../tmp'; +restore table t1 from '../../bogus'; +restore table t1 from '../../tmp'; select n from t1; create table t2(m int not null primary key); create table t3(k int not null primary key); insert into t2 values (123),(145),(167); insert into t3 values (223),(245),(267); -backup table t2,t3 to '../tmp'; +backup table t2,t3 to '../../tmp'; drop table t1,t2,t3; -restore table t1,t2,t3 from '../tmp'; +restore table t1,t2,t3 from '../../tmp'; select n from t1; select m from t2; select k from t3; drop table t1,t2,t3,t4; -restore table t1 from '../tmp'; +restore table t1 from '../../tmp'; connection con2; rename table t1 to t5; --send lock tables t5 write; connection con1; --send -backup table t5 to '../tmp'; +backup table t5 to '../../tmp'; connection con2; reap; unlock tables; @@ -80,11 +80,11 @@ DROP TABLE IF EXISTS `t+1`; --enable_warnings CREATE TABLE `t+1` (c1 INT); INSERT INTO `t+1` VALUES (1), (2), (3); -BACKUP TABLE `t+1` TO '../tmp'; +BACKUP TABLE `t+1` TO '../../tmp'; DROP TABLE `t+1`; # # Same for restore. -RESTORE TABLE `t+1` FROM '../tmp'; +RESTORE TABLE `t+1` FROM '../../tmp'; SELECT * FROM `t+1`; DROP TABLE `t+1`; diff --git a/mysql-test/t/bootstrap.test b/mysql-test/t/bootstrap.test index 203ba9b2914..db89269b35d 100644 --- a/mysql-test/t/bootstrap.test +++ b/mysql-test/t/bootstrap.test @@ -6,6 +6,10 @@ drop table if exists t1; --enable_warnings +# Add the datadir to the bootstrap command +let $MYSQLD_DATADIR= `select @@datadir`; +let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR; + # # Check that --bootstrap reads from stdin # diff --git a/mysql-test/t/crash_commit_before.test b/mysql-test/t/crash_commit_before.test index 4e212d81e66..e3dba58d4df 100644 --- a/mysql-test/t/crash_commit_before.test +++ b/mysql-test/t/crash_commit_before.test @@ -15,7 +15,7 @@ insert into t1 values(9); SET SESSION debug="d,crash_commit_before"; # Write file to make mysql-test-run.pl expect crash and restart ---exec echo "restart" > $MYSQLTEST_VARDIR/tmp/master0.expect +--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect # Run the crashing query --error 2013 diff --git a/mysql-test/t/create_not_windows.test b/mysql-test/t/create_not_windows.test index 56b4002106d..b612e31e3aa 100644 --- a/mysql-test/t/create_not_windows.test +++ b/mysql-test/t/create_not_windows.test @@ -29,7 +29,8 @@ drop table if exists t1; --enable_warnings create table t1(a int) engine=myisam; insert into t1 values(1); ---system rm -f $MYSQLTEST_VARDIR/master-data/test/t1.frm +let $MYSQLD_DATADIR= `select @@datadir`; +remove_file $MYSQLD_DATADIR/test/t1.frm; --echo "We get an error because the table is in the definition cache" --error ER_TABLE_EXISTS_ERROR create table t1(a int, b int); diff --git a/mysql-test/t/csv.test b/mysql-test/t/csv.test index 6c83fbfdc9c..4cb300a223f 100644 --- a/mysql-test/t/csv.test +++ b/mysql-test/t/csv.test @@ -1406,7 +1406,8 @@ DROP TABLE test_repair_table; # CREATE TABLE test_repair_table2 ( val integer not null ) ENGINE = CSV; ---remove_file $MYSQLTEST_VARDIR/master-data/test/test_repair_table2.CSM +let $MYSQLD_DATADIR= `select @@datadir`; +--remove_file $MYSQLD_DATADIR/test/test_repair_table2.CSM # Should give a warning and perform autorepair. We also disable ps-protocol # here, as mysql-test eats up warnings in ps-protocol mode @@ -1417,15 +1418,15 @@ SELECT * from test_repair_table2; # this should work ok, as the table is already repaired SELECT * from test_repair_table2; # check that the metafile appeared again. ---file_exists $MYSQLTEST_VARDIR/master-data/test/test_repair_table2.CSM +--file_exists $MYSQLD_DATADIR/test/test_repair_table2.CSM CHECK TABLE test_repair_table2; DROP TABLE test_repair_table2; # Corrupt csv file and see if we can repair it CREATE TABLE test_repair_table3 ( val integer not null ) ENGINE = CSV; ---remove_file $MYSQLTEST_VARDIR/master-data/test/test_repair_table3.CSV ---write_file $MYSQLTEST_VARDIR/master-data/test/test_repair_table3.CSV +--remove_file $MYSQLD_DATADIR/test/test_repair_table3.CSV +--write_file $MYSQLD_DATADIR/test/test_repair_table3.CSV "1" "4" "3 @@ -1444,7 +1445,7 @@ CREATE TABLE test_repair_table4 ( founded char(4) DEFAULT '' NOT NULL ) ENGINE = CSV; ---remove_file $MYSQLTEST_VARDIR/master-data/test/test_repair_table4.CSM +--remove_file $MYSQLD_DATADIR/test/test_repair_table4.CSM --disable_ps_protocol SELECT * FROM test_repair_table4; --enable_ps_protocol @@ -1477,8 +1478,8 @@ CREATE TABLE test_repair_table5 ( ) ENGINE = CSV; # Corrupt a table -- put a file with wrong # of columns ---remove_file $MYSQLTEST_VARDIR/master-data/test/test_repair_table5.CSV ---write_file $MYSQLTEST_VARDIR/master-data/test/test_repair_table5.CSV +--remove_file $MYSQLD_DATADIR/test/test_repair_table5.CSV +--write_file $MYSQLD_DATADIR/test/test_repair_table5.CSV "1","101","IBM" EOF @@ -1489,7 +1490,7 @@ INSERT INTO test_repair_table5 VALUES (1, 102, "CORRECT", 1876); SELECT * FROM test_repair_table5; # Corrupt a table -- put a row with wrong # of columns at end of file ---append_file $MYSQLTEST_VARDIR/master-data/test/test_repair_table5.CSV +--append_file $MYSQLD_DATADIR/test/test_repair_table5.CSV "1","101","IBM" EOF @@ -1502,7 +1503,7 @@ INSERT INTO test_repair_table5 VALUES (1, 102, "CORRECT2", 1876); SELECT * FROM test_repair_table5; # Corrupt table again -- put a row with wrong # of columns at end of file ---append_file $MYSQLTEST_VARDIR/master-data/test/test_repair_table5.CSV +--append_file $MYSQLD_DATADIR/test/test_repair_table5.CSV "1","101","IBM" EOF @@ -1585,14 +1586,14 @@ drop table t1; create table bug15205 (val int(11) not null) engine=csv; create table bug15205_2 (val int(11) not null) engine=csv; ---remove_file $MYSQLTEST_VARDIR/master-data/test/bug15205.CSV +--remove_file $MYSQLD_DATADIR/test/bug15205.CSV # system error (can't open the datafile) --replace_result $MYSQLTEST_VARDIR . master-data/ '' --error 13 select * from bug15205; select * from bug15205_2; # Create empty file ---write_file $MYSQLTEST_VARDIR/master-data/test/bug15205.CSV +--write_file $MYSQLD_DATADIR/test/bug15205.CSV EOF select * from bug15205; drop table bug15205; @@ -1631,16 +1632,16 @@ insert into bug22080_1 values(2,'string'); insert into bug22080_1 values(3,'string'); # Create first corrupt file as described in bug report ---remove_file $MYSQLTEST_VARDIR/master-data/test/bug22080_2.CSV ---write_file $MYSQLTEST_VARDIR/master-data/test/bug22080_2.CSV +--remove_file $MYSQLD_DATADIR/test/bug22080_2.CSV +--write_file $MYSQLD_DATADIR/test/bug22080_2.CSV 1,"string" 2","string" 3,"string" EOF # Create second corrupt file as described in bug report ---remove_file $MYSQLTEST_VARDIR/master-data/test/bug22080_3.CSV ---write_file $MYSQLTEST_VARDIR/master-data/test/bug22080_3.CSV +--remove_file $MYSQLD_DATADIR/test/bug22080_3.CSV +--write_file $MYSQLD_DATADIR/test/bug22080_3.CSV 1,"string" "2",string" 3,"string" @@ -1700,8 +1701,8 @@ check table t1; drop table t1; create table t1(a int not null, b int not null) engine=csv; ---remove_file $MYSQLTEST_VARDIR/master-data/test/t1.CSV ---write_file $MYSQLTEST_VARDIR/master-data/test/t1.CSV +--remove_file $MYSQLD_DATADIR/test/t1.CSV +--write_file $MYSQLD_DATADIR/test/t1.CSV 1, 1E-2 -2E2, .9 -10E-1, -.9 diff --git a/mysql-test/t/ctype_big5.test b/mysql-test/t/ctype_big5.test index 5f3357e0406..b1d7d49adc9 100644 --- a/mysql-test/t/ctype_big5.test +++ b/mysql-test/t/ctype_big5.test @@ -73,11 +73,12 @@ create table t1 (a blob); insert into t1 values (0xEE00); select * into outfile 'test/t1.txt' from t1; delete from t1; ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR ---eval select hex(load_file('$MYSQLTEST_VARDIR/master-data/test/t1.txt')); +let $MYSQLD_DATADIR= `select @@datadir`; +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR +--eval select hex(load_file('$MYSQLD_DATADIR/test/t1.txt')); load data infile 't1.txt' into table t1; select hex(a) from t1; ---exec rm $MYSQLTEST_VARDIR/master-data/test/t1.txt +--remove_file $MYSQLD_DATADIR/test/t1.txt drop table t1; --echo End of 5.0 tests diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index ab50548499f..ec4385412d0 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -4,12 +4,10 @@ # # Separate the test case name and the comment with ':'. # -# : BUG# +# : BUG# # # Do not use any TAB characters for whitespace. # ############################################################################## -user_limits : Bug#23921 random failure of user_limits.test - -concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences -federated_transactions : Bug#29523 Transactions do not work +user_limits : Bug#23921 random failure of user_limits.test +concurrent_innodb : BUG#21579 innodb_concurrent random failures with varying differences diff --git a/mysql-test/t/distinct.test b/mysql-test/t/distinct.test index bfdb5f8b9f8..60715c8e9cc 100644 --- a/mysql-test/t/distinct.test +++ b/mysql-test/t/distinct.test @@ -490,13 +490,13 @@ DROP TABLE t1; #default NULL); # #SELECT DISTINCT fruit_id, fruit_name INTO OUTFILE -#'../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE'; -#LOAD DATA INFILE '../tmp/data1.tmp' INTO TABLE t2; +#'../../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE'; +#LOAD DATA INFILE '../../tmp/data1.tmp' INTO TABLE t2; #--exec rm $MYSQL_TEST_DIR/var/tmp/data1.tmp # #SELECT DISTINCT @v19:= fruit_id, @v20:= fruit_name INTO OUTFILE -#'../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE'; -#LOAD DATA INFILE '../tmp/data2.tmp' INTO TABLE t2; +#'../../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE'; +#LOAD DATA INFILE '../../tmp/data2.tmp' INTO TABLE t2; #--exec rm $MYSQL_TEST_DIR/var/tmp/data2.tmp # #SELECT @v19, @v20; diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test index b4c515d2e8c..b6151659020 100644 --- a/mysql-test/t/gis.test +++ b/mysql-test/t/gis.test @@ -386,7 +386,7 @@ drop table t1; create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b)); alter table t1 disable keys; --error 1263 -load data infile '../std_data_ln/bad_gis_data.dat' into table t1; +load data infile '../../std_data/bad_gis_data.dat' into table t1; alter table t1 enable keys; drop table t1; diff --git a/mysql-test/t/grant_cache_no_prot.test b/mysql-test/t/grant_cache_no_prot.test index 1f6a9aeb9ed..31209f343b9 100644 --- a/mysql-test/t/grant_cache_no_prot.test +++ b/mysql-test/t/grant_cache_no_prot.test @@ -18,7 +18,7 @@ if (`SELECT $PS_PROTOCOL + $SP_PROTOCOL + $CURSOR_PROTOCOL + $VIEW_PROTOCOL > 0`) { - --skip Test requires: ps-protocol/sp-protocol/cursor-protocol/view-protocol disabled + --skip Need normal protocol } # The main testing script diff --git a/mysql-test/t/grant_cache_ps_prot.test b/mysql-test/t/grant_cache_ps_prot.test index 7b579f869e9..27b3f23de3f 100644 --- a/mysql-test/t/grant_cache_ps_prot.test +++ b/mysql-test/t/grant_cache_ps_prot.test @@ -17,7 +17,7 @@ if (`SELECT $SP_PROTOCOL + $CURSOR_PROTOCOL + $VIEW_PROTOCOL > 0 OR $PS_PROTOCOL = 0`) { - --skip Test requires: ps-protocol enabled, other protocols disabled + --skip Need ps-protocol } # The main testing script diff --git a/mysql-test/t/information_schema_chmod.test b/mysql-test/t/information_schema_chmod.test index 51e67a0c956..39e2f680bb8 100644 --- a/mysql-test/t/information_schema_chmod.test +++ b/mysql-test/t/information_schema_chmod.test @@ -17,7 +17,8 @@ # create database mysqltest; create table mysqltest.t1(a int); -chmod 0000 $MYSQLTEST_VARDIR/master-data/mysqltest; +let $MYSQLD_DATADIR= `select @@datadir`; +chmod 0000 $MYSQLD_DATADIR/mysqltest; select table_schema from information_schema.tables where table_schema='mysqltest'; -chmod 0777 $MYSQLTEST_VARDIR/master-data/mysqltest; +chmod 0777 $MYSQLD_DATADIR/mysqltest; drop database mysqltest; diff --git a/mysql-test/t/loaddata.test b/mysql-test/t/loaddata.test index 5433d787c14..3ed6852fb46 100644 --- a/mysql-test/t/loaddata.test +++ b/mysql-test/t/loaddata.test @@ -7,25 +7,25 @@ drop table if exists t1, t2; --enable_warnings create table t1 (a date, b date, c date not null, d date); -load data infile '../std_data_ln/loaddata1.dat' into table t1 fields terminated by ','; -load data infile '../std_data_ln/loaddata1.dat' into table t1 fields terminated by ',' IGNORE 2 LINES; +load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ','; +load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',' IGNORE 2 LINES; SELECT * from t1; truncate table t1; -load data infile '../std_data_ln/loaddata1.dat' into table t1 fields terminated by ',' LINES STARTING BY ',' (b,c,d); +load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',' LINES STARTING BY ',' (b,c,d); SELECT * from t1; drop table t1; create table t1 (a text, b text); -load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by ''''; +load data infile '../../std_data/loaddata2.dat' into table t1 fields terminated by ',' enclosed by ''''; select concat('|',a,'|'), concat('|',b,'|') from t1; drop table t1; create table t1 (a int, b char(10)); -load data infile '../std_data_ln/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines; +load data infile '../../std_data/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines; select * from t1; truncate table t1; -load data infile '../std_data_ln/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines; +load data infile '../../std_data/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines; # The empty line last comes from the end line field in the file select * from t1; @@ -63,7 +63,7 @@ drop table t1; # ENCLOSED # create table t1 (a varchar(20), b varchar(20)); -load data infile '../std_data_ln/loaddata_dq.dat' into table t1 fields terminated by ',' enclosed by '"' escaped by '"' (a,b); +load data infile '../../std_data/loaddata_dq.dat' into table t1 fields terminated by ',' enclosed by '"' escaped by '"' (a,b); select * from t1; drop table t1; @@ -108,44 +108,44 @@ DROP TABLE t1,t2; # create table t1 (a int default 100, b int, c varchar(60)); # we can do something like this -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (a, @b) set b=@b+10, c=concat("b=",@b); +load data infile '../../std_data/rpl_loaddata.dat' into table t1 (a, @b) set b=@b+10, c=concat("b=",@b); select * from t1; truncate table t1; # we can use filled fields in expressions # we also assigning NULL value to field with non-NULL default here -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (a, @b) set c= if(a is null,"oops",a); +load data infile '../../std_data/rpl_loaddata.dat' into table t1 (a, @b) set c= if(a is null,"oops",a); select * from t1; truncate table t1; # we even can use variables in set clause, and missed columns will be set # with default values set @c:=123; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (@a, b) set c= if(@a is null,@c,b); +load data infile '../../std_data/rpl_loaddata.dat' into table t1 (@a, b) set c= if(@a is null,@c,b); select * from t1; # let us test side-effect of such load -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (@a, @b); +load data infile '../../std_data/rpl_loaddata.dat' into table t1 (@a, @b); select * from t1; select @a, @b; truncate table t1; # Reading of all columns with set -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 set c=b; +load data infile '../../std_data/rpl_loaddata.dat' into table t1 set c=b; select * from t1; truncate table t1; # now going to test fixed field-row file format -load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, b) set c="Wow"; +load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, b) set c="Wow"; select * from t1; truncate table t1; # this also should work -load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, b) set c=concat(a,"+",b,"+",@c,"+",b,"+",if(c is null,"NIL",c)); +load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, b) set c=concat(a,"+",b,"+",@c,"+",b,"+",if(c is null,"NIL",c)); select * from t1; # and this should bark --error 1409 -load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, @b); +load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, @b); # Now let us test LOAD DATA with subselect create table t2 (num int primary key, str varchar(10)); insert into t2 values (10,'Ten'), (15,'Fifteen'); truncate table t1; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (@dummy,@n) set a= @n, c= (select str from t2 where num=@n); +load data infile '../../std_data/rpl_loaddata.dat' into table t1 (@dummy,@n) set a= @n, c= (select str from t2 where num=@n); select * from t1; # @@ -262,6 +262,7 @@ select @@character_set_filesystem; LOAD DATA INFILE 't@002d1' INTO TABLE t1; SELECT * FROM t1; DROP TABLE t1; -remove_file $MYSQLTEST_VARDIR/master-data/test/t@002d1; +let $MYSQLD_DATADIR= `select @@datadir`; +remove_file $MYSQLD_DATADIR/test/t@002d1; SET character_set_filesystem=default; select @@character_set_filesystem; diff --git a/mysql-test/t/log_state.test b/mysql-test/t/log_state.test index f7795e49b37..f05d687da47 100644 --- a/mysql-test/t/log_state.test +++ b/mysql-test/t/log_state.test @@ -224,4 +224,5 @@ disconnect con1; # Remove the log files that was created in the "default location" # i.e var/run ---remove_file $MYSQLTEST_VARDIR/run/master.log +--remove_file $MYSQLTEST_VARDIR/run/mysqld.log +--remove_file $MYSQLTEST_VARDIR/run/mysqld-slow.log diff --git a/mysql-test/t/myisam-system.test b/mysql-test/t/myisam-system.test index c4a7651ac7d..dc5bb58b6a2 100644 --- a/mysql-test/t/myisam-system.test +++ b/mysql-test/t/myisam-system.test @@ -7,14 +7,15 @@ drop table if exists t1,t2; --enable_warnings create table t1 (a int) engine=myisam; ---remove_file $MYSQLTEST_VARDIR/master-data/test/t1.MYI +let $MYSQLD_DATADIR= `select @@datadir`; +--remove_file $MYSQLD_DATADIR/test/t1.MYI drop table if exists t1; create table t1 (a int) engine=myisam; ---remove_file $MYSQLTEST_VARDIR/master-data/test/t1.MYI +--remove_file $MYSQLD_DATADIR/test/t1.MYI --error 1051,6 drop table t1; create table t1 (a int) engine=myisam; ---remove_file $MYSQLTEST_VARDIR/master-data/test/t1.MYD +--remove_file $MYSQLD_DATADIR/test/t1.MYD --error 1105,6,29 drop table t1; --error 1051 diff --git a/mysql-test/t/mysql_upgrade.test b/mysql-test/t/mysql_upgrade.test index 233e8c7c256..6b2ce0cd2d6 100644 --- a/mysql-test/t/mysql_upgrade.test +++ b/mysql-test/t/mysql_upgrade.test @@ -15,7 +15,8 @@ select LENGTH("$MYSQL_UPGRADE")>0 as have_mysql_upgrade; --exec $MYSQL_UPGRADE --skip-verbose 2>&1 # It should have created a file in the MySQL Servers datadir -file_exists $MYSQLTEST_VARDIR/master-data/mysql_upgrade_info; +let $MYSQLD_DATADIR= `select @@datadir`; +file_exists $MYSQLD_DATADIR/mysql_upgrade_info; --echo Run it again - should say already completed --replace_result $MYSQL_SERVER_VERSION VERSION @@ -23,13 +24,13 @@ file_exists $MYSQLTEST_VARDIR/master-data/mysql_upgrade_info; --exec $MYSQL_UPGRADE --skip-verbose 2>&1 # It should have created a file in the MySQL Servers datadir -file_exists $MYSQLTEST_VARDIR/master-data/mysql_upgrade_info; +file_exists $MYSQLD_DATADIR/mysql_upgrade_info; --echo Force should run it regardless of wether it's been run before --exec $MYSQL_UPGRADE --skip-verbose --force 2>&1 # It should have created a file in the MySQL Servers datadir -file_exists $MYSQLTEST_VARDIR/master-data/mysql_upgrade_info; +file_exists $MYSQLD_DATADIR/mysql_upgrade_info; # diff --git a/mysql-test/t/mysqlbinlog-cp932.test b/mysql-test/t/mysqlbinlog-cp932.test index 4ca0eedaece..a7055bfc8ca 100644 --- a/mysql-test/t/mysqlbinlog-cp932.test +++ b/mysql-test/t/mysqlbinlog-cp932.test @@ -13,7 +13,8 @@ create table t4 (f text character set cp932); --exec $MYSQL --default-character-set=cp932 test -e "insert into t4 values(_cp932'ƒ\');" flush logs; rename table t3 to t03, t4 to t04; ---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000002 | $MYSQL --default-character-set=utf8 +let $MYSQLD_DATADIR= `select @@datadir`; +--exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000002 | $MYSQL --default-character-set=utf8 # original and recovered data must be equal select HEX(f) from t03; select HEX(f) from t3; diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index 18b08cf11d6..569c5a10c6a 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -23,11 +23,11 @@ insert into t2 values (); # test for load data and load data distributed among the several # files (we need to fill up first binlog) -load data infile '../std_data_ln/words.dat' into table t1; -load data infile '../std_data_ln/words.dat' into table t1; -load data infile '../std_data_ln/words.dat' into table t1; -load data infile '../std_data_ln/words.dat' into table t1; -load data infile '../std_data_ln/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; # simple query to show more in second binlog insert into t1 values ("Alas"); flush logs; @@ -41,30 +41,30 @@ select "--- Local --" as ""; # We should use --short-form everywhere because in other case output will # be time dependend. Better than nothing. # - +let $MYSQLD_DATADIR= `select @@datadir`; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR ---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLD_DATADIR/master-bin.000001 # this should not fail but shouldn't produce any working statements --disable_query_log select "--- Broken LOAD DATA --" as ""; --enable_query_log --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR ---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLTEST_VARDIR/log/master-bin.000002 2> /dev/null +--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLD_DATADIR/master-bin.000002 2> /dev/null # this should show almost nothing --disable_query_log select "--- --database --" as ""; --enable_query_log --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR ---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --database=nottest $MYSQLTEST_VARDIR/log/master-bin.000001 2> /dev/null +--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --database=nottest $MYSQLD_DATADIR/master-bin.000001 2> /dev/null # this test for position option --disable_query_log select "--- --position --" as ""; --enable_query_log --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR ---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=239 $MYSQLTEST_VARDIR/log/master-bin.000002 +--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=239 $MYSQLD_DATADIR/master-bin.000002 # These are tests for remote binlog. # They should return the same as previous test. @@ -127,7 +127,7 @@ EOF # must be digestable for both client and server. In 4.1 the client # should use default-character-set same as the server. flush logs; ---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000004 | $MYSQL +--exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000004 | $MYSQL select * from t5 /* must be (1),(1) */; drop table t5; @@ -146,7 +146,7 @@ insert into t5 values (3, date_format('2001-01-01','%W')); select * from t5 order by c1; flush logs; drop table t5; ---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000006 | $MYSQL +--exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000006 | $MYSQL select * from t5 order by c1; drop table t5; @@ -169,8 +169,8 @@ call p1(); drop procedure p1; --error 1305 call p1(); ---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000008 ---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000008 | $MYSQL +--exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000008 +--exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000008 | $MYSQL call p1(); drop procedure p1; @@ -189,22 +189,22 @@ drop procedure p1; flush logs; create table t1 (a varchar(64) character set utf8); -load data infile '../std_data_ln/loaddata6.dat' into table t1; +load data infile '../../std_data/loaddata6.dat' into table t1; set character_set_database=koi8r; -load data infile '../std_data_ln/loaddata6.dat' into table t1; +load data infile '../../std_data/loaddata6.dat' into table t1; set character_set_database=latin1; -load data infile '../std_data_ln/loaddata6.dat' into table t1; -load data infile '../std_data_ln/loaddata6.dat' into table t1; +load data infile '../../std_data/loaddata6.dat' into table t1; +load data infile '../../std_data/loaddata6.dat' into table t1; set character_set_database=koi8r; -load data infile '../std_data_ln/loaddata6.dat' into table t1; +load data infile '../../std_data/loaddata6.dat' into table t1; set character_set_database=latin1; -load data infile '../std_data_ln/loaddata6.dat' into table t1; -load data infile '../std_data_ln/loaddata6.dat' into table t1 character set koi8r; +load data infile '../../std_data/loaddata6.dat' into table t1; +load data infile '../../std_data/loaddata6.dat' into table t1 character set koi8r; select hex(a) from t1; drop table t1; flush logs; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR ---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLTEST_VARDIR/log/master-bin.000010 +--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLD_DATADIR/master-bin.000010 # # Bug#28293 missed '#' sign in the hex dump when the dump length @@ -217,7 +217,7 @@ flush logs; INSERT INTO t1 VALUES ('0123456789'); flush logs; DROP TABLE t1; ---exec $MYSQL_BINLOG --hexdump --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLTEST_VARDIR/log/master-bin.000012 | grep 'Query' | sed 's/[0-9]\{1,\}/REMOVED/g' +--exec $MYSQL_BINLOG --hexdump --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLD_DATADIR/master-bin.000012 | grep 'Query' | sed 's/[0-9]\{1,\}/REMOVED/g' # # Bug #29928: incorrect connection_id() restoring from mysqlbinlog out @@ -227,7 +227,7 @@ create table t1(a int); insert into t1 values(connection_id()); let $a= `select a from t1`; flush logs; ---exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000014 > $MYSQLTEST_VARDIR/tmp/bug29928.sql +--exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000014 > $MYSQLTEST_VARDIR/tmp/bug29928.sql drop table t1; connect (con1, localhost, root, , test); connection con1; @@ -251,8 +251,8 @@ exec $MYSQL_BINLOG $MYSQL_TEST_DIR/std_data/corrupt-relay-bin.000624 > $MYSQLTES # flush logs; --error 1 ---exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000016 >/dev/null 2>/dev/null ---exec $MYSQL_BINLOG --force-if-open $MYSQLTEST_VARDIR/log/master-bin.000016 >/dev/null 2>/dev/null +--exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000016 >/dev/null 2>/dev/null +--exec $MYSQL_BINLOG --force-if-open $MYSQLD_DATADIR/master-bin.000016 >/dev/null 2>/dev/null --echo BUG#31611: Security risk with BINLOG statement @@ -268,7 +268,7 @@ flush logs; INSERT INTO t1 VALUES (1,USER()); flush logs; echo mysqlbinlog var/log/master-bin.000017 > var/tmp/bug31611.sql; -exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000017 > $MYSQLTEST_VARDIR/tmp/bug31611.sql; +exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000017 > $MYSQLTEST_VARDIR/tmp/bug31611.sql; connect (unsecure,localhost,untrusted,,mysqltest1); echo mysql mysqltest1 -uuntrusted < var/tmp/bug31611.sql; error 1; @@ -301,7 +301,7 @@ query_vertical SELECT * FROM t1; DROP TABLE t1; echo >> mysqlbinlog var/log/master-bin.000019 > var/tmp/bug32580.sql; -exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000019 > $MYSQLTEST_VARDIR/tmp/bug32580.sql; +exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000019 > $MYSQLTEST_VARDIR/tmp/bug32580.sql; echo >> mysql test < var/tmp/bug32580.sql; exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug32580.sql; remove_file $MYSQLTEST_VARDIR/tmp/bug32580.sql; diff --git a/mysql-test/t/mysqlbinlog2.test b/mysql-test/t/mysqlbinlog2.test index be9397aafee..d197114d920 100644 --- a/mysql-test/t/mysqlbinlog2.test +++ b/mysql-test/t/mysqlbinlog2.test @@ -40,34 +40,34 @@ select "--- Local --" as ""; # We should use --short-form everywhere because in other case output will # be time dependent (the Start events). Better than nothing. # - +let $MYSQLD_DATADIR= `select @@datadir`; --replace_regex /[[:<:]][0-9]{6} [0-9 ][0-9]:[0-9]{2}:[0-9]{2}[[:>:]]/{yymmdd} {HH:MM:SS}/ /=[0-9]+ /={integer} / /# at [0-9]+/# at {pos}/ /(pos:?) [0-9]+/\1 {pos}/ /binlog v [0-9]+, server v [^ ]* created/binlog v #, server v ## created/ ---exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001 --disable_query_log select "--- offset --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --offset=2 $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --short-form --offset=2 $MYSQLD_DATADIR/master-bin.000001 --disable_query_log select "--- start-position --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --start-position=608 $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --short-form --start-position=608 $MYSQLD_DATADIR/master-bin.000001 --disable_query_log select "--- stop-position --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --stop-position=608 $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --short-form --stop-position=608 $MYSQLD_DATADIR/master-bin.000001 --disable_query_log select "--- start and stop positions ---" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --start-position=608 --stop-position 725 $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --short-form --start-position=608 --stop-position 725 $MYSQLD_DATADIR/master-bin.000001 --disable_query_log select "--- start-datetime --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 --disable_query_log select "--- stop-datetime --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form "--stop-datetime=2020-01-21 15:32:24" $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --short-form "--stop-datetime=2020-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 --disable_query_log select "--- Local with 2 binlogs on command line --" as ""; @@ -76,28 +76,28 @@ select "--- Local with 2 binlogs on command line --" as ""; # This is to verify that some options apply only to first, or last binlog flush logs; ---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002 +--exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 --disable_query_log select "--- offset --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --offset=2 $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002 +--exec $MYSQL_BINLOG --short-form --offset=2 $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 --disable_query_log select "--- start-position --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --start-position=608 $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002 +--exec $MYSQL_BINLOG --short-form --start-position=608 $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 --disable_query_log select "--- stop-position --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --stop-position=134 $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002 +--exec $MYSQL_BINLOG --short-form --stop-position=134 $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 --disable_query_log select "--- start-datetime --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002 +--exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 --disable_query_log select "--- stop-datetime --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form "--stop-datetime=2020-01-21 15:32:24" $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002 +--exec $MYSQL_BINLOG --short-form "--stop-datetime=2020-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 --disable_query_log select "--- Remote --" as ""; diff --git a/mysql-test/t/mysqlbinlog_base64.test b/mysql-test/t/mysqlbinlog_base64.test index 1b5dc67c150..9425fd3301d 100644 --- a/mysql-test/t/mysqlbinlog_base64.test +++ b/mysql-test/t/mysqlbinlog_base64.test @@ -10,7 +10,7 @@ update t1 set a=a+2 where a=2; update t1 set a=a+2 where a=3; create table t2 (word varchar(20)); -load data infile '../std_data_ln/words.dat' into table t2; +load data infile '../../std_data/words.dat' into table t2; # # Save binlog @@ -38,7 +38,7 @@ select * from t2; flush logs; drop table t2; create table t2 (word varchar(20)); -load data infile '../std_data_ln/words.dat' into table t2; +load data infile '../../std_data/words.dat' into table t2; insert into t2 select * from t2; insert into t2 select * from t2; insert into t2 select * from t2; diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 0e4e9989ffa..1f6a39c50d1 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -1633,7 +1633,7 @@ select * from t2; # Now we test with multiple threads, but less threads than files. create table words(a varchar(255)); create table words2(b varchar(255)); ---exec $MYSQL_IMPORT --silent --use-threads=2 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt $MYSQLTEST_VARDIR/std_data_ln/words.dat $MYSQLTEST_VARDIR/std_data_ln/words2.dat +--exec $MYSQL_IMPORT --silent --use-threads=2 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt $MYSQLTEST_VARDIR/std_data/words.dat $MYSQLTEST_VARDIR/std_data/words2.dat select * from t1; select * from t2; select * from words; @@ -1643,7 +1643,7 @@ select * from words2; drop table words; --replace_regex /.*mysqlimport(\.exe)*/mysql-import/ --error 1 ---exec $MYSQL_IMPORT --silent --use-threads=2 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt $MYSQLTEST_VARDIR/std_data_ln/words.dat $MYSQLTEST_VARDIR/std_data_ln/words2.dat 2>&1 +--exec $MYSQL_IMPORT --silent --use-threads=2 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt $MYSQLTEST_VARDIR/std_data/words.dat $MYSQLTEST_VARDIR/std_data/words2.dat 2>&1 drop table t1; drop table t2; diff --git a/mysql-test/t/outfile.test b/mysql-test/t/outfile.test index 2b80b0b9d93..064aaa4612e 100644 --- a/mysql-test/t/outfile.test +++ b/mysql-test/t/outfile.test @@ -1,7 +1,7 @@ disable_query_log; -- source include/test_outfile.inc -# Server are started in "var/master-data", so "../tmp" will be "var/tmp" -eval set @tmpdir="../tmp"; +# Server are started in "var/master-data", so "../../tmp" will be "var/tmp" +eval set @tmpdir="../../tmp"; enable_query_log; -- source include/have_outfile.inc @@ -16,15 +16,15 @@ drop table if exists t1; create table t1 (`a` blob); insert into t1 values("hello world"),("Hello mars"),(NULL); disable_query_log; -eval select * into outfile "../tmp/outfile-test.1" from t1; +eval select * into outfile "../../tmp/outfile-test.1" from t1; enable_query_log; select load_file(concat(@tmpdir,"/outfile-test.1")); disable_query_log; -eval select * into dumpfile "../tmp/outfile-test.2" from t1 limit 1; +eval select * into dumpfile "../../tmp/outfile-test.2" from t1 limit 1; enable_query_log; select load_file(concat(@tmpdir,"/outfile-test.2")); disable_query_log; -eval select * into dumpfile "../tmp/outfile-test.3" from t1 where a is null; +eval select * into dumpfile "../../tmp/outfile-test.3" from t1 where a is null; enable_query_log; select load_file(concat(@tmpdir,"/outfile-test.3")); @@ -32,13 +32,13 @@ select load_file(concat(@tmpdir,"/outfile-test.3")); disable_query_log; --error 1086 -eval select * into outfile "../tmp/outfile-test.1" from t1; +eval select * into outfile "../../tmp/outfile-test.1" from t1; --error 1086 -eval select * into dumpfile "../tmp/outfile-test.2" from t1; +eval select * into dumpfile "../../tmp/outfile-test.2" from t1; --error 1086 -eval select * into dumpfile "../tmp/outfile-test.3" from t1; +eval select * into dumpfile "../../tmp/outfile-test.3" from t1; enable_query_log; select load_file(concat(@tmpdir,"/outfile-test.not-exist")); --remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.1 @@ -48,7 +48,7 @@ drop table t1; # Bug#8191 disable_query_log; -eval select 1 into outfile "../tmp/outfile-test.4"; +eval select 1 into outfile "../../tmp/outfile-test.4"; enable_query_log; select load_file(concat(@tmpdir,"/outfile-test.4")); --remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.4 @@ -71,7 +71,7 @@ DROP TABLE t1; # Bug#13202 SELECT * INTO OUTFILE ... FROM information_schema.schemata now fails # disable_query_log; -eval SELECT * INTO OUTFILE "../tmp/outfile-test.4" +eval SELECT * INTO OUTFILE "../../tmp/outfile-test.4" FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"' FROM information_schema.schemata LIMIT 0, 5; # enable_query_log; @@ -79,7 +79,7 @@ FROM information_schema.schemata LIMIT 0, 5; use information_schema; # disable_query_log; -eval SELECT * INTO OUTFILE "../tmp/outfile-test.4" +eval SELECT * INTO OUTFILE "../../tmp/outfile-test.4" FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"' FROM schemata LIMIT 0, 5; enable_query_log; @@ -107,7 +107,7 @@ connect (con28181_1,localhost,user_1,,mysqltest); --error 1044 eval select schema_name -into outfile "../tmp/outfile-test.4" +into outfile "../../tmp/outfile-test.4" fields terminated by ',' optionally enclosed by '"' lines terminated by '\n' from information_schema.schemata @@ -118,7 +118,7 @@ grant file on *.* to user_1@localhost; connect (con28181_2,localhost,user_1,,mysqltest); eval select schema_name -into outfile "../tmp/outfile-test.4" +into outfile "../../tmp/outfile-test.4" fields terminated by ',' optionally enclosed by '"' lines terminated by '\n' from information_schema.schemata diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test index 65e78a5e740..c6b6df2c8fd 100644 --- a/mysql-test/t/partition.test +++ b/mysql-test/t/partition.test @@ -1392,13 +1392,15 @@ drop table t1, t2; # Bug #24633 SQL MODE "NO_DIR_IN_CREATE" does not work with partitioned tables # +let $MYSQLD_DATADIR= `select @@datadir`; + disable_query_log; eval create table t2 (i int ) partition by range (i) ( partition p01 values less than (1000) - data directory="$MYSQLTEST_VARDIR/master-data/test/" - index directory="$MYSQLTEST_VARDIR/master-data/test/" + data directory="$MYSQLD_DATADIR/test/" + index directory="$MYSQLD_DATADIR/test/" ); enable_query_log; diff --git a/mysql-test/t/partition_error.test b/mysql-test/t/partition_error.test index c9b95fc1664..37fef050147 100644 --- a/mysql-test/t/partition_error.test +++ b/mysql-test/t/partition_error.test @@ -103,7 +103,8 @@ partitions 3 partition x2 tablespace ts2, partition x3 tablespace ts3); -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); +let $MYSQLD_DATADIR= `select @@datadir`; +select load_file('$MYSQLD_DATADIR/test/t1.par'); # # Partition by hash, invalid field in function # @@ -199,7 +200,7 @@ partition by hash (a) partitions 2 (partition x1 values less than (4), partition x2 values less than (5)); -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); +select load_file('$MYSQLD_DATADIR/test/t1.par'); # # Partition by hash, values in error @@ -214,7 +215,7 @@ partition by hash (a) partitions 2 (partition x1 values in (4), partition x2 values in (5)); -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); +select load_file('$MYSQLD_DATADIR/test/t1.par'); # # Partition by hash, values in error @@ -229,7 +230,7 @@ partition by hash (a) partitions 2 (partition x1 values in (4,6), partition x2 values in (5,7)); -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); +select load_file('$MYSQLD_DATADIR/test/t1.par'); # # Subpartition by key, no partitions defined, single field @@ -242,7 +243,7 @@ c int not null, primary key (a,b)) partition by key (a) subpartition by key (b); -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); +select load_file('$MYSQLD_DATADIR/test/t1.par'); # # Subpartition by key, no partitions defined, list of fields @@ -255,7 +256,7 @@ c int not null, primary key (a,b)) partition by key (a) subpartition by key (a, b); -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); +select load_file('$MYSQLD_DATADIR/test/t1.par'); # # Subpartition by hash, no partitions defined @@ -268,7 +269,7 @@ c int not null, primary key (a,b)) partition by key (a) subpartition by hash (a+b); -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); +select load_file('$MYSQLD_DATADIR/test/t1.par'); # # Subpartition by key, no partitions defined, single field @@ -281,7 +282,7 @@ c int not null, primary key (a,b)) partition by key (a) subpartition by key (b); -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); +select load_file('$MYSQLD_DATADIR/test/t1.par'); # # Subpartition by key, no partitions defined, list of fields @@ -294,7 +295,7 @@ c int not null, primary key (a,b)) partition by key (a) subpartition by key (a, b); -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); +select load_file('$MYSQLD_DATADIR/test/t1.par'); # # Subpartition by hash, no partitions defined @@ -307,7 +308,7 @@ c int not null, primary key (a,b)) partition by key (a) subpartition by hash (a+b); -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); +select load_file('$MYSQLD_DATADIR/test/t1.par'); # # Subpartition by hash, no partitions defined, wrong subpartition function @@ -334,7 +335,7 @@ partition by key (a) subpartition by hash (sin(a+b)) (partition x1 (subpartition x11, subpartition x12), partition x2 (subpartition x21, subpartition x22)); -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); +select load_file('$MYSQLD_DATADIR/test/t1.par'); # # Subpartition by hash, no partitions defined, wrong subpartition function @@ -363,7 +364,7 @@ partition by range (a) subpartition by key (a,d) (partition x1 values less than (1) (subpartition x11, subpartition x12), partition x2 values less than (2) (subpartition x21, subpartition x22)); -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); +select load_file('$MYSQLD_DATADIR/test/t1.par'); # # Subpartition by hash, no partitions defined, wrong subpartition function @@ -401,7 +402,7 @@ b int not null, c int not null, primary key(a,b)) partition by range (a); -select load_file('$MYSQLTEST_VARDIR/master-data/test/t1.par'); +select load_file('$MYSQLD_DATADIR/test/t1.par'); # # Partition by range, invalid field in function diff --git a/mysql-test/t/partition_federated.test b/mysql-test/t/partition_federated.test index c8483291228..0fe692ecd01 100644 --- a/mysql-test/t/partition_federated.test +++ b/mysql-test/t/partition_federated.test @@ -3,7 +3,7 @@ # -- source include/have_partition.inc -- source include/not_embedded.inc --- source include/have_federated_db.inc +-- source suite/federated/have_federated_db.inc --disable_warnings drop table if exists t1; diff --git a/mysql-test/t/partition_mgm.test b/mysql-test/t/partition_mgm.test index 68da4a5b390..1e4f723ccc6 100644 --- a/mysql-test/t/partition_mgm.test +++ b/mysql-test/t/partition_mgm.test @@ -22,18 +22,19 @@ drop table t1; CREATE TABLE t1 (f_date DATE, f_varchar VARCHAR(30)) PARTITION BY HASH(YEAR(f_date)) PARTITIONS 2; SHOW CREATE TABLE t1; --- file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD --- file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI --- file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD --- file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI --- file_exists $MYSQLTEST_VARDIR/master-data/test/t1.frm --- file_exists $MYSQLTEST_VARDIR/master-data/test/t1.par +let $MYSQLD_DATADIR= `select @@datadir`; +-- file_exists $MYSQLD_DATADIR/test/t1#P#p0.MYD +-- file_exists $MYSQLD_DATADIR/test/t1#P#p0.MYI +-- file_exists $MYSQLD_DATADIR/test/t1#P#p1.MYD +-- file_exists $MYSQLD_DATADIR/test/t1#P#p1.MYI +-- file_exists $MYSQLD_DATADIR/test/t1.frm +-- file_exists $MYSQLD_DATADIR/test/t1.par ALTER TABLE t1 COALESCE PARTITION 1; SHOW CREATE TABLE t1; --- file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD --- file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI --- file_exists $MYSQLTEST_VARDIR/master-data/test/t1.frm --- file_exists $MYSQLTEST_VARDIR/master-data/test/t1.par +-- file_exists $MYSQLD_DATADIR/test/t1#P#p0.MYD +-- file_exists $MYSQLD_DATADIR/test/t1#P#p0.MYI +-- file_exists $MYSQLD_DATADIR/test/t1.frm +-- file_exists $MYSQLD_DATADIR/test/t1.par drop table t1; # # Bug 20767: REORGANIZE partition crashes diff --git a/mysql-test/t/partition_not_windows.test b/mysql-test/t/partition_not_windows.test index 012b8b50dee..4e285535677 100644 --- a/mysql-test/t/partition_not_windows.test +++ b/mysql-test/t/partition_not_windows.test @@ -12,16 +12,17 @@ # doesn't remove old directory --disable_query_log ---exec mkdir $MYSQLTEST_VARDIR/master-data/tmpdata || true -eval SET @data_dir = 'DATA DIRECTORY = ''$MYSQLTEST_VARDIR/master-data/tmpdata'''; +let $MYSQLD_DATADIR= `select @@datadir`; +--exec mkdir $MYSQLD_DATADIR/tmpdata || true +eval SET @data_dir = 'DATA DIRECTORY = ''$MYSQLD_DATADIR/tmpdata'''; let $data_directory = `select @data_dir`; ---exec mkdir $MYSQLTEST_VARDIR/master-data/tmpinx || true -eval SET @inx_dir = 'INDEX DIRECTORY = ''$MYSQLTEST_VARDIR/master-data/tmpinx'''; +--exec mkdir $MYSQLD_DATADIR/tmpinx || true +eval SET @inx_dir = 'INDEX DIRECTORY = ''$MYSQLD_DATADIR/tmpinx'''; let $inx_directory = `select @inx_dir`; --enable_query_log ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR eval create table t1 (a int) engine myisam partition by range (a) subpartition by hash (a) @@ -29,18 +30,18 @@ subpartition by hash (a) (SUBPARTITION subpart00, SUBPARTITION subpart01)); --echo Checking if file exists before alter ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1.frm ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1.par ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0#SP#subpart00.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0#SP#subpart00.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0#SP#subpart01.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0#SP#subpart01.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/tmpdata/t1#P#p0#SP#subpart00.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/tmpdata/t1#P#p0#SP#subpart01.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/tmpinx/t1#P#p0#SP#subpart00.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/tmpinx/t1#P#p0#SP#subpart01.MYI +--file_exists $MYSQLD_DATADIR/test/t1.frm +--file_exists $MYSQLD_DATADIR/test/t1.par +--file_exists $MYSQLD_DATADIR/test/t1#P#p0#SP#subpart00.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p0#SP#subpart00.MYI +--file_exists $MYSQLD_DATADIR/test/t1#P#p0#SP#subpart01.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p0#SP#subpart01.MYI +--file_exists $MYSQLD_DATADIR/tmpdata/t1#P#p0#SP#subpart00.MYD +--file_exists $MYSQLD_DATADIR/tmpdata/t1#P#p0#SP#subpart01.MYD +--file_exists $MYSQLD_DATADIR/tmpinx/t1#P#p0#SP#subpart00.MYI +--file_exists $MYSQLD_DATADIR/tmpinx/t1#P#p0#SP#subpart01.MYI ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR eval ALTER TABLE t1 REORGANIZE PARTITION p0 INTO (partition p1 VALUES LESS THAN (1) $data_directory $inx_directory (SUBPARTITION subpart10, SUBPARTITION subpart11), @@ -48,28 +49,28 @@ eval ALTER TABLE t1 REORGANIZE PARTITION p0 INTO (SUBPARTITION subpart20, SUBPARTITION subpart21)); --echo Checking if file exists after alter ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1.frm ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1.par ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1#SP#subpart10.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1#SP#subpart10.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1#SP#subpart11.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1#SP#subpart11.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p2#SP#subpart20.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p2#SP#subpart20.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p2#SP#subpart21.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p2#SP#subpart21.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/tmpdata/t1#P#p1#SP#subpart10.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/tmpdata/t1#P#p1#SP#subpart11.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/tmpdata/t1#P#p2#SP#subpart20.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/tmpdata/t1#P#p2#SP#subpart21.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/tmpinx/t1#P#p1#SP#subpart10.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/tmpinx/t1#P#p1#SP#subpart11.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/tmpinx/t1#P#p2#SP#subpart20.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/tmpinx/t1#P#p2#SP#subpart21.MYI +--file_exists $MYSQLD_DATADIR/test/t1.frm +--file_exists $MYSQLD_DATADIR/test/t1.par +--file_exists $MYSQLD_DATADIR/test/t1#P#p1#SP#subpart10.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p1#SP#subpart10.MYI +--file_exists $MYSQLD_DATADIR/test/t1#P#p1#SP#subpart11.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p1#SP#subpart11.MYI +--file_exists $MYSQLD_DATADIR/test/t1#P#p2#SP#subpart20.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p2#SP#subpart20.MYI +--file_exists $MYSQLD_DATADIR/test/t1#P#p2#SP#subpart21.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p2#SP#subpart21.MYI +--file_exists $MYSQLD_DATADIR/tmpdata/t1#P#p1#SP#subpart10.MYD +--file_exists $MYSQLD_DATADIR/tmpdata/t1#P#p1#SP#subpart11.MYD +--file_exists $MYSQLD_DATADIR/tmpdata/t1#P#p2#SP#subpart20.MYD +--file_exists $MYSQLD_DATADIR/tmpdata/t1#P#p2#SP#subpart21.MYD +--file_exists $MYSQLD_DATADIR/tmpinx/t1#P#p1#SP#subpart10.MYI +--file_exists $MYSQLD_DATADIR/tmpinx/t1#P#p1#SP#subpart11.MYI +--file_exists $MYSQLD_DATADIR/tmpinx/t1#P#p2#SP#subpart20.MYI +--file_exists $MYSQLD_DATADIR/tmpinx/t1#P#p2#SP#subpart21.MYI drop table t1; ---exec rmdir $MYSQLTEST_VARDIR/master-data/tmpdata || true ---exec rmdir $MYSQLTEST_VARDIR/master-data/tmpinx || true +--exec rmdir $MYSQLD_DATADIR/tmpdata || true +--exec rmdir $MYSQLD_DATADIR/tmpinx || true # End Windows specific test failures. diff --git a/mysql-test/t/partition_symlink.test b/mysql-test/t/partition_symlink.test index ab779ec2b68..0ca60c14c6c 100644 --- a/mysql-test/t/partition_symlink.test +++ b/mysql-test/t/partition_symlink.test @@ -35,21 +35,22 @@ DROP DATABASE IF EXISTS mysqltest2; connect(con1,localhost,mysqltest_1,,); -- echo # user mysqltest_1: USE test; - -- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +let $MYSQLD_DATADIR= `select @@datadir`; + --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR eval CREATE TABLE t1 (a INT) PARTITION BY LIST (a) ( PARTITION p0 VALUES IN (0) - DATA DIRECTORY '$MYSQLTEST_VARDIR/master-data/mysqltest2' - INDEX DIRECTORY '$MYSQLTEST_VARDIR/master-data/mysqltest2', + DATA DIRECTORY '$MYSQLD_DATADIR/mysqltest2' + INDEX DIRECTORY '$MYSQLD_DATADIR/mysqltest2', PARTITION p1 VALUES IN (1) - DATA DIRECTORY '$MYSQLTEST_VARDIR/master-data/test' - INDEX DIRECTORY '$MYSQLTEST_VARDIR/master-data/test', + DATA DIRECTORY '$MYSQLD_DATADIR/test' + INDEX DIRECTORY '$MYSQLD_DATADIR/test', PARTITION p2 VALUES IN (2) ); -- echo # without the patch for bug#32091 this would create -- echo # files mysqltest2/t1.MYD + .MYI and possible overwrite -- echo # the mysqltest2.t1 table (depending on bug#32111) - -- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR + --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR ALTER TABLE t1 REMOVE PARTITIONING; INSERT INTO t1 VALUES (1); SELECT * FROM t1; @@ -76,40 +77,41 @@ connection default; -- echo # user root: CREATE DATABASE mysqltest2; USE mysqltest2; - -- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR + --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR eval CREATE TABLE t1 (a INT) PARTITION BY LIST (a) ( PARTITION p0 VALUES IN (0) - DATA DIRECTORY '$MYSQLTEST_VARDIR/master-data/mysqltest2' - INDEX DIRECTORY '$MYSQLTEST_VARDIR/master-data/mysqltest2', + DATA DIRECTORY '$MYSQLD_DATADIR/mysqltest2' + INDEX DIRECTORY '$MYSQLD_DATADIR/mysqltest2', PARTITION p1 VALUES IN (1) - DATA DIRECTORY '$MYSQLTEST_VARDIR/master-data/test' - INDEX DIRECTORY '$MYSQLTEST_VARDIR/master-data/test' + DATA DIRECTORY '$MYSQLD_DATADIR/test' + INDEX DIRECTORY '$MYSQLD_DATADIR/test' ); connection con1; -- echo # user mysqltest_1: USE test; - -- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR + --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR -- error 1,1 eval CREATE TABLE t1 (a INT) PARTITION BY LIST (a) ( PARTITION p0 VALUES IN (0) - DATA DIRECTORY '$MYSQLTEST_VARDIR/master-data/mysqltest2' - INDEX DIRECTORY '$MYSQLTEST_VARDIR/master-data/mysqltest2', + DATA DIRECTORY '$MYSQLD_DATADIR/mysqltest2' + INDEX DIRECTORY '$MYSQLD_DATADIR/mysqltest2', PARTITION p1 VALUES IN (1) - DATA DIRECTORY '$MYSQLTEST_VARDIR/master-data/test' - INDEX DIRECTORY '$MYSQLTEST_VARDIR/master-data/test' + DATA DIRECTORY '$MYSQLD_DATADIR/test' + INDEX DIRECTORY '$MYSQLD_DATADIR/test' ); - -- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR + + --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR -- error 1,1 eval CREATE TABLE t1 (a INT) PARTITION BY LIST (a) ( PARTITION p0 VALUES IN (0) - DATA DIRECTORY '$MYSQLTEST_VARDIR/master-data/test' - INDEX DIRECTORY '$MYSQLTEST_VARDIR/master-data/test', + DATA DIRECTORY '$MYSQLD_DATADIR/test' + INDEX DIRECTORY '$MYSQLD_DATADIR/test', PARTITION p1 VALUES IN (1) - DATA DIRECTORY '$MYSQLTEST_VARDIR/master-data/mysqltest2' - INDEX DIRECTORY '$MYSQLTEST_VARDIR/master-data/mysqltest2' + DATA DIRECTORY '$MYSQLD_DATADIR/mysqltest2' + INDEX DIRECTORY '$MYSQLD_DATADIR/mysqltest2' ); connection default; -- echo # user root (cleanup): diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test index 9e250372d51..25d9ed653c2 100644 --- a/mysql-test/t/query_cache.test +++ b/mysql-test/t/query_cache.test @@ -423,7 +423,7 @@ create table t1 (word char(20) not null); select * from t1; show status like "Qcache_queries_in_cache"; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR -eval load data infile '$MYSQLTEST_VARDIR/std_data_ln/words.dat' into table t1; +eval load data infile '$MYSQLTEST_VARDIR/std_data/words.dat' into table t1; show status like "Qcache_queries_in_cache"; select count(*) from t1; drop table t1; diff --git a/mysql-test/t/repair.test b/mysql-test/t/repair.test index b433b8720b9..84614798832 100644 --- a/mysql-test/t/repair.test +++ b/mysql-test/t/repair.test @@ -29,7 +29,8 @@ repair table t1 use_frm; create table t1 engine=myisam SELECT 1,"table 1"; flush tables; -system echo 1 > $MYSQLTEST_VARDIR/master-data/test/t1.MYI ; +let $MYSQLD_DATADIR= `select @@datadir`; +system echo 1 > $MYSQLD_DATADIR/test/t1.MYI ; repair table t1; repair table t1 use_frm; drop table t1; diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test index 34e1941c9d7..50062dfb0c3 100644 --- a/mysql-test/t/show_check.test +++ b/mysql-test/t/show_check.test @@ -422,14 +422,15 @@ DROP TABLE t1; flush tables; # Create a junk frm file on disk -system echo "this is a junk file for test" >> $MYSQLTEST_VARDIR/master-data/test/t1.frm ; +let $MYSQLD_DATADIR= `select @@datadir`; +system echo "this is a junk file for test" >> $MYSQLD_DATADIR/test/t1.frm ; --replace_column 6 # 7 # 8 # 9 # SHOW TABLE STATUS like 't1'; --error 1033 show create table t1; drop table if exists t1; --error 1,0 ---remove_file $MYSQLTEST_VARDIR/master-data/test/t1.frm +--remove_file $MYSQLD_DATADIR/test/t1.frm # # BUG 12183 - SHOW OPEN TABLES behavior doesn't match grammar diff --git a/mysql-test/t/sp-destruct.test b/mysql-test/t/sp-destruct.test index 56d99c4435c..ae2bb9f7ea3 100644 --- a/mysql-test/t/sp-destruct.test +++ b/mysql-test/t/sp-destruct.test @@ -13,9 +13,10 @@ -- source include/not_embedded.inc # Backup proc table ---copy_file $MYSQLTEST_VARDIR/master-data/mysql/proc.frm $MYSQLTEST_VARDIR/tmp/proc.frm ---copy_file $MYSQLTEST_VARDIR/master-data/mysql/proc.MYD $MYSQLTEST_VARDIR/tmp/proc.MYD ---copy_file $MYSQLTEST_VARDIR/master-data/mysql/proc.MYI $MYSQLTEST_VARDIR/tmp/proc.MYI +let $MYSQLD_DATADIR= `select @@datadir`; +--copy_file $MYSQLD_DATADIR/mysql/proc.frm $MYSQLTEST_VARDIR/tmp/proc.frm +--copy_file $MYSQLD_DATADIR/mysql/proc.MYD $MYSQLTEST_VARDIR/tmp/proc.MYD +--copy_file $MYSQLD_DATADIR/mysql/proc.MYI $MYSQLTEST_VARDIR/tmp/proc.MYI use test; @@ -50,8 +51,8 @@ insert into t1 values (0); flush table mysql.proc; # Thrashing the .frm file ---remove_file $MYSQLTEST_VARDIR/master-data/mysql/proc.frm ---write_file $MYSQLTEST_VARDIR/master-data/mysql/proc.frm +--remove_file $MYSQLD_DATADIR/mysql/proc.frm +--write_file $MYSQLD_DATADIR/mysql/proc.frm saljdfa EOF --replace_result $MYSQLTEST_VARDIR . master-data// '' '\\' '/' @@ -67,9 +68,9 @@ insert into t1 values (0); flush table mysql.proc; # Drop the mysql.proc table ---remove_file $MYSQLTEST_VARDIR/master-data/mysql/proc.frm ---remove_file $MYSQLTEST_VARDIR/master-data/mysql/proc.MYD ---remove_file $MYSQLTEST_VARDIR/master-data/mysql/proc.MYI +--remove_file $MYSQLD_DATADIR/mysql/proc.frm +--remove_file $MYSQLD_DATADIR/mysql/proc.MYD +--remove_file $MYSQLD_DATADIR/mysql/proc.MYI --error ER_NO_SUCH_TABLE call bug14233(); --error ER_NO_SUCH_TABLE @@ -78,9 +79,9 @@ create view v1 as select bug14233_f(); insert into t1 values (0); # Restore mysql.proc ---copy_file $MYSQLTEST_VARDIR/tmp/proc.frm $MYSQLTEST_VARDIR/master-data/mysql/proc.frm ---copy_file $MYSQLTEST_VARDIR/tmp/proc.MYD $MYSQLTEST_VARDIR/master-data/mysql/proc.MYD ---copy_file $MYSQLTEST_VARDIR/tmp/proc.MYI $MYSQLTEST_VARDIR/master-data/mysql/proc.MYI +--copy_file $MYSQLTEST_VARDIR/tmp/proc.frm $MYSQLD_DATADIR/mysql/proc.frm +--copy_file $MYSQLTEST_VARDIR/tmp/proc.MYD $MYSQLD_DATADIR/mysql/proc.MYD +--copy_file $MYSQLTEST_VARDIR/tmp/proc.MYI $MYSQLD_DATADIR/mysql/proc.MYI --remove_file $MYSQLTEST_VARDIR/tmp/proc.frm --remove_file $MYSQLTEST_VARDIR/tmp/proc.MYD --remove_file $MYSQLTEST_VARDIR/tmp/proc.MYI diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test index 004e1c4ddd2..979141fb573 100644 --- a/mysql-test/t/sp.test +++ b/mysql-test/t/sp.test @@ -703,7 +703,7 @@ drop procedure into_test4| --disable_warnings drop procedure if exists into_outfile| --enable_warnings ---replace_result $MYSQLTEST_VARDIR .. +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval create procedure into_outfile(x char(16), y int) begin insert into test.t1 values (x, y); @@ -722,7 +722,7 @@ drop procedure into_outfile| --disable_warnings drop procedure if exists into_dumpfile| --enable_warnings ---replace_result $MYSQLTEST_VARDIR .. +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval create procedure into_dumpfile(x char(16), y int) begin insert into test.t1 values (x, y); @@ -5260,9 +5260,9 @@ drop procedure if exists bug13012| create procedure bug13012() BEGIN REPAIR TABLE t1; - BACKUP TABLE t1 to '../tmp'; + BACKUP TABLE t1 to '../../tmp'; DROP TABLE t1; - RESTORE TABLE t1 FROM '../tmp'; + RESTORE TABLE t1 FROM '../../tmp'; END| call bug13012()| --enable_warnings diff --git a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test index f339b29c83a..69b1b3cdb4e 100644 --- a/mysql-test/t/symlink.test +++ b/mysql-test/t/symlink.test @@ -123,11 +123,12 @@ drop table t1; # # BUG#32111 - Security Breach via DATA/INDEX DIRECORY and RENAME TABLE # ---replace_result $MYSQLTEST_VARDIR TEST_DIR +let $MYSQLD_DATADIR= `select @@datadir`; +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR eval CREATE TABLE t1(a INT) -DATA DIRECTORY='$MYSQLTEST_VARDIR/master-data/mysql' -INDEX DIRECTORY='$MYSQLTEST_VARDIR/master-data/mysql'; ---replace_result $MYSQLTEST_VARDIR TEST_DIR +DATA DIRECTORY='$MYSQLD_DATADIR/mysql' +INDEX DIRECTORY='$MYSQLD_DATADIR/mysql'; +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR/ --error 1 RENAME TABLE t1 TO user; DROP TABLE t1; @@ -137,12 +138,12 @@ DROP TABLE t1; # have been chosen. (Bug #8707) # disable_query_log; -eval create table t1 (i int) data directory = "$MYSQLTEST_VARDIR/master-data/test/"; +eval create table t1 (i int) data directory = "$MYSQLD_DATADIR/test/"; enable_query_log; show create table t1; drop table t1; disable_query_log; -eval create table t1 (i int) index directory = "$MYSQLTEST_VARDIR/master-data/test/"; +eval create table t1 (i int) index directory = "$MYSQLD_DATADIR/test/"; enable_query_log; show create table t1; drop table t1; @@ -196,7 +197,7 @@ CREATE DATABASE db2; USE db2; --disable_query_log eval CREATE TABLE t1 (b INT) ENGINE MYISAM -DATA DIRECTORY = '$MYSQLTEST_VARDIR/master-data/db1/'; +DATA DIRECTORY = '$MYSQLD_DATADIR/db1/'; --enable_query_log INSERT INTO db2.t1 VALUES (1); diff --git a/mysql-test/t/system_mysql_db.test b/mysql-test/t/system_mysql_db.test index e3d58ab7139..398a222b642 100644 --- a/mysql-test/t/system_mysql_db.test +++ b/mysql-test/t/system_mysql_db.test @@ -6,11 +6,6 @@ # depends on the presence of the log tables (which are CSV-based). --source include/have_csv.inc -# First delete some tables maybe left over from previous tests ---disable_warnings -drop table if exists t1,t1aa,t2aa; ---enable_warnings - -- disable_query_log use mysql; -- enable_query_log diff --git a/mysql-test/t/system_mysql_db_fix30020.test b/mysql-test/t/system_mysql_db_fix30020.test index dc68f469d3a..a3dc9adb254 100644 --- a/mysql-test/t/system_mysql_db_fix30020.test +++ b/mysql-test/t/system_mysql_db_fix30020.test @@ -21,10 +21,6 @@ if (`SELECT LENGTH("$MYSQL_FIX_SYSTEM_TABLES") <= 0`) # mysql_fix_system_tables which should be ignored. # Instead, concentrate on the errors in r/system_mysql_db.reject ---disable_warnings -drop table if exists t1,t1aa,t2aa; ---enable_warnings - -- disable_result_log -- disable_query_log diff --git a/mysql-test/t/system_mysql_db_fix40123.test b/mysql-test/t/system_mysql_db_fix40123.test index 419a9cd1827..440fcc8aa8a 100644 --- a/mysql-test/t/system_mysql_db_fix40123.test +++ b/mysql-test/t/system_mysql_db_fix40123.test @@ -18,10 +18,6 @@ if (`SELECT LENGTH("$MYSQL_FIX_PRIVILEGE_TABLES") <= 0`) # mysql_fix_system_tables which should be ignored. # Instead, concentrate on the errors in r/system_mysql_db.reject ---disable_warnings -drop table if exists t1,t1aa,t2aa; ---enable_warnings - -- disable_result_log -- disable_query_log diff --git a/mysql-test/t/system_mysql_db_fix50030.test b/mysql-test/t/system_mysql_db_fix50030.test index b4e0ed65242..a1fbe9872f8 100644 --- a/mysql-test/t/system_mysql_db_fix50030.test +++ b/mysql-test/t/system_mysql_db_fix50030.test @@ -11,10 +11,6 @@ # mysql_fix_system_tables which should be ignored. # Instead, concentrate on the errors in r/system_mysql_db.reject ---disable_warnings -drop table if exists t1,t1aa,t2aa; ---enable_warnings - -- disable_result_log -- disable_query_log diff --git a/mysql-test/t/system_mysql_db_fix50117.test b/mysql-test/t/system_mysql_db_fix50117.test index 5f259ac6133..9dc77cdbfc0 100644 --- a/mysql-test/t/system_mysql_db_fix50117.test +++ b/mysql-test/t/system_mysql_db_fix50117.test @@ -11,10 +11,6 @@ # mysql_fix_system_tables which should be ignored. # Instead, concentrate on the errors in r/system_mysql_db.reject ---disable_warnings - drop table if exists t1,t1aa,t2aa; ---enable_warnings - -- disable_result_log -- disable_query_log diff --git a/mysql-test/t/trigger-compat.test b/mysql-test/t/trigger-compat.test index 9f7fd8bc505..bf119cd89e6 100644 --- a/mysql-test/t/trigger-compat.test +++ b/mysql-test/t/trigger-compat.test @@ -60,8 +60,9 @@ CREATE TRIGGER wl2818_trg1 BEFORE INSERT ON t1 --echo --echo ---> patching t1.TRG... ---exec grep -v 'definers=' $MYSQLTEST_VARDIR/master-data/mysqltest_db1/t1.TRG > $MYSQLTEST_VARDIR/tmp/t1.TRG ---exec mv $MYSQLTEST_VARDIR/tmp/t1.TRG $MYSQLTEST_VARDIR/master-data/mysqltest_db1/t1.TRG +let $MYSQLD_DATADIR= `select @@datadir`; +--exec grep -v 'definers=' $MYSQLD_DATADIR/mysqltest_db1/t1.TRG > $MYSQLTEST_VARDIR/tmp/t1.TRG +--exec mv $MYSQLTEST_VARDIR/tmp/t1.TRG $MYSQLD_DATADIR/mysqltest_db1/t1.TRG # # Create a new trigger. diff --git a/mysql-test/t/trigger-grant.test b/mysql-test/t/trigger-grant.test index 8145212ed5b..c31864662d1 100644 --- a/mysql-test/t/trigger-grant.test +++ b/mysql-test/t/trigger-grant.test @@ -360,10 +360,11 @@ CREATE TRIGGER trg5 BEFORE DELETE ON t1 SET @a = 5; # Replace definers with the "weird" definers +let MYSQLD_DATADIR= `select @@datadir`; perl; use strict; use warnings; -my $fname= "$ENV{'MYSQLTEST_VARDIR'}/master-data/mysqltest_db1/t1.TRG"; +my $fname= "$ENV{'MYSQLD_DATADIR'}/mysqltest_db1/t1.TRG"; open(FILE, "<", $fname) or die; my @content= grep($_ !~ /^definers=/, ); close FILE; diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test index 1c98a0f8d29..688cf7a996c 100644 --- a/mysql-test/t/trigger.test +++ b/mysql-test/t/trigger.test @@ -472,11 +472,11 @@ create trigger trg1 before insert on t1 for each row set new.k = new.i; create trigger trg2 after insert on t1 for each row set @b:= "Fired"; set @b:=""; # Test triggers with file with separators -load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (@a, i); +load data infile '../../std_data/rpl_loaddata.dat' into table t1 (@a, i); select *, @b from t1; set @b:=""; # Test triggers with fixed size row file -load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, j); +load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, j); select *, @b from t1; # This also will drop triggers drop table t1; @@ -510,7 +510,7 @@ delete from t1 where i = 2; select * from t1; # Should fail and insert only 1 row --error ER_BAD_FIELD_ERROR -load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, k); +load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, k); select * from t1; --error ER_BAD_FIELD_ERROR insert into t1 select 3, 3; @@ -567,7 +567,7 @@ select * from t1; delete from t1; select * from t1; --error ER_BAD_FIELD_ERROR -load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, k); +load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (i, k); select * from t1; --error ER_BAD_FIELD_ERROR insert into t1 select 3, 3; @@ -1142,10 +1142,11 @@ select trigger_schema, trigger_name, event_object_schema, event_object_table, action_statement from information_schema.triggers where event_object_schema = 'test'; # Trick which makes update of second .TRN file impossible -write_file $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~; +let $MYSQLD_DATADIR= `select @@datadir`; +write_file $MYSQLD_DATADIR/test/t1_ai.TRN~; dummy EOF -chmod 0000 $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~; +chmod 0000 $MYSQLD_DATADIR/test/t1_ai.TRN~; # Normalize the datadir path; the embedded server doesn't chdir to datadir --replace_result $MYSQLTEST_VARDIR . master-data/ '' --error 1 @@ -1156,8 +1157,8 @@ select @a, @b; select trigger_schema, trigger_name, event_object_schema, event_object_table, action_statement from information_schema.triggers where event_object_schema = 'test'; -chmod 0600 $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~; -remove_file $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~; +chmod 0600 $MYSQLD_DATADIR/test/t1_ai.TRN~; +remove_file $MYSQLD_DATADIR/test/t1_ai.TRN~; # Let us check that updates to .TRN files were rolled back too drop trigger t1_bi; drop trigger t1_ai; @@ -1190,7 +1191,7 @@ insert into t1 (a) values create trigger t2_ai after insert on t2 for each row set @a:= (select max(a) from t2); insert into t2 select * from t1; -load data infile '../std_data_ln/words.dat' into table t1 (a); +load data infile '../../std_data/words.dat' into table t1 (a); drop trigger t1_ai; drop trigger t2_ai; # Test that the problem for functions is fixed as well @@ -1200,7 +1201,7 @@ insert into t1 values ("And",f1()),("the",f1()),("mome", f1()),("raths",f1()),("outgrabe",f1()); create function f2() returns int return (select max(b) from t2); insert into t2 select a, f2() from t1; -load data infile '../std_data_ln/words.dat' into table t1 (a) set b:= f1(); +load data infile '../../std_data/words.dat' into table t1 (a) set b:= f1(); drop function f1; drop function f2; drop table t1, t2; diff --git a/mysql-test/t/type_blob.test b/mysql-test/t/type_blob.test index b6febf8e76d..ba66914aac9 100644 --- a/mysql-test/t/type_blob.test +++ b/mysql-test/t/type_blob.test @@ -308,20 +308,20 @@ create table t1 (id integer auto_increment unique,imagem LONGBLOB not null defau insert into t1 (id) values (1); # We have to clean up the path in the results for safe comparison eval select - charset(load_file('../std_data_ln/words.dat')), - collation(load_file('../std_data_ln/words.dat')), - coercibility(load_file('../std_data_ln/words.dat')); + charset(load_file('../../std_data/words.dat')), + collation(load_file('../../std_data/words.dat')), + coercibility(load_file('../../std_data/words.dat')); --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval explain extended select - charset(load_file('$MYSQLTEST_VARDIR/std_data_ln/words.dat')), - collation(load_file('$MYSQLTEST_VARDIR/std_data_ln/words.dat')), - coercibility(load_file('$MYSQLTEST_VARDIR/std_data_ln/words.dat')); + charset(load_file('$MYSQLTEST_VARDIR/std_data/words.dat')), + collation(load_file('$MYSQLTEST_VARDIR/std_data/words.dat')), + coercibility(load_file('$MYSQLTEST_VARDIR/std_data/words.dat')); --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR -eval update t1 set imagem=load_file('$MYSQLTEST_VARDIR/std_data_ln/words.dat') where id=1; +eval update t1 set imagem=load_file('$MYSQLTEST_VARDIR/std_data/words.dat') where id=1; select if(imagem is null, "ERROR", "OK"),length(imagem) from t1 where id = 1; drop table t1; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR -eval create table t1 select load_file('$MYSQLTEST_VARDIR/std_data_ln/words.dat') l; +eval create table t1 select load_file('$MYSQLTEST_VARDIR/std_data/words.dat') l; # We mask out the Privileges column because it differs for embedded server --replace_column 8 # show full fields from t1; diff --git a/mysql-test/t/type_varchar.test b/mysql-test/t/type_varchar.test index 1eb949a21e3..9098881e379 100644 --- a/mysql-test/t/type_varchar.test +++ b/mysql-test/t/type_varchar.test @@ -3,7 +3,8 @@ drop table if exists t1, t2; --enable_warnings create table t1 (v varchar(30), c char(3), e enum('abc','def','ghi'), t text); -copy_file $MYSQL_TEST_DIR/std_data/vchar.frm $MYSQLTEST_VARDIR/master-data/test/vchar.frm; +let $MYSQLD_DATADIR= `select @@datadir`; +copy_file $MYSQL_TEST_DIR/std_data/vchar.frm $MYSQLD_DATADIR/test/vchar.frm; truncate table vchar; show create table t1; show create table vchar; @@ -162,8 +163,8 @@ create table t3 ( en varchar(255) character set utf8, cz varchar(255) character set utf8 ); -remove_file $MYSQLTEST_VARDIR/master-data/test/t3.frm; -copy_file $MYSQL_TEST_DIR/std_data/14897.frm $MYSQLTEST_VARDIR/master-data/test/t3.frm; +remove_file $MYSQLD_DATADIR/test/t3.frm; +copy_file $MYSQL_TEST_DIR/std_data/14897.frm $MYSQLD_DATADIR/test/t3.frm; truncate table t3; insert into t3 (id, en, cz) values (1,'en string 1','cz string 1'), diff --git a/mysql-test/t/upgrade.test b/mysql-test/t/upgrade.test index 05f430b087b..fa1db9fcfb7 100644 --- a/mysql-test/t/upgrade.test +++ b/mysql-test/t/upgrade.test @@ -57,7 +57,8 @@ drop table `txu#p#p1`; # Check if old tables work # -system cp $MYSQL_TEST_DIR/std_data/old_table-323.frm $MYSQLTEST_VARDIR/master-data/test/t1.frm; +let $MYSQLD_DATADIR= `select @@datadir`; +system cp $MYSQL_TEST_DIR/std_data/old_table-323.frm $MYSQLD_DATADIR/test/t1.frm; truncate t1; drop table t1; @@ -75,11 +76,11 @@ create table tabc.t1 (a int); FLUSH TABLES; # Manually make a 5.0 database from the template ---exec mkdir $MYSQLTEST_VARDIR/master-data/a-b-c ---copy_file $MYSQLTEST_VARDIR/master-data/tabc/db.opt $MYSQLTEST_VARDIR/master-data/a-b-c/db.opt ---copy_file $MYSQLTEST_VARDIR/master-data/tabc/t1.frm $MYSQLTEST_VARDIR/master-data/a-b-c/t1.frm ---copy_file $MYSQLTEST_VARDIR/master-data/tabc/t1.MYD $MYSQLTEST_VARDIR/master-data/a-b-c/t1.MYD ---copy_file $MYSQLTEST_VARDIR/master-data/tabc/t1.MYI $MYSQLTEST_VARDIR/master-data/a-b-c/t1.MYI +--exec mkdir $MYSQLD_DATADIR/a-b-c +--copy_file $MYSQLD_DATADIR/tabc/db.opt $MYSQLD_DATADIR/a-b-c/db.opt +--copy_file $MYSQLD_DATADIR/tabc/t1.frm $MYSQLD_DATADIR/a-b-c/t1.frm +--copy_file $MYSQLD_DATADIR/tabc/t1.MYD $MYSQLD_DATADIR/a-b-c/t1.MYD +--copy_file $MYSQLD_DATADIR/tabc/t1.MYI $MYSQLD_DATADIR/a-b-c/t1.MYI show databases like '%a-b-c%'; ALTER DATABASE `#mysql50#a-b-c` UPGRADE DATA DIRECTORY NAME; diff --git a/mysql-test/t/user_var-binlog.test b/mysql-test/t/user_var-binlog.test index 70f2f0fa7a6..0098f237de9 100644 --- a/mysql-test/t/user_var-binlog.test +++ b/mysql-test/t/user_var-binlog.test @@ -16,9 +16,9 @@ source include/show_binlog_events.inc; # more important than SHOW BINLOG EVENTS, mysqlbinlog (where we # absolutely need variables names to be quoted and strings to be # escaped). ---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR +let $MYSQLD_DATADIR= `select @@datadir`; flush logs; ---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000001 drop table t1; # End of 4.1 tests diff --git a/mysql-test/t/varbinary.test b/mysql-test/t/varbinary.test index 9ccbac7cdda..192c9a427f2 100644 --- a/mysql-test/t/varbinary.test +++ b/mysql-test/t/varbinary.test @@ -47,12 +47,13 @@ drop table t1; # # Test with a saved table from 4.1 -copy_file std_data/bug19371.frm $MYSQLTEST_VARDIR/master-data/test/t1.frm; -chmod 0777 $MYSQLTEST_VARDIR/master-data/test/t1.frm; -copy_file std_data/bug19371.MYD $MYSQLTEST_VARDIR/master-data/test/t1.MYD; -chmod 0777 $MYSQLTEST_VARDIR/master-data/test/t1.MYD; -copy_file std_data/bug19371.MYI $MYSQLTEST_VARDIR/master-data/test/t1.MYI; -chmod 0777 $MYSQLTEST_VARDIR/master-data/test/t1.MYI; +let $MYSQLD_DATADIR= `select @@datadir`; +copy_file std_data/bug19371.frm $MYSQLD_DATADIR/test/t1.frm; +chmod 0777 $MYSQLD_DATADIR/test/t1.frm; +copy_file std_data/bug19371.MYD $MYSQLD_DATADIR/test/t1.MYD; +chmod 0777 $MYSQLD_DATADIR/test/t1.MYD; +copy_file std_data/bug19371.MYI $MYSQLD_DATADIR/test/t1.MYI; +chmod 0777 $MYSQLD_DATADIR/test/t1.MYI; # Everything _looks_ fine show create table t1; diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test index e388aa61803..e7e361ac9f8 100644 --- a/mysql-test/t/view.test +++ b/mysql-test/t/view.test @@ -1228,11 +1228,11 @@ drop table t1; create table t1 (a int, b char(10)); create view v1 as select * from t1 where a != 0 with check option; -- error 1369 -load data infile '../std_data_ln/loaddata3.dat' into table v1 fields terminated by '' enclosed by '' ignore 1 lines; +load data infile '../../std_data/loaddata3.dat' into table v1 fields terminated by '' enclosed by '' ignore 1 lines; select * from t1; select * from v1; delete from t1; -load data infile '../std_data_ln/loaddata3.dat' ignore into table v1 fields terminated by '' enclosed by '' ignore 1 lines; +load data infile '../../std_data/loaddata3.dat' ignore into table v1 fields terminated by '' enclosed by '' ignore 1 lines; select * from t1 order by a,b; select * from v1 order by a,b; drop view v1; @@ -1241,11 +1241,11 @@ drop table t1; create table t1 (a text, b text); create view v1 as select * from t1 where a <> 'Field A' with check option; -- error 1369 -load data infile '../std_data_ln/loaddata2.dat' into table v1 fields terminated by ',' enclosed by ''''; +load data infile '../../std_data/loaddata2.dat' into table v1 fields terminated by ',' enclosed by ''''; select concat('|',a,'|'), concat('|',b,'|') from t1; select concat('|',a,'|'), concat('|',b,'|') from v1; delete from t1; -load data infile '../std_data_ln/loaddata2.dat' ignore into table v1 fields terminated by ',' enclosed by ''''; +load data infile '../../std_data/loaddata2.dat' ignore into table v1 fields terminated by ',' enclosed by ''''; select concat('|',a,'|'), concat('|',b,'|') from t1; select concat('|',a,'|'), concat('|',b,'|') from v1; drop view v1; diff --git a/mysql-test/t/warnings.test b/mysql-test/t/warnings.test index b5bae109f5f..26cef584252 100644 --- a/mysql-test/t/warnings.test +++ b/mysql-test/t/warnings.test @@ -50,7 +50,7 @@ drop table t1; # create table t1(a tinyint, b int not null, c date, d char(5)); -load data infile '../std_data_ln/warnings_loaddata.dat' into table t1 fields terminated by ','; +load data infile '../../std_data/warnings_loaddata.dat' into table t1 fields terminated by ','; # PS doesn't work good with @@warning_count --disable_ps_protocol select @@warning_count; From 864989d97f22d16bd38ac6c0ca039f4fc4760a82 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 13 Dec 2007 11:28:34 +0100 Subject: [PATCH 002/705] Don't add --binlog-format if --skip-log-bin or --loose-skip-log-bin is used for the test --- mysql-test/mysql-test-run.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 1b12f1580dd..8e828ad2aed 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2600,8 +2600,8 @@ sub mysqld_arguments ($$$) { mtr_add_arg($args, "%s--log-output=table,file", $prefix); } - # Check if "extra_opt" contains --skip-log-bin - my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt, @opt_extra_mysqld_opt); + # Check if "extra_opt" contains skip-log-bin + my $skip_binlog= grep(/^(--|--loose-)skip-log-bin/, @$extra_opt, @opt_extra_mysqld_opt); if ( $opt_debug ) { From 4930a27d6c177fabb2e653d7ee56aab2ff1c56ea Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 13 Dec 2007 11:39:00 +0100 Subject: [PATCH 003/705] Only skip restart(and use dynamic binlog switch) if the next test has 'binlog_format_switch' set --- mysql-test/mysql-test-run.pl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 8e828ad2aed..bb9ee1cfba8 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2818,16 +2818,15 @@ sub server_need_restart { ! mtr_same_opts($started_opts, $extra_opt) ) { # Check if diff is binlog format only + # and the next test has $binlog_format_switch set my @diff_opts= mtr_diff_opts($started_opts, $extra_opt); if (@diff_opts == 2 and $diff_opts[0] =~/^--binlog-format=/ and - $diff_opts[1] =~/^--binlog-format=/) + $diff_opts[1] =~/^--binlog-format=/ and + defined $tinfo->{binlog_format_switch}) { mtr_verbose("Using dynamic switch of binlog format from ", $diff_opts[0],"to", $diff_opts[1]); - - die "Binlog format to switch to is not set" - unless defined $tinfo->{binlog_format_switch}; } else { From c9d61297f06261d69c8dae8f954ed17fae930462 Mon Sep 17 00:00:00 2001 From: "msvensson@shellback.(none)" <> Date: Thu, 13 Dec 2007 15:02:50 +0100 Subject: [PATCH 004/705] Generate ssl arguments only if ssl is supported --- mysql-test/lib/My/ConfigFactory.pm | 22 ++++++++++++++++------ mysql-test/mysql-test-run.pl | 5 +---- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index f176ccbeab3..4911e4caaa8 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -139,27 +139,37 @@ sub fix_std_data { return "$basedir/mysql-test/std_data"; } +sub ssl_supported { + my ($self)= @_; + return $self->{ARGS}->{ssl}; +} + sub fix_ssl_ca { + return if !ssl_supported(@_); my $std_data= fix_std_data(@_); return "$std_data/cacert.pem" } sub fix_ssl_server_cert { + return if !ssl_supported(@_); my $std_data= fix_std_data(@_); return "$std_data/server-cert.pem" } sub fix_ssl_client_cert { + return if !ssl_supported(@_); my $std_data= fix_std_data(@_); return "$std_data/client-cert.pem" } sub fix_ssl_server_key { + return if !ssl_supported(@_); my $std_data= fix_std_data(@_); return "$std_data/server-key.pem" } sub fix_ssl_client_key { + return if !ssl_supported(@_); my $std_data= fix_std_data(@_); return "$std_data/client-key.pem" } @@ -188,9 +198,9 @@ my @mysqld_rules= { 'server-id' => \&fix_server_id, }, # By default, prevent the started mysqld to access files outside of vardir { 'secure-file-priv' => sub { return shift->{ARGS}->{vardir}; } }, - { 'loose-ssl-ca' => \&fix_ssl_ca }, - { 'loose-ssl-cert' => \&fix_ssl_server_cert }, - { 'loose-ssl-key' => \&fix_ssl_server_key }, + { 'ssl-ca' => \&fix_ssl_ca }, + { 'ssl-cert' => \&fix_ssl_server_cert }, + { 'ssl-key' => \&fix_ssl_server_key }, ); @@ -268,9 +278,9 @@ my @client_rules= # my @mysqltest_rules= ( - { 'loose-ssl-ca' => \&fix_ssl_ca }, - { 'loose-ssl-cert' => \&fix_ssl_client_cert }, - { 'loose-ssl-key' => \&fix_ssl_client_key }, + { 'ssl-ca' => \&fix_ssl_ca }, + { 'ssl-cert' => \&fix_ssl_client_cert }, + { 'ssl-key' => \&fix_ssl_client_key }, ); diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index bb9ee1cfba8..b5c122caefc 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2235,6 +2235,7 @@ sub run_testcase ($) { #hosts => [ 'host1', 'host2' ], user => $opt_user, password => '', + ssl => $opt_ssl_supported, } ); @@ -3198,10 +3199,6 @@ sub start_mysqltest ($) { # Turn on SSL for _all_ test cases if option --ssl was used mtr_add_arg($args, "--ssl"); } - elsif ( $opt_ssl_supported ) - { - mtr_add_arg($args, "--skip-ssl"); - } # ---------------------------------------------------------------------- # export MYSQL_TEST variable containing /mysqltest From f9fc83c2906bb4d2d45f0de2538d0a40d4790d91 Mon Sep 17 00:00:00 2001 From: "msvensson@shellback.(none)" <> Date: Thu, 13 Dec 2007 15:04:25 +0100 Subject: [PATCH 005/705] Don't add skip-innodb on slave --- mysql-test/suite/rpl/rpl_1slave_base.cnf | 1 - 1 file changed, 1 deletion(-) diff --git a/mysql-test/suite/rpl/rpl_1slave_base.cnf b/mysql-test/suite/rpl/rpl_1slave_base.cnf index 83b391f07c4..88436224f0b 100644 --- a/mysql-test/suite/rpl/rpl_1slave_base.cnf +++ b/mysql-test/suite/rpl/rpl_1slave_base.cnf @@ -35,7 +35,6 @@ report-host= 127.0.0.1 report-port= @mysqld.2.port report-user= root -skip-innodb skip-slave-start # Directory where slaves find the dumps generated by "load data" From 83ea6d49c5bf0a6d875745960b52489a4bf40ec7 Mon Sep 17 00:00:00 2001 From: "msvensson@shellback.(none)" <> Date: Thu, 13 Dec 2007 16:07:49 +0100 Subject: [PATCH 006/705] Fix faulty select to check for existence of blackhole support --- mysql-test/include/have_blackhole.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mysql-test/include/have_blackhole.inc b/mysql-test/include/have_blackhole.inc index 2ddb0df4eae..146f5afb0d5 100644 --- a/mysql-test/include/have_blackhole.inc +++ b/mysql-test/include/have_blackhole.inc @@ -1,3 +1,5 @@ -if (`select (support = 'YES' or support = 'DEFAULT')=0 from information_schema.engines where engine = 'blackhole'`){ +if (!`SELECT count(*) FROM information_schema.engines WHERE + (support = 'YES' OR support = 'DEFAULT') AND + engine = 'blackhole'`){ skip Need blackhole engine; } From 71e7862d8563692e77aedf8555f95c5975e965d1 Mon Sep 17 00:00:00 2001 From: "msvensson@shellback.(none)" <> Date: Thu, 13 Dec 2007 17:07:35 +0100 Subject: [PATCH 007/705] Fix faulty select to check for existence of federated support --- mysql-test/suite/federated/have_federated_db.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/federated/have_federated_db.inc b/mysql-test/suite/federated/have_federated_db.inc index 69cb20c46f0..81f49aaa48e 100644 --- a/mysql-test/suite/federated/have_federated_db.inc +++ b/mysql-test/suite/federated/have_federated_db.inc @@ -1,4 +1,6 @@ -if (`select (support = 'YES' or support = 'DEFAULT')=0 from information_schema.engines where engine = 'federated'`) +if (!`SELECT count(*) FROM information_schema.engines WHERE + (support = 'YES' OR support = 'DEFAULT') AND + engine = 'federated'`) { skip Need federated engine; } From 85047bba0560d6687d682b9f77cf2336899cef40 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 19 Dec 2007 09:37:35 +0100 Subject: [PATCH 008/705] BUG#30919 - move tests to main suite --- .../rpl/r/rpl_innodb_bug30919.result => r/innodb_bug30919.result} | 0 .../innodb_bug30919-master.opt} | 0 .../rpl/t/rpl_innodb_bug30919.test => t/innodb_bug30919.test} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename mysql-test/{suite/rpl/r/rpl_innodb_bug30919.result => r/innodb_bug30919.result} (100%) rename mysql-test/{suite/rpl/t/rpl_innodb_bug30919-master.opt => t/innodb_bug30919-master.opt} (100%) rename mysql-test/{suite/rpl/t/rpl_innodb_bug30919.test => t/innodb_bug30919.test} (100%) diff --git a/mysql-test/suite/rpl/r/rpl_innodb_bug30919.result b/mysql-test/r/innodb_bug30919.result similarity index 100% rename from mysql-test/suite/rpl/r/rpl_innodb_bug30919.result rename to mysql-test/r/innodb_bug30919.result diff --git a/mysql-test/suite/rpl/t/rpl_innodb_bug30919-master.opt b/mysql-test/t/innodb_bug30919-master.opt similarity index 100% rename from mysql-test/suite/rpl/t/rpl_innodb_bug30919-master.opt rename to mysql-test/t/innodb_bug30919-master.opt diff --git a/mysql-test/suite/rpl/t/rpl_innodb_bug30919.test b/mysql-test/t/innodb_bug30919.test similarity index 100% rename from mysql-test/suite/rpl/t/rpl_innodb_bug30919.test rename to mysql-test/t/innodb_bug30919.test From f4d93f41bc379e3a271c107d190630b7671861a4 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 19 Dec 2007 09:42:31 +0100 Subject: [PATCH 009/705] Use absolute path to allow tets to be run also when datadir differs --- mysql-test/extra/rpl_tests/rpl_row_001.test | 8 +++++--- mysql-test/suite/rpl/r/rpl_row_001.result | 4 ++-- mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/mysql-test/extra/rpl_tests/rpl_row_001.test b/mysql-test/extra/rpl_tests/rpl_row_001.test index 98746326fb2..8eb684e0dff 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_001.test +++ b/mysql-test/extra/rpl_tests/rpl_row_001.test @@ -1,7 +1,9 @@ +let $LOAD_FILE= $MYSQLTEST_VARDIR/std_data/words.dat; CREATE TABLE t1 (word CHAR(20) NOT NULL); -LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1; ---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR -eval LOAD DATA LOCAL INFILE '$MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1; +--replace_result $LOAD_FILE LOAD_FILE +eval LOAD DATA INFILE '$LOAD_FILE' INTO TABLE t1; +--replace_result $LOAD_FILE LOAD_FILE +eval LOAD DATA INFILE '$LOAD_FILE' INTO TABLE t1; SELECT * FROM t1 ORDER BY word LIMIT 10; # diff --git a/mysql-test/suite/rpl/r/rpl_row_001.result b/mysql-test/suite/rpl/r/rpl_row_001.result index b07a99644fc..0d682eb82e1 100644 --- a/mysql-test/suite/rpl/r/rpl_row_001.result +++ b/mysql-test/suite/rpl/r/rpl_row_001.result @@ -5,8 +5,8 @@ reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; CREATE TABLE t1 (word CHAR(20) NOT NULL); -LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1; -LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1; +LOAD DATA INFILE 'LOAD_FILE' INTO TABLE t1; +LOAD DATA INFILE 'LOAD_FILE' INTO TABLE t1; SELECT * FROM t1 ORDER BY word LIMIT 10; word Aarhus diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result index 21fc33c577f..7f75bdedd65 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result @@ -5,8 +5,8 @@ reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; CREATE TABLE t1 (word CHAR(20) NOT NULL); -LOAD DATA INFILE '../../../std_data/words.dat' INTO TABLE t1; -LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1; +LOAD DATA INFILE 'LOAD_FILE' INTO TABLE t1; +LOAD DATA INFILE 'LOAD_FILE' INTO TABLE t1; SELECT * FROM t1 ORDER BY word LIMIT 10; word Aarhus From 7feb6c1abeda430c3db7fdfe17e578d08139b692 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 19 Dec 2007 10:25:21 +0100 Subject: [PATCH 010/705] Improve --check-testcase --- mysql-test/include/check-testcase.test | 55 ++++++++++++++++---------- mysql-test/mysql-test-run.pl | 15 +++++-- 2 files changed, 46 insertions(+), 24 deletions(-) diff --git a/mysql-test/include/check-testcase.test b/mysql-test/include/check-testcase.test index 5bdbf6cd072..b5d77ba8244 100644 --- a/mysql-test/include/check-testcase.test +++ b/mysql-test/include/check-testcase.test @@ -1,34 +1,47 @@ + # # This test is executed twice for each test case if mysql-test-run is passed -# the flag --check-testcase. -# Before every testcase it's run with mysqltest in record mode and will -# thus produce an output file -# that can be compared to output from after the tescase. -# In that way it's possible to check that a testcase does not have +# the flag --check-testcase. Before every testcase it is run with mysqltest +# in record mode and will thus produce an output file that can be compared +# to output from after the tescase. +# In that way its possible to check that a testcase does not have # any unwanted side affects. # -# -# Dump all global variables -# -show global variables; +# Dump all global variables except those +# that are supposed to change +show global variables where Variable_name != 'timestamp'; -# -# Dump all databases -# +# Dump all databases, there should be none +# except mysql, test and information_schema show databases; -# -# Dump the "test" database, all it's tables and their data -# ---exec $MYSQL_DUMP --skip-comments --skip-lock-tables test +# The test database should not contain any tables +show tables from test; -# -# Dump the "mysql" database and it's tables -# Select data separately to add "order by" -# ---exec $MYSQL_DUMP --skip-comments --skip-lock-tables --no-data mysql +# Dump the "mysql" database and its tables use mysql; +show tables; +show create table columns_priv; +show create table db; +show create table func; +show create table help_category; +show create table help_keyword; +show create table help_relation; +show create table help_relation; +show create table host; +show create table proc; +show create table procs_priv; +show create table tables_priv; +show create table time_zone; +show create table time_zone_leap_second; +show create table time_zone_name; +show create table time_zone_transition; +show create table time_zone_transition_type; +show create table user; + +# Select data from system tables to make sure they have been properly +# restored after test select * from columns_priv; select * from db order by host, db, user; select * from func; diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index b5c122caefc..f47cd9bdc7c 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -149,7 +149,7 @@ my $opt_mtr_build_thread= $ENV{'MTR_BUILD_THREAD'} || "auto"; my $opt_record; my $opt_report_features; -my $opt_check_testcases; +our $opt_check_testcases; my $opt_mark_progress; my $opt_sleep; @@ -2123,6 +2123,7 @@ sub do_before_run_mysqltest($) sub run_check_testcase_all($$) { my ($tinfo, $mode)= @_; + my $result; foreach my $mysqld ( mysqlds() ) { @@ -2132,9 +2133,11 @@ sub run_check_testcase_all($$) { # Check failed, mark the test case with that info $tinfo->{'check_testcase_failed'}= 1; + $result= 1; } } } + return $result; } @@ -2323,7 +2326,12 @@ sub run_testcase ($) { if ( $opt_check_testcases ) { - run_check_testcase_all($tinfo, "after"); + if (run_check_testcase_all($tinfo, "after")) + { + # Stop all servers that are known to be running + stop_all_servers(); + mtr_report("Resuming tests...\n"); + } } } elsif ( $res == 62 ) @@ -2602,7 +2610,8 @@ sub mysqld_arguments ($$$) { } # Check if "extra_opt" contains skip-log-bin - my $skip_binlog= grep(/^(--|--loose-)skip-log-bin/, @$extra_opt, @opt_extra_mysqld_opt); + my $skip_binlog= grep(/^(--|--loose-)skip-log-bin/, + @$extra_opt, @opt_extra_mysqld_opt); if ( $opt_debug ) { From 4c7fea8f9015ad03722baf44e39e2770bb08570d Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 19 Dec 2007 10:30:05 +0100 Subject: [PATCH 011/705] Bug#33361 rpl_row_sp005 fails randomly --- mysql-test/suite/rpl/t/rpl_row_sp005.test | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mysql-test/suite/rpl/t/rpl_row_sp005.test b/mysql-test/suite/rpl/t/rpl_row_sp005.test index acd2f4511a0..a75acbcde7c 100644 --- a/mysql-test/suite/rpl/t/rpl_row_sp005.test +++ b/mysql-test/suite/rpl/t/rpl_row_sp005.test @@ -84,6 +84,7 @@ let $message=< ---- Master selects-- >; --source include/show_msg.inc connection master; CALL test.p1(); + let $wait_condition= SELECT COUNT(*) = 4 FROM t3; --source include/wait_condition.inc SELECT * FROM test.t3 ORDER BY id3; @@ -91,6 +92,8 @@ SELECT * FROM test.t3 ORDER BY id3; let $message=< ---- Slave selects-- >; --source include/show_msg.inc connection slave; +let $wait_condition= SELECT COUNT(*) = 4 FROM t3; +--source include/wait_condition.inc SELECT * FROM test.t3 ORDER BY id3; connection master; From 87283f40cf14189608b0f70f4acfef93d4ab47f2 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 19 Dec 2007 10:32:53 +0100 Subject: [PATCH 012/705] Don't use innodb on slave --- mysql-test/suite/rpl/rpl_1slave_base.cnf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql-test/suite/rpl/rpl_1slave_base.cnf b/mysql-test/suite/rpl/rpl_1slave_base.cnf index 88436224f0b..431315c3f0b 100644 --- a/mysql-test/suite/rpl/rpl_1slave_base.cnf +++ b/mysql-test/suite/rpl/rpl_1slave_base.cnf @@ -45,6 +45,8 @@ slave-load-tmpdir= ../../tmp rpl-recovery-rank= @mysqld.2.server-id +loose-skip-innodb + [ENV] MASTER_MYPORT= @mysqld.1.port From ec886a34c648493fb9c45ac91357492aad3d14b2 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 19 Dec 2007 11:08:41 +0100 Subject: [PATCH 013/705] Use dynamic switch directly from "server_need_restart" for better control of when to do it. Remove #!force-restart and #!fresh-datadir --- mysql-test/mysql-test-run.pl | 110 ++++++++++------------- mysql-test/suite/rpl/rpl_1slave_base.cnf | 6 -- 2 files changed, 47 insertions(+), 69 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index f47cd9bdc7c..59d75855ee2 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2066,33 +2066,26 @@ sub run_testcase_check_skip_test($) return 0; } -sub dynamic_binlog_format_switch { - my ($tinfo)= @_; - # Dynamically switch binlog format started MySQL servers - foreach my $mysqld ( mysqlds() ) - { - # Skip servers that are restarted between each test - next if $mysqld->option('#!force-restart'); - my $sql= "include/set_binlog_format_".$tinfo->{binlog_format_switch}.".sql"; - my $args; - mtr_init_args(\$args); - mtr_add_arg($args, "--defaults-file=%s", $path_config_file); - mtr_add_arg($args, "--defaults-group-suffix=%s", $mysqld->after('mysqld')); - mtr_verbose("Dynamically switching binlog format to:", - $tinfo->{binlog_format_switch}); - my $res= My::SafeProcess->run - ( - name => "switch binlog format ".$mysqld->name(), - path => $exe_mysql, - args => \$args, - input => $sql, +sub dynamic_binlog_format_switch { + my ($tinfo, $mysqld)= @_; + + my $sql= "include/set_binlog_format_".$tinfo->{binlog_format_switch}.".sql"; + my $args; + mtr_init_args(\$args); + mtr_add_arg($args, "--defaults-file=%s", $path_config_file); + mtr_add_arg($args, "--defaults-group-suffix=%s", $mysqld->after('mysqld')); + my $res= My::SafeProcess->run + ( + name => "switch binlog format ".$mysqld->name(), + path => $exe_mysql, + args => \$args, + input => $sql, ); - if ($res != 0) - { - mtr_error("Failed to switch binlog format"); - } + if ($res != 0) + { + mtr_error("Failed to switch binlog format"); } } @@ -2287,11 +2280,6 @@ sub run_testcase ($) { do_before_run_mysqltest($tinfo); - if (defined $tinfo->{binlog_format_switch} ) - { - dynamic_binlog_format_switch($tinfo) - } - if ( $opt_check_testcases ) { run_check_testcase_all($tinfo, "before") @@ -2779,11 +2767,6 @@ sub server_need_restart { return 0; } - if ( $server->option('#!force-restart') ) { - mtr_verbose("Restart: forced in configuration"); - return 1; - } - if ( $tinfo->{'force_restart'} ) { mtr_verbose("Restart: forced in .opt file"); return 1; @@ -2820,31 +2803,38 @@ sub server_need_restart { } } - # Check that running process was started with same options - # as the current test requires - my $extra_opt= get_extra_opt($server, $tinfo); - my $started_opts= $server->{'started_opts'}; - if (defined $started_opts and $extra_opt and - ! mtr_same_opts($started_opts, $extra_opt) ) + my $is_mysqld= grep ($server eq $_, mysqlds()); + if ($is_mysqld) { - # Check if diff is binlog format only - # and the next test has $binlog_format_switch set - my @diff_opts= mtr_diff_opts($started_opts, $extra_opt); - if (@diff_opts == 2 and - $diff_opts[0] =~/^--binlog-format=/ and - $diff_opts[1] =~/^--binlog-format=/ and - defined $tinfo->{binlog_format_switch}) - { - mtr_verbose("Using dynamic switch of binlog format from ", - $diff_opts[0],"to", $diff_opts[1]); - } - else - { - mtr_verbose("Restart: running with different options '" . - join(" ", @{$extra_opt}) . "' != '" . - join(" ", @{$server->{'started_opts'}}) . "'" ); - return 1; + # Check that running process was started with same options + # as the current test requires + my $extra_opt= get_extra_opt($server, $tinfo); + my $started_opts= $server->{'started_opts'}; + if (defined $started_opts and $extra_opt and + ! mtr_same_opts($started_opts, $extra_opt) ) + { + # TODO Use a list to find all options that can be set dynamically + + # Check if diff is binlog format only + # and the next test has $binlog_format_switch set + my @diff_opts= mtr_diff_opts($started_opts, $extra_opt); + if (@diff_opts == 2 and + $diff_opts[0] =~/^--binlog-format=/ and + $diff_opts[1] =~/^--binlog-format=/ and + defined $tinfo->{binlog_format_switch}) + { + mtr_verbose("Using dynamic switch of binlog format from ", + $diff_opts[0],"to", $diff_opts[1]); + dynamic_binlog_format_switch($tinfo, $server); + } + else + { + mtr_verbose("Restart: running with different options '" . + join(" ", @{$extra_opt}) . "' != '" . + join(" ", @{$server->{'started_opts'}}) . "'" ); + return 1; + } } } @@ -2985,12 +2975,6 @@ sub start_servers($) { # Don't delete anything if starting dirty if (!$opt_start_dirty) { - # Remove old datadir before starting process - if ($mysqld->option('#!fresh-datadir') and -d $datadir) { - mtr_debug("Removing old datadir: '$datadir'"); - rmdir($datadir); - } - my @options= ('log-bin', 'relay-log'); foreach my $option_name ( @options ) { diff --git a/mysql-test/suite/rpl/rpl_1slave_base.cnf b/mysql-test/suite/rpl/rpl_1slave_base.cnf index 431315c3f0b..cd902a6483f 100644 --- a/mysql-test/suite/rpl/rpl_1slave_base.cnf +++ b/mysql-test/suite/rpl/rpl_1slave_base.cnf @@ -16,12 +16,6 @@ log-bin= master-bin # starting the mysqld #!use-slave-opt -# Force restart between each test case -#!force-restart - -# Always install a fresh datadir before starting process -#!fresh-datadir - log-bin= slave-bin relay-log= slave-relay-bin From 926f7dec680aa7d616c48eb651ff444d9cbbae44 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 19 Dec 2007 12:58:06 +0100 Subject: [PATCH 014/705] Windows fixeds for mtr --- CMakeLists.txt | 1 + mysql-test/lib/My/Find.pm | 39 +++++++++++++++----- mysql-test/lib/My/SafeProcess.pm | 26 +++++++------ mysql-test/lib/My/SafeProcess/CMakeLists.txt | 17 +++++++++ mysql-test/lib/mtr_misc.pl | 10 ++--- mysql-test/mysql-test-run.pl | 16 ++++---- 6 files changed, 75 insertions(+), 34 deletions(-) create mode 100644 mysql-test/lib/My/SafeProcess/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 341f8d08df2..32eed9d39c7 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -245,3 +245,4 @@ IF(WITH_EMBEDDED_SERVER) ADD_SUBDIRECTORY(libmysqld) ADD_SUBDIRECTORY(libmysqld/examples) ENDIF(WITH_EMBEDDED_SERVER) +ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) diff --git a/mysql-test/lib/My/Find.pm b/mysql-test/lib/My/Find.pm index 8b996ce45a4..4a1fff0fdfc 100644 --- a/mysql-test/lib/My/Find.pm +++ b/mysql-test/lib/My/Find.pm @@ -22,6 +22,7 @@ package My::Find; # use strict; +use Carp; use base qw(Exporter); our @EXPORT= qw(my_find_bin my_find_dir); @@ -29,6 +30,7 @@ our @EXPORT= qw(my_find_bin my_find_dir); our $vs_config_dir; my $is_win= ($^O eq "MSWin32" or $^O eq "Win32"); +my $bin_extension= ".exe" if $is_win; # # my_find_bin - find an executable with "name_1...name_n" in @@ -47,13 +49,13 @@ my $is_win= ($^O eq "MSWin32" or $^O eq "Win32"); # sub my_find_bin { my ($base, $paths, $names)= @_; - die "usage: my_find_bin(, , )" + croak "usage: my_find_bin(, , )" unless @_ == 3; # ------------------------------------------------------- # Find and return the first executable # ------------------------------------------------------- - foreach my $path (my_find_paths($base, $paths, $names)) { + foreach my $path (my_find_paths($base, $paths, $names, $bin_extension)) { return $path if ( -x $path or ($is_win and -f $path) ); } find_error($base, $paths, $names); @@ -78,7 +80,7 @@ sub my_find_bin { # sub my_find_dir { my ($base, $paths, $dirs)= @_; - die "usage: my_find_dir(, [, ])" + croak "usage: my_find_dir(, [, ])" unless (@_ == 3 or @_ == 2); # ------------------------------------------------------- @@ -92,7 +94,7 @@ sub my_find_dir { sub my_find_paths { - my ($base, $paths, $names)= @_; + my ($base, $paths, $names, $extension)= @_; # Convert the arguments into two normal arrays to ease # further mappings @@ -110,13 +112,15 @@ sub my_find_paths { my $build_dir= $vs_config_dir || $ENV{MTR_VS_CONFIG} || $ENV{MTR_BUILD_DIR}; push(@extra_dirs, $build_dir) if defined $build_dir; + if (defined $extension){ + # Append extension to names, if name does not already have extension + map { $_.=$extension unless /\.(.*)+$/ } @names; + } + # ------------------------------------------------------- # Windows specific # ------------------------------------------------------- if ($is_win) { - # Append .exe to names, if name does not already have extension - map { $_.=".exe" unless /\.(.*)+$/ } @names; - # Add the default extra build dirs unless a specific one has # already been selected push(@extra_dirs, @@ -156,6 +160,21 @@ sub my_find_paths { } +sub commify { + return + (@_ == 0) ? '' : + (@_ == 1) ? $_[0] : + (@_ == 2) ? join(" or ", @_) : + join(", ", @_[0..($#_-1)], "or $_[-1]"); + +} + + +sub fnuttify { + return map('\''.$_.'\'', @_); +} + + sub find_error { my ($base, $paths, $names)= @_; @@ -163,9 +182,9 @@ sub find_error { push(@names, ref $names eq "ARRAY" ? @$names : $names); push(@paths, ref $paths eq "ARRAY" ? @$paths : $paths); - die "Could not find ", - join(", ", @names), " in ", - join(", ", my_find_paths($base, $paths, $names)); + croak "** ERROR: Could not find ", + commify(fnuttify(@names)), " in ", + commify(fnuttify(my_find_paths($base, $paths, $names))), "\n"; } 1; diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index 7e1f699ee25..612096cceb7 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -86,23 +86,26 @@ BEGIN { } # Find the safe process binary or script -my $safe_path= $^X; # Path to perl binary -my $safe_script; +my @safe_process_cmd; my $safe_kill; if (IS_WIN32PERL or IS_CYGWIN){ # Use my_safe_process.exe - $safe_path= my_find_bin(("extra","bin"), "my_safe_process.exe"); - die "Could not find my_safe_process.exe" unless $safe_path; + my $exe= my_find_bin(".", "lib/My/SafeProcess", "my_safe_process.exe"); + die "Could not find my_safe_process.exe" unless $exe; + push(@safe_process_cmd, $exe); # Use my_safe_kill.exe - $safe_path= my_find_bin(("extra","bin"), "my_safe_kill"); + my $safe_kill= my_find_bin(".", "lib/My/SafeProcess", "my_safe_kill"); die "Could not find my_safe_kill.exe" unless $safe_kill; } else { # Use safe_process.pl - $safe_script= "lib/My/SafeProcess/safe_process.pl"; - $safe_script= "../$safe_script" unless -f $safe_script; - die "Could not find safe_process.pl" unless -f $safe_script; + my $script= "lib/My/SafeProcess/safe_process.pl"; + $script= "../$script" unless -f $script; + die "Could not find safe_process.pl" unless -f $script; + + # Call $script with Perl interpreter + push(@safe_process_cmd, $^X, $script); } @@ -124,9 +127,9 @@ sub new { my $host = delete($opts{'host'}); my $shutdown = delete($opts{'shutdown'}); - if (defined $host) { - $safe_script= "lib/My/SafeProcess/safe_process_cpcd.pl"; - } +# if (defined $host) { +# $safe_script= "lib/My/SafeProcess/safe_process_cpcd.pl"; +# } if (IS_CYGWIN){ # safe_procss is a windows program and need @@ -138,6 +141,7 @@ sub new { } my @safe_args; + my ($safe_path, $safe_script)= @safe_process_cmd; push(@safe_args, $safe_script) if defined $safe_script; push(@safe_args, "--verbose") if $verbose > 0; diff --git a/mysql-test/lib/My/SafeProcess/CMakeLists.txt b/mysql-test/lib/My/SafeProcess/CMakeLists.txt new file mode 100644 index 00000000000..97fab820f95 --- /dev/null +++ b/mysql-test/lib/My/SafeProcess/CMakeLists.txt @@ -0,0 +1,17 @@ +# Copyright (C) 2006 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +ADD_EXECUTABLE(my_safe_process safe_process_win.cc) +ADD_EXECUTABLE(my_safe_kill safe_kill_win.cc) diff --git a/mysql-test/lib/mtr_misc.pl b/mysql-test/lib/mtr_misc.pl index 95f5bf584f0..3c1d60fd6ab 100644 --- a/mysql-test/lib/mtr_misc.pl +++ b/mysql-test/lib/mtr_misc.pl @@ -49,7 +49,7 @@ sub mtr_native_path($) if ($::mysql_version_id < 50000); $path=~ s/\//\\/g - if ($::glob_win32); + if ($::is_win32); return $path; } @@ -72,7 +72,7 @@ sub mtr_add_arg ($$@) { # Quote args if args contain space $format= "\"$format\"" - if ($::glob_win32 and grep(/\s/, @fargs)); + if ($::is_win32 and grep(/\s/, @fargs)); push(@$args, sprintf($format, @fargs)); } @@ -111,7 +111,7 @@ sub mtr_path_exists (@) { sub mtr_script_exists (@) { foreach my $path ( @_ ) { - if($::glob_win32) + if($::is_win32) { return $path if -f $path; } @@ -151,10 +151,10 @@ sub mtr_file_exists (@) { sub mtr_exe_maybe_exists (@) { my @path= @_; - map {$_.= ".exe"} @path if $::glob_win32; + map {$_.= ".exe"} @path if $::is_win32; foreach my $path ( @path ) { - if($::glob_win32) + if($::is_win32) { return $path if -f $path; } diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index bb9ee1cfba8..8d9d10e7252 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -304,7 +304,7 @@ sub command_line_setup { 'skip-combination' => \&collect_option, # Specify ports - 'mtr-build-thread=i' => \$opt_mtr_build_thread, + 'build-thread|mtr-build-thread=i' => \$opt_mtr_build_thread, # Test case authoring 'record' => \$opt_record, @@ -410,6 +410,11 @@ sub command_line_setup { $basedir= dirname($basedir); } + # -------------------------------------------------------------------------- + # Check mtr_build_thread and calculate baseport + # -------------------------------------------------------------------------- + set_mtr_build_thread_ports($opt_mtr_build_thread); + # # Find the mysqld executable to be able to find the mysqld version # number as early as possible @@ -732,11 +737,6 @@ sub command_line_setup { $path_current_test_log= "$opt_vardir/log/current_test"; $path_ndb_testrun_log= "$opt_vardir/log/ndb_testrun.log"; - # -------------------------------------------------------------------------- - # Check mtr_build_thread and calculate baseport - # -------------------------------------------------------------------------- - set_mtr_build_thread_ports($opt_mtr_build_thread); - } @@ -765,6 +765,7 @@ sub set_mtr_build_thread_ports($) { print "got ".$mtr_build_thread."\n"; } $opt_mtr_build_thread= $mtr_build_thread; + $ENV{MTR_BUILD_THREAD}= $mtr_build_thread; # Calculate baseport $opt_baseport= $mtr_build_thread * 10 + 10000; @@ -3551,9 +3552,8 @@ Options to control what test suites or cases to run Options that specify ports - baseport=PORT Specify the first port number used mtr-build-thread=# Specify unique number to calculate port number(s) from. - Can be set in environment variable MTR_BUILD_THREAD. + build-thread=# Can be set in environment variable MTR_BUILD_THREAD. Set MTR_BUILD_THREAD="auto" to automatically aquire a build thread id that is unique to current host From aeb88d4b7637b9f225d19bdb7333f7467e6f0bfc Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 19 Dec 2007 13:04:54 +0100 Subject: [PATCH 015/705] Properly detect cygwin --- mysql-test/lib/My/Find.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/lib/My/Find.pm b/mysql-test/lib/My/Find.pm index 4a1fff0fdfc..36a08dd6b58 100644 --- a/mysql-test/lib/My/Find.pm +++ b/mysql-test/lib/My/Find.pm @@ -29,7 +29,7 @@ our @EXPORT= qw(my_find_bin my_find_dir); our $vs_config_dir; -my $is_win= ($^O eq "MSWin32" or $^O eq "Win32"); +my $is_win= ($^O eq "MSWin32" or $^O eq "cygwin"); my $bin_extension= ".exe" if $is_win; # From a8210af5b0964253a237e5c83d2e9dcceefec84c Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 19 Dec 2007 14:16:33 +0100 Subject: [PATCH 016/705] Test does not need binlog --- mysql-test/t/innodb_bug30919.test | 1 - 1 file changed, 1 deletion(-) diff --git a/mysql-test/t/innodb_bug30919.test b/mysql-test/t/innodb_bug30919.test index 17d2261e13a..56b2c7bc03d 100644 --- a/mysql-test/t/innodb_bug30919.test +++ b/mysql-test/t/innodb_bug30919.test @@ -1,6 +1,5 @@ --source include/have_innodb.inc --source include/have_partition.inc ---source include/have_log_bin.inc --vertical_results let $engine_type= 'innodb'; From 7cf53b1d89dd807ff0df238333f280bbc6567f0d Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 19 Dec 2007 14:21:09 +0100 Subject: [PATCH 017/705] Update path to master-bin file --- mysql-test/t/mysqlbinlog_base64.test | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mysql-test/t/mysqlbinlog_base64.test b/mysql-test/t/mysqlbinlog_base64.test index 9425fd3301d..71def6a733a 100644 --- a/mysql-test/t/mysqlbinlog_base64.test +++ b/mysql-test/t/mysqlbinlog_base64.test @@ -15,8 +15,9 @@ load data infile '../../std_data/words.dat' into table t2; # # Save binlog # +let $MYSQLD_DATADIR=`select @@datadir`; flush logs; ---exec $MYSQL_BINLOG --hexdump $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql +--exec $MYSQL_BINLOG --hexdump $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql # # Clear database and restore from binlog @@ -51,7 +52,7 @@ insert into t2 select * from t2; select count(*) from t2; flush logs; ---exec $MYSQL_BINLOG --hexdump $MYSQLTEST_VARDIR/log/master-bin.000003 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql +--exec $MYSQL_BINLOG --hexdump $MYSQLD_DATADIR/master-bin.000003 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql --exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql # @@ -62,6 +63,6 @@ select count(*) from t2; # # Test cleanup # ---exec rm $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql +--remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql drop table t1; drop table t2; From d9bdcddc570f48481265dc121eae52368c682a22 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 19 Dec 2007 17:16:22 +0100 Subject: [PATCH 018/705] Update name of binlog file for ndb_binlog* tests --- mysql-test/include/default_mysqld.cnf | 3 + .../suite/ndb/r/ndb_binlog_ddl_multi.result | 114 +++++++++--------- .../suite/ndb/r/ndb_binlog_discover.result | 18 +-- .../suite/ndb/r/ndb_binlog_format.result | 26 ++-- .../suite/ndb/r/ndb_binlog_ignore_db.result | 2 +- .../suite/ndb/r/ndb_binlog_log_bin.result | 96 +++++++-------- .../suite/ndb/r/ndb_binlog_multi.result | 60 ++++----- .../suite/ndb/t/ndb_binlog_discover.test | 2 +- 8 files changed, 162 insertions(+), 159 deletions(-) diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf index 60d12ebe1a6..2f1af5242c6 100644 --- a/mysql-test/include/default_mysqld.cnf +++ b/mysql-test/include/default_mysqld.cnf @@ -16,3 +16,6 @@ max_heap_table_size= 1M loose-innodb_data_file_path= ibdata1:10M:autoextend set-variable= slave_net_timeout=120 + +log-bin + diff --git a/mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result b/mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result index 6631feeaa17..0699f8c4a59 100644 --- a/mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result +++ b/mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result @@ -10,32 +10,32 @@ create table t1 (a int primary key) engine=ndb; create table t2 (a int primary key) engine=ndb; show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin1.000001 # Query 1 # create database mysqltest -master-bin1.000001 # Query 1 # use `mysqltest`; create table t1 (a int primary key) engine=ndb -master-bin1.000001 # Query 102 # use `test`; create table t2 (a int primary key) engine=ndb +mysqld-bin.000001 # Query 1 # create database mysqltest +mysqld-bin.000001 # Query 1 # use `mysqltest`; create table t1 (a int primary key) engine=ndb +mysqld-bin.000001 # Query 2 # use `test`; create table t2 (a int primary key) engine=ndb show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query 1 # create database mysqltest -master-bin.000001 # Query 1 # use `mysqltest`; create table t1 (a int primary key) engine=ndb -master-bin.000001 # Query 102 # use `test`; create table t2 (a int primary key) engine=ndb +mysqld-bin.000001 # Query 1 # create database mysqltest +mysqld-bin.000001 # Query 1 # use `mysqltest`; create table t1 (a int primary key) engine=ndb +mysqld-bin.000001 # Query 2 # use `test`; create table t2 (a int primary key) engine=ndb reset master; reset master; alter table t2 add column (b int); show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query 102 # use `test`; alter table t2 add column (b int) +mysqld-bin.000001 # Query 2 # use `test`; alter table t2 add column (b int) reset master; reset master; ALTER DATABASE mysqltest CHARACTER SET latin1; drop table mysqltest.t1; show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query 102 # ALTER DATABASE mysqltest CHARACTER SET latin1 -master-bin.000001 # Query 102 # use `mysqltest`; drop table `t1` +mysqld-bin.000001 # Query 2 # ALTER DATABASE mysqltest CHARACTER SET latin1 +mysqld-bin.000001 # Query 2 # use `mysqltest`; drop table `t1` show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query 102 # ALTER DATABASE mysqltest CHARACTER SET latin1 -master-bin.000001 # Query 102 # use `mysqltest`; drop table `t1` +mysqld-bin.000001 # Query 2 # ALTER DATABASE mysqltest CHARACTER SET latin1 +mysqld-bin.000001 # Query 2 # use `mysqltest`; drop table `t1` reset master; reset master; use test; @@ -44,14 +44,14 @@ drop database mysqltest; create table t1 (a int primary key) engine=ndb; show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin1.000001 # Query 102 # BEGIN -master-bin1.000001 # Table_map 102 # table_id: # (test.t2) -master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status) -master-bin1.000001 # Write_rows 102 # table_id: # -master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F -master-bin1.000001 # Query 102 # COMMIT -master-bin1.000001 # Query 1 # drop database mysqltest -master-bin1.000001 # Query 1 # use `test`; create table t1 (a int primary key) engine=ndb +mysqld-bin.000001 # Query 2 # BEGIN +mysqld-bin.000001 # Table_map 2 # table_id: # (test.t2) +mysqld-bin.000001 # Table_map 2 # table_id: # (mysql.ndb_apply_status) +mysqld-bin.000001 # Write_rows 2 # table_id: # +mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query 2 # COMMIT +mysqld-bin.000001 # Query 1 # drop database mysqltest +mysqld-bin.000001 # Query 1 # use `test`; create table t1 (a int primary key) engine=ndb drop table t2; reset master; reset master; @@ -85,63 +85,63 @@ DROP LOGFILE GROUP lg1 ENGINE =NDB; show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin1.000001 # Query 1 # CREATE LOGFILE GROUP lg1 +mysqld-bin.000001 # Query 1 # CREATE LOGFILE GROUP lg1 ADD UNDOFILE 'undofile.dat' INITIAL_SIZE 16M UNDO_BUFFER_SIZE = 1M ENGINE=NDB -master-bin1.000001 # Query 1 # ALTER LOGFILE GROUP lg1 +mysqld-bin.000001 # Query 1 # ALTER LOGFILE GROUP lg1 ADD UNDOFILE 'undofile02.dat' INITIAL_SIZE = 4M ENGINE=NDB -master-bin1.000001 # Query 1 # CREATE TABLESPACE ts1 +mysqld-bin.000001 # Query 1 # CREATE TABLESPACE ts1 ADD DATAFILE 'datafile.dat' USE LOGFILE GROUP lg1 INITIAL_SIZE 12M ENGINE NDB -master-bin1.000001 # Query 1 # ALTER TABLESPACE ts1 +mysqld-bin.000001 # Query 1 # ALTER TABLESPACE ts1 ADD DATAFILE 'datafile02.dat' INITIAL_SIZE = 4M ENGINE=NDB -master-bin1.000001 # Query 1 # ALTER TABLESPACE ts1 +mysqld-bin.000001 # Query 1 # ALTER TABLESPACE ts1 DROP DATAFILE 'datafile.dat' ENGINE = NDB -master-bin1.000001 # Query 1 # ALTER TABLESPACE ts1 +mysqld-bin.000001 # Query 1 # ALTER TABLESPACE ts1 DROP DATAFILE 'datafile02.dat' ENGINE = NDB -master-bin1.000001 # Query 1 # DROP TABLESPACE ts1 +mysqld-bin.000001 # Query 1 # DROP TABLESPACE ts1 ENGINE = NDB -master-bin1.000001 # Query 1 # DROP LOGFILE GROUP lg1 +mysqld-bin.000001 # Query 1 # DROP LOGFILE GROUP lg1 ENGINE =NDB show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin1.000001 # Query 1 # CREATE LOGFILE GROUP lg1 +mysqld-bin.000001 # Query 1 # CREATE LOGFILE GROUP lg1 ADD UNDOFILE 'undofile.dat' INITIAL_SIZE 16M UNDO_BUFFER_SIZE = 1M ENGINE=NDB -master-bin1.000001 # Query 1 # ALTER LOGFILE GROUP lg1 +mysqld-bin.000001 # Query 1 # ALTER LOGFILE GROUP lg1 ADD UNDOFILE 'undofile02.dat' INITIAL_SIZE = 4M ENGINE=NDB -master-bin1.000001 # Query 1 # CREATE TABLESPACE ts1 +mysqld-bin.000001 # Query 1 # CREATE TABLESPACE ts1 ADD DATAFILE 'datafile.dat' USE LOGFILE GROUP lg1 INITIAL_SIZE 12M ENGINE NDB -master-bin1.000001 # Query 1 # ALTER TABLESPACE ts1 +mysqld-bin.000001 # Query 1 # ALTER TABLESPACE ts1 ADD DATAFILE 'datafile02.dat' INITIAL_SIZE = 4M ENGINE=NDB -master-bin1.000001 # Query 1 # ALTER TABLESPACE ts1 +mysqld-bin.000001 # Query 1 # ALTER TABLESPACE ts1 DROP DATAFILE 'datafile.dat' ENGINE = NDB -master-bin1.000001 # Query 1 # ALTER TABLESPACE ts1 +mysqld-bin.000001 # Query 1 # ALTER TABLESPACE ts1 DROP DATAFILE 'datafile02.dat' ENGINE = NDB -master-bin1.000001 # Query 1 # DROP TABLESPACE ts1 +mysqld-bin.000001 # Query 1 # DROP TABLESPACE ts1 ENGINE = NDB -master-bin1.000001 # Query 1 # DROP LOGFILE GROUP lg1 +mysqld-bin.000001 # Query 1 # DROP LOGFILE GROUP lg1 ENGINE =NDB drop table t1; reset master; @@ -156,13 +156,13 @@ create table t3 (a int key) engine=ndb; rename table t3 to t4, t2 to t3, t1 to t2, t4 to t1; show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin1.000001 # Query 1 # use `test`; create table t1 (a int key) engine=ndb -master-bin1.000001 # Query 1 # use `test`; create table t2 (a int key) engine=ndb -master-bin1.000001 # Query 1 # use `test`; create table t3 (a int key) engine=ndb -master-bin1.000001 # Query 1 # use `test`; rename table `test.t3` to `test.t4` -master-bin1.000001 # Query 1 # use `test`; rename table `test.t2` to `test.t3` -master-bin1.000001 # Query 1 # use `test`; rename table `test.t1` to `test.t2` -master-bin1.000001 # Query 1 # use `test`; rename table `test.t4` to `test.t1` +mysqld-bin.000001 # Query 1 # use `test`; create table t1 (a int key) engine=ndb +mysqld-bin.000001 # Query 1 # use `test`; create table t2 (a int key) engine=ndb +mysqld-bin.000001 # Query 1 # use `test`; create table t3 (a int key) engine=ndb +mysqld-bin.000001 # Query 1 # use `test`; rename table `test.t3` to `test.t4` +mysqld-bin.000001 # Query 1 # use `test`; rename table `test.t2` to `test.t3` +mysqld-bin.000001 # Query 1 # use `test`; rename table `test.t1` to `test.t2` +mysqld-bin.000001 # Query 1 # use `test`; rename table `test.t4` to `test.t1` drop table t1; drop table t2; drop table t3; @@ -179,18 +179,18 @@ insert into t2 values(2); drop table t2; show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin1.000001 # Query 1 # use `test`; create table t1 (a int key) engine=ndb -master-bin1.000001 # Query 102 # BEGIN -master-bin1.000001 # Table_map 102 # table_id: # (test.t1) -master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status) -master-bin1.000001 # Write_rows 102 # table_id: # -master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F -master-bin1.000001 # Query 102 # COMMIT -master-bin1.000001 # Query 1 # use `test`; rename table `test.t1` to `test.t2` -master-bin1.000001 # Query 102 # BEGIN -master-bin1.000001 # Table_map 102 # table_id: # (test.t2) -master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status) -master-bin1.000001 # Write_rows 102 # table_id: # -master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F -master-bin1.000001 # Query 102 # COMMIT -master-bin1.000001 # Query 102 # use `test`; drop table t2 +mysqld-bin.000001 # Query 1 # use `test`; create table t1 (a int key) engine=ndb +mysqld-bin.000001 # Query 2 # BEGIN +mysqld-bin.000001 # Table_map 2 # table_id: # (test.t1) +mysqld-bin.000001 # Table_map 2 # table_id: # (mysql.ndb_apply_status) +mysqld-bin.000001 # Write_rows 2 # table_id: # +mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query 2 # COMMIT +mysqld-bin.000001 # Query 1 # use `test`; rename table `test.t1` to `test.t2` +mysqld-bin.000001 # Query 2 # BEGIN +mysqld-bin.000001 # Table_map 2 # table_id: # (test.t2) +mysqld-bin.000001 # Table_map 2 # table_id: # (mysql.ndb_apply_status) +mysqld-bin.000001 # Write_rows 2 # table_id: # +mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query 2 # COMMIT +mysqld-bin.000001 # Query 2 # use `test`; drop table t2 diff --git a/mysql-test/suite/ndb/r/ndb_binlog_discover.result b/mysql-test/suite/ndb/r/ndb_binlog_discover.result index 7c3a976c4d5..f8704971878 100644 --- a/mysql-test/suite/ndb/r/ndb_binlog_discover.result +++ b/mysql-test/suite/ndb/r/ndb_binlog_discover.result @@ -3,15 +3,15 @@ create table t1 (a int key) engine=ndb; reset master; show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Incident 1 # #1 (LOST_EVENTS) -master-bin.000001 # Rotate 1 # master-bin.000002;pos=4 -PURGE MASTER LOGS TO 'master-bin.000002'; +mysqld-bin.000001 # Incident 1 # #1 (LOST_EVENTS) +mysqld-bin.000001 # Rotate 1 # mysqld-bin.000002;pos=4 +PURGE MASTER LOGS TO 'mysqld-bin.000002'; show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000002 # Query 1 # BEGIN -master-bin.000002 # Table_map 1 # table_id: # (test.t1) -master-bin.000002 # Table_map 1 # table_id: # (mysql.ndb_apply_status) -master-bin.000002 # Write_rows 1 # table_id: # -master-bin.000002 # Write_rows 1 # table_id: # flags: STMT_END_F -master-bin.000002 # Query 1 # COMMIT +mysqld-bin.000002 # Query 1 # BEGIN +mysqld-bin.000002 # Table_map 1 # table_id: # (test.t1) +mysqld-bin.000002 # Table_map 1 # table_id: # (mysql.ndb_apply_status) +mysqld-bin.000002 # Write_rows 1 # table_id: # +mysqld-bin.000002 # Write_rows 1 # table_id: # flags: STMT_END_F +mysqld-bin.000002 # Query 1 # COMMIT drop table t1; diff --git a/mysql-test/suite/ndb/r/ndb_binlog_format.result b/mysql-test/suite/ndb/r/ndb_binlog_format.result index ed26060e2a4..21240c243f7 100644 --- a/mysql-test/suite/ndb/r/ndb_binlog_format.result +++ b/mysql-test/suite/ndb/r/ndb_binlog_format.result @@ -14,17 +14,17 @@ UPDATE t3, t2 SET e = 2, b = 3 WHERE f = c; COMMIT; show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (1,2), (2,1), (2,2) -master-bin.000001 # Query # # use `test`; INSERT INTO t2 VALUES (1,1), (1,2), (2,1), (2,2) -master-bin.000001 # Query # # use `test`; UPDATE t1, t2 SET m = 2, b = 3 WHERE n = c -master-bin.000001 # Query # # use `test`; BEGIN -master-bin.000001 # Query # # use `test`; INSERT INTO t3 VALUES (1,1), (1,2), (2,1), (2,2) -master-bin.000001 # Query # # use `test`; UPDATE t1, t3 SET m = 2, e = 3 WHERE n = f -master-bin.000001 # Query # # use `test`; UPDATE t3, t2 SET e = 2, b = 3 WHERE f = c -master-bin.000001 # Query # # use `test`; COMMIT -master-bin.000001 # Query # # BEGIN -master-bin.000001 # Table_map # # table_id: # (test.t3) -master-bin.000001 # Table_map # # table_id: # (mysql.ndb_apply_status) -master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F -master-bin.000001 # Query # # COMMIT +mysqld-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (1,2), (2,1), (2,2) +mysqld-bin.000001 # Query # # use `test`; INSERT INTO t2 VALUES (1,1), (1,2), (2,1), (2,2) +mysqld-bin.000001 # Query # # use `test`; UPDATE t1, t2 SET m = 2, b = 3 WHERE n = c +mysqld-bin.000001 # Query # # use `test`; BEGIN +mysqld-bin.000001 # Query # # use `test`; INSERT INTO t3 VALUES (1,1), (1,2), (2,1), (2,2) +mysqld-bin.000001 # Query # # use `test`; UPDATE t1, t3 SET m = 2, e = 3 WHERE n = f +mysqld-bin.000001 # Query # # use `test`; UPDATE t3, t2 SET e = 2, b = 3 WHERE f = c +mysqld-bin.000001 # Query # # use `test`; COMMIT +mysqld-bin.000001 # Query # # BEGIN +mysqld-bin.000001 # Table_map # # table_id: # (test.t3) +mysqld-bin.000001 # Table_map # # table_id: # (mysql.ndb_apply_status) +mysqld-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query # # COMMIT DROP TABLE t1, t2, t3; diff --git a/mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result b/mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result index e4c9faa802c..d018f67dd71 100644 --- a/mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result +++ b/mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result @@ -7,5 +7,5 @@ create table t1 (a int primary key, b int) engine=ndb; insert into t1 values (1, 1); show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query 1 # use `test`; drop table if exists t1 +mysqld-bin.000001 # Query 1 # use `test`; drop table if exists t1 drop database mysqltest; diff --git a/mysql-test/suite/ndb/r/ndb_binlog_log_bin.result b/mysql-test/suite/ndb/r/ndb_binlog_log_bin.result index f80a46324e0..0260d49f75f 100644 --- a/mysql-test/suite/ndb/r/ndb_binlog_log_bin.result +++ b/mysql-test/suite/ndb/r/ndb_binlog_log_bin.result @@ -11,27 +11,27 @@ insert into t1 values (1,1); alter table t1 add c int; show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query 1 # BEGIN -master-bin.000001 # Table_map 1 # table_id: # (mysqltest.t1) -master-bin.000001 # Table_map 1 # table_id: # (mysql.ndb_apply_status) -master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F -master-bin.000001 # Query 1 # COMMIT +mysqld-bin.000001 # Query 1 # BEGIN +mysqld-bin.000001 # Table_map 1 # table_id: # (mysqltest.t1) +mysqld-bin.000001 # Table_map 1 # table_id: # (mysql.ndb_apply_status) +mysqld-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query 1 # COMMIT reset master; use mysqltest; insert into t2 values (1,1); show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin1.000001 # Query 102 # BEGIN -master-bin1.000001 # Table_map 102 # table_id: # (mysqltest.t1) -master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status) -master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F -master-bin1.000001 # Query 102 # COMMIT -master-bin1.000001 # Query 102 # BEGIN -master-bin1.000001 # Table_map 102 # table_id: # (mysqltest.t2) -master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status) -master-bin1.000001 # Write_rows 102 # table_id: # -master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F -master-bin1.000001 # Query 102 # COMMIT +mysqld-bin.000001 # Query 2 # BEGIN +mysqld-bin.000001 # Table_map 2 # table_id: # (mysqltest.t1) +mysqld-bin.000001 # Table_map 2 # table_id: # (mysql.ndb_apply_status) +mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query 2 # COMMIT +mysqld-bin.000001 # Query 2 # BEGIN +mysqld-bin.000001 # Table_map 2 # table_id: # (mysqltest.t2) +mysqld-bin.000001 # Table_map 2 # table_id: # (mysql.ndb_apply_status) +mysqld-bin.000001 # Write_rows 2 # table_id: # +mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query 2 # COMMIT reset master; use mysqltest; drop table t1; @@ -41,40 +41,40 @@ create table t2 (d int key, e int) engine=ndb; insert into t1 values (1,1); show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query 1 # BEGIN -master-bin.000001 # Table_map 1 # table_id: # (mysqltest.t2) -master-bin.000001 # Table_map 1 # table_id: # (mysql.ndb_apply_status) -master-bin.000001 # Write_rows 1 # table_id: # -master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F -master-bin.000001 # Query 1 # COMMIT -master-bin.000001 # Query 1 # use `mysqltest`; drop table t1 -master-bin.000001 # Query 1 # use `mysqltest`; drop table t2 -master-bin.000001 # Query 1 # use `mysqltest`; create table t1 (d int key, e int) engine=ndb -master-bin.000001 # Query 1 # use `mysqltest`; create table t2 (d int key, e int) engine=ndb -master-bin.000001 # Query 1 # BEGIN -master-bin.000001 # Table_map 1 # table_id: # (mysqltest.t1) -master-bin.000001 # Table_map 1 # table_id: # (mysql.ndb_apply_status) -master-bin.000001 # Write_rows 1 # table_id: # -master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F -master-bin.000001 # Query 1 # COMMIT +mysqld-bin.000001 # Query 1 # BEGIN +mysqld-bin.000001 # Table_map 1 # table_id: # (mysqltest.t2) +mysqld-bin.000001 # Table_map 1 # table_id: # (mysql.ndb_apply_status) +mysqld-bin.000001 # Write_rows 1 # table_id: # +mysqld-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query 1 # COMMIT +mysqld-bin.000001 # Query 1 # use `mysqltest`; drop table t1 +mysqld-bin.000001 # Query 1 # use `mysqltest`; drop table t2 +mysqld-bin.000001 # Query 1 # use `mysqltest`; create table t1 (d int key, e int) engine=ndb +mysqld-bin.000001 # Query 1 # use `mysqltest`; create table t2 (d int key, e int) engine=ndb +mysqld-bin.000001 # Query 1 # BEGIN +mysqld-bin.000001 # Table_map 1 # table_id: # (mysqltest.t1) +mysqld-bin.000001 # Table_map 1 # table_id: # (mysql.ndb_apply_status) +mysqld-bin.000001 # Write_rows 1 # table_id: # +mysqld-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query 1 # COMMIT use mysqltest; insert into t2 values (1,1); show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin1.000001 # Query 1 # use `mysqltest`; drop table `t1` -master-bin1.000001 # Query 1 # use `mysqltest`; drop table `t2` -master-bin1.000001 # Query 1 # use `mysqltest`; create table t1 (d int key, e int) engine=ndb -master-bin1.000001 # Query 1 # use `mysqltest`; create table t2 (d int key, e int) engine=ndb -master-bin1.000001 # Query 102 # BEGIN -master-bin1.000001 # Table_map 102 # table_id: # (mysqltest.t1) -master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status) -master-bin1.000001 # Write_rows 102 # table_id: # -master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F -master-bin1.000001 # Query 102 # COMMIT -master-bin1.000001 # Query 102 # BEGIN -master-bin1.000001 # Table_map 102 # table_id: # (mysqltest.t2) -master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status) -master-bin1.000001 # Write_rows 102 # table_id: # -master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F -master-bin1.000001 # Query 102 # COMMIT +mysqld-bin.000001 # Query 1 # use `mysqltest`; drop table `t1` +mysqld-bin.000001 # Query 1 # use `mysqltest`; drop table `t2` +mysqld-bin.000001 # Query 1 # use `mysqltest`; create table t1 (d int key, e int) engine=ndb +mysqld-bin.000001 # Query 1 # use `mysqltest`; create table t2 (d int key, e int) engine=ndb +mysqld-bin.000001 # Query 2 # BEGIN +mysqld-bin.000001 # Table_map 2 # table_id: # (mysqltest.t1) +mysqld-bin.000001 # Table_map 2 # table_id: # (mysql.ndb_apply_status) +mysqld-bin.000001 # Write_rows 2 # table_id: # +mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query 2 # COMMIT +mysqld-bin.000001 # Query 2 # BEGIN +mysqld-bin.000001 # Table_map 2 # table_id: # (mysqltest.t2) +mysqld-bin.000001 # Table_map 2 # table_id: # (mysql.ndb_apply_status) +mysqld-bin.000001 # Write_rows 2 # table_id: # +mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query 2 # COMMIT drop database mysqltest; diff --git a/mysql-test/suite/ndb/r/ndb_binlog_multi.result b/mysql-test/suite/ndb/r/ndb_binlog_multi.result index b2a9da39be0..e1af4aea092 100644 --- a/mysql-test/suite/ndb/r/ndb_binlog_multi.result +++ b/mysql-test/suite/ndb/r/ndb_binlog_multi.result @@ -8,13 +8,13 @@ CREATE TABLE t2 (a INT PRIMARY KEY, b int) ENGINE = NDB; INSERT INTO t2 VALUES (1,1),(2,2); show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin1.000001 # Query 102 # use `test`; CREATE TABLE t2 (a INT PRIMARY KEY, b int) ENGINE = NDB -master-bin1.000001 # Query 102 # BEGIN -master-bin1.000001 # Table_map 102 # table_id: # (test.t2) -master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status) -master-bin1.000001 # Write_rows 102 # table_id: # -master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F -master-bin1.000001 # Query 102 # COMMIT +mysqld-bin.000001 # Query 2 # use `test`; CREATE TABLE t2 (a INT PRIMARY KEY, b int) ENGINE = NDB +mysqld-bin.000001 # Query 2 # BEGIN +mysqld-bin.000001 # Table_map 2 # table_id: # (test.t2) +mysqld-bin.000001 # Table_map 2 # table_id: # (mysql.ndb_apply_status) +mysqld-bin.000001 # Write_rows 2 # table_id: # +mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query 2 # COMMIT select * from t2 order by a; a b 1 1 @@ -30,14 +30,14 @@ a b DROP TABLE t2; show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query 102 # use `test`; CREATE TABLE t2 (a INT PRIMARY KEY, b int) ENGINE = NDB -master-bin.000001 # Query 1 # BEGIN -master-bin.000001 # Table_map 1 # table_id: # (test.t2) -master-bin.000001 # Table_map 1 # table_id: # (mysql.ndb_apply_status) -master-bin.000001 # Write_rows 1 # table_id: # -master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F -master-bin.000001 # Query 1 # COMMIT -master-bin.000001 # Query 1 # use `test`; DROP TABLE t2 +mysqld-bin.000001 # Query 2 # use `test`; CREATE TABLE t2 (a INT PRIMARY KEY, b int) ENGINE = NDB +mysqld-bin.000001 # Query 1 # BEGIN +mysqld-bin.000001 # Table_map 1 # table_id: # (test.t2) +mysqld-bin.000001 # Table_map 1 # table_id: # (mysql.ndb_apply_status) +mysqld-bin.000001 # Write_rows 1 # table_id: # +mysqld-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query 1 # COMMIT +mysqld-bin.000001 # Query 1 # use `test`; DROP TABLE t2 SELECT inserts,updates,deletes,schemaops FROM mysql.ndb_binlog_index WHERE epoch=; inserts updates deletes schemaops @@ -48,13 +48,13 @@ CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE = NDB; INSERT INTO t1 VALUES (1),(2); show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin1.000001 # Query 102 # use `test`; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE = NDB -master-bin1.000001 # Query 102 # BEGIN -master-bin1.000001 # Table_map 102 # table_id: # (test.t1) -master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status) -master-bin1.000001 # Write_rows 102 # table_id: # -master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F -master-bin1.000001 # Query 102 # COMMIT +mysqld-bin.000001 # Query 2 # use `test`; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE = NDB +mysqld-bin.000001 # Query 2 # BEGIN +mysqld-bin.000001 # Table_map 2 # table_id: # (test.t1) +mysqld-bin.000001 # Table_map 2 # table_id: # (mysql.ndb_apply_status) +mysqld-bin.000001 # Write_rows 2 # table_id: # +mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query 2 # COMMIT SELECT @the_epoch2:=epoch,inserts,updates,deletes,schemaops FROM mysql.ndb_binlog_index ORDER BY epoch DESC LIMIT 1; @the_epoch2:=epoch inserts updates deletes schemaops @@ -66,14 +66,14 @@ inserts updates deletes schemaops drop table t1; show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin1.000001 # Query 102 # use `test`; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE = NDB -master-bin1.000001 # Query 102 # BEGIN -master-bin1.000001 # Table_map 102 # table_id: # (test.t1) -master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status) -master-bin1.000001 # Write_rows 102 # table_id: # -master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F -master-bin1.000001 # Query 102 # COMMIT -master-bin1.000001 # Query 102 # use `test`; drop table t1 +mysqld-bin.000001 # Query 2 # use `test`; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE = NDB +mysqld-bin.000001 # Query 2 # BEGIN +mysqld-bin.000001 # Table_map 2 # table_id: # (test.t1) +mysqld-bin.000001 # Table_map 2 # table_id: # (mysql.ndb_apply_status) +mysqld-bin.000001 # Write_rows 2 # table_id: # +mysqld-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query 2 # COMMIT +mysqld-bin.000001 # Query 2 # use `test`; drop table t1 SELECT inserts,updates,deletes,schemaops FROM mysql.ndb_binlog_index WHERE epoch > AND epoch <= ; inserts updates deletes schemaops diff --git a/mysql-test/suite/ndb/t/ndb_binlog_discover.test b/mysql-test/suite/ndb/t/ndb_binlog_discover.test index e842b57093a..dc8275a8a39 100644 --- a/mysql-test/suite/ndb/t/ndb_binlog_discover.test +++ b/mysql-test/suite/ndb/t/ndb_binlog_discover.test @@ -30,7 +30,7 @@ while ($mysql_errno) --enable_query_log --source include/show_binlog_events2.inc -PURGE MASTER LOGS TO 'master-bin.000002'; +PURGE MASTER LOGS TO 'mysqld-bin.000002'; --source include/show_binlog_events2.inc drop table t1; From f32e0b0bf855f55bcaa94ce95c37e6e1580dea40 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 19 Dec 2007 17:26:43 +0100 Subject: [PATCH 019/705] Update location of binlog --- mysql-test/t/mysqlbinlog_base64.test | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mysql-test/t/mysqlbinlog_base64.test b/mysql-test/t/mysqlbinlog_base64.test index 9425fd3301d..71def6a733a 100644 --- a/mysql-test/t/mysqlbinlog_base64.test +++ b/mysql-test/t/mysqlbinlog_base64.test @@ -15,8 +15,9 @@ load data infile '../../std_data/words.dat' into table t2; # # Save binlog # +let $MYSQLD_DATADIR=`select @@datadir`; flush logs; ---exec $MYSQL_BINLOG --hexdump $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql +--exec $MYSQL_BINLOG --hexdump $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql # # Clear database and restore from binlog @@ -51,7 +52,7 @@ insert into t2 select * from t2; select count(*) from t2; flush logs; ---exec $MYSQL_BINLOG --hexdump $MYSQLTEST_VARDIR/log/master-bin.000003 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql +--exec $MYSQL_BINLOG --hexdump $MYSQLD_DATADIR/master-bin.000003 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql --exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql # @@ -62,6 +63,6 @@ select count(*) from t2; # # Test cleanup # ---exec rm $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql +--remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql drop table t1; drop table t2; From d930e9bb22166091b1c282e47143e4660926a3cd Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 20 Dec 2007 18:38:23 +0100 Subject: [PATCH 020/705] Update path to the load_file --- mysql-test/extra/rpl_tests/rpl_log.test | 7 ++++++- mysql-test/include/wait_show_pattern.inc | 2 +- mysql-test/suite/rpl/r/rpl_row_log.result | 2 +- mysql-test/suite/rpl/r/rpl_row_log_innodb.result | 2 +- mysql-test/suite/rpl/r/rpl_stm_log.result | 2 +- mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/mysql-test/extra/rpl_tests/rpl_log.test b/mysql-test/extra/rpl_tests/rpl_log.test index eaf93789fe4..017477fc959 100644 --- a/mysql-test/extra/rpl_tests/rpl_log.test +++ b/mysql-test/extra/rpl_tests/rpl_log.test @@ -32,8 +32,13 @@ reset master; eval create table t1(n int not null auto_increment primary key)ENGINE=$engine_type; insert into t1 values (NULL); drop table t1; +let $LOAD_FILE= ../../std_data/words.dat; +if (!`SELECT length(load_file('$LOAD_FILE'))`){ + let $LOAD_FILE= ../$LOAD_FILE; +} eval create table t1 (word char(20) not null)ENGINE=$engine_type; -load data infile '../../std_data/words.dat' into table t1 ignore 1 lines; +--replace_result $LOAD_FILE LOAD_FILE +eval load data infile '$LOAD_FILE' into table t1 ignore 1 lines; select count(*) from t1; --replace_result $VERSION VERSION --replace_column 2 # 5 # diff --git a/mysql-test/include/wait_show_pattern.inc b/mysql-test/include/wait_show_pattern.inc index c9f84ce7f08..d1fbbfe8e3e 100644 --- a/mysql-test/include/wait_show_pattern.inc +++ b/mysql-test/include/wait_show_pattern.inc @@ -32,7 +32,7 @@ let $wait_counter= 150; while ($wait_counter) { let $result= `SHOW $show_type`; - let $success= `SELECT '$result' LIKE $show_pattern`; + let $success= `SELECT "$result" LIKE $show_pattern`; if ($success) { let $wait_counter= 0; diff --git a/mysql-test/suite/rpl/r/rpl_row_log.result b/mysql-test/suite/rpl/r/rpl_row_log.result index c5e9cebcf23..02e0ce28c33 100644 --- a/mysql-test/suite/rpl/r/rpl_row_log.result +++ b/mysql-test/suite/rpl/r/rpl_row_log.result @@ -12,7 +12,7 @@ create table t1(n int not null auto_increment primary key)ENGINE=MyISAM; insert into t1 values (NULL); drop table t1; create table t1 (word char(20) not null)ENGINE=MyISAM; -load data infile '../../std_data/words.dat' into table t1 ignore 1 lines; +load data infile 'LOAD_FILE' into table t1 ignore 1 lines; select count(*) from t1; count(*) 69 diff --git a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result index 6ea0532fe25..c186f3e22f8 100644 --- a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result +++ b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result @@ -12,7 +12,7 @@ create table t1(n int not null auto_increment primary key)ENGINE=InnoDB; insert into t1 values (NULL); drop table t1; create table t1 (word char(20) not null)ENGINE=InnoDB; -load data infile '../../std_data/words.dat' into table t1 ignore 1 lines; +load data infile 'LOAD_FILE' into table t1 ignore 1 lines; select count(*) from t1; count(*) 69 diff --git a/mysql-test/suite/rpl/r/rpl_stm_log.result b/mysql-test/suite/rpl/r/rpl_stm_log.result index 3bbb60feca7..e2553d3939d 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_log.result +++ b/mysql-test/suite/rpl/r/rpl_stm_log.result @@ -12,7 +12,7 @@ create table t1(n int not null auto_increment primary key)ENGINE=MyISAM; insert into t1 values (NULL); drop table t1; create table t1 (word char(20) not null)ENGINE=MyISAM; -load data infile '../../std_data/words.dat' into table t1 ignore 1 lines; +load data infile 'LOAD_FILE' into table t1 ignore 1 lines; select count(*) from t1; count(*) 69 diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result index 438bdf91c09..16b097e0846 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result @@ -12,7 +12,7 @@ create table t1(n int not null auto_increment primary key)ENGINE=NDB; insert into t1 values (NULL); drop table t1; create table t1 (word char(20) not null)ENGINE=NDB; -load data infile '../../../std_data/words.dat' into table t1 ignore 1 lines; +load data infile 'LOAD_FILE' into table t1 ignore 1 lines; select count(*) from t1; count(*) 69 From 8b3d267eea95f1b6ab2eaa76e3736562ac158bbb Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 20 Dec 2007 18:39:33 +0100 Subject: [PATCH 021/705] Don't use Getopt::Long in safe_process.pl --- mysql-test/lib/My/SafeProcess/safe_process.pl | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/mysql-test/lib/My/SafeProcess/safe_process.pl b/mysql-test/lib/My/SafeProcess/safe_process.pl index 707f78d36bd..e3114a749d3 100644 --- a/mysql-test/lib/My/SafeProcess/safe_process.pl +++ b/mysql-test/lib/My/SafeProcess/safe_process.pl @@ -4,7 +4,6 @@ use strict; use warnings; -use Time::localtime; use lib 'lib'; use My::SafeProcess::Base; use POSIX qw(WNOHANG); @@ -19,6 +18,7 @@ use POSIX qw(WNOHANG); my $verbose= 0; sub message { if ($verbose > 0){ + use Time::localtime; my $tm= localtime(); my $timestamp= sprintf("%02d%02d%02d %2d:%02d:%02d", $tm->year % 100, $tm->mon+1, $tm->mday, @@ -43,16 +43,26 @@ $SIG{INT}= sub { message("!Got signal @_"); $terminated= 1; }; my $parent_pid= getppid(); -use Getopt::Long; -GetOptions( - 'verbose' => \$verbose, - ) or die "GetOptions failed"; -shift(@ARGV) if defined($ARGV[0]) and $ARGV[0] eq "--"; +my $found_double_dash= 0; +while (my $arg= shift(@ARGV)){ + + if ($arg =~ /^--$/){ + $found_double_dash= 1; + last; + } + elsif ($arg =~ /^--verbose$/){ + $verbose= 1; + } + else { + die "Unknown option: $arg"; + } +} + my $path= shift(@ARGV); # Executable die "usage:\n" . " safe_process.pl [opts] -- [ [...]]" - unless defined $path; + unless defined $path || $found_double_dash; message("started"); From 412ab8016b0c637ecbdca1f3071c5bb923b6533a Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 20 Dec 2007 18:42:23 +0100 Subject: [PATCH 022/705] Use --skip-ssl by default --- mysql-test/mysql-test-run.pl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index ca037830caf..e53039ba65e 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3193,6 +3193,11 @@ sub start_mysqltest ($) { # Turn on SSL for _all_ test cases if option --ssl was used mtr_add_arg($args, "--ssl"); } + elsif ( $opt_ssl_supported ) + { + mtr_add_arg($args, "--skip-ssl"); + } + # ---------------------------------------------------------------------- # export MYSQL_TEST variable containing /mysqltest From 8ba9c0afa752fa4f66c0e7fbb20ab3d3ee2f904b Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 21 Dec 2007 13:06:56 +0100 Subject: [PATCH 023/705] Ignore --skip-im --- mysql-test/mysql-test-run.pl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index e53039ba65e..ce0fe4c8a2b 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -255,6 +255,11 @@ sub main { } +sub ignore_option { + my ($opt, $value)= @_; + print "Ignoring option '$opt'\n"; +} + sub command_line_setup { my $opt_comment; my $opt_usage; @@ -303,6 +308,8 @@ sub command_line_setup { 'combination=s' => \@opt_combinations, 'skip-combination' => \&collect_option, + 'skip-im' => \&ignore_option, + # Specify ports 'build-thread|mtr-build-thread=i' => \$opt_mtr_build_thread, From c2bba780deeb927b060a8fbc753769de58ae7e6f Mon Sep 17 00:00:00 2001 From: "msvensson@shellback.(none)" <> Date: Mon, 7 Jan 2008 15:38:25 +0100 Subject: [PATCH 024/705] Improve error message --- mysql-test/lib/mtr_cases.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 4d6885f5495..6ec73715a0c 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -971,7 +971,7 @@ sub envsubst { if ( ! defined $ENV{$string} ) { - mtr_error("opt file referense \$$string that is unknown"); + mtr_error(".opt file references '$string' which is not set"); } return $ENV{$string}; From 2f9093e64529122430c4f84943ada430c0eb57e4 Mon Sep 17 00:00:00 2001 From: "msvensson@shellback.(none)" <> Date: Mon, 7 Jan 2008 15:39:32 +0100 Subject: [PATCH 025/705] calculate build thread earlier Always set MTR_BUILD_THREAD env variable --- mysql-test/mysql-test-run.pl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index b5c122caefc..441a296de91 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -381,6 +381,11 @@ sub command_line_setup { usage("") if $opt_usage; + # -------------------------------------------------------------------------- + # Check mtr_build_thread and calculate baseport + # -------------------------------------------------------------------------- + set_mtr_build_thread_ports($opt_mtr_build_thread); + if ( -d "../sql" ) { $source_dist= 1; @@ -732,11 +737,6 @@ sub command_line_setup { $path_current_test_log= "$opt_vardir/log/current_test"; $path_ndb_testrun_log= "$opt_vardir/log/ndb_testrun.log"; - # -------------------------------------------------------------------------- - # Check mtr_build_thread and calculate baseport - # -------------------------------------------------------------------------- - set_mtr_build_thread_ports($opt_mtr_build_thread); - } @@ -765,6 +765,7 @@ sub set_mtr_build_thread_ports($) { print "got ".$mtr_build_thread."\n"; } $opt_mtr_build_thread= $mtr_build_thread; + $ENV{MTR_BUILD_THREAD}= $mtr_build_thread; # Calculate baseport $opt_baseport= $mtr_build_thread * 10 + 10000; From 9087ee9170b6d1a5bfefadaedafeb7024e109fac Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 7 Jan 2008 19:44:48 +0100 Subject: [PATCH 026/705] Try to dynamically change option, restart if it fails --- mysql-test/lib/My/Options.pm | 191 +++++++++++++++++++++++++++++++++++ mysql-test/lib/mtr_cases.pm | 70 ++++++++----- mysql-test/lib/mtr_misc.pl | 60 ----------- mysql-test/lib/mtr_report.pl | 4 +- mysql-test/lib/t/Options.t | 120 ++++++++++++++++++++++ mysql-test/mysql-test-run.pl | 82 +++++++-------- 6 files changed, 403 insertions(+), 124 deletions(-) create mode 100644 mysql-test/lib/My/Options.pm create mode 100644 mysql-test/lib/t/Options.t diff --git a/mysql-test/lib/My/Options.pm b/mysql-test/lib/My/Options.pm new file mode 100644 index 00000000000..e79fc0fba9c --- /dev/null +++ b/mysql-test/lib/My/Options.pm @@ -0,0 +1,191 @@ +# -*- cperl -*- +# Copyright (C) 2004-2006 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +package My::Options; + +# +# Utility functions to work with list of options +# + +use strict; + + +sub same($$) { + my $l1= shift; + my $l2= shift; + return compare($l1,$l2) == 0; +} + + +sub compare ($$) { + my $l1= shift; + my $l2= shift; + + my @l1= @$l1; + my @l2= @$l2; + + return -1 if @l1 < @l2; + return 1 if @l1 > @l2; + + while ( @l1 ) # Same length + { + my $e1= shift @l1; + my $e2= shift @l2; + my $cmp= ($e1 cmp $e2); + return $cmp if $cmp != 0; + } + + return 0; # They are the same +} + + +sub _split_option { + my ($option)= @_; + if ($option=~ /^--(.*)=(.*)$/){ + return ($1, $2); + } + elsif ($option=~ /^--(.*)$/){ + return ($1, undef) + } + elsif ($option=~ /^(.*)=(.*)$/){ + return ($1, $2) + } + elsif ($option=~ /^-O$/){ + return (undef, undef); + } + die "Unknown option format '$option'"; +} + + +sub _build_option { + my ($name, $value)= @_; + if ($name =~ /^O, /){ + return "-".$name."=".$value; + } + elsif ($value){ + return "--".$name."=".$value; + } + return "--".$name; +} + + +# +# Compare two list of options and return what would need +# to be done to get the server running with the new settings +# +sub diff { + my ($from_opts, $to_opts)= @_; + + my %from; + foreach my $from (@$from_opts) + { + my ($opt, $value)= _split_option($from); + next unless defined($opt); + $from{$opt}= $value; + } + + #print "from: ", %from, "\n"; + + my %to; + foreach my $to (@$to_opts) + { + my ($opt, $value)= _split_option($to); + next unless defined($opt); + $to{$opt}= $value; + } + + #print "to: ", %to, "\n"; + + # Remove the ones that are in both lists + foreach my $name (keys %from){ + if (exists $to{$name} and $to{$name} eq $from{$name}){ + #print "removing '$name' from both lists\n"; + delete $to{$name}; + delete $from{$name}; + } + } + + #print "from: ", %from, "\n"; + #print "to: ", %to, "\n"; + + # Add all keys in "to" to result + my @result; + foreach my $name (keys %to){ + push(@result, _build_option($name, $to{$name})); + } + + # Add all keys in "from" that are not in "to" + # to result as "set to default" + foreach my $name (keys %from){ + if (not exists $to{$name}) { + push(@result, _build_option($name, "default")); + } + } + + return @result; +} + + +sub is_set { + my ($opts, $set_opts)= @_; + + foreach my $opt (@$opts){ + + my ($opt_name1, $value1)= _split_option($opt); + + foreach my $set_opt (@$set_opts){ + my ($opt_name2, $value2)= _split_option($set_opt); + + if ($opt_name1 eq $opt_name2){ + # Option already set + return 1; + } + } + } + + return 0; +} + + +sub toSQL { + my (@options)= @_; + my @sql; + + foreach my $option (@options) { + my ($name, $value)= _split_option($option); + #print "name: $name\n"; + if ($name =~ /^O, (.*)/){ + push(@sql, "SET GLOBAL $1=$value"); + } else { + my $sql_name= $name; + $sql_name=~ s/-/_/g; + push(@sql, "SET GLOBAL $sql_name=$value"); + } + } + return join("; ", @sql); +} + + +sub toStr { + my $name= shift; + return "$name: ", + "['", join("', '", @_), "']\n"; +} + + +1; + diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 4d6885f5495..1687b0df47e 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -31,7 +31,7 @@ our $skip_rpl; our $do_test; our $skip_test; our $opt_skip_combination; -our $binlog_format;; +our $binlog_format; our $enable_disabled; our $default_storage_engine; our $opt_with_ndbcluster_only; @@ -83,8 +83,9 @@ sub init_pattern { # ############################################################################## -sub collect_test_cases ($) { +sub collect_test_cases ($$) { my $suites= shift; # Semicolon separated list of test suites + my $opt_cases= shift; my $cases= []; # Array of hash(one hash for each testcase) $do_test_reg= init_pattern($do_test, "--do-test"); @@ -92,15 +93,15 @@ sub collect_test_cases ($) { foreach my $suite (split(",", $suites)) { - push(@$cases, collect_one_suite($suite)); + push(@$cases, collect_one_suite($suite, $opt_cases)); } - if ( @::opt_cases ) + if ( @$opt_cases ) { # A list of tests was specified on the command line # Check that the tests specified was found # in at least one suite - foreach my $test_name_spec ( @::opt_cases ) + foreach my $test_name_spec ( @$opt_cases ) { my $found= 0; my ($sname, $tname, $extension)= split_testname($test_name_spec); @@ -236,6 +237,7 @@ sub split_testname { sub collect_one_suite($) { my $suite= shift; # Test suite name + my $opt_cases= shift; my @cases; # Array of hash mtr_verbose("Collecting: $suite"); @@ -304,10 +306,10 @@ sub collect_one_suite($) $suite_opts= opts_from_file($suite_opt_file); } - if ( @::opt_cases ) + if ( @$opt_cases ) { # Collect in specified order - foreach my $test_name_spec ( @::opt_cases ) + foreach my $test_name_spec ( @$opt_cases ) { my ($sname, $tname, $extension)= split_testname($test_name_spec); @@ -428,9 +430,15 @@ sub collect_one_suite($) { foreach my $test (@cases) { - #print $test->{name}, " ", $comb, "\n"; - my $new_test= {}; + # Skip this combination if the values it provides + # already are set in master_opt or slave_opt + if (My::Options::is_set($test->{master_opt}, $comb->{comb_opt}) && + My::Options::is_set($test->{slave_opt}, $comb->{comb_opt}) ){ + next; + } + # Copy test options + my $new_test= {}; while (my ($key, $value) = each(%$test)) { if (ref $value eq "ARRAY") { push(@{$new_test->{$key}}, @$value); @@ -450,6 +458,18 @@ sub collect_one_suite($) push(@new_cases, $new_test); } } + + # Add the plain test if it was not already added + # as part of a combination + my %added; + foreach my $new_test (@new_cases){ + $added{$new_test->{name}}= 1; + } + foreach my $test (@cases){ + push(@new_cases, $test) unless $added{$test->{name}}; + } + + #print_testcases(@new_cases); @cases= @new_cases; #print_testcases(@cases); @@ -481,6 +501,7 @@ sub optimize_cases { # --mysqld=--binlog-format=x, skip all test that does not # support it # ======================================================= + #print "binlog_format: $binlog_format\n"; if (defined $binlog_format ) { # ======================================================= @@ -488,6 +509,8 @@ sub optimize_cases { # ======================================================= if ( defined $tinfo->{'binlog_formats'} ) { + #print "binlog_formats: ". join(", ", @{$tinfo->{binlog_formats}})."\n"; + # The test supports different binlog formats # check if the selected one is ok my $supported= @@ -513,23 +536,18 @@ sub optimize_cases { mtr_match_prefix($opt, "--binlog-format=") || $test_binlog_format; } - if (defined $test_binlog_format) + if (defined $test_binlog_format and + defined $tinfo->{binlog_formats} ) { - if ( defined $tinfo->{binlog_formats} ) + my $supported= + grep { $_ eq $test_binlog_format } @{$tinfo->{'binlog_formats'}}; + if ( !$supported ) { - my $supported= - grep { $_ eq $test_binlog_format } @{$tinfo->{'binlog_formats'}}; - if ( !$supported ) - { - $tinfo->{'skip'}= 1; - $tinfo->{'comment'}= - "Doesn't support --binlog-format='$test_binlog_format'"; - next; - } + $tinfo->{'skip'}= 1; + $tinfo->{'comment'}= + "Doesn't support --binlog-format='$test_binlog_format'"; + next; } - - # Save binlog format for dynamic switching - $tinfo->{binlog_format_switch}= $test_binlog_format; } } } @@ -882,6 +900,12 @@ sub collect_one_test_case { $tinfo->{extra_template_path}= $defaults_extra_file; } + # ---------------------------------------------------------------------- + # Append mysqld extra options to both master and slave + # ---------------------------------------------------------------------- + push(@{$tinfo->{'master_opt'}}, @::opt_extra_mysqld_opt); + push(@{$tinfo->{'slave_opt'}}, @::opt_extra_mysqld_opt); + return $tinfo; } diff --git a/mysql-test/lib/mtr_misc.pl b/mysql-test/lib/mtr_misc.pl index 3c1d60fd6ab..759ad6da3bc 100644 --- a/mysql-test/lib/mtr_misc.pl +++ b/mysql-test/lib/mtr_misc.pl @@ -29,8 +29,6 @@ sub mtr_script_exists(@); sub mtr_file_exists(@); sub mtr_exe_exists(@); sub mtr_exe_maybe_exists(@); -sub mtr_same_opts($$); -sub mtr_cmp_opts($$); ############################################################################## # @@ -189,35 +187,6 @@ sub mtr_exe_exists (@) { } - -sub mtr_same_opts ($$) { - my $l1= shift; - my $l2= shift; - return mtr_cmp_opts($l1,$l2) == 0; -} - -sub mtr_cmp_opts ($$) { - my $l1= shift; - my $l2= shift; - - my @l1= @$l1; - my @l2= @$l2; - - return -1 if @l1 < @l2; - return 1 if @l1 > @l2; - - while ( @l1 ) # Same length - { - my $e1= shift @l1; - my $e2= shift @l2; - my $cmp= ($e1 cmp $e2); - return $cmp if $cmp != 0; - } - - return 0; # They are the same -} - - sub mtr_milli_sleep { die "usage: mtr_milli_sleep(milliseconds)" unless @_ == 1; my ($millis)= @_; @@ -225,33 +194,4 @@ sub mtr_milli_sleep { select(undef, undef, undef, ($millis/1000)); } -# -# Compare two arrays and put all unequal elements into a new one -# -sub mtr_diff_opts ($$) { - my $l1= shift; - my $l2= shift; - my $found; - my @result; - foreach my $e1 (@$l1) - { - $found= undef; - foreach my $e2 (@$l2) - { - $found= 1 unless ($e1 ne $e2); - } - push(@result, $e1) unless (defined $found); - } - foreach my $e2 (@$l2) - { - $found= undef; - foreach my $e1 (@$l1) - { - $found= 1 unless ($e1 ne $e2); - } - push(@result, $e2) unless (defined $found); - } - return @result; -} - 1; diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl index f3b950e4d3a..61a698f4123 100644 --- a/mysql-test/lib/mtr_report.pl +++ b/mysql-test/lib/mtr_report.pl @@ -68,7 +68,9 @@ sub mtr_report_test_skipped ($) { if ( $tinfo->{skip_detected_by_test} ) { mtr_report("[ skip.] $tinfo->{'comment'}"); - } else { + } + else + { mtr_report("[ skip ] $tinfo->{'comment'}"); } } diff --git a/mysql-test/lib/t/Options.t b/mysql-test/lib/t/Options.t new file mode 100644 index 00000000000..e48999cd99b --- /dev/null +++ b/mysql-test/lib/t/Options.t @@ -0,0 +1,120 @@ +# -*- cperl -*- +use Test::More qw(no_plan); +use strict; + +use_ok("My::Options"); + +my @tests= +( + [ + ['--binlog-format=row', '--loose-skip-innodb', '--binlog-format=ms'], + ['--binlog-format=row', '--loose-skip-innodb', '--binlog-format=statement'], + ['--binlog-format=statement'] + ], + + [ + ['--binlog-format=row', '--loose-skip-innodb', '--binlog-format=statement'], + ['--binlog-format=row', '--loose-skip-innodb', '--binlog-format=mixed'], + ['--binlog-format=mixed'] + ], + + [ + ['--binlog-format=row', '--loose-skip-innodb', '--binlog-format=mixed'], + ['--binlog-format=row', '--loose-skip-innodb', '--binlog-format=statement'], + ['--binlog-format=statement'] + ], + + [ + ['--binlog-format=mixed', '--loose-skip-innodb', '--binlog-format=row'], + ['--binlog-format=statement', '--loose-skip-innodb', '--binlog-format=row'], + [ ] + ], + + [ + ['--binlog-format=row'], + [ ], + ['--binlog-format=default'] + ], + + [ + [ ], + ['--binlog-format=row'], + ['--binlog-format=row'] + ], + + [ + [ ], + ['-O', 'max_binlog_size=1' ], + ['--max_binlog_size=1' ] + ], + + [ + ['-O', 'max_binlog_size=1' ], + ['-O', 'max_binlog_size=1' ], + [ ], + ], + + [ + ['-O', 'max_binlog_size=1' ], + [ ], + ['--max_binlog_size=default' ] + ], + + [ + [ ], + ['-O', 'max_binlog_size=1', '--binlog-format=row' ], + ['--max_binlog_size=1', '--binlog-format=row' ] + ], + [ + ['--binlog-format=statement' ], + ['-O', 'max_binlog_size=1', '--binlog-format=row' ], + ['--max_binlog_size=1', '--binlog-format=row'] + ], + + [ + [ '--binlog-format=statement' ], + ['-O', 'max_binlog_size=1', '--binlog-format=statement' ], + ['--max_binlog_size=1' ] + ], + + [ + [ '--binlog-format=statement' ], + ['-O', 'max_binlog_size=1', '--binlog-format=statement' ], + ['--max_binlog_size=1' ] + ], + + [ + [ '--binlog-format=statement' ], + ['--relay-log=/path/to/a/relay-log', '--binlog-format=row'], + ['--relay-log=/path/to/a/relay-log', '--binlog-format=row' ] + ], + + + [ + [ '--binlog-format=statement' ], + ['--relay-log=/path/to/a/relay-log', '-O', 'max_binlog_size=1'], + ['--max_binlog_size=1', '--relay-log=/path/to/a/relay-log', '--binlog-format=default' ] + ], + + +); + + +my $test_no= 0; +foreach my $test (@tests){ + print "test", $test_no++, "\n"; + foreach my $opts (@$test){ + print My::Options::toStr("", @$opts); + } + my $from= $test->[0]; + my $to= $test->[1]; + my @result= My::Options::diff($from, $to); + ok(My::Options::same(\@result, $test->[2])); + if (!My::Options::same(\@result, $test->[2])){ + print "failed\n"; + print My::Options::toStr("result", @result); + print My::Options::toStr("expect", @{$test->[2]}); + } + print My::Options::toSQL(@result), "\n"; + print "\n"; +} diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index ce0fe4c8a2b..4eda93fb664 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -48,6 +48,7 @@ use File::Copy; use File::Temp qw / tempdir /; use My::SafeProcess; use My::ConfigFactory; +use My::Options; use mtr_cases; our $is_win32_perl= ($^O eq "MSWin32"); # ActiveState Win32 Perl @@ -230,7 +231,7 @@ sub main { # Figure out which tests we are going to run mtr_report("Collecting tests..."); - my $tests= collect_test_cases($opt_suites); + my $tests= collect_test_cases($opt_suites, \@opt_cases); initialize_servers(); @@ -2075,28 +2076,29 @@ sub run_testcase_check_skip_test($) } -sub dynamic_binlog_format_switch { - my ($tinfo, $mysqld)= @_; +sub run_query { + my ($tinfo, $mysqld, $query)= @_; - my $sql= "include/set_binlog_format_".$tinfo->{binlog_format_switch}.".sql"; my $args; mtr_init_args(\$args); mtr_add_arg($args, "--defaults-file=%s", $path_config_file); mtr_add_arg($args, "--defaults-group-suffix=%s", $mysqld->after('mysqld')); + + mtr_add_arg($args, "-e %s", $query); + my $res= My::SafeProcess->run ( - name => "switch binlog format ".$mysqld->name(), + name => "run_query -> ".$mysqld->name(), path => $exe_mysql, args => \$args, - input => $sql, + output => '/dev/null', + error => '/dev/null' ); - if ($res != 0) - { - mtr_error("Failed to switch binlog format"); - } + return $res } + sub do_before_run_mysqltest($) { my $tinfo= shift; @@ -2570,7 +2572,7 @@ sub mysqld_stop { sub mysqld_arguments ($$$) { my $args= shift; my $mysqld= shift; - my $extra_opt= shift; + my $extra_opts= shift; my $prefix= ""; # If mysqltest server arg if ( $opt_embedded_server ) @@ -2585,7 +2587,7 @@ sub mysqld_arguments ($$$) { # to start unless we specify what user to run as, see BUG#30630 my $euid= $>; if (!$is_win32 and $euid == 0 and - (grep(/^--user/, @$extra_opt, @opt_extra_mysqld_opt)) == 0) { + (grep(/^--user/, @$extra_opts)) == 0) { mtr_add_arg($args, "%s--user=root", $prefix); } @@ -2606,8 +2608,7 @@ sub mysqld_arguments ($$$) { } # Check if "extra_opt" contains skip-log-bin - my $skip_binlog= grep(/^(--|--loose-)skip-log-bin/, - @$extra_opt, @opt_extra_mysqld_opt); + my $skip_binlog= grep(/^(--|--loose-)skip-log-bin/, @$extra_opts); if ( $opt_debug ) { @@ -2622,7 +2623,7 @@ sub mysqld_arguments ($$$) { } my $found_skip_core= 0; - foreach my $arg ( @opt_extra_mysqld_opt, @$extra_opt ) + foreach my $arg ( @$extra_opts ) { # Allow --skip-core-file to be set in -[master|slave].opt file if ($arg eq "--skip-core-file") @@ -2651,9 +2652,12 @@ sub mysqld_arguments ($$$) { } + sub mysqld_start ($$) { my $mysqld= shift; - my $extra_opt= shift; + my $extra_opts= shift; + + mtr_verbose(My::Options::toStr("mysqld_start", @$extra_opts)); my $exe= $exe_mysqld; my $wait_for_pid_file= 1; @@ -2669,7 +2673,7 @@ sub mysqld_start ($$) { valgrind_arguments($args, \$exe); } - mysqld_arguments($args,$mysqld,$extra_opt); + mysqld_arguments($args,$mysqld,$extra_opts); if ( $opt_gdb || $opt_manual_gdb ) { @@ -2738,7 +2742,7 @@ sub mysqld_start ($$) { } # Remember options used when starting - $mysqld->{'started_opts'}= $extra_opt; + $mysqld->{'started_opts'}= $extra_opts; return; } @@ -2758,7 +2762,6 @@ sub stop_all_servers () { } - # Find out if server should be restarted for this test sub server_need_restart { my ($tinfo, $server)= @_; @@ -2811,35 +2814,34 @@ sub server_need_restart { } } - my $is_mysqld= grep ($server eq $_, mysqlds()); + my $is_mysqld= grep ($server eq $_, mysqlds()); if ($is_mysqld) { # Check that running process was started with same options # as the current test requires - my $extra_opt= get_extra_opt($server, $tinfo); + my $extra_opts= get_extra_opts($server, $tinfo); my $started_opts= $server->{'started_opts'}; - if (defined $started_opts and $extra_opt and - ! mtr_same_opts($started_opts, $extra_opt) ) - { - # TODO Use a list to find all options that can be set dynamically - # Check if diff is binlog format only - # and the next test has $binlog_format_switch set - my @diff_opts= mtr_diff_opts($started_opts, $extra_opt); - if (@diff_opts == 2 and - $diff_opts[0] =~/^--binlog-format=/ and - $diff_opts[1] =~/^--binlog-format=/ and - defined $tinfo->{binlog_format_switch}) - { - mtr_verbose("Using dynamic switch of binlog format from ", - $diff_opts[0],"to", $diff_opts[1]); - dynamic_binlog_format_switch($tinfo, $server); + if (!My::Options::same($started_opts, $extra_opts) ) + { + mtr_verbose(My::Options::toStr("started_opts", @$started_opts)); + mtr_verbose(My::Options::toStr("extra_opts", @$extra_opts)); + + # Get diff and check if dynamic switch is possible + my @diff_opts= My::Options::diff($started_opts, $extra_opts); + mtr_verbose(My::Options::toStr("diff_opts", @diff_opts)); + + my $query= My::Options::toSQL(@diff_opts); + mtr_verbose("Attempting dynamic switch '$query'"); + if (run_query($tinfo, $server, $query)){ + mtr_verbose("Restart: Dynamic switch failed"); + return 1; } else { mtr_verbose("Restart: running with different options '" . - join(" ", @{$extra_opt}) . "' != '" . + join(" ", @{$extra_opts}) . "' != '" . join(" ", @{$server->{'started_opts'}}) . "'" ); return 1; } @@ -2890,7 +2892,7 @@ sub started { return grep(defined $_, map($_->{proc}, @_)); } sub stopped { return grep(!defined $_, map($_->{proc}, @_)); } -sub get_extra_opt { +sub get_extra_opts { my ($mysqld, $tinfo)= @_; return @@ -3026,8 +3028,8 @@ sub start_servers($) { return 1; } - my $extra_opt= get_extra_opt($mysqld, $tinfo); - mysqld_start($mysqld,$extra_opt); + my $extra_opts= get_extra_opts($mysqld, $tinfo); + mysqld_start($mysqld,$extra_opts); # Save this test case information, so next can examine it $mysqld->{'started_tinfo'}= $tinfo; From ec673b8a9780fe125445cd3aa30619708080822e Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 8 Jan 2008 10:35:34 +0100 Subject: [PATCH 027/705] Use loose-skip-innodb so it works also with mysqld that has no innodb support --- mysql-test/suite/rpl_ndb/my.cnf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/suite/rpl_ndb/my.cnf b/mysql-test/suite/rpl_ndb/my.cnf index b37b163afee..58fec36eedd 100644 --- a/mysql-test/suite/rpl_ndb/my.cnf +++ b/mysql-test/suite/rpl_ndb/my.cnf @@ -52,7 +52,7 @@ report-host= 127.0.0.1 report-port= @mysqld.1.slave.port report-user= root -skip-innodb +loose-skip-innodb skip-slave-start # Directory where slaves find the dumps generated by "load data" From 3b2cfef63756c804d519f95146aa20f5fdbe88bf Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 8 Jan 2008 10:50:07 +0100 Subject: [PATCH 028/705] Use a tempdir name for the directory that var symlink points at, otherwise it can conflict with another MTR_BUILD_THREAD=auto run --- mysql-test/mysql-test-run.pl | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 4eda93fb664..a4cf7b41310 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -539,7 +539,7 @@ sub command_line_setup { if $opt_tmpdir; # Search through list of locations that are known - # to be "fast disks" to list to find a suitable location + # to be "fast disks" to find a suitable location # Use --mem= as first location to look. my @tmpfs_locations= ($opt_mem, "/dev/shm", "/tmp"); @@ -547,8 +547,8 @@ sub command_line_setup { { if ( -d $fs ) { - $opt_mem= "$fs/var"; - $opt_mem .= $opt_mtr_build_thread if $opt_mtr_build_thread; + my $template= "var_${opt_mtr_build_thread}_XXXX"; + $opt_mem= tempdir( $template, DIR => $fs, CLEANUP => 0); last; } } @@ -772,7 +772,6 @@ sub set_mtr_build_thread_ports($) { mtr_require_unique_id_and_wait("/tmp/mysql-test-ports", 200, 299); print "got ".$mtr_build_thread."\n"; } - $opt_mtr_build_thread= $mtr_build_thread; $ENV{MTR_BUILD_THREAD}= $mtr_build_thread; # Calculate baseport @@ -1272,7 +1271,7 @@ sub remove_stale_vardir () { { # var is a symlink - if ( $opt_mem and readlink($opt_vardir) eq $opt_mem ) + if ( $opt_mem ) { # Remove the directory which the link points at mtr_verbose("Removing " . readlink($opt_vardir)); @@ -1282,14 +1281,6 @@ sub remove_stale_vardir () { mtr_verbose("unlink($opt_vardir)"); unlink($opt_vardir); } - elsif ( $opt_mem ) - { - # Just remove the "var" symlink - mtr_report(" - WARNING: Removing '$opt_vardir' symlink it's wrong"); - - mtr_verbose("unlink($opt_vardir)"); - unlink($opt_vardir); - } else { # Some users creates a soft link in mysql-test/var to another area From 03d31f72a0a51b314e442d92aa40eef545dbdb0a Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 8 Jan 2008 11:11:06 +0100 Subject: [PATCH 029/705] Remove pidfile after killing serve --- mysql-test/mysql-test-run.pl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index a4cf7b41310..09b66ee4521 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2747,6 +2747,13 @@ sub stop_all_servers () { My::SafeProcess::shutdown(0, # shutdown timeout 0 => kill started(all_servers())); + # Remove pidfiles + foreach my $server ( all_servers() ) + { + my $pid_file= $server->if_exist('pid-file'); + unlink($pid_file) if defined $pid_file; + } + # Mark servers as stopped map($_->{proc}= undef, all_servers()); From 5c1dba67e5c4307a3af7020ae5c6195846658561 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 8 Jan 2008 15:24:17 +0100 Subject: [PATCH 030/705] Use "diif --help" to find out if diff is available at all. Otherwise the return code from "could not find command" which is 1, conflicts with return code from diff failed, which is also 1. --- client/mysqltest.c | 71 ++++++++++++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 25 deletions(-) diff --git a/client/mysqltest.c b/client/mysqltest.c index 9af0c93d186..39675a168d9 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1313,42 +1313,64 @@ void show_diff(DYNAMIC_STRING* ds, const char* filename1, const char* filename2) { + const char* diff_failed= 0; DYNAMIC_STRING ds_tmp; if (init_dynamic_string(&ds_tmp, "", 256, 256)) die("Out of memory"); - /* First try with unified diff */ + /* First try with diff --help to see if the command exists at all */ if (run_tool("diff", &ds_tmp, /* Get output from diff in ds_tmp */ - "-u", - filename1, - filename2, + "--help", "2>&1", - NULL) > 1) /* Most "diff" tools return >1 if error */ + NULL) != 0) /* Most "diff --help" tools return 0 */ + { + diff_failed= "You don't appear to have diff installed"; + } + else { - dynstr_set(&ds_tmp, ""); - /* Fallback to context diff with "diff -c" */ + /* First try with unified diff */ + if (run_tool("diff", &ds_tmp, /* Get output from diff in ds_tmp */ - "-c", + "-u", filename1, filename2, "2>&1", NULL) > 1) /* Most "diff" tools return >1 if error */ { - /* - Fallback to dump both files to result file and inform - about installing "diff" - */ dynstr_set(&ds_tmp, ""); - dynstr_append(&ds_tmp, + /* Fallback to context diff with "diff -c" */ + if (run_tool("diff", + &ds_tmp, /* Get output from diff in ds_tmp */ + "-c", + filename1, + filename2, + "2>&1", + NULL) > 1) /* Most "diff" tools return >1 if error */ + { + dynstr_set(&ds_tmp, ""); + diff_failed= "Could not execute 'diff -u' or 'diff -c'"; + } + } + } + + if (diff_failed) + { + /* + Fallback to dump both files to result file and inform + about installing "diff" + */ + dynstr_append(&ds_tmp, "\n"); + dynstr_append(&ds_tmp, diff_failed); + dynstr_append(&ds_tmp, "\n" "The two files differ but it was not possible to execute 'diff' in\n" -"order to show only the difference, tried both 'diff -u' or 'diff -c'.\n" -"Instead the whole content of the two files was shown for you to diff manually. ;)\n\n" +"order to show only the difference. Instead the whole content of the\n" +"two files was shown for you to diff manually.\n\n" "To get a better report you should install 'diff' on your system, which you\n" "for example can get from http://www.gnu.org/software/diffutils/diffutils.html\n" #ifdef __WIN__ @@ -1356,16 +1378,15 @@ void show_diff(DYNAMIC_STRING* ds, #endif "\n"); - dynstr_append(&ds_tmp, " --- "); - dynstr_append(&ds_tmp, filename1); - dynstr_append(&ds_tmp, " >>>\n"); - cat_file(&ds_tmp, filename1); - dynstr_append(&ds_tmp, "<<<\n --- "); - dynstr_append(&ds_tmp, filename1); - dynstr_append(&ds_tmp, " >>>\n"); - cat_file(&ds_tmp, filename2); - dynstr_append(&ds_tmp, "<<<<\n"); - } + dynstr_append(&ds_tmp, " --- "); + dynstr_append(&ds_tmp, filename1); + dynstr_append(&ds_tmp, " >>>\n"); + cat_file(&ds_tmp, filename1); + dynstr_append(&ds_tmp, "<<<\n --- "); + dynstr_append(&ds_tmp, filename1); + dynstr_append(&ds_tmp, " >>>\n"); + cat_file(&ds_tmp, filename2); + dynstr_append(&ds_tmp, "<<<<\n"); } if (ds) From 5a026a867951f6feb1538812c6a58b16963ab559 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 8 Jan 2008 15:45:47 +0100 Subject: [PATCH 031/705] Force restart before events_restart_phase2 --- mysql-test/t/events_restart_phase2-master.opt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/t/events_restart_phase2-master.opt b/mysql-test/t/events_restart_phase2-master.opt index 673e87f4357..b60aeb8d9b3 100644 --- a/mysql-test/t/events_restart_phase2-master.opt +++ b/mysql-test/t/events_restart_phase2-master.opt @@ -1 +1 @@ ---event-scheduler=on +--event-scheduler=on --force-restart From 284f28d78fa954c6a38e3e16e903e75d77fbfd2a Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 8 Jan 2008 15:47:04 +0100 Subject: [PATCH 032/705] Remember dynamically set options as started --- mysql-test/lib/My/Options.pm | 7 ++++++- mysql-test/mysql-test-run.pl | 8 +++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/mysql-test/lib/My/Options.pm b/mysql-test/lib/My/Options.pm index e79fc0fba9c..f0fc4ba75b5 100644 --- a/mysql-test/lib/My/Options.pm +++ b/mysql-test/lib/My/Options.pm @@ -168,9 +168,14 @@ sub toSQL { foreach my $option (@options) { my ($name, $value)= _split_option($option); #print "name: $name\n"; + #print "value: $value\n"; if ($name =~ /^O, (.*)/){ push(@sql, "SET GLOBAL $1=$value"); - } else { + } + elsif ($name =~ /^set-variable=(.*)/){ + push(@sql, "SET GLOBAL $1=$value"); + } + else { my $sql_name= $name; $sql_name=~ s/-/_/g; push(@sql, "SET GLOBAL $sql_name=$value"); diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 09b66ee4521..b6080538a61 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2833,16 +2833,14 @@ sub server_need_restart { my $query= My::Options::toSQL(@diff_opts); mtr_verbose("Attempting dynamic switch '$query'"); if (run_query($tinfo, $server, $query)){ - mtr_verbose("Restart: Dynamic switch failed"); - return 1; - } - else - { mtr_verbose("Restart: running with different options '" . join(" ", @{$extra_opts}) . "' != '" . join(" ", @{$server->{'started_opts'}}) . "'" ); return 1; } + + # Remember the dynamically set options + $server->{'started_opts'}= $extra_opts; } } From 14aaab792d7cf2d51e935bc9835cac26b3a1ef9e Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 8 Jan 2008 15:48:55 +0100 Subject: [PATCH 033/705] Fix spelling --- mysql-test/mysql-test-run.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 09b66ee4521..09a9b2cbcd2 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -783,7 +783,7 @@ sub set_mtr_build_thread_ports($) { "($opt_baseport - $opt_baseport + 9)"); } - mtr_report("Using MR_BUILD_THREAD $opt_mtr_build_thread,", + mtr_report("Using MR_BUILD_THREAD $mtr_build_thread,", "with reserved ports $opt_baseport..".($opt_baseport+9)); } From d610b72159a6cc2f5ae22b7ca27799723f44e680 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 8 Jan 2008 21:13:25 +0100 Subject: [PATCH 034/705] Check for windows patch to convert also in --replace --- client/mysqltest.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/client/mysqltest.c b/client/mysqltest.c index 39675a168d9..628a4e639fd 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -7406,6 +7406,7 @@ void do_get_replace(struct st_command *command) if (!*from) die("Wrong number of arguments to replace_result in '%s'", command->query); + IF_WIN(fix_win_paths(to, from - to), 0); insert_pointer_name(&from_array,to); to= get_string(&buff, &from, command); insert_pointer_name(&to_array,to); @@ -8596,9 +8597,7 @@ void free_pointer_array(POINTER_ARRAY *pa) void replace_dynstr_append_mem(DYNAMIC_STRING *ds, const char *val, int len) { -#ifdef __WIN__ - fix_win_paths(val, len); -#endif + IF_WIN(fix_win_paths(val, len), 0); if (glob_replace_regex) { From 29a9df427891d82212e1f91cad9c2c6a67b34508 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 8 Jan 2008 21:23:30 +0100 Subject: [PATCH 035/705] Clear ds_tmp after running "diff --help" --- client/mysqltest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/mysqltest.c b/client/mysqltest.c index 628a4e639fd..ad9e7452430 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1330,7 +1330,7 @@ void show_diff(DYNAMIC_STRING* ds, } else { - + dynstr_set(&ds_tmp, ""); /* First try with unified diff */ if (run_tool("diff", From f3a95344121394d35d82815890d19b003b83f556 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 8 Jan 2008 21:26:55 +0100 Subject: [PATCH 036/705] Skipp adding combinations for test tat already are skipped --- mysql-test/lib/mtr_cases.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 1687b0df47e..5e07c01bf7f 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -430,6 +430,9 @@ sub collect_one_suite($) { foreach my $test (@cases) { + + next if ( $test->{'skip'} ); + # Skip this combination if the values it provides # already are set in master_opt or slave_opt if (My::Options::is_set($test->{master_opt}, $comb->{comb_opt}) && From e898b7943bd07b9ff51539ddfd31496904307bf2 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 8 Jan 2008 21:45:15 +0100 Subject: [PATCH 037/705] reset master first in test to get consistent start --- mysql-test/r/mysqlbinlog.result | 1 + mysql-test/t/mysqlbinlog.test | 3 +++ 2 files changed, 4 insertions(+) diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result index 7f500c88c26..1730b6b97eb 100644 --- a/mysql-test/r/mysqlbinlog.result +++ b/mysql-test/r/mysqlbinlog.result @@ -1,3 +1,4 @@ +reset master; set timestamp=1000000000; drop table if exists t1,t2,t3,t4,t5,t03,t04; create table t1 (word varchar(20)); diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index 569c5a10c6a..4592e422560 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -4,6 +4,9 @@ -- source include/have_log_bin.inc +# Deletes all the binary logs +reset master; + # we need this for getting fixed timestamps inside of this test set timestamp=1000000000; From 3f910d48f283b32293921923cb47dc5ba4d3fce2 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 9 Jan 2008 10:20:15 +0100 Subject: [PATCH 038/705] Fix warnings --- client/mysqltest.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/client/mysqltest.c b/client/mysqltest.c index ad9e7452430..1d02f4dbec2 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -7406,7 +7406,9 @@ void do_get_replace(struct st_command *command) if (!*from) die("Wrong number of arguments to replace_result in '%s'", command->query); - IF_WIN(fix_win_paths(to, from - to), 0); +#ifdef __WIN__ + fix_win_paths(to, from - to); +#endif insert_pointer_name(&from_array,to); to= get_string(&buff, &from, command); insert_pointer_name(&to_array,to); @@ -8597,7 +8599,9 @@ void free_pointer_array(POINTER_ARRAY *pa) void replace_dynstr_append_mem(DYNAMIC_STRING *ds, const char *val, int len) { - IF_WIN(fix_win_paths(val, len), 0); +#ifdef __WIN__ + fix_win_paths(val, len); +#endif if (glob_replace_regex) { From af4bede6dfa2ee8b75cb7c60c0c9f2baee01c181 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 9 Jan 2008 11:15:59 +0100 Subject: [PATCH 039/705] Fix reorder --- mysql-test/lib/mtr_cases.pm | 6 ++++-- mysql-test/mysql-test-run.pl | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 5e07c01bf7f..5dc76db99e4 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -37,6 +37,7 @@ our $default_storage_engine; our $opt_with_ndbcluster_only; our $defaults_file; our $defaults_extra_file; +our $reorder; sub collect_option { my ($opt, $value)= @_; @@ -120,7 +121,7 @@ sub collect_test_cases ($$) { } } - if ( $::opt_reorder ) + if ( $reorder ) { # Reorder the test cases in an order that will make them faster to run my %sort_criteria; @@ -173,7 +174,8 @@ sub collect_test_cases ($$) { push(@criteria, "ndb=" . ($tinfo->{'ndb_test'} ? "1" : "0")); # Group test with equal options together. # Ending with "~" makes empty sort later than filled - push(@criteria, join("!", sort @{$tinfo->{'master_opt'}}) . "~"); + my $opts= $tinfo->{'master_opt'} ? $tinfo->{'master_opt'} : []; + push(@criteria, join("!", sort @{$opts}) . "~"); $sort_criteria{$test_name} = join(" ", @criteria); } diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index e3b89707e57..5fd0ff5e277 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -124,7 +124,6 @@ sub using_extern { return (keys %opts_extern > 0);}; our $opt_fast= 0; our $opt_force; -our $opt_reorder= 0; our $opt_mem= $ENV{'MTR_MEM'}; our $opt_gcov; @@ -368,7 +367,7 @@ sub command_line_setup { 'report-features' => \$opt_report_features, 'comment=s' => \$opt_comment, 'fast' => \$opt_fast, - 'reorder' => \$opt_reorder, + 'reorder' => \&collect_option, 'enable-disabled' => \&collect_option, 'verbose+' => \$opt_verbose, 'sleep=i' => \$opt_sleep, From 1fa7072bfae9ddb70b8fff9c651b491672784b81 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 9 Jan 2008 12:59:20 +0100 Subject: [PATCH 040/705] Bug#33763 Mysqld leaves readonly mode for cluster tables too early - part2 - Open tables readonly while not properly initialized - Close cached tables when coming out of readonly mode - Apply basically same patch as for 32275 --- mysql-test/include/ndb_not_readonly.inc | 4 ++-- sql/ha_ndbcluster.cc | 10 ++++++++-- sql/ha_ndbcluster_binlog.cc | 13 +++++++------ 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/mysql-test/include/ndb_not_readonly.inc b/mysql-test/include/ndb_not_readonly.inc index a87ba66f1ef..16e77a31639 100644 --- a/mysql-test/include/ndb_not_readonly.inc +++ b/mysql-test/include/ndb_not_readonly.inc @@ -11,13 +11,13 @@ let $counter= 600; while ($mysql_errno) { # Table is readonly until the mysqld has connected properly - --error 0,ER_NO_SUCH_TABLE,ER_OPEN_AS_READONLY,ER_GET_ERRMSG + --error 0,ER_NO_SUCH_TABLE,ER_OPEN_AS_READONLY replace into mysql.ndb_apply_status values(0,0,"",0,0); if ($mysql_errno) { if (!$counter) { - die("Failed while waiting for mysqld to come out of readonly mode"); + die Failed while waiting for mysqld to come out of readonly mode; } dec $counter; --sleep 0.1 diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index bf2b19bfc9c..1b0b5c53250 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -5138,6 +5138,7 @@ int ha_ndbcluster::create(const char *name, strcmp(m_tabname, NDB_SCHEMA_TABLE) == 0)) { DBUG_PRINT("info", ("Schema distribution table not setup")); + DBUG_ASSERT(ndb_schema_share); DBUG_RETURN(HA_ERR_NO_CONNECTION); } single_user_mode = NdbDictionary::Table::SingleUserModeReadWrite; @@ -5963,6 +5964,7 @@ ha_ndbcluster::delete_table(ha_ndbcluster *h, Ndb *ndb, if (!ndb_schema_share) { DBUG_PRINT("info", ("Schema distribution table not setup")); + DBUG_ASSERT(ndb_schema_share); DBUG_RETURN(HA_ERR_NO_CONNECTION); } /* ndb_share reference temporary */ @@ -6144,6 +6146,7 @@ int ha_ndbcluster::delete_table(const char *name) if (!ndb_schema_share) { DBUG_PRINT("info", ("Schema distribution table not setup")); + DBUG_ASSERT(ndb_schema_share); DBUG_RETURN(HA_ERR_NO_CONNECTION); } #endif @@ -6424,8 +6427,11 @@ int ha_ndbcluster::open(const char *name, int mode, uint test_if_locked) DBUG_RETURN(res); } #ifdef HAVE_NDB_BINLOG - if (!ndb_binlog_tables_inited && ndb_binlog_running) + if (!ndb_binlog_tables_inited) + { table->db_stat|= HA_READ_ONLY; + sql_print_information("table '%s' opened read only", name); + } #endif DBUG_RETURN(0); } @@ -6784,8 +6790,8 @@ static void ndbcluster_drop_database(handlerton *hton, char *path) if (!ndb_schema_share) { DBUG_PRINT("info", ("Schema distribution table not setup")); + DBUG_ASSERT(ndb_schema_share); DBUG_VOID_RETURN; - //DBUG_RETURN(HA_ERR_NO_CONNECTION); } #endif ndbcluster_drop_database_impl(path); diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index 55af0c38aed..a6246e76538 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -879,12 +879,9 @@ int ndbcluster_setup_binlog_table_shares(THD *thd) { pthread_mutex_lock(&LOCK_open); ndb_binlog_tables_inited= TRUE; - if (ndb_binlog_running) - { - if (ndb_extra_logging) - sql_print_information("NDB Binlog: ndb tables writable"); - close_cached_tables((THD*) 0, 0, (TABLE_LIST*) 0, TRUE); - } + if (ndb_extra_logging) + sql_print_information("NDB Binlog: ndb tables writable"); + close_cached_tables((THD*) 0, 0, (TABLE_LIST*) 0, TRUE); pthread_mutex_unlock(&LOCK_open); /* Signal injector thread that all is setup */ pthread_cond_signal(&injector_cond); @@ -2029,6 +2026,7 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb, ndb_schema_share->use_count)); free_share(&ndb_schema_share); ndb_schema_share= 0; + ndb_binlog_tables_inited= 0; pthread_mutex_unlock(&ndb_schema_share_mutex); /* end protect ndb_schema_share */ @@ -3226,6 +3224,7 @@ ndb_binlog_thread_handle_non_data_event(THD *thd, Ndb *ndb, share->key, share->use_count)); free_share(&ndb_apply_status_share); ndb_apply_status_share= 0; + ndb_binlog_tables_inited= 0; } DBUG_PRINT("error", ("CLUSTER FAILURE EVENT: " "%s received share: 0x%lx op: 0x%lx share op: 0x%lx " @@ -3245,6 +3244,7 @@ ndb_binlog_thread_handle_non_data_event(THD *thd, Ndb *ndb, share->key, share->use_count)); free_share(&ndb_apply_status_share); ndb_apply_status_share= 0; + ndb_binlog_tables_inited= 0; } /* ToDo: remove printout */ if (ndb_extra_logging) @@ -4220,6 +4220,7 @@ err: ndb_schema_share->use_count)); free_share(&ndb_schema_share); ndb_schema_share= 0; + ndb_binlog_tables_inited= 0; pthread_mutex_unlock(&ndb_schema_share_mutex); /* end protect ndb_schema_share */ } From 8f8b396e8cb4515753d8383a69032975200f2fdd Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 9 Jan 2008 13:47:09 +0100 Subject: [PATCH 041/705] Add printouts when servers are restarted Disable dynamic option switch --- mysql-test/mysql-test-run.pl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 5fd0ff5e277..fac5810ec9c 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2822,6 +2822,9 @@ sub server_need_restart { if (!My::Options::same($started_opts, $extra_opts) ) { + my $use_dynamic_option_switch= 0; + return 1 if (!$use_dynamic_option_switch); + mtr_verbose(My::Options::toStr("started_opts", @$started_opts)); mtr_verbose(My::Options::toStr("extra_opts", @$extra_opts)); @@ -2907,7 +2910,7 @@ sub stop_servers($$) { # All servers are going down, use some kind of order to # avoid too many warnings in the log files - mtr_verbose("All servers are going down"); + mtr_report("Restarting all servers"); # mysqld processes My::SafeProcess::shutdown( $opt_shutdown_timeout, started(mysqlds()) ); @@ -2918,6 +2921,8 @@ sub stop_servers($$) { } else { + mtr_report("Restarting ", started(@servers)); + # Stop only some servers My::SafeProcess::shutdown( $opt_shutdown_timeout, started(@servers) ); From 36c69b9d6cab96da29638bb7091cfe9301cf2394 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 9 Jan 2008 16:10:25 +0100 Subject: [PATCH 042/705] Fix bug where local variable masked outer variable --- mysql-test/lib/My/SafeProcess.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index 612096cceb7..c3e368eea8d 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -95,7 +95,7 @@ if (IS_WIN32PERL or IS_CYGWIN){ push(@safe_process_cmd, $exe); # Use my_safe_kill.exe - my $safe_kill= my_find_bin(".", "lib/My/SafeProcess", "my_safe_kill"); + $safe_kill= my_find_bin(".", "lib/My/SafeProcess", "my_safe_kill"); die "Could not find my_safe_kill.exe" unless $safe_kill; } else { From 76951b55343aed00d5b9ed31d36d75dbc7ea005f Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 9 Jan 2008 19:13:07 +0100 Subject: [PATCH 043/705] Bug#33748 my_getsystime, my_micro_time and my_micro_time_and_time broken on windows - Fix 'my_win_init' code that handles initialization of "query_performance_counter" and conversion from registry values to environment strings --- mysys/my_init.c | 115 ++++++++++++++++++++---------------------------- 1 file changed, 48 insertions(+), 67 deletions(-) diff --git a/mysys/my_init.c b/mysys/my_init.c index 6d1b9ec04be..5afc1e377ac 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -30,7 +30,6 @@ #endif my_bool have_tcpip=0; static void my_win_init(void); -static my_bool win32_have_tcpip(void); static my_bool win32_init_tcp_ip(); #else #define my_win_init() @@ -233,29 +232,6 @@ Voluntary context switches %ld, Involuntary context switches %ld\n", #ifdef __WIN__ -/* - This code is specially for running MySQL, but it should work in - other cases too. - - Inizializzazione delle variabili d'ambiente per Win a 32 bit. - - Vengono inserite nelle variabili d'ambiente (utilizzando cosi' - le funzioni getenv e putenv) i valori presenti nelle chiavi - del file di registro: - - HKEY_LOCAL_MACHINE\software\MySQL - - Se la kiave non esiste nonn inserisce nessun valore -*/ - -/* Crea la stringa d'ambiente */ - -void setEnvString(char *ret, const char *name, const char *value) -{ - DBUG_ENTER("setEnvString"); - strxmov(ret, name,"=",value,NullS); - DBUG_VOID_RETURN ; -} /* my_parameter_handler @@ -305,17 +281,6 @@ int handle_rtc_failure(int err_type, const char *file, int line, static void my_win_init(void) { - HKEY hSoftMysql ; - DWORD dimName = 256 ; - DWORD dimData = 1024 ; - DWORD dimNameValueBuffer = 256 ; - DWORD dimDataValueBuffer = 1024 ; - DWORD indexValue = 0 ; - long retCodeEnumValue ; - char NameValueBuffer[256] ; - char DataValueBuffer[1024] ; - char EnvString[1271] ; - const char *targetKey = "Software\\MySQL" ; DBUG_ENTER("my_win_init"); setlocale(LC_CTYPE, ""); /* To get right sortorder */ @@ -343,43 +308,58 @@ static void my_win_init(void) _tzset(); - /* apre la chiave HKEY_LOCAL_MACHINES\software\MySQL */ - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,(LPCTSTR)targetKey,0, - KEY_READ,&hSoftMysql) != ERROR_SUCCESS) - DBUG_VOID_RETURN; - - /* - ** Ne legge i valori e li inserisce nell'ambiente - ** suppone che tutti i valori letti siano di tipo stringa + '\0' - ** Legge il valore con indice 0 e lo scarta - */ - retCodeEnumValue = RegEnumValue(hSoftMysql, indexValue++, - (LPTSTR)NameValueBuffer, &dimNameValueBuffer, - NULL, NULL, (LPBYTE)DataValueBuffer, - &dimDataValueBuffer) ; - - while (retCodeEnumValue != ERROR_NO_MORE_ITEMS) { - char *my_env; - /* Crea la stringa d'ambiente */ - setEnvString(EnvString, NameValueBuffer, DataValueBuffer) ; + /* + Open HKEY_LOCAL_MACHINE\SOFTWARE\MySQL and set any strings found + there as environment variables + */ + HKEY key_handle; + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, (LPCTSTR)"SOFTWARE\\MySQL", + 0, KEY_READ, &key_handle) == ERROR_SUCCESS) + { + LONG ret; + DWORD index= 0; + DWORD type; + char key_name[256], key_data[1024]; + size_t key_name_len= sizeof(key_name) - 1; + size_t key_data_len= sizeof(key_data) - 1; - /* Inserisce i dati come variabili d'ambiente */ - my_env=strdup(EnvString); /* variable for putenv must be allocated ! */ - putenv(my_env) ; + while ((ret= RegEnumValue(key_handle, index++, + key_name, &key_name_len, + NULL, &type, (LPBYTE)&key_data, + &key_data_len)) != ERROR_NO_MORE_ITEMS) + { + char env_string[sizeof(key_name) + sizeof(key_data) + 2]; - dimNameValueBuffer = dimName ; - dimDataValueBuffer = dimData ; + if (ret == ERROR_MORE_DATA) + { + /* Registry value larger than 'key_data', skip it */ + DBUG_PRINT("error", ("Skipped registry value that was too large")); + } + else if (ret == ERROR_SUCCESS) + { + if (type == REG_SZ) + { + strxmov(env_string, key_name, "=", key_data, NullS); - retCodeEnumValue = RegEnumValue(hSoftMysql, indexValue++, - NameValueBuffer, &dimNameValueBuffer, - NULL, NULL, (LPBYTE)DataValueBuffer, - &dimDataValueBuffer) ; + /* variable for putenv must be allocated ! */ + putenv(strdup(env_string)) ; + } + } + else + { + /* Unhandled error, break out of loop */ + break; + } + + key_name_len= sizeof(key_name) - 1; + key_data_len= sizeof(key_data) - 1; + } + + RegCloseKey(key_handle) ; + } } - /* chiude la chiave */ - RegCloseKey(hSoftMysql) ; - /* The following is used by time functions */ #define OFFSET_TO_EPOC ((__int64) 134774 * 24 * 60 * 60 * 1000 * 1000 * 10) #define MS 10000000 @@ -387,7 +367,8 @@ static void my_win_init(void) FILETIME ft; LARGE_INTEGER li, t_cnt; DBUG_ASSERT(sizeof(LARGE_INTEGER) == sizeof(query_performance_frequency)); - if (QueryPerformanceFrequency((LARGE_INTEGER *)&query_performance_frequency)) + if (QueryPerformanceFrequency((LARGE_INTEGER *) + &query_performance_frequency) == 0) query_performance_frequency= 0; else { From da6073b4bcf4e76624a6cd38d0c12083245cc1d2 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 10 Jan 2008 10:25:45 +0100 Subject: [PATCH 044/705] Revert removal of ER_GET_ERRMSG --- mysql-test/include/ndb_not_readonly.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/include/ndb_not_readonly.inc b/mysql-test/include/ndb_not_readonly.inc index 16e77a31639..f50ca0cab66 100644 --- a/mysql-test/include/ndb_not_readonly.inc +++ b/mysql-test/include/ndb_not_readonly.inc @@ -11,7 +11,7 @@ let $counter= 600; while ($mysql_errno) { # Table is readonly until the mysqld has connected properly - --error 0,ER_NO_SUCH_TABLE,ER_OPEN_AS_READONLY + --error 0,ER_NO_SUCH_TABLE,ER_OPEN_AS_READONLY,ER_GET_ERRMSG replace into mysql.ndb_apply_status values(0,0,"",0,0); if ($mysql_errno) { From 727afed6576346c336cd5addfeb2ce65b6401cda Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 10 Jan 2008 10:44:18 +0100 Subject: [PATCH 045/705] Add --repeat and --retry --- mysql-test/lib/mtr_report.pl | 7 ++++- mysql-test/mysql-test-run.pl | 58 ++++++++++++++++++++++++++++++++---- 2 files changed, 58 insertions(+), 7 deletions(-) diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl index 61a698f4123..6365593786c 100644 --- a/mysql-test/lib/mtr_report.pl +++ b/mysql-test/lib/mtr_report.pl @@ -92,7 +92,10 @@ sub mtr_report_test_passed ($$) { $tot_real_time += ($timer/1000); $timer= sprintf "%12s", $timer; } - $tinfo->{'result'}= 'MTR_RES_PASSED'; + # Set as passed unless already set + if ( not defined $tinfo->{'result'} ){ + $tinfo->{'result'}= 'MTR_RES_PASSED'; + } mtr_report("[ pass ] $timer"); } @@ -102,6 +105,8 @@ sub mtr_report_test_failed ($$) { mtr_report_test_name($tinfo); $tinfo->{'result'}= 'MTR_RES_FAILED'; + my $test_failures= $tinfo->{'failures'} || 0; + $tinfo->{'failures'}= $test_failures + 1; if ( defined $tinfo->{'timeout'} ) { mtr_report("[ fail ] timeout"); diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index fac5810ec9c..d88ad3dea3b 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -161,6 +161,9 @@ my $opt_start_timeout = 30; # 30 seconds my $opt_start; my $opt_start_dirty; +my $opt_repeat= 1; +my $opt_retry= 1; +my $opt_retry_failure= 2; my $opt_strace_client; @@ -374,8 +377,9 @@ sub command_line_setup { 'start-dirty' => \$opt_start_dirty, 'start' => \$opt_start, 'print-testcases' => \&collect_option, -# TODO 'repeat' -# TODO 'retry' + 'repeat=i' => \$opt_repeat, + 'retry=i' => \$opt_retry, + 'retry-failure=i' => \$opt_retry_failure, 'timer!' => \$opt_timer, 'user=s' => \$opt_user, 'testcase-timeout=i' => \$opt_testcase_timeout, @@ -1742,7 +1746,39 @@ sub run_tests { next; } - run_testcase($tinfo); + for my $repeat (1..$opt_repeat){ + + if (run_testcase($tinfo)) + { + # Testcase failed, enter retry mode + my $retries= 1; + while ($retries <= $opt_retry){ + mtr_report("\nRetrying, attempt($retries/$opt_retry)...\n"); + + if (run_testcase($tinfo) <= 0) + { + # Testcase suceeded + + my $test_has_failed= $tinfo->{failures} || 0; + if (!$test_has_failed){ + last; + } + } + else + { + # Testcase failed + + # Limit number of test failures + my $failures= $tinfo->{failures}; + if ($opt_retry > 1 and $failures >= $opt_retry_failure){ + mtr_report("Test has failed $failures times, no more retries!\n"); + last; + } + } + $retries++; + } + } + } } # Kill the test suite timer $suite_timeout_proc->kill(); @@ -2184,6 +2220,11 @@ my %old_env; # # Run a single test case # +# RETURN VALUE +# 0 OK +# > 0 failure +# + sub run_testcase ($) { my $tinfo= shift; @@ -2362,7 +2403,7 @@ sub run_testcase ($) { # Remove the file that mysql-test-run writes info to unlink($path_current_test_log); - return; + return ($res == 62) ? 0 : $res; } @@ -2389,7 +2430,7 @@ sub run_testcase ($) { "Server failed during test run"; report_failure_and_restart($tinfo); - return; + return 1; } # ---------------------------------------------------- @@ -2400,7 +2441,7 @@ sub run_testcase ($) { mtr_report("Test case timeout!"); $tinfo->{'timeout'}= 1; # Mark as timeout report_failure_and_restart($tinfo); - return; + return 1; } # ---------------------------------------------------- @@ -2414,6 +2455,7 @@ sub run_testcase ($) { mtr_error("Unhandled process $proc exited"); } + mtr_error("Should never come here"); } @@ -3631,6 +3673,10 @@ Misc options the first specified test case fast Run as fast as possible, dont't wait for servers to shutdown etc. + repeat=N Run each test N number of times + retry=N Retry tests that fail N times, limit number of failures + to $max_failures + retry-failure=N Limit number of retries for a failed test reorder Reorder tests to get fewer server restarts help Get this help text From b23110f2de94e8abb51a9140bfdcfa4a3e6c1400 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 10 Jan 2008 12:00:56 +0100 Subject: [PATCH 046/705] Auto kill any children before exiting from process --- mysql-test/lib/My/SafeProcess.pm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index 612096cceb7..53577c96602 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -85,6 +85,24 @@ BEGIN { } } +END { + # Kill any children still running + for my $proc (values %running){ + if ( $proc->is_child($$) ){ + print "Killing: $proc\n"; + $proc->kill(); + } + } +} + + +sub is_child { + my ($self, $parent_pid)= @_; + die "usage: \$safe_proc->is_child()" unless (@_ == 2 and ref $self); + return ($self->{PARENT} == $parent_pid); +} + + # Find the safe process binary or script my @safe_process_cmd; my $safe_kill; @@ -172,6 +190,7 @@ sub new { SAFE_WINPID => $winpid, SAFE_NAME => $name, SAFE_SHUTDOWN => $shutdown, + PARENT => $$, }, $class); # Put the new process in list of running @@ -203,6 +222,7 @@ sub timer { ({ SAFE_PID => $pid, SAFE_NAME => "timer", + PARENT => $$, }, $class); # Put the new process in list of running From a7c70e4954145719f1e660ffd65ee316d37a38cb Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 10 Jan 2008 16:38:59 +0100 Subject: [PATCH 047/705] Fix misspelled variable name --- mysql-test/mysql-test-run.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index d88ad3dea3b..b72fd085609 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3675,7 +3675,7 @@ Misc options to shutdown etc. repeat=N Run each test N number of times retry=N Retry tests that fail N times, limit number of failures - to $max_failures + to $opt_retry_failure retry-failure=N Limit number of retries for a failed test reorder Reorder tests to get fewer server restarts help Get this help text From af96a3f8ba04977038d3864a48ad836d7d673d5f Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 10 Jan 2008 16:50:37 +0100 Subject: [PATCH 048/705] - Add autodetection of which my.cnfs to use for each testcase if suite does not have a my.cnf of it's own - Fix paths: master-data => mysqld.1/data, ../std_data_ln => MYSQLTEST_VARDIR/std_data --- mysql-test/lib/mtr_cases.pm | 13 +- mysql-test/suite/parts/inc/partition.pre | 4 +- .../suite/parts/inc/partition_basic.inc | 16 +- .../suite/parts/inc/partition_check_drop.inc | 14 +- .../suite/parts/inc/partition_layout.inc | 2 +- .../parts/inc/partition_layout_check1.inc | 12 +- .../parts/inc/partition_layout_check2.inc | 8 +- .../inc/partition_supported_sql_funcs.inc | 9 +- .../r/part_supported_sql_func_innodb.result | 126 +- .../r/part_supported_sql_func_myisam.result | 126 +- .../parts/r/partition_alter1_myisam.result | 1984 ++++---- .../parts/r/partition_alter2_myisam.result | 4464 ++++++++--------- .../parts/r/partition_alter3_innodb.result | 104 +- .../parts/r/partition_alter3_myisam.result | 480 +- .../parts/r/partition_alter4_myisam.result | 2528 +++++----- .../parts/r/partition_basic_innodb.result | 62 +- .../parts/r/partition_basic_myisam.result | 1894 +++---- .../parts/r/partition_engine_myisam.result | 220 +- .../parts/r/partition_syntax_myisam.result | 160 +- mysql-test/suite/parts/r/partition_t55.out | 124 +- .../suite/parts/t/partition_sessions.test | 8 +- 21 files changed, 6186 insertions(+), 6172 deletions(-) diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 5e07c01bf7f..3aae4cceff7 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -892,8 +892,19 @@ sub collect_one_test_case { my $config= "$suitedir/my.cnf"; if (! -f $config ) { - # Suite has no config, use default.cnf + # assume default.cnf will be used $config= "include/default_my.cnf"; + + # Suite has no config, autodetect which one to use + if ( $tinfo->{rpl_test} ){ + $config= "suite/rpl/my.cnf"; + if ( $tinfo->{ndb_test} ){ + $config= "suite/rpl_ndb/my.cnf"; + } + } + elsif ( $tinfo->{ndb_test} ){ + $config= "suite/ndb/my.cnf"; + } } $tinfo->{template_path}= $config; } diff --git a/mysql-test/suite/parts/inc/partition.pre b/mysql-test/suite/parts/inc/partition.pre index 0c906ce4581..7c3b0d9d1ef 100644 --- a/mysql-test/suite/parts/inc/partition.pre +++ b/mysql-test/suite/parts/inc/partition.pre @@ -246,7 +246,7 @@ if (0) # Option, for displaying files: # $ls= 1 (default) # --> Display the table related directory content via -# "ls $MYSQLTEST_VARDIR/master-data/test/t1*" +# "ls $MYSQLTEST_VARDIR/mysqld.1/data/test/t1*" # if these informations were collected. # This is probably not portable to some OS. # $ls= 0 @@ -410,7 +410,7 @@ if (0) # 3. How to analyze a partitioning bug revealed with these tests/ How to build # a small replay script from the monstrous protocols ? #------------------------------------------------------------------------------# -# a) crash -- use the file var/master-data/mysql/general_log.CSV +# a) crash -- use the file var/mysqld.1/data/mysql/general_log.CSV # b) no crash, but unexpected server response (there is no "reject file) # -- use the file r/.log # Please be aware that the option $debug= 0 suppresses the diff --git a/mysql-test/suite/parts/inc/partition_basic.inc b/mysql-test/suite/parts/inc/partition_basic.inc index a5815d3b71c..72673a0d535 100644 --- a/mysql-test/suite/parts/inc/partition_basic.inc +++ b/mysql-test/suite/parts/inc/partition_basic.inc @@ -35,16 +35,16 @@ let $unique= ; --disable_query_log # DATA DIRECTORY # Make directory for partition data - --exec mkdir $MYSQLTEST_VARDIR/master-data/test/data || true + --exec mkdir $MYSQLTEST_VARDIR/mysqld.1/data/test/data || true eval SET @data_dir = 'DATA DIRECTORY = - ''''$MYSQLTEST_VARDIR/master-data/test/data'''''; + ''''$MYSQLTEST_VARDIR/mysqld.1/data/test/data'''''; let $data_directory = `select @data_dir`; #INDEX DIRECTORY # Make directory for partition index - --exec mkdir $MYSQLTEST_VARDIR/master-data/test/index || true + --exec mkdir $MYSQLTEST_VARDIR/mysqld.1/data/test/index || true eval SET @indx_dir = 'INDEX DIRECTORY = - ''''$MYSQLTEST_VARDIR/master-data/test/index'''''; + ''''$MYSQLTEST_VARDIR/mysqld.1/data/test/index'''''; let $index_directory = `select @indx_dir`; let $with_directories= 1; @@ -78,16 +78,16 @@ if ($more_pk_ui_tests) --disable_query_log # DATA DIRECTORY # Make directory for partition data - --exec mkdir $MYSQLTEST_VARDIR/master-data/test/data || true + --exec mkdir $MYSQLTEST_VARDIR/mysqld.1/data/test/data || true eval SET @data_dir = 'DATA DIRECTORY = - ''''$MYSQLTEST_VARDIR/master-data/test/data'''''; + ''''$MYSQLTEST_VARDIR/mysqld.1/data/test/data'''''; let $data_directory = `select @data_dir`; #INDEX DIRECTORY # Make directory for partition index - --exec mkdir $MYSQLTEST_VARDIR/master-data/test/index || true + --exec mkdir $MYSQLTEST_VARDIR/mysqld.1/data/test/index || true eval SET @indx_dir = 'INDEX DIRECTORY = - ''''$MYSQLTEST_VARDIR/master-data/test/index'''''; + ''''$MYSQLTEST_VARDIR/mysqld.1/data/test/index'''''; let $index_directory = `select @indx_dir`; let $with_directories= TRUE; diff --git a/mysql-test/suite/parts/inc/partition_check_drop.inc b/mysql-test/suite/parts/inc/partition_check_drop.inc index 88ebdb7ad48..1e06fbdd156 100644 --- a/mysql-test/suite/parts/inc/partition_check_drop.inc +++ b/mysql-test/suite/parts/inc/partition_check_drop.inc @@ -24,13 +24,13 @@ if ($no_debug) if ($do_file_tests) { # List the files belonging to the table t1 ---exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $MYSQLTEST_VARDIR/master-data/test/tmp2 || true +--exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/t1* > $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp2 || true if ($with_directories) { ---exec ls $MYSQLTEST_VARDIR/master-data/test/data/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 || true ---exec ls $MYSQLTEST_VARDIR/master-data/test/index/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 || true +--exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1* >> $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp2 || true +--exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1* >> $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp2 || true } -eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/master-data/test/tmp2'')'); +eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/mysqld.1/data/test/tmp2'')'); let $file_list= `SELECT @aux`; } if (!$do_file_tests) @@ -62,11 +62,11 @@ if ($found_garbage) } # Do a manual cleanup, because the following tests should not suffer from # remaining files - --exec rm -f $MYSQLTEST_VARDIR/master-data/test/t1* || true + --exec rm -f $MYSQLTEST_VARDIR/mysqld.1/data/test/t1* || true if ($with_directories) { - --exec rm -f $MYSQLTEST_VARDIR/master-data/test/data/t1* || true - --exec rm -f $MYSQLTEST_VARDIR/master-data/test/index/t1* || true + --exec rm -f $MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1* || true + --exec rm -f $MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1* || true } } --enable_query_log diff --git a/mysql-test/suite/parts/inc/partition_layout.inc b/mysql-test/suite/parts/inc/partition_layout.inc index c4181ef1cfd..b9835cb4d55 100644 --- a/mysql-test/suite/parts/inc/partition_layout.inc +++ b/mysql-test/suite/parts/inc/partition_layout.inc @@ -10,5 +10,5 @@ eval SHOW CREATE TABLE t1; if ($ls) { --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR - --exec ls $MYSQLTEST_VARDIR/master-data/test/t1* + --exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/t1* } diff --git a/mysql-test/suite/parts/inc/partition_layout_check1.inc b/mysql-test/suite/parts/inc/partition_layout_check1.inc index 9989f4ed9e3..3d8f634603b 100644 --- a/mysql-test/suite/parts/inc/partition_layout_check1.inc +++ b/mysql-test/suite/parts/inc/partition_layout_check1.inc @@ -31,17 +31,17 @@ DELETE FROM t0_definition; # - SHOW CREATE TABLE t1 is at least currently most probably more reliable than # the corresponding SELECT on the INFORMATION_SCHEMA # - SHOW CREATE TABLE .. cannot write its out put into a file like SELECT ---exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $MYSQLTEST_VARDIR/master-data/test/tmp1 2>&1 || true +--exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp1 2>&1 || true if ($do_file_tests) { # List the files belonging to the table t1 ---exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true +--exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/t1* > $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp2 2>&1 || true if ($with_directories) { ---exec ls $MYSQLTEST_VARDIR/master-data/test/data/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true ---exec ls $MYSQLTEST_VARDIR/master-data/test/index/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true +--exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1* >> $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp2 2>&1 || true +--exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1* >> $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp2 2>&1 || true } -eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/master-data/test/tmp2'' +eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/mysqld.1/data/test/tmp2'' )'); let $file_list= `SELECT @aux`; } @@ -52,7 +52,7 @@ let $file_list= '--- not determined ---'; # Insert the current definition of the table t1 into t0_definition eval INSERT INTO t0_definition SET state = 'old', - create_command = load_file('$MYSQLTEST_VARDIR/master-data/test/tmp1'), + create_command = load_file('$MYSQLTEST_VARDIR/mysqld.1/data/test/tmp1'), file_list = $file_list; # Print the create table statement into the protocol diff --git a/mysql-test/suite/parts/inc/partition_layout_check2.inc b/mysql-test/suite/parts/inc/partition_layout_check2.inc index 05c44a73a7f..1cd4fe5aa8d 100644 --- a/mysql-test/suite/parts/inc/partition_layout_check2.inc +++ b/mysql-test/suite/parts/inc/partition_layout_check2.inc @@ -27,12 +27,12 @@ if ($no_debug) DELETE FROM t0_definition WHERE state = 'new'; # Dump the current definition of the table t1 to tmp1 ---exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $MYSQLTEST_VARDIR/master-data/test/tmp1 2>&1 || true +--exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp1 2>&1 || true if ($do_file_tests) { # List the files belonging to the table t1 ---exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true -eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/master-data/test/tmp2'')'); +--exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/t1* > $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp2 2>&1 || true +eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/mysqld.1/data/test/tmp2'')'); let $file_list= `SELECT @aux`; } if (!$do_file_tests) @@ -42,7 +42,7 @@ let $file_list= '--- not determined ---'; # Insert the current definition of the table t1 into t0_definition eval INSERT INTO t0_definition SET state = 'new', - create_command = load_file('$MYSQLTEST_VARDIR/master-data/test/tmp1'), + create_command = load_file('$MYSQLTEST_VARDIR/mysqld.1/data/test/tmp1'), file_list = $file_list; # Print the old and new table layout, if they differ diff --git a/mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc b/mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc index d9c1f5836f0..029b8676533 100644 --- a/mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc +++ b/mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc @@ -83,9 +83,12 @@ eval insert into t3 values ($val1); eval insert into t3 values ($val2); eval insert into t3 values ($val3); -eval load data infile '../std_data_ln/parts/$infile' into table t4; -eval load data infile '../std_data_ln/parts/$infile' into table t5; -eval load data infile '../std_data_ln/parts/$infile' into table t6; +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +eval load data infile '$MYSQLTEST_VARDIR/std_data/parts/$infile' into table t4; +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +eval load data infile '$MYSQLTEST_VARDIR/std_data/parts/$infile' into table t5; +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +eval load data infile '$MYSQLTEST_VARDIR/std_data/parts/$infile' into table t6; eval select $sqlfunc from t1 order by col1; diff --git a/mysql-test/suite/parts/r/part_supported_sql_func_innodb.result b/mysql-test/suite/parts/r/part_supported_sql_func_innodb.result index c47c22ed363..f73f175f635 100644 --- a/mysql-test/suite/parts/r/part_supported_sql_func_innodb.result +++ b/mysql-test/suite/parts/r/part_supported_sql_func_innodb.result @@ -55,9 +55,9 @@ insert into t2 values (17 ); insert into t3 values (5 ); insert into t3 values (13 ); insert into t3 values (17 ); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t6; select abs(col1) from t1 order by col1; abs(col1) 5 @@ -1731,9 +1731,9 @@ insert into t2 values (17); insert into t3 values (5); insert into t3 values (19); insert into t3 values (17); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t6; select mod(col1,10) from t1 order by col1; mod(col1,10) 5 @@ -3429,9 +3429,9 @@ insert into t2 values ('2006-01-25'); insert into t3 values ('2006-02-03'); insert into t3 values ('2006-01-17'); insert into t3 values ('2006-01-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select day(col1) from t1 order by col1; day(col1) 17 @@ -3925,9 +3925,9 @@ insert into t2 values ('2006-01-25'); insert into t3 values ('2006-02-03'); insert into t3 values ('2006-01-17'); insert into t3 values ('2006-01-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select dayofmonth(col1) from t1 order by col1; dayofmonth(col1) 17 @@ -4421,9 +4421,9 @@ insert into t2 values ('2006-01-25'); insert into t3 values ('2006-01-03'); insert into t3 values ('2006-02-17'); insert into t3 values ('2006-01-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select dayofweek(col1) from t1 order by col1; dayofweek(col1) 3 @@ -4929,9 +4929,9 @@ insert into t2 values ('2006-02-25'); insert into t3 values ('2006-01-03'); insert into t3 values ('2006-01-17'); insert into t3 values ('2006-02-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select dayofyear(col1) from t1 order by col1; dayofyear(col1) 3 @@ -5427,9 +5427,9 @@ insert into t2 values ('2006-02-25'); insert into t3 values ('2006-01-03'); insert into t3 values ('2006-01-17'); insert into t3 values ('2006-02-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select dayofyear(col1) from t1 order by col1; dayofyear(col1) 3 @@ -5925,9 +5925,9 @@ insert into t2 values ('2006-01-25'); insert into t3 values ('2006-01-03'); insert into t3 values ('2006-02-17'); insert into t3 values ('2006-01-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select extract(month from col1) from t1 order by col1; extract(month from col1) 1 @@ -6423,9 +6423,9 @@ insert into t2 values ('21:59'); insert into t3 values ('09:09'); insert into t3 values ('14:30'); insert into t3 values ('21:59'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6; select hour(col1) from t1 order by col1; hour(col1) 9 @@ -6927,9 +6927,9 @@ insert into t2 values ('00:59:22.000024'); insert into t3 values ('09:09:15.000002'); insert into t3 values ('04:30:01.000018'); insert into t3 values ('00:59:22.000024'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6; select microsecond(col1) from t1 order by col1; microsecond(col1) 0 @@ -7417,9 +7417,9 @@ insert into t2 values ('21:59:22'); insert into t3 values ('09:09:15'); insert into t3 values ('14:30:45'); insert into t3 values ('21:59:22'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6; select minute(col1) from t1 order by col1; minute(col1) 9 @@ -7927,9 +7927,9 @@ insert into t2 values ('21:59:22'); insert into t3 values ('09:09:09'); insert into t3 values ('14:30:20'); insert into t3 values ('21:59:22'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6; select second(col1) from t1 order by col1; second(col1) 9 @@ -8437,9 +8437,9 @@ insert into t2 values ('21:59:22'); insert into t3 values ('09:09:09'); insert into t3 values ('14:30:20'); insert into t3 values ('21:59:22'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6; select second(col1) from t1 order by col1; second(col1) 9 @@ -8947,9 +8947,9 @@ insert into t2 values ('2006-05-25'); insert into t3 values ('2006-01-03'); insert into t3 values ('2006-12-17'); insert into t3 values ('2006-05-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select month(col1) from t1 order by col1; month(col1) 1 @@ -9451,9 +9451,9 @@ insert into t2 values ('2006-09-25'); insert into t3 values ('2006-01-03'); insert into t3 values ('2006-12-17'); insert into t3 values ('2006-09-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select quarter(col1) from t1 order by col1; quarter(col1) 1 @@ -9953,9 +9953,9 @@ insert into t2 values ('21:59:22'); insert into t3 values ('09:09:15'); insert into t3 values ('14:30:45'); insert into t3 values ('21:59:22'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6; select time_to_sec(col1)-(time_to_sec(col1)-20) from t1 order by col1; time_to_sec(col1)-(time_to_sec(col1)-20) 20 @@ -10461,9 +10461,9 @@ insert into t2 values ('2006-01-25'); insert into t3 values ('2006-02-03'); insert into t3 values ('2006-01-17'); insert into t3 values ('2006-01-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select to_days(col1)-to_days('2006-01-01') from t1 order by col1; to_days(col1)-to_days('2006-01-01') 16 @@ -10961,9 +10961,9 @@ insert into t2 values ('2006-01-25'); insert into t3 values ('2006-02-03'); insert into t3 values ('2006-01-17'); insert into t3 values ('2006-01-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select datediff(col1, '2006-01-01') from t1 order by col1; datediff(col1, '2006-01-01') 16 @@ -11461,9 +11461,9 @@ insert into t2 values ('2006-05-25'); insert into t3 values ('2006-12-03'); insert into t3 values ('2006-11-17'); insert into t3 values ('2006-05-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select weekday(col1) from t1 order by col1; weekday(col1) 4 @@ -11961,9 +11961,9 @@ insert into t2 values ('2004-05-25'); insert into t3 values ('1996-01-03'); insert into t3 values ('2000-02-17'); insert into t3 values ('2004-05-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select year(col1)-1990 from t1 order by col1; year(col1)-1990 6 @@ -12465,9 +12465,9 @@ insert into t2 values ('2006-03-25'); insert into t3 values ('2006-01-03'); insert into t3 values ('2006-08-17'); insert into t3 values ('2006-03-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select yearweek(col1)-200600 from t1 order by col1; yearweek(col1)-200600 1 diff --git a/mysql-test/suite/parts/r/part_supported_sql_func_myisam.result b/mysql-test/suite/parts/r/part_supported_sql_func_myisam.result index f14f9517646..1150081e89b 100644 --- a/mysql-test/suite/parts/r/part_supported_sql_func_myisam.result +++ b/mysql-test/suite/parts/r/part_supported_sql_func_myisam.result @@ -55,9 +55,9 @@ insert into t2 values (17 ); insert into t3 values (5 ); insert into t3 values (13 ); insert into t3 values (17 ); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t6; select abs(col1) from t1 order by col1; abs(col1) 5 @@ -1731,9 +1731,9 @@ insert into t2 values (17); insert into t3 values (5); insert into t3 values (19); insert into t3 values (17); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t6; select mod(col1,10) from t1 order by col1; mod(col1,10) 5 @@ -3429,9 +3429,9 @@ insert into t2 values ('2006-01-25'); insert into t3 values ('2006-02-03'); insert into t3 values ('2006-01-17'); insert into t3 values ('2006-01-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select day(col1) from t1 order by col1; day(col1) 17 @@ -3925,9 +3925,9 @@ insert into t2 values ('2006-01-25'); insert into t3 values ('2006-02-03'); insert into t3 values ('2006-01-17'); insert into t3 values ('2006-01-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select dayofmonth(col1) from t1 order by col1; dayofmonth(col1) 17 @@ -4421,9 +4421,9 @@ insert into t2 values ('2006-01-25'); insert into t3 values ('2006-01-03'); insert into t3 values ('2006-02-17'); insert into t3 values ('2006-01-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select dayofweek(col1) from t1 order by col1; dayofweek(col1) 3 @@ -4929,9 +4929,9 @@ insert into t2 values ('2006-02-25'); insert into t3 values ('2006-01-03'); insert into t3 values ('2006-01-17'); insert into t3 values ('2006-02-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select dayofyear(col1) from t1 order by col1; dayofyear(col1) 3 @@ -5427,9 +5427,9 @@ insert into t2 values ('2006-02-25'); insert into t3 values ('2006-01-03'); insert into t3 values ('2006-01-17'); insert into t3 values ('2006-02-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select dayofyear(col1) from t1 order by col1; dayofyear(col1) 3 @@ -5925,9 +5925,9 @@ insert into t2 values ('2006-01-25'); insert into t3 values ('2006-01-03'); insert into t3 values ('2006-02-17'); insert into t3 values ('2006-01-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select extract(month from col1) from t1 order by col1; extract(month from col1) 1 @@ -6423,9 +6423,9 @@ insert into t2 values ('21:59'); insert into t3 values ('09:09'); insert into t3 values ('14:30'); insert into t3 values ('21:59'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6; select hour(col1) from t1 order by col1; hour(col1) 9 @@ -6927,9 +6927,9 @@ insert into t2 values ('00:59:22.000024'); insert into t3 values ('09:09:15.000002'); insert into t3 values ('04:30:01.000018'); insert into t3 values ('00:59:22.000024'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6; select microsecond(col1) from t1 order by col1; microsecond(col1) 0 @@ -7417,9 +7417,9 @@ insert into t2 values ('21:59:22'); insert into t3 values ('09:09:15'); insert into t3 values ('14:30:45'); insert into t3 values ('21:59:22'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6; select minute(col1) from t1 order by col1; minute(col1) 9 @@ -7927,9 +7927,9 @@ insert into t2 values ('21:59:22'); insert into t3 values ('09:09:09'); insert into t3 values ('14:30:20'); insert into t3 values ('21:59:22'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6; select second(col1) from t1 order by col1; second(col1) 9 @@ -8437,9 +8437,9 @@ insert into t2 values ('21:59:22'); insert into t3 values ('09:09:09'); insert into t3 values ('14:30:20'); insert into t3 values ('21:59:22'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6; select second(col1) from t1 order by col1; second(col1) 9 @@ -8947,9 +8947,9 @@ insert into t2 values ('2006-05-25'); insert into t3 values ('2006-01-03'); insert into t3 values ('2006-12-17'); insert into t3 values ('2006-05-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select month(col1) from t1 order by col1; month(col1) 1 @@ -9451,9 +9451,9 @@ insert into t2 values ('2006-09-25'); insert into t3 values ('2006-01-03'); insert into t3 values ('2006-12-17'); insert into t3 values ('2006-09-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select quarter(col1) from t1 order by col1; quarter(col1) 1 @@ -9953,9 +9953,9 @@ insert into t2 values ('21:59:22'); insert into t3 values ('09:09:15'); insert into t3 values ('14:30:45'); insert into t3 values ('21:59:22'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6; select time_to_sec(col1)-(time_to_sec(col1)-20) from t1 order by col1; time_to_sec(col1)-(time_to_sec(col1)-20) 20 @@ -10461,9 +10461,9 @@ insert into t2 values ('2006-01-25'); insert into t3 values ('2006-02-03'); insert into t3 values ('2006-01-17'); insert into t3 values ('2006-01-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select to_days(col1)-to_days('2006-01-01') from t1 order by col1; to_days(col1)-to_days('2006-01-01') 16 @@ -10961,9 +10961,9 @@ insert into t2 values ('2006-01-25'); insert into t3 values ('2006-02-03'); insert into t3 values ('2006-01-17'); insert into t3 values ('2006-01-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select datediff(col1, '2006-01-01') from t1 order by col1; datediff(col1, '2006-01-01') 16 @@ -11461,9 +11461,9 @@ insert into t2 values ('2006-05-25'); insert into t3 values ('2006-12-03'); insert into t3 values ('2006-11-17'); insert into t3 values ('2006-05-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select weekday(col1) from t1 order by col1; weekday(col1) 4 @@ -11961,9 +11961,9 @@ insert into t2 values ('2004-05-25'); insert into t3 values ('1996-01-03'); insert into t3 values ('2000-02-17'); insert into t3 values ('2004-05-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select year(col1)-1990 from t1 order by col1; year(col1)-1990 6 @@ -12465,9 +12465,9 @@ insert into t2 values ('2006-03-25'); insert into t3 values ('2006-01-03'); insert into t3 values ('2006-08-17'); insert into t3 values ('2006-03-25'); -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5; -load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5; +load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6; select yearweek(col1)-200600 from t1 order by col1; yearweek(col1)-200600 1 diff --git a/mysql-test/suite/parts/r/partition_alter1_myisam.result b/mysql-test/suite/parts/r/partition_alter1_myisam.result index 1058342aa8d..28e4523609e 100644 --- a/mysql-test/suite/parts/r/partition_alter1_myisam.result +++ b/mysql-test/suite/parts/r/partition_alter1_myisam.result @@ -236,12 +236,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -751,18 +751,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1280,24 +1280,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1813,20 +1813,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2338,24 +2338,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2873,24 +2873,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3406,24 +3406,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3937,26 +3937,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4467,12 +4467,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4982,18 +4982,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5511,24 +5511,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6044,20 +6044,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6569,24 +6569,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7104,24 +7104,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7637,24 +7637,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8168,26 +8168,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8703,12 +8703,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9218,18 +9218,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9747,24 +9747,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -10280,20 +10280,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -10805,24 +10805,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -11338,24 +11338,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -11871,24 +11871,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -12402,26 +12402,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -12932,12 +12932,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -13447,18 +13447,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -13976,24 +13976,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -14509,20 +14509,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -15034,24 +15034,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -15567,24 +15567,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -16100,24 +16100,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -16631,26 +16631,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -17167,12 +17167,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -17630,18 +17630,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -18107,24 +18107,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -18588,20 +18588,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -19061,24 +19061,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -19544,24 +19544,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -20025,24 +20025,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -20504,26 +20504,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -20986,12 +20986,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -21449,18 +21449,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -21926,24 +21926,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -22407,20 +22407,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -22880,24 +22880,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -23361,24 +23361,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -23842,24 +23842,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -24321,26 +24321,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -24799,12 +24799,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -25262,18 +25262,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -25739,24 +25739,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -26220,20 +26220,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -26693,24 +26693,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -27174,24 +27174,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -27655,24 +27655,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -28134,26 +28134,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -28612,12 +28612,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -29075,18 +29075,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -29552,24 +29552,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -30033,20 +30033,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -30506,24 +30506,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -30987,24 +30987,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -31468,24 +31468,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -31947,26 +31947,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_alter2_myisam.result b/mysql-test/suite/parts/r/partition_alter2_myisam.result index 18abf7380c3..13996123d9f 100644 --- a/mysql-test/suite/parts/r/partition_alter2_myisam.result +++ b/mysql-test/suite/parts/r/partition_alter2_myisam.result @@ -76,12 +76,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -539,18 +539,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1016,24 +1016,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1497,20 +1497,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1970,24 +1970,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2453,24 +2453,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2934,24 +2934,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3413,26 +3413,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3893,12 +3893,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4408,18 +4408,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4937,24 +4937,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5470,20 +5470,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5995,24 +5995,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6530,24 +6530,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7063,24 +7063,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7594,26 +7594,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8124,12 +8124,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8639,18 +8639,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9168,24 +9168,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9701,20 +9701,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -10226,24 +10226,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -10761,24 +10761,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -11294,24 +11294,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -11825,26 +11825,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -12359,12 +12359,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -12822,18 +12822,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -13299,24 +13299,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -13780,20 +13780,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -14253,24 +14253,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -14736,24 +14736,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -15217,24 +15217,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -15696,26 +15696,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -16174,12 +16174,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -16637,18 +16637,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -17114,24 +17114,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -17595,20 +17595,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -18068,24 +18068,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -18549,24 +18549,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -19030,24 +19030,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -19509,26 +19509,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -19989,12 +19989,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -20504,18 +20504,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -21033,24 +21033,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -21566,20 +21566,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -22091,24 +22091,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -22626,24 +22626,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -23159,24 +23159,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -23690,26 +23690,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -24220,12 +24220,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -24735,18 +24735,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -25264,24 +25264,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -25797,20 +25797,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -26322,24 +26322,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -26855,24 +26855,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -27388,24 +27388,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -27919,26 +27919,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -28449,12 +28449,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -28964,18 +28964,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -29493,24 +29493,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -30026,20 +30026,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -30551,24 +30551,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -31086,24 +31086,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -31619,24 +31619,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -32150,26 +32150,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -32680,12 +32680,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -33195,18 +33195,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -33724,24 +33724,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -34257,20 +34257,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -34782,24 +34782,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -35315,24 +35315,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -35848,24 +35848,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -36379,26 +36379,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -36917,12 +36917,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -37382,18 +37382,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -37861,24 +37861,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -38344,20 +38344,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -38817,24 +38817,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -39302,24 +39302,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -39783,24 +39783,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -40264,26 +40264,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -40746,12 +40746,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -41263,18 +41263,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -41794,24 +41794,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -42329,20 +42329,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -42854,24 +42854,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -43391,24 +43391,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -43924,24 +43924,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -44457,26 +44457,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -44989,12 +44989,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -45506,18 +45506,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -46037,24 +46037,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -46572,20 +46572,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -47097,24 +47097,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -47634,24 +47634,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -48167,24 +48167,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -48700,26 +48700,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -49235,12 +49235,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -49701,18 +49701,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -50181,24 +50181,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -50665,20 +50665,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -51143,24 +51143,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -51629,24 +51629,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -52115,24 +52115,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -52597,26 +52597,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -53078,12 +53078,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -53544,18 +53544,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -54024,24 +54024,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -54508,20 +54508,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -54986,24 +54986,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -55472,24 +55472,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -55958,24 +55958,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -56440,26 +56440,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -56923,12 +56923,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -57441,18 +57441,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -57973,24 +57973,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -58509,20 +58509,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -59039,24 +59039,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -59577,24 +59577,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -60115,24 +60115,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -60649,26 +60649,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -61182,12 +61182,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -61700,18 +61700,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -62232,24 +62232,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -62768,20 +62768,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -63298,24 +63298,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -63836,24 +63836,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -64374,24 +64374,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -64908,26 +64908,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -65441,12 +65441,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -65959,18 +65959,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -66491,24 +66491,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -67027,20 +67027,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -67557,24 +67557,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -68095,24 +68095,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -68633,24 +68633,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -69167,26 +69167,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -69700,12 +69700,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -70218,18 +70218,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -70750,24 +70750,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -71286,20 +71286,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -71816,24 +71816,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -72354,24 +72354,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -72892,24 +72892,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -73426,26 +73426,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_alter3_innodb.result b/mysql-test/suite/parts/r/partition_alter3_innodb.result index 2ca1e783839..edeca8f55b3 100644 --- a/mysql-test/suite/parts/r/partition_alter3_innodb.result +++ b/mysql-test/suite/parts/r/partition_alter3_innodb.result @@ -56,7 +56,7 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 -MYSQLTEST_VARDIR/master-data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 20 Using where @@ -77,8 +77,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -94,8 +94,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (DAYOFYEAR(f_date)) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -109,8 +109,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -130,8 +130,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part1 ALL NULL NULL NULL NULL 7 Using where @@ -149,8 +149,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 5 Using where @@ -165,8 +165,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB, PARTITION p6 ENGINE = InnoDB, PARTITION p7 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 3 Using where @@ -193,8 +193,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB, PARTITION p6 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p6 ALL NULL NULL NULL NULL 3 Using where @@ -208,8 +208,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p4 ALL NULL NULL NULL NULL 4 Using where @@ -223,8 +223,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 4 Using where @@ -238,8 +238,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 5 Using where @@ -253,8 +253,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part1 ALL NULL NULL NULL NULL 7 Using where @@ -268,8 +268,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 10 Using where @@ -283,8 +283,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -302,7 +302,7 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 -MYSQLTEST_VARDIR/master-data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 20 Using where @@ -341,7 +341,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 -MYSQLTEST_VARDIR/master-data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 20 Using where @@ -363,8 +363,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -387,8 +387,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part7 ALL NULL NULL NULL NULL 7 Using where @@ -406,8 +406,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part7 ALL NULL NULL NULL NULL 5 Using where @@ -425,8 +425,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB, PARTITION p6 ENGINE = InnoDB, PARTITION p7 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p6 ALL NULL NULL NULL NULL 3 Using where @@ -451,8 +451,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB, PARTITION p6 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 4 Using where @@ -469,8 +469,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part7 ALL NULL NULL NULL NULL 3 Using where @@ -487,8 +487,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p4 ALL NULL NULL NULL NULL 10 Using where @@ -505,8 +505,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part7 ALL NULL NULL NULL NULL 5 Using where @@ -523,8 +523,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part7 ALL NULL NULL NULL NULL 7 Using where @@ -541,8 +541,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 10 Using where @@ -559,8 +559,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -581,7 +581,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 -MYSQLTEST_VARDIR/master-data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 20 Using where diff --git a/mysql-test/suite/parts/r/partition_alter3_myisam.result b/mysql-test/suite/parts/r/partition_alter3_myisam.result index 5684ca89b1c..1c897324adc 100644 --- a/mysql-test/suite/parts/r/partition_alter3_myisam.result +++ b/mysql-test/suite/parts/r/partition_alter3_myisam.result @@ -56,9 +56,9 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -MYSQLTEST_VARDIR/master-data/test/t1.MYD -MYSQLTEST_VARDIR/master-data/test/t1.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 20 Using where @@ -79,10 +79,10 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -98,10 +98,10 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (DAYOFYEAR(f_date)) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -115,10 +115,10 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -138,14 +138,14 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part1 ALL NULL NULL NULL NULL 7 Using where @@ -163,16 +163,16 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 5 Using where @@ -187,24 +187,24 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM, PARTITION p6 ENGINE = MyISAM, PARTITION p7 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#p7.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p7.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p7.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p7.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 3 Using where @@ -231,22 +231,22 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM, PARTITION p6 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p6 ALL NULL NULL NULL NULL 3 Using where @@ -260,20 +260,20 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p4 ALL NULL NULL NULL NULL 4 Using where @@ -287,18 +287,18 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 4 Using where @@ -312,16 +312,16 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 5 Using where @@ -335,14 +335,14 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part1 ALL NULL NULL NULL NULL 7 Using where @@ -356,12 +356,12 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 10 Using where @@ -375,10 +375,10 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -396,9 +396,9 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -MYSQLTEST_VARDIR/master-data/test/t1.MYD -MYSQLTEST_VARDIR/master-data/test/t1.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 20 Using where @@ -431,9 +431,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -MYSQLTEST_VARDIR/master-data/test/t1.MYD -MYSQLTEST_VARDIR/master-data/test/t1.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 20 Using where @@ -455,10 +455,10 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -481,14 +481,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part7 ALL NULL NULL NULL NULL 7 Using where @@ -506,16 +506,16 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part7 ALL NULL NULL NULL NULL 5 Using where @@ -533,24 +533,24 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM, PARTITION p6 ENGINE = MyISAM, PARTITION p7 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#p7.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p7.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p7.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p7.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p6 ALL NULL NULL NULL NULL 3 Using where @@ -575,22 +575,22 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM, PARTITION p6 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 4 Using where @@ -607,20 +607,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part7 ALL NULL NULL NULL NULL 3 Using where @@ -637,18 +637,18 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p4 ALL NULL NULL NULL NULL 10 Using where @@ -665,16 +665,16 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part7 ALL NULL NULL NULL NULL 5 Using where @@ -691,14 +691,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part7 ALL NULL NULL NULL NULL 7 Using where @@ -715,12 +715,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 10 Using where @@ -737,10 +737,10 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm -MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -761,9 +761,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -MYSQLTEST_VARDIR/master-data/test/t1.MYD -MYSQLTEST_VARDIR/master-data/test/t1.MYI -MYSQLTEST_VARDIR/master-data/test/t1.frm +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI +MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 20 Using where diff --git a/mysql-test/suite/parts/r/partition_alter4_myisam.result b/mysql-test/suite/parts/r/partition_alter4_myisam.result index 8eac8d414de..2e68b7710bd 100644 --- a/mysql-test/suite/parts/r/partition_alter4_myisam.result +++ b/mysql-test/suite/parts/r/partition_alter4_myisam.result @@ -75,12 +75,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -538,18 +538,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1015,24 +1015,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1496,20 +1496,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1969,24 +1969,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2452,24 +2452,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2933,24 +2933,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3412,26 +3412,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3891,12 +3891,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4354,18 +4354,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4831,24 +4831,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5312,20 +5312,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5785,24 +5785,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6268,24 +6268,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6749,24 +6749,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7228,26 +7228,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8030,12 +8030,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8493,18 +8493,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8970,24 +8970,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9451,20 +9451,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9924,24 +9924,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -10407,24 +10407,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -10888,24 +10888,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -11367,26 +11367,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -11846,12 +11846,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -12309,18 +12309,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -12786,24 +12786,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -13267,20 +13267,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -13740,24 +13740,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -14223,24 +14223,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -14704,24 +14704,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -15183,26 +15183,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -15985,12 +15985,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -16448,18 +16448,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -16925,24 +16925,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -17406,20 +17406,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -17879,24 +17879,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -18362,24 +18362,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -18843,24 +18843,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -19322,26 +19322,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -19801,12 +19801,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -20264,18 +20264,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -20741,24 +20741,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -21222,20 +21222,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -21695,24 +21695,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -22178,24 +22178,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -22659,24 +22659,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -23138,26 +23138,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -23940,12 +23940,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -24403,18 +24403,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -24880,24 +24880,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -25361,20 +25361,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -25834,24 +25834,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -26317,24 +26317,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -26798,24 +26798,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -27277,26 +27277,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -27756,12 +27756,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -28219,18 +28219,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -28696,24 +28696,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -29177,20 +29177,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -29650,24 +29650,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -30133,24 +30133,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -30614,24 +30614,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -31093,26 +31093,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -31895,12 +31895,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -32358,18 +32358,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -32835,24 +32835,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -33316,20 +33316,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -33789,24 +33789,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -34272,24 +34272,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -34753,24 +34753,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -35232,26 +35232,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -35711,12 +35711,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -36174,18 +36174,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -36651,24 +36651,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -37132,20 +37132,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -37605,24 +37605,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -38088,24 +38088,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -38569,24 +38569,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -39048,26 +39048,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -39850,9 +39850,9 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -40310,9 +40310,9 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -40778,9 +40778,9 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -41244,9 +41244,9 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -41708,9 +41708,9 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -42176,9 +42176,9 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -42644,9 +42644,9 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -43108,9 +43108,9 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_basic_innodb.result b/mysql-test/suite/parts/r/partition_basic_innodb.result index b9097e33ce0..d3e8cefeb45 100644 --- a/mysql-test/suite/parts/r/partition_basic_innodb.result +++ b/mysql-test/suite/parts/r/partition_basic_innodb.result @@ -3620,7 +3620,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4065,7 +4065,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4510,7 +4510,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4955,7 +4955,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5398,7 +5398,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5843,7 +5843,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6286,7 +6286,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6731,7 +6731,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8067,7 +8067,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8512,7 +8512,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8955,7 +8955,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9400,7 +9400,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9843,7 +9843,7 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -14878,7 +14878,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -15360,7 +15360,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -15840,7 +15840,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -16322,7 +16322,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -16802,7 +16802,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -17284,7 +17284,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -18731,7 +18731,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -19213,7 +19213,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -19693,7 +19693,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -20175,7 +20175,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -20655,7 +20655,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -21137,7 +21137,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -22616,7 +22616,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -23114,7 +23114,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -23610,7 +23610,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -24108,7 +24108,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -24604,7 +24604,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -25102,7 +25102,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */ +) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */ # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_basic_myisam.result b/mysql-test/suite/parts/r/partition_basic_myisam.result index 7e0d5bcd62a..fe490aa1b22 100644 --- a/mysql-test/suite/parts/r/partition_basic_myisam.result +++ b/mysql-test/suite/parts/r/partition_basic_myisam.result @@ -66,12 +66,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -515,18 +515,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -970,24 +970,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1431,20 +1431,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1886,24 +1886,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2347,24 +2347,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2806,24 +2806,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3267,26 +3267,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3728,19 +3728,19 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ +) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4159,31 +4159,31 @@ OPTIMIZE TABLE t1; Table Op Msg_type Msg_text test.t1 optimize status OK state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI # check layout success: 0 REPAIR TABLE t1 EXTENDED; Table Op Msg_type Msg_text test.t1 repair status OK state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI # check layout success: 0 TRUNCATE t1; # check TRUNCATE success: 1 state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI # check layout success: 0 # End usability test (inc/partition_check.inc) DROP TABLE t1; @@ -4199,31 +4199,31 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ +) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#p5.MYD -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#p5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p5.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p5.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4642,31 +4642,31 @@ OPTIMIZE TABLE t1; Table Op Msg_type Msg_text test.t1 optimize status OK state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p5.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p5.MYI # check layout success: 0 REPAIR TABLE t1 EXTENDED; Table Op Msg_type Msg_text test.t1 repair status OK state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p5.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p5.MYI # check layout success: 0 TRUNCATE t1; # check TRUNCATE success: 1 state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p5.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p5.MYI # check layout success: 0 # End usability test (inc/partition_check.inc) DROP TABLE t1; @@ -4682,43 +4682,43 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ +) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_N.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5137,31 +5137,31 @@ OPTIMIZE TABLE t1; Table Op Msg_type Msg_text test.t1 optimize status OK state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_N.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_N.MYI # check layout success: 0 REPAIR TABLE t1 EXTENDED; Table Op Msg_type Msg_text test.t1 repair status OK state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_N.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_N.MYI # check layout success: 0 TRUNCATE t1; # check TRUNCATE success: 1 state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_N.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_N.MYI # check layout success: 0 # End usability test (inc/partition_check.inc) DROP TABLE t1; @@ -5177,35 +5177,35 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ +) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partf.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5622,31 +5622,31 @@ OPTIMIZE TABLE t1; Table Op Msg_type Msg_text test.t1 optimize status OK state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partf.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partf.MYI # check layout success: 0 REPAIR TABLE t1 EXTENDED; Table Op Msg_type Msg_text test.t1 repair status OK state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partf.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partf.MYI # check layout success: 0 TRUNCATE t1; # check TRUNCATE success: 1 state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partf.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partf.MYI # check layout success: 0 # End usability test (inc/partition_check.inc) DROP TABLE t1; @@ -5662,43 +5662,43 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ +) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp1.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6117,31 +6117,31 @@ OPTIMIZE TABLE t1; Table Op Msg_type Msg_text test.t1 optimize status OK state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp1.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp1.MYI # check layout success: 0 REPAIR TABLE t1 EXTENDED; Table Op Msg_type Msg_text test.t1 repair status OK state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp1.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp1.MYI # check layout success: 0 TRUNCATE t1; # check TRUNCATE success: 1 state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp1.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp1.MYI # check layout success: 0 # End usability test (inc/partition_check.inc) DROP TABLE t1; @@ -6157,43 +6157,43 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ +) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart42.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6610,31 +6610,31 @@ OPTIMIZE TABLE t1; Table Op Msg_type Msg_text test.t1 optimize status OK state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart42.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart42.MYI # check layout success: 0 REPAIR TABLE t1 EXTENDED; Table Op Msg_type Msg_text test.t1 repair status OK state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart42.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart42.MYI # check layout success: 0 TRUNCATE t1; # check TRUNCATE success: 1 state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart42.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart42.MYI # check layout success: 0 # End usability test (inc/partition_check.inc) DROP TABLE t1; @@ -6650,43 +6650,43 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ +) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp42.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7105,31 +7105,31 @@ OPTIMIZE TABLE t1; Table Op Msg_type Msg_text test.t1 optimize status OK state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp42.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp42.MYI # check layout success: 0 REPAIR TABLE t1 EXTENDED; Table Op Msg_type Msg_text test.t1 repair status OK state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp42.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp42.MYI # check layout success: 0 TRUNCATE t1; # check TRUNCATE success: 1 state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp42.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp42.MYI # check layout success: 0 # End usability test (inc/partition_check.inc) DROP TABLE t1; @@ -7145,47 +7145,47 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ +) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp2.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7604,31 +7604,31 @@ OPTIMIZE TABLE t1; Table Op Msg_type Msg_text test.t1 optimize status OK state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp2.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp2.MYI # check layout success: 0 REPAIR TABLE t1 EXTENDED; Table Op Msg_type Msg_text test.t1 repair status OK state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp2.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp2.MYI # check layout success: 0 TRUNCATE t1; # check TRUNCATE success: 1 state new -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par state old -Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ -File list MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp2.MYI +Table definition SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `f_int1` int(11) DEFAULT NULL, `f_int2` int(11) DEFAULT NULL, `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ +File list MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp2.MYI # check layout success: 0 # End usability test (inc/partition_check.inc) DROP TABLE t1; @@ -7648,12 +7648,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8097,18 +8097,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8549,27 +8549,27 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ +) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9010,23 +9010,23 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ +) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9465,27 +9465,27 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ +) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9926,27 +9926,27 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ +) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -10385,27 +10385,27 @@ t1 CREATE TABLE `t1` ( `f_char1` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ +) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -10860,12 +10860,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -11318,18 +11318,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -11790,24 +11790,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -12266,20 +12266,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -12734,24 +12734,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -13210,24 +13210,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -13686,24 +13686,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -14160,26 +14160,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -14631,12 +14631,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -15133,18 +15133,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -15638,27 +15638,27 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ +) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -16152,23 +16152,23 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ +) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -16660,27 +16660,27 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ +) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -17174,27 +17174,27 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ +) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -17686,27 +17686,27 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ +) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -18200,29 +18200,29 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ +) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -18734,12 +18734,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -19245,18 +19245,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -19770,24 +19770,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -20299,20 +20299,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -20820,24 +20820,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -21349,24 +21349,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -21878,24 +21878,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -22405,26 +22405,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_engine_myisam.result b/mysql-test/suite/parts/r/partition_engine_myisam.result index f81becc6eea..9b6c3c9ed21 100644 --- a/mysql-test/suite/parts/r/partition_engine_myisam.result +++ b/mysql-test/suite/parts/r/partition_engine_myisam.result @@ -70,12 +70,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -534,12 +534,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -999,16 +999,16 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1465,12 +1465,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1925,12 +1925,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2390,16 +2390,16 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2857,16 +2857,16 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3328,16 +3328,16 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3795,16 +3795,16 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4262,12 +4262,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4727,16 +4727,16 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5196,16 +5196,16 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5659,10 +5659,10 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6118,12 +6118,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (1000) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_syntax_myisam.result b/mysql-test/suite/parts/r/partition_syntax_myisam.result index 93cb075ce2f..ed610aafcfa 100644 --- a/mysql-test/suite/parts/r/partition_syntax_myisam.result +++ b/mysql-test/suite/parts/r/partition_syntax_myisam.result @@ -662,12 +662,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,2)) (PARTITION part1 VALUES IN (NULL) ENGINE = MyISAM, PARTITION part3 VALUES IN (1) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par DROP TABLE t1; # 3.5.3 Reveal that IN (...NULL) is not mapped to IN(0) @@ -694,14 +694,14 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,2)) (PARTITION part1 VALUES IN (NULL) ENGINE = MyISAM, PARTITION part2 VALUES IN (0) ENGINE = MyISAM, PARTITION part3 VALUES IN (1) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par DROP TABLE t1; @@ -734,10 +734,10 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par DROP TABLE t1; # 4.1.2 no partition number, named partitions @@ -761,12 +761,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par DROP TABLE t1; # 4.1.3 variations on no partition/subpartition number, named partitions, @@ -852,20 +852,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (20) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (2147483646) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par DROP TABLE t1; #------------------------------------------------------------------------ @@ -893,12 +893,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par DROP TABLE t1; CREATE TABLE t1 ( @@ -924,16 +924,16 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part1 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part2 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par DROP TABLE t1; CREATE TABLE t1 ( @@ -956,10 +956,10 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 1 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par DROP TABLE t1; CREATE TABLE t1 ( @@ -985,12 +985,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 1 (PARTITION part1 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part2 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par DROP TABLE t1; CREATE TABLE t1 ( @@ -1732,12 +1732,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par DROP TABLE t1; CREATE TABLE t1 ( @@ -1766,16 +1766,16 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (1000) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par DROP TABLE t1; # 4.3.2 (positive) number of partition/subpartition , diff --git a/mysql-test/suite/parts/r/partition_t55.out b/mysql-test/suite/parts/r/partition_t55.out index d86ceda8c38..e309785a30c 100644 --- a/mysql-test/suite/parts/r/partition_t55.out +++ b/mysql-test/suite/parts/r/partition_t55.out @@ -4,65 +4,65 @@ t55 CREATE TABLE `t55` ( `colint` int(11) DEFAULT NULL, `col1` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY HASH (abs(col1)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM, PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) */ -27 MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp0.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp0.MYI -18 MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp1.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp1.MYI -9 MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp2.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp2.MYI -18 MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp3.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp3.MYI -18 MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp4.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp4.MYI -9 MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp0.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp0.MYI -9 MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp1.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp1.MYI -18 MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp2.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp2.MYI -18 MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp3.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp3.MYI -36 MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp4.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp4.MYI -36 MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp0.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp0.MYI -0 MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp1.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp1.MYI -9 MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp2.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp2.MYI -18 MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp3.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp3.MYI -27 MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp4.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp4.MYI -9 MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp0.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp0.MYI -9 MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp1.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp1.MYI -9 MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp2.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp2.MYI -18 MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp3.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp3.MYI -45 MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp4.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp4.MYI -9 MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp0.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp0.MYI -9 MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp1.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp1.MYI -9 MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp2.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp2.MYI -0 MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp3.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp3.MYI -0 MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp4.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp4.MYI -0 MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp0.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp0.MYI -0 MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp1.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp1.MYI -0 MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp2.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp2.MYI -9 MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp3.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp3.MYI -9 MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp4.MYD -1024 MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp4.MYI -8594 MYSQL_TEST_DIR/var/master-data/test/t55.frm -408 MYSQL_TEST_DIR/var/master-data/test/t55.par +27 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp0.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp0.MYI +18 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp1.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp1.MYI +9 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp2.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp2.MYI +18 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp3.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp3.MYI +18 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp4.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp4.MYI +9 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp0.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp0.MYI +9 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp1.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp1.MYI +18 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp2.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp2.MYI +18 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp3.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp3.MYI +36 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp4.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp4.MYI +36 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp0.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp0.MYI +0 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp1.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp1.MYI +9 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp2.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp2.MYI +18 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp3.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp3.MYI +27 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp4.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp4.MYI +9 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp0.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp0.MYI +9 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp1.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp1.MYI +9 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp2.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp2.MYI +18 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp3.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp3.MYI +45 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp4.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp4.MYI +9 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp0.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp0.MYI +9 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp1.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp1.MYI +9 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp2.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp2.MYI +0 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp3.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp3.MYI +0 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp4.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp4.MYI +0 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp0.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp0.MYI +0 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp1.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp1.MYI +0 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp2.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp2.MYI +9 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp3.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp3.MYI +9 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp4.MYD +1024 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp4.MYI +8594 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55.frm +408 MYSQL_TEST_DIR/var/mysqld.1/data/test/t55.par diff --git a/mysql-test/suite/parts/t/partition_sessions.test b/mysql-test/suite/parts/t/partition_sessions.test index ef3c5ef6a97..d9e3d6613aa 100644 --- a/mysql-test/suite/parts/t/partition_sessions.test +++ b/mysql-test/suite/parts/t/partition_sessions.test @@ -34,16 +34,16 @@ let $col_new_list = new.f1,new.f2,new.f3 new.f4 ; --disable_query_log # DATA DIRECTORY # Make directory for partition data ---exec mkdir $MYSQLTEST_VARDIR/master-data/tmpdata || true +--exec mkdir $MYSQLTEST_VARDIR/mysqld.1/data/tmpdata || true eval SET @data_dir = 'DATA DIRECTORY = -''$MYSQLTEST_VARDIR/master-data/tmpdata'''; +''$MYSQLTEST_VARDIR/mysqld.1/data/tmpdata'''; let $data_directory = `select @data_dir`; #INDEX DIRECTORY # Make directory for partition index ---exec mkdir $MYSQLTEST_VARDIR/master-data/tmpindex || true +--exec mkdir $MYSQLTEST_VARDIR/mysqld.1/data/tmpindex || true eval SET @indx_dir = 'INDEX DIRECTORY = -''$MYSQLTEST_VARDIR/master-data/tmpindex'''; +''$MYSQLTEST_VARDIR/mysqld.1/data/tmpindex'''; let $index_directory = `select @indx_dir`; --enable_query_log From 08cbaffbff9f01336bd33391c4653a74c08acfda Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 11 Jan 2008 10:44:16 +0100 Subject: [PATCH 049/705] Allow start-from to also filter on suitename --- mysql-test/lib/mtr_cases.pm | 16 ++++++++++++---- mysql-test/mysql-test-run.pl | 6 ++++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 16d4da39667..2a8a3054ed9 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -653,18 +653,26 @@ sub collect_one_test_case { #print " filename: $filename\n"; # ---------------------------------------------------------------------- - # Skip some tests silently + # Check --start-from # ---------------------------------------------------------------------- - if ( $start_from and $tname lt $start_from ) + if ( $start_from ) { - return; + # start_from can be specified as [suite.].testname_prefix + my ($suite, $test, $ext)= split_testname($start_from); + + if ( $suite and $suitename lt $suite){ + return; # Skip silently + } + if ( $tname lt $test ){ + return; # Skip silently + } } # ---------------------------------------------------------------------- # Set defaults # ---------------------------------------------------------------------- my $tinfo= {}; - $tinfo->{'name'}= basename($suitename) . ".$tname"; + $tinfo->{'name'}= $suitename . ".$tname"; $tinfo->{'path'}= "$testdir/$filename"; # TODO allow nonexistsing result file diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index b72fd085609..2d578e776f7 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3588,8 +3588,10 @@ Options to control what test suites or cases to run skip-test=PREFIX or REGEX Skip test cases which name are prefixed with PREFIX or fulfills REGEX - start-from=PREFIX Run test cases starting from test prefixed with PREFIX - suite[s]=NAME1,..,NAMEN Collect tests in suites from the comma separated + start-from=PREFIX Run test cases starting test prefixed with PREFIX where + prefix may be suite.testname or just testname + suite[s]=NAME1,..,NAMEN + Collect tests in suites from the comma separated list of suite names. The default is: "$opt_suites" skip-rpl Skip the replication test cases. From f8de652fe2a347acd264a96f8dd67506cb9c7361 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 11 Jan 2008 16:56:14 +0100 Subject: [PATCH 050/705] Update test result --- .../suite/binlog/r/binlog_multi_engine.result | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/mysql-test/suite/binlog/r/binlog_multi_engine.result b/mysql-test/suite/binlog/r/binlog_multi_engine.result index 67c3412ec15..83e0414bab0 100644 --- a/mysql-test/suite/binlog/r/binlog_multi_engine.result +++ b/mysql-test/suite/binlog/r/binlog_multi_engine.result @@ -17,22 +17,22 @@ TRUNCATE t1b; TRUNCATE t1n; show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query # # use `test`; INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2) -master-bin.000001 # Query # # use `test`; INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2) -master-bin.000001 # Query # # use `test`; UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c -master-bin.000001 # Query # # use `test`; BEGIN -master-bin.000001 # Query # # use `test`; INSERT INTO t1n VALUES (1,1), (1,2), (2,1), (2,2) -master-bin.000001 # Query # # use `test`; UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f -master-bin.000001 # Query # # use `test`; UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c -master-bin.000001 # Query # # use `test`; COMMIT -master-bin.000001 # Query # # use `test`; TRUNCATE t1m -master-bin.000001 # Query # # use `test`; TRUNCATE t1b -master-bin.000001 # Query # # BEGIN -master-bin.000001 # Table_map # # table_id: # (test.t1n) -master-bin.000001 # Table_map # # table_id: # (mysql.ndb_apply_status) -master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F -master-bin.000001 # Query # # COMMIT -master-bin.000001 # Query # # use `test`; TRUNCATE t1n +mysqld-bin.000001 # Query # # use `test`; INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2) +mysqld-bin.000001 # Query # # use `test`; INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2) +mysqld-bin.000001 # Query # # use `test`; UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c +mysqld-bin.000001 # Query # # use `test`; BEGIN +mysqld-bin.000001 # Query # # use `test`; INSERT INTO t1n VALUES (1,1), (1,2), (2,1), (2,2) +mysqld-bin.000001 # Query # # use `test`; UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f +mysqld-bin.000001 # Query # # use `test`; UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c +mysqld-bin.000001 # Query # # use `test`; COMMIT +mysqld-bin.000001 # Query # # use `test`; TRUNCATE t1m +mysqld-bin.000001 # Query # # use `test`; TRUNCATE t1b +mysqld-bin.000001 # Query # # BEGIN +mysqld-bin.000001 # Table_map # # table_id: # (test.t1n) +mysqld-bin.000001 # Table_map # # table_id: # (mysql.ndb_apply_status) +mysqld-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query # # COMMIT +mysqld-bin.000001 # Query # # use `test`; TRUNCATE t1n RESET MASTER; SET SESSION BINLOG_FORMAT=MIXED; INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2); @@ -48,18 +48,18 @@ TRUNCATE t1b; TRUNCATE t1n; show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query # # use `test`; INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2) -master-bin.000001 # Query # # use `test`; INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2) -master-bin.000001 # Query # # use `test`; UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c -master-bin.000001 # Query # # use `test`; TRUNCATE t1m -master-bin.000001 # Query # # use `test`; TRUNCATE t1b -master-bin.000001 # Query # # BEGIN -master-bin.000001 # Table_map # # table_id: # (test.t1n) -master-bin.000001 # Table_map # # table_id: # (mysql.ndb_apply_status) -master-bin.000001 # Write_rows # # table_id: # -master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F -master-bin.000001 # Query # # COMMIT -master-bin.000001 # Query # # use `test`; TRUNCATE t1n +mysqld-bin.000001 # Query # # use `test`; INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2) +mysqld-bin.000001 # Query # # use `test`; INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2) +mysqld-bin.000001 # Query # # use `test`; UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c +mysqld-bin.000001 # Query # # use `test`; TRUNCATE t1m +mysqld-bin.000001 # Query # # use `test`; TRUNCATE t1b +mysqld-bin.000001 # Query # # BEGIN +mysqld-bin.000001 # Table_map # # table_id: # (test.t1n) +mysqld-bin.000001 # Table_map # # table_id: # (mysql.ndb_apply_status) +mysqld-bin.000001 # Write_rows # # table_id: # +mysqld-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query # # COMMIT +mysqld-bin.000001 # Query # # use `test`; TRUNCATE t1n RESET MASTER; SET SESSION BINLOG_FORMAT=ROW; INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2); @@ -74,13 +74,13 @@ UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c; ERROR HY000: Binary logging not possible. Message: Row-based format required for this statement, but not allowed by this combination of engines show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Table_map # # table_id: # (test.t1m) -master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F -master-bin.000001 # Query # # BEGIN -master-bin.000001 # Table_map # # table_id: # (test.t1n) -master-bin.000001 # Table_map # # table_id: # (mysql.ndb_apply_status) -master-bin.000001 # Write_rows # # table_id: # -master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F -master-bin.000001 # Query # # COMMIT +mysqld-bin.000001 # Table_map # # table_id: # (test.t1m) +mysqld-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query # # BEGIN +mysqld-bin.000001 # Table_map # # table_id: # (test.t1n) +mysqld-bin.000001 # Table_map # # table_id: # (mysql.ndb_apply_status) +mysqld-bin.000001 # Write_rows # # table_id: # +mysqld-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query # # COMMIT RESET MASTER; DROP TABLE t1m, t1b, t1n; From cf9053f199588c7392991456a5df0c6d798dfe9a Mon Sep 17 00:00:00 2001 From: "msvensson@shellback.(none)" <> Date: Fri, 18 Jan 2008 00:03:38 +0100 Subject: [PATCH 051/705] Add C version of safe_process --- .bzrignore | 1 + configure.in | 2 +- mysql-test/Makefile.am | 2 + mysql-test/lib/My/SafeProcess.pm | 33 ++- mysql-test/lib/My/SafeProcess/Makefile.am | 21 ++ mysql-test/lib/My/SafeProcess/safe_process.cc | 267 ++++++++++++++++++ mysql-test/lib/t/SafeProcessStress.pl | 4 +- 7 files changed, 317 insertions(+), 13 deletions(-) create mode 100644 mysql-test/lib/My/SafeProcess/Makefile.am create mode 100644 mysql-test/lib/My/SafeProcess/safe_process.cc diff --git a/.bzrignore b/.bzrignore index 7a8066fdba1..7721217165b 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3005,3 +3005,4 @@ win/vs71cache.txt win/vs8cache.txt zlib/*.ds? zlib/*.vcproj +mysql-test/lib/My/SafeProcess/my_safe_process diff --git a/configure.in b/configure.in index 34e22562e1f..dafcf1f067c 100644 --- a/configure.in +++ b/configure.in @@ -2680,7 +2680,7 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl server-tools/Makefile server-tools/instance-manager/Makefile dnl cmd-line-utils/Makefile cmd-line-utils/libedit/Makefile dnl libmysqld/Makefile libmysqld/examples/Makefile dnl - mysql-test/Makefile dnl + mysql-test/Makefile mysql-test/lib/My/SafeProcess/Makefile dnl netware/Makefile sql-bench/Makefile dnl include/mysql_version.h plugin/Makefile win/Makefile) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 13bcdbe73cf..b9ed71902f0 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -29,6 +29,8 @@ EXTRA_DIST = README \ test_SCRIPTS = mtr mysql-test-run CLEANFILES = $(test_SCRIPTS) +SUBDIRS = lib/My/SafeProcess + # Install all files and files in directories listed in EXTRA_DIST install-data-local: diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index 612096cceb7..ef3ba9146d1 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -90,22 +90,35 @@ my @safe_process_cmd; my $safe_kill; if (IS_WIN32PERL or IS_CYGWIN){ # Use my_safe_process.exe - my $exe= my_find_bin(".", "lib/My/SafeProcess", "my_safe_process.exe"); - die "Could not find my_safe_process.exe" unless $exe; + my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"], + "my_safe_process"); + die "Could not find my_safe_process" unless $exe; push(@safe_process_cmd, $exe); # Use my_safe_kill.exe my $safe_kill= my_find_bin(".", "lib/My/SafeProcess", "my_safe_kill"); - die "Could not find my_safe_kill.exe" unless $safe_kill; + die "Could not find my_safe_kill" unless $safe_kill; } -else { - # Use safe_process.pl - my $script= "lib/My/SafeProcess/safe_process.pl"; - $script= "../$script" unless -f $script; - die "Could not find safe_process.pl" unless -f $script; +else +{ + my $use_safe_process_binary= 1; + if ($use_safe_process_binary) { + # Use my_safe_process + my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"], + "my_safe_process"); + die "Could not find my_safe_process" unless $exe; + push(@safe_process_cmd, $exe); + } + else + { + # Use safe_process.pl + my $script= "lib/My/SafeProcess/safe_process.pl"; + $script= "../$script" unless -f $script; + die "Could not find safe_process.pl" unless -f $script; - # Call $script with Perl interpreter - push(@safe_process_cmd, $^X, $script); + # Call $script with Perl interpreter + push(@safe_process_cmd, $^X, $script); + } } diff --git a/mysql-test/lib/My/SafeProcess/Makefile.am b/mysql-test/lib/My/SafeProcess/Makefile.am new file mode 100644 index 00000000000..6ad43949b11 --- /dev/null +++ b/mysql-test/lib/My/SafeProcess/Makefile.am @@ -0,0 +1,21 @@ +# Copyright (C) 2000-2006 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +bin_PROGRAMS = my_safe_process + +my_safe_process_SOURCES = safe_process.cc + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/mysql-test/lib/My/SafeProcess/safe_process.cc b/mysql-test/lib/My/SafeProcess/safe_process.cc new file mode 100644 index 00000000000..71ba5f2f12d --- /dev/null +++ b/mysql-test/lib/My/SafeProcess/safe_process.cc @@ -0,0 +1,267 @@ +/* Copyright (C) 2008 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + + +/* + Utility program that encapsulates process creation, monitoring + and bulletproof process cleanup + + Usage: + safe_process [options to safe_process] -- progname arg1 ... argn + + To safeguard mysqld you would invoke safe_process with a few options + for safe_process itself followed by a double dash to indicate start + of the command line for the program you really want to start + + $> safe_process --output=output.log -- mysqld --datadir=var/data1 ... + + This would redirect output to output.log and then start mysqld, + once it has done that it will continue to monitor the child as well + as the parent. + + The safe_process then checks the follwing things: + 1. Child exits, propagate the childs return code to the parent + by exiting with the same return code as the child. + + 2. Parent dies, immediately kill the child and exit, thus the + parent does not need to properly cleanup any child, it is handled + automatically. + + 3. Signal's recieced by the process will trigger same action as 2) + +*/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +int verbose= 0; +int terminated= 0; +pid_t child_pid= -1; +char safe_process_name[32]= {0}; + + +static void message(const char* fmt, ...) +{ + if (!verbose) + return; + va_list args; + fprintf(stderr, "%s: ", safe_process_name); + va_start(args, fmt); + vfprintf(stderr, fmt, args); + fprintf(stderr, "\n"); + va_end(args); + fflush(stderr); +} + + +static void die(const char* fmt, ...) +{ + va_list args; + fprintf(stderr, "%s: FATAL ERROR, ", safe_process_name); + va_start(args, fmt); + vfprintf(stderr, fmt, args); + fprintf(stderr, "\n"); + va_end(args); + if (int last_err= errno) + fprintf(stderr, "error: %d, %s\n", last_err, strerror(last_err)); + exit(1); +} + + +static void kill_child (void) +{ + int exit_code= 1; + int status= 0; + + message("Killing child: %d", child_pid); + // Terminate whole process group + kill(-child_pid, SIGKILL); + + pid_t ret_pid= waitpid(child_pid, &status, 0); + if (ret_pid == child_pid) + { + if (WIFEXITED(status)) + { + // Process has exited, collect return status + exit_code= WEXITSTATUS(status); + message("Child exit: %d", exit_code); + // Exit with exit status of the child + exit(exit_code); + } + + if (WIFSIGNALED(status)) + message("Child killed by signal: %d", WTERMSIG(status)); + + exit(exit_code); + } + exit(exit_code); +} + + +static void handle_signal (int sig) +{ + message("Got signal %d, child_pid: %d", sig, child_pid); + terminated= 1; + + // Ignore further signals + signal(SIGTERM, SIG_IGN); + signal(SIGINT, SIG_IGN); + signal(SIGCHLD, SIG_IGN); + + if (child_pid > 0) + kill_child(); + + // Continune execution, allow the child to be started and + // finally terminated by monitor loop +} + + +int main(int argc, char* const argv[] ) +{ + char* const* child_argv= 0; + pid_t own_pid= getpid(); + pid_t parent_pid= getppid(); + + /* Install signal handlers */ + signal(SIGTERM, handle_signal); + signal(SIGINT, handle_signal); + signal(SIGCHLD, handle_signal); + + sprintf(safe_process_name, "safe_process[%d]", own_pid); + + message("Started"); + + /* Parse arguments */ + for (int i= 1; i < argc; i++) { + const char* arg= argv[i]; + if (strcmp(arg, "--") == 0 && strlen(arg) == 2) { + /* Got the "--" delimiter */ + if (i >= argc) + die("No real args -> nothing to do"); + child_argv= &argv[i+1]; + break; + } else { + if ( strcmp(arg, "--verbose") == 0 ) + verbose++; + else if ( strncmp(arg, "--parent-pid", 10) == 0 ) + { + /* Override parent_pid with a value provided by user */ + const char* start; + if ((start= strstr(arg, "=")) == NULL) + die("Could not find start of option value in '%s'", arg); + start++; /* Step past = */ + if ((parent_pid= atoi(start)) == 0) + die("Invalid value '%s' passed to --parent-id", start); + } + else + die("Unknown option: %s", arg); + } + } + if (!child_argv || *child_argv == 0) + die("nothing to do"); + + message("parent_pid: %d", parent_pid); + if (parent_pid == own_pid) + die("parent_pid is equal to own pid!"); + + char buf; + int pfd[2]; + if (pipe(pfd) == -1) + die("Failed to create pipe"); + + /* Create the child process */ + while((child_pid= fork()) == -1) + { + message("fork failed"); + sleep(1); + } + + if (child_pid == 0) + { + close(pfd[0]); // Close unused read end + + // Use default signal handlers in child + signal(SIGTERM, SIG_DFL); + signal(SIGINT, SIG_DFL); + signal(SIGCHLD, SIG_DFL); + + // Make this process it's own process group to be able to kill + // it and any childs(that hasn't changed group themself) + setpgid(0, 0); + + // Signal that child is ready + buf= 37; + write(pfd[1], &buf, 1); + // Close write end + close(pfd[1]); + + if (execvp(child_argv[0], child_argv) < 0) + die("Failed to exec child"); + } + + close(pfd[1]); // Close unused write end + + // Wait for child to signal it's ready + read(pfd[0], &buf, 1); + if(buf != 37) + die("Didn't get 37 from pipe"); + close(pfd[0]); // Close read end + + /* Monitor loop */ + message("Started child %d, terminated: %d", child_pid, terminated); + + while(!terminated) + { + // Check if parent is still alive + if (kill(parent_pid, 0) != 0){ + message("Parent is not alive anymore"); + break; + } + + // Check if child has exited, normally this wil be + // detected immediately with SIGCHLD handler + int status= 0; + pid_t ret_pid= waitpid(child_pid, &status, WNOHANG); + if (ret_pid == child_pid) + { + int ret_code= 2; + if (WIFEXITED(status)) + { + // Process has exited, collect return status + int ret_code= WEXITSTATUS(status); + message("Child exit: %d", ret_code); + // Exit with exit status of the child + exit(ret_code); + } + + if (WIFSIGNALED(status)) + message("Child killed by signal: %d", WTERMSIG(status)); + + exit(ret_code); + } + sleep(1); + } + kill_child(); + + exit(1); +} + diff --git a/mysql-test/lib/t/SafeProcessStress.pl b/mysql-test/lib/t/SafeProcessStress.pl index a31f3031262..0f7a59d67f0 100755 --- a/mysql-test/lib/t/SafeProcessStress.pl +++ b/mysql-test/lib/t/SafeProcessStress.pl @@ -11,7 +11,7 @@ use My::SafeProcess; my $perl_path= $^X; my $verbose= 0; -my $loops= 1000; +my $loops= 100; print "kill one and wait for one\n"; for (1...$loops){ @@ -33,7 +33,7 @@ for (1...$loops){ foreach my $proc (@procs) { $proc->kill(); - # dummyd will always be kiled and thus + # dummyd will always be killed and thus # exit_status should have been set to 1 die "oops, exit_status: ", $proc->exit_status() unless $proc->exit_status() == 1; From fad93c7ad81a7ae3a3f24eb8a8eb3b54e4fbf693 Mon Sep 17 00:00:00 2001 From: "msvensson@shellback.(none)" <> Date: Fri, 18 Jan 2008 16:48:08 +0100 Subject: [PATCH 052/705] Remove duplcate code after merge --- mysql-test/mysql-test-run.pl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 04a79a5fcf6..8893a0343af 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -426,11 +426,6 @@ sub command_line_setup { $basedir= dirname($basedir); } - # -------------------------------------------------------------------------- - # Check mtr_build_thread and calculate baseport - # -------------------------------------------------------------------------- - set_mtr_build_thread_ports($opt_mtr_build_thread); - # # Find the mysqld executable to be able to find the mysqld version # number as early as possible From e0717e2e56c05853024069216cc9c9004aa98a9d Mon Sep 17 00:00:00 2001 From: "msvensson@shellback.(none)" <> Date: Fri, 18 Jan 2008 22:30:38 +0100 Subject: [PATCH 053/705] Make "./mtr --start" exit if any child process dies --- mysql-test/mysql-test-run.pl | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 8893a0343af..c12adf4f386 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2312,9 +2312,16 @@ sub run_testcase ($) { # ---------------------------------------------------------------------- if ( $opt_start or $opt_start_dirty ) { - mtr_report("\nServers started, sleeping"); - sleep(1) while (1); - exit(0); + $suite_timeout_proc->kill(); + mtr_report("\nServers started, waiting for any of them to die..."); + my $proc= My::SafeProcess->wait_any(); + if ( grep($proc eq $_, started(all_servers())) ) + { + mtr_report("Server $proc died"); + exit(1); + } + mtr_report("Unknown process $proc died"); + exit(1); } my $test_timeout_proc= My::SafeProcess->timer($opt_testcase_timeout * 60); From abb0bdde9ec9337b20f67d06fc0de1d8edb680a7 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 4 Feb 2008 09:15:44 +0100 Subject: [PATCH 054/705] Add --verbose-restart --- mysql-test/lib/mtr_cases.pm | 2 +- mysql-test/lib/mtr_report.pl | 12 ++++++++++++ mysql-test/lib/t/Options.t | 7 +++++++ mysql-test/mysql-test-run.pl | 36 +++++++++++++++++++++--------------- 4 files changed, 41 insertions(+), 16 deletions(-) diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 2a8a3054ed9..bf5697d55d3 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -456,7 +456,7 @@ sub collect_one_suite($) push(@{$new_test->{master_opt}}, @{$comb->{comb_opt}}); push(@{$new_test->{slave_opt}}, @{$comb->{comb_opt}}); - # Add combination name shrt name + # Add combination name short name $new_test->{combination}= $comb->{name}; # Add the new test to new test cases list diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl index 6365593786c..de4b99d8536 100644 --- a/mysql-test/lib/mtr_report.pl +++ b/mysql-test/lib/mtr_report.pl @@ -536,4 +536,16 @@ sub mtr_verbose (@) { } +sub mtr_verbose_restart (@) { + my ($server, @args)= @_; + my $proc= $server->{proc}; + # Always print to log, print to screen only when --verbose is used + _mtr_log("> Restart: $proc - ",@args); + if ( $::opt_verbose_restart ) + { + print STDERR "> Restart $proc - ",join(" ", @args),"\n"; + } +} + + 1; diff --git a/mysql-test/lib/t/Options.t b/mysql-test/lib/t/Options.t index e48999cd99b..7012f3da8de 100644 --- a/mysql-test/lib/t/Options.t +++ b/mysql-test/lib/t/Options.t @@ -1,3 +1,4 @@ + # -*- cperl -*- use Test::More qw(no_plan); use strict; @@ -96,6 +97,12 @@ my @tests= ['--max_binlog_size=1', '--relay-log=/path/to/a/relay-log', '--binlog-format=default' ] ], + [ + [ '--slow-query-log=0' ], + [ '--slow-query-log' ], + [ '--slow-query-log' ] + ], + ); diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 2d578e776f7..533e28b1597 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -90,6 +90,7 @@ our $opt_vs_config = $ENV{'MTR_VS_CONFIG'}; our $opt_suites= DEFAULT_SUITES; our $opt_verbose= 0; # Verbose output, enable with --verbose +our $opt_verbose_restart= 0; # Verbose output for restarts my $exe_mysqld; our $exe_mysql; @@ -186,8 +187,6 @@ our $opt_skip_ndbcluster_slave= 0; our $opt_with_ndbcluster= 0; our $glob_ndbcluster_supported= 0; our $opt_ndb_extra_test= 0; -our $opt_skip_master_binlog= 0; -our $opt_skip_slave_binlog= 0; our $exe_ndb_mgm=""; our $exe_ndb_waiter; @@ -300,8 +299,6 @@ sub command_line_setup { 'skip-ndbcluster-slave|skip-ndb-slave' => \$opt_skip_ndbcluster_slave, 'ndb-extra-test' => \$opt_ndb_extra_test, - 'skip-master-binlog' => \$opt_skip_master_binlog, - 'skip-slave-binlog' => \$opt_skip_slave_binlog, 'suite|suites=s' => \$opt_suites, 'skip-rpl' => \&collect_option, 'skip-test=s' => \&collect_option, @@ -373,6 +370,7 @@ sub command_line_setup { 'reorder' => \&collect_option, 'enable-disabled' => \&collect_option, 'verbose+' => \$opt_verbose, + 'verbose-restart' => \$opt_verbose_restart, 'sleep=i' => \$opt_sleep, 'start-dirty' => \$opt_start_dirty, 'start' => \$opt_start, @@ -2807,36 +2805,36 @@ sub server_need_restart { if ( using_extern() ) { - mtr_verbose("No restart: using extern"); + mtr_verbose_restart($server, "no restart for --extern server"); return 0; } if ( $opt_embedded_server ) { - mtr_verbose("No start or restart for embedded server"); + mtr_verbose_restart($server, "no start or restart for embedded server"); return 0; } if ( $tinfo->{'force_restart'} ) { - mtr_verbose("Restart: forced in .opt file"); + mtr_verbose_restart($server, "forced in .opt file"); return 1; } if ( $tinfo->{template_path} ne $current_config_name) { - mtr_verbose("Restart: using different config file"); + mtr_verbose_restart($server, "using different config file"); return 1; } if ( $tinfo->{'master_sh'} || $tinfo->{'slave_sh'} ) { - mtr_verbose("Restart: script to run"); + mtr_verbose_restart($server, "sh script to run"); return 1; } if ( ! started($server) ) { - mtr_verbose("Restart: not started"); + mtr_verbose_restart($server, "not started"); return 1; } @@ -2848,7 +2846,7 @@ sub server_need_restart { # with differs from timezone of next test if ( timezone($started_tinfo) ne timezone($tinfo) ) { - mtr_verbose("Restart: Different timezone"); + mtr_verbose_restart($server, "different timezone"); return 1; } } @@ -2865,7 +2863,13 @@ sub server_need_restart { if (!My::Options::same($started_opts, $extra_opts) ) { my $use_dynamic_option_switch= 0; - return 1 if (!$use_dynamic_option_switch); + if (!$use_dynamic_option_switch) + { + mtr_verbose_restart($server, "running with different options '" . + join(" ", @{$extra_opts}) . "' != '" . + join(" ", @{$started_opts}) . "'" ); + return 1; + } mtr_verbose(My::Options::toStr("started_opts", @$started_opts)); mtr_verbose(My::Options::toStr("extra_opts", @$extra_opts)); @@ -2879,7 +2883,7 @@ sub server_need_restart { if (run_query($tinfo, $server, $query)){ mtr_verbose("Restart: running with different options '" . join(" ", @{$extra_opts}) . "' != '" . - join(" ", @{$server->{'started_opts'}}) . "'" ); + join(" ", @{$started_opts}) . "'" ); return 1; } @@ -3249,6 +3253,10 @@ sub start_mysqltest ($) { mtr_add_arg($args, "--skip-ssl"); } + if ( defined $tinfo->{'include_file'} ) { + mtr_add_arg($args, "--include=%s", $tinfo->{'include_file'}); # MASV + } + # ---------------------------------------------------------------------- # export MYSQL_TEST variable containing /mysqltest @@ -3561,8 +3569,6 @@ Options to control what engine/variation to run all generated configs Options to control directories to use - benchdir=DIR The directory where the benchmark suite is stored - (default: ../../mysql-bench) tmpdir=DIR The directory where temporary files are stored (default: ./var/tmp). vardir=DIR The directory where files generated from the test run From 86d065f525e6684898f7bacd52e9a07ae89c50b7 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 4 Feb 2008 11:16:25 +0100 Subject: [PATCH 055/705] Make mtr_report.pl into it's own package Remove mtr_log_* --- mysql-test/lib/mtr_cases.pm | 4 +- .../lib/{mtr_report.pl => mtr_report.pm} | 94 ++++++++----------- mysql-test/lib/mtr_settings.pl | 16 ---- mysql-test/mysql-test-run.pl | 16 ++-- 4 files changed, 48 insertions(+), 82 deletions(-) rename mysql-test/lib/{mtr_report.pl => mtr_report.pm} (89%) delete mode 100644 mysql-test/lib/mtr_settings.pl diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index cc9323cb9fb..7bc3aad4b47 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -24,6 +24,8 @@ use strict; use base qw(Exporter); our @EXPORT= qw(collect_option collect_test_cases); +use mtr_report; + # Options used for the collect phase our $start_from; our $print_testcases; @@ -52,8 +54,6 @@ use File::Basename; use IO::File(); use My::Config; -require "mtr_settings.pl"; -require "mtr_report.pl"; require "mtr_match.pl"; require "mtr_misc.pl"; diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pm similarity index 89% rename from mysql-test/lib/mtr_report.pl rename to mysql-test/lib/mtr_report.pm index de4b99d8536..eebb24ba118 100644 --- a/mysql-test/lib/mtr_report.pl +++ b/mysql-test/lib/mtr_report.pm @@ -18,30 +18,38 @@ # and is part of the translation of the Bourne shell script with the # same name. +package mtr_report; use strict; -use warnings; -sub mtr_report_test_passed($$); -sub mtr_report_test_failed($$); -sub mtr_report_test_skipped($); -sub mtr_report_stats ($); +use base qw(Exporter); +our @EXPORT= qw(report_option mtr_print_line mtr_print_thick_line + mtr_print_header mtr_report mtr_report_stats + mtr_warning mtr_error mtr_debug mtr_verbose + mtr_verbose_restart mtr_report_test_passed + mtr_report_test_failed mtr_report_test_skipped + mtr_report_stats); -sub mtr_print_line (); -sub mtr_print_thick_line ($); -sub mtr_print_header (); -sub mtr_report (@); -sub mtr_warning (@); -sub mtr_error (@); -sub mtr_debug (@); -sub mtr_verbose (@); +require "mtr_io.pl"; my $tot_real_time= 0; -sub mtr_report_test_name ($) { +our $timestamp= 0; + +sub report_option { + my ($opt, $value)= @_; + + # Convert - to _ in option name + $opt =~ s/-/_/; + no strict 'refs'; + ${$opt}= $value; +} + +sub SHOW_SUITE_NAME() { return 1; }; + +sub _mtr_report_test_name ($) { my $tinfo= shift; my $tname= $tinfo->{name}; - # Remove suite part of name $tname =~ s/.*\.// unless SHOW_SUITE_NAME; @@ -49,14 +57,14 @@ sub mtr_report_test_name ($) { $tname.= " '$tinfo->{combination}'" if defined $tinfo->{combination}; - _mtr_log("$tname"); + print _timestamp(); printf "%-30s ", $tname; } sub mtr_report_test_skipped ($) { my $tinfo= shift; - mtr_report_test_name($tinfo); + _mtr_report_test_name($tinfo); $tinfo->{'result'}= 'MTR_RES_SKIPPED'; if ( $tinfo->{'disable'} ) @@ -83,7 +91,7 @@ sub mtr_report_test_skipped ($) { sub mtr_report_test_passed ($$) { my ($tinfo, $use_timer)= @_; - mtr_report_test_name($tinfo); + _mtr_report_test_name($tinfo); my $timer= ""; if ( $use_timer and -f "$::opt_vardir/log/timer" ) @@ -102,7 +110,7 @@ sub mtr_report_test_passed ($$) { sub mtr_report_test_failed ($$) { my ($tinfo, $logfile)= @_; - mtr_report_test_name($tinfo); + _mtr_report_test_name($tinfo); $tinfo->{'result'}= 'MTR_RES_FAILED'; my $test_failures= $tinfo->{'failures'} || 0; @@ -440,7 +448,7 @@ sub mtr_print_line () { } -sub mtr_print_thick_line ($) { +sub mtr_print_thick_line { my $char= shift || '='; print $char x 60, "\n"; } @@ -467,52 +475,33 @@ sub mtr_print_header () { # ############################################################################## -use IO::File; use Time::localtime; sub _timestamp { + return "" unless $timestamp; + my $tm= localtime(); return sprintf("%02d%02d%02d %2d:%02d:%02d ", $tm->year % 100, $tm->mon+1, $tm->mday, $tm->hour, $tm->min, $tm->sec); } -my $log_file_ref= undef; - -sub mtr_log_init ($) { - my ($filename)= @_; - - mtr_error("Log is already open") if defined $log_file_ref; - - $log_file_ref= IO::File->new($filename, "a") or - mtr_warning("Could not create logfile $filename: $!"); -} - - -sub _mtr_log (@) { - print $log_file_ref join(" ", _timestamp(), @_),"\n" - if defined $log_file_ref; -} - +# Print message to screen sub mtr_report (@) { - # Print message to screen and log - _mtr_log(@_); - print join(" ", @_),"\n"; + print join(" ", @_), "\n"; } +# Print warning to screen sub mtr_warning (@) { - # Print message to screen and log - _mtr_log("WARNING: ", @_); - print STDERR "mysql-test-run: WARNING: ",join(" ", @_),"\n"; + print STDERR _timestamp(), "mysql-test-run: WARNING: ", join(" ", @_), "\n"; } +# Print error to screen and then exit sub mtr_error (@) { - # Print message to screen and log - _mtr_log("ERROR: ", @_); - print STDERR "mysql-test-run: *** ERROR: ",join(" ", @_),"\n"; + print STDERR _timestamp(), "mysql-test-run: *** ERROR: ", join(" ", @_), "\n"; exit(1); } @@ -520,18 +509,15 @@ sub mtr_error (@) { sub mtr_debug (@) { if ( $::opt_verbose > 1 ) { - _mtr_log("###: ", @_); - print STDERR "####: ",join(" ", @_),"\n"; + print STDERR _timestamp(), "####: ", join(" ", @_), "\n"; } } sub mtr_verbose (@) { - # Always print to log, print to screen only when --verbose is used - _mtr_log("> ",@_); if ( $::opt_verbose ) { - print STDERR "> ",join(" ", @_),"\n"; + print STDERR _timestamp(), "> ",join(" ", @_),"\n"; } } @@ -539,11 +525,9 @@ sub mtr_verbose (@) { sub mtr_verbose_restart (@) { my ($server, @args)= @_; my $proc= $server->{proc}; - # Always print to log, print to screen only when --verbose is used - _mtr_log("> Restart: $proc - ",@args); if ( $::opt_verbose_restart ) { - print STDERR "> Restart $proc - ",join(" ", @args),"\n"; + print STDERR _timestamp(), "> Restart $proc - ",join(" ", @args),"\n"; } } diff --git a/mysql-test/lib/mtr_settings.pl b/mysql-test/lib/mtr_settings.pl deleted file mode 100644 index 01ba4c9516e..00000000000 --- a/mysql-test/lib/mtr_settings.pl +++ /dev/null @@ -1,16 +0,0 @@ -# -# Defines used to control how mysql-test-run.pl -# should work in the current version of MySQL -# - -# Control if the suite name should be output before testname -sub SHOW_SUITE_NAME { return 1; }; - - -# Control which suites are run by default -sub DEFAULT_SUITES { return "main,binlog,federated,rpl,rpl_ndb,ndb"; }; - - - -1; - diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index d3d7f9d077b..12df5054891 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -33,9 +33,6 @@ BEGIN { "Could not find the lib/ directory \n"; exit(1); } - - # Include settings that control how the script behaves - require "lib/mtr_settings.pl"; } @@ -50,6 +47,7 @@ use My::SafeProcess; use My::ConfigFactory; use My::Options; use mtr_cases; +use mtr_report; our $is_win32_perl= ($^O eq "MSWin32"); # ActiveState Win32 Perl our $is_cygwin= ($^O eq "cygwin"); # Cygwin Perl @@ -58,7 +56,6 @@ our $is_win32= ($is_win32_perl or $is_cygwin); require "lib/mtr_process.pl"; require "lib/mtr_io.pl"; require "lib/mtr_gcov.pl"; -require "lib/mtr_report.pl"; require "lib/mtr_match.pl"; require "lib/mtr_misc.pl"; require "lib/mtr_unique.pl"; @@ -87,7 +84,8 @@ my $path_config_file; # The generated config file, var/my.cnf # executables will be used by the test suite. our $opt_vs_config = $ENV{'MTR_VS_CONFIG'}; -our $opt_suites= DEFAULT_SUITES; +my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb"; +our $opt_suites= $DEFAULT_SUITES; our $opt_verbose= 0; # Verbose output, enable with --verbose our $opt_verbose_restart= 0; # Verbose output for restarts @@ -100,7 +98,7 @@ our $exe_ndbd; our $exe_ndb_mgmd= ""; our $exe_libtool; -our $opt_big_test= 0; +my $opt_big_test= 0; our @opt_combinations; @@ -384,6 +382,7 @@ sub command_line_setup { 'suite-timeout=i' => \$opt_suite_timeout, 'shutdown-timeout=i' => \$opt_shutdown_timeout, 'warnings!' => \$opt_warnings, + 'timestamp' => \&report_option, 'help|h' => \$opt_usage, ) or usage("Can't read options"); @@ -1946,8 +1945,6 @@ sub initialize_servers { } } check_running_as_root(); - - mtr_log_init("$opt_vardir/log/mysql-test-run.log"); } @@ -2090,7 +2087,7 @@ sub run_testcase_check_skip_test($) { $tinfo->{comment}= "Failed to find cluster binaries"; - mtr_report_test_failed($tinfo); + mtr_report_test_failed($tinfo, undef); return 1; } } @@ -2357,6 +2354,7 @@ sub run_testcase ($) { { # Stop all servers that are known to be running stop_all_servers(); + after_test_failure($tinfo->{'name'}); mtr_report("Resuming tests...\n"); } } From bf98940d6b1e611912c53eff75b09350a5767b11 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 19 Feb 2008 09:36:28 +0100 Subject: [PATCH 056/705] Revert change to check proper return value from QueryPerformanceFrequency since it will be change in other patch --- mysys/my_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysys/my_init.c b/mysys/my_init.c index 5afc1e377ac..e50b121cc1d 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -368,7 +368,7 @@ static void my_win_init(void) LARGE_INTEGER li, t_cnt; DBUG_ASSERT(sizeof(LARGE_INTEGER) == sizeof(query_performance_frequency)); if (QueryPerformanceFrequency((LARGE_INTEGER *) - &query_performance_frequency) == 0) + &query_performance_frequency)) query_performance_frequency= 0; else { From bf65a61567c913c9d5ba4810759aee7d7529f9ee Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 20 Feb 2008 14:55:30 +0100 Subject: [PATCH 057/705] Use My::Platform Put all path conversions in one file Convert the --tmpdir passed to "mysqld --verbose --help" --- mysql-test/lib/My/Find.pm | 8 +-- mysql-test/lib/My/Platform.pm | 95 ++++++++++++++++++++++++++++++++ mysql-test/lib/My/SafeProcess.pm | 37 ++----------- mysql-test/lib/mtr_cases.pm | 5 +- mysql-test/lib/mtr_misc.pl | 34 +++--------- mysql-test/lib/t/Platform.t | 18 ++++++ mysql-test/mysql-test-run.pl | 56 ++++++++++--------- 7 files changed, 162 insertions(+), 91 deletions(-) create mode 100644 mysql-test/lib/My/Platform.pm create mode 100644 mysql-test/lib/t/Platform.t diff --git a/mysql-test/lib/My/Find.pm b/mysql-test/lib/My/Find.pm index 36a08dd6b58..6b4d5732c36 100644 --- a/mysql-test/lib/My/Find.pm +++ b/mysql-test/lib/My/Find.pm @@ -23,14 +23,14 @@ package My::Find; use strict; use Carp; +use My::Platform; use base qw(Exporter); our @EXPORT= qw(my_find_bin my_find_dir); our $vs_config_dir; -my $is_win= ($^O eq "MSWin32" or $^O eq "cygwin"); -my $bin_extension= ".exe" if $is_win; +my $bin_extension= ".exe" if IS_WINDOWS; # # my_find_bin - find an executable with "name_1...name_n" in @@ -56,7 +56,7 @@ sub my_find_bin { # Find and return the first executable # ------------------------------------------------------- foreach my $path (my_find_paths($base, $paths, $names, $bin_extension)) { - return $path if ( -x $path or ($is_win and -f $path) ); + return $path if ( -x $path or (IS_WINDOWS and -f $path) ); } find_error($base, $paths, $names); } @@ -120,7 +120,7 @@ sub my_find_paths { # ------------------------------------------------------- # Windows specific # ------------------------------------------------------- - if ($is_win) { + if (IS_WINDOWS) { # Add the default extra build dirs unless a specific one has # already been selected push(@extra_dirs, diff --git a/mysql-test/lib/My/Platform.pm b/mysql-test/lib/My/Platform.pm new file mode 100644 index 00000000000..27543d55adf --- /dev/null +++ b/mysql-test/lib/My/Platform.pm @@ -0,0 +1,95 @@ +# -*- cperl -*- +# Copyright (C) 2004-2006 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +package My::Platform; + +use strict; + +use base qw(Exporter); +our @EXPORT= qw(IS_CYGWIN IS_WINDOWS IS_WIN32PERL + native_path posix_path mixed_path); + +BEGIN { + if ($^O eq "cygwin") { + # Make sure cygpath works + if ((system("cygpath > /dev/null 2>&1") >> 8) != 1){ + die "Could not execute 'cygpath': $!"; + } + eval 'sub IS_CYGWIN { 1 }'; + } + else { + eval 'sub IS_CYGWIN { 0 }'; + } + if ($^O eq "MSWin32") { + eval 'sub IS_WIN32PERL { 1 }'; + } + else { + eval 'sub IS_WIN32PERL { 0 }'; + } +} + +BEGIN { + if (IS_CYGWIN or IS_WIN32PERL) { + eval 'sub IS_WINDOWS { 1 }'; + } + else { + eval 'sub IS_WINDOWS { 0 }'; + } +} + + +# +# native_path +# Convert from path format used by perl to the underlying +# operating systems format +# +# NOTE +# Used when running windows binaries (that expect windows paths) +# in cygwin perl (that uses unix paths) +# + +sub mixed_path { + my ($path)= @_; + if (IS_CYGWIN){ + return unless defined $path; + $path= `cygpath -m $path`; + chomp $path; + } + return $path; +} + + +sub native_path { + my ($path)= @_; + $path=~ s/\//\\/g + if (IS_CYGWIN or IS_WIN32PERL); + return $path; +} + + +sub posix_path { + my ($path)= @_; + if (IS_CYGWIN){ + return unless defined $path; + $path= `cygpath $path`; + chomp $path; + } + return $path; +} + + + +1; diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index 8dffe66ea03..d4c3d29520a 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -56,35 +56,10 @@ use My::SafeProcess::Base; use base 'My::SafeProcess::Base'; use My::Find; +use My::Platform; my %running; -BEGIN { - if ($^O eq "MSWin32") { - eval 'sub IS_WIN32PERL () { 1 }'; - } - else { - eval 'sub IS_WIN32PERL () { 0 }'; - } - if ($^O eq "cygwin") { - eval 'sub IS_CYGWIN () { 1 }'; - # Make sure cygpath works - if ((system("cygpath > /dev/null 2>&1") >> 8) != 1){ - die "Could not execute 'cygpath': $!"; - } - eval 'sub fixpath { - my ($path)= @_; - return unless defined $path; - $path= `cygpath -w $path`; - chomp $path; - return $path; - }'; - } - else { - eval 'sub IS_CYGWIN () { 0 }'; - } -} - END { # Kill any children still running for my $proc (values %running){ @@ -163,12 +138,10 @@ sub new { # } if (IS_CYGWIN){ - # safe_procss is a windows program and need - # windows paths - $path= fixpath($path); - $input= fixpath($input); - $output= fixpath($output); - $error= fixpath($error); + $path= native_path($path); + $input= native_path($input); + $output= native_path($output); + $error= native_path($error); } my @safe_args; diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 7bc3aad4b47..488ff21dabb 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -53,6 +53,7 @@ sub collect_option { use File::Basename; use IO::File(); use My::Config; +use My::Platform; require "mtr_match.pl"; require "mtr_misc.pl"; @@ -744,7 +745,7 @@ sub collect_one_test_case { my $master_sh= "$testdir/$tname-master.sh"; if ( -f $master_sh ) { - if ( $main::is_win32_perl ) + if ( IS_WIN32PERL ) { $tinfo->{'skip'}= 1; $tinfo->{'comment'}= "No tests with sh scripts on Windows"; @@ -762,7 +763,7 @@ sub collect_one_test_case { my $slave_sh= "$testdir/$tname-slave.sh"; if ( -f $slave_sh ) { - if ( $main::is_win32_perl ) + if ( IS_WIN32PERL ) { $tinfo->{'skip'}= 1; $tinfo->{'comment'}= "No tests with sh scripts on Windows"; diff --git a/mysql-test/lib/mtr_misc.pl b/mysql-test/lib/mtr_misc.pl index 759ad6da3bc..658eb270535 100644 --- a/mysql-test/lib/mtr_misc.pl +++ b/mysql-test/lib/mtr_misc.pl @@ -20,7 +20,8 @@ use strict; -sub mtr_native_path($); +use My::Platform; + sub mtr_init_args ($); sub mtr_add_arg ($$@); sub mtr_args2str($@); @@ -30,27 +31,6 @@ sub mtr_file_exists(@); sub mtr_exe_exists(@); sub mtr_exe_maybe_exists(@); -############################################################################## -# -# Misc -# -############################################################################## - -# Convert path to OS native format -sub mtr_native_path($) -{ - my $path= shift; - - # MySQL version before 5.0 still use cygwin, no need - # to convert path - return $path - if ($::mysql_version_id < 50000); - - $path=~ s/\//\\/g - if ($::is_win32); - return $path; -} - ############################################################################## # @@ -70,14 +50,14 @@ sub mtr_add_arg ($$@) { # Quote args if args contain space $format= "\"$format\"" - if ($::is_win32 and grep(/\s/, @fargs)); + if (IS_WINDOWS and grep(/\s/, @fargs)); push(@$args, sprintf($format, @fargs)); } sub mtr_args2str($@) { my $exe= shift or die; - return join(" ", mtr_native_path($exe), @_); + return join(" ", native_path($exe), @_); } ############################################################################## @@ -109,7 +89,7 @@ sub mtr_path_exists (@) { sub mtr_script_exists (@) { foreach my $path ( @_ ) { - if($::is_win32) + if(IS_WINDOWS) { return $path if -f $path; } @@ -149,10 +129,10 @@ sub mtr_file_exists (@) { sub mtr_exe_maybe_exists (@) { my @path= @_; - map {$_.= ".exe"} @path if $::is_win32; + map {$_.= ".exe"} @path if IS_WINDOWS; foreach my $path ( @path ) { - if($::is_win32) + if(IS_WINDOWS) { return $path if -f $path; } diff --git a/mysql-test/lib/t/Platform.t b/mysql-test/lib/t/Platform.t new file mode 100644 index 00000000000..a8cb7751925 --- /dev/null +++ b/mysql-test/lib/t/Platform.t @@ -0,0 +1,18 @@ +# -*- cperl -*- +use Test::More qw(no_plan); +use strict; + +use_ok ("My::Platform"); +use My::Platform; + +use File::Temp qw / tempdir /; +my $dir = tempdir( CLEANUP => 1 ); + +print "Running on Windows\n" if (IS_WINDOWS); +print "Using ActiveState perl\n" if (IS_WIN32PERL); +print "Using cygwin perl\n" if (IS_CYGWIN); + +print "dir: '$dir'\n"; +print "native: '".native_path($dir)."'\n"; +print "mixed: '".mixed_path($dir)."'\n"; +print "posix: '".posix_path($dir)."'\n"; diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 12df5054891..0f18bd3dd65 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -43,16 +43,13 @@ use My::File::Path; # Patched version of File::Path use File::Basename; use File::Copy; use File::Temp qw / tempdir /; +use My::Platform; use My::SafeProcess; use My::ConfigFactory; use My::Options; use mtr_cases; use mtr_report; -our $is_win32_perl= ($^O eq "MSWin32"); # ActiveState Win32 Perl -our $is_cygwin= ($^O eq "cygwin"); # Cygwin Perl -our $is_win32= ($is_win32_perl or $is_cygwin); - require "lib/mtr_process.pl"; require "lib/mtr_io.pl"; require "lib/mtr_gcov.pl"; @@ -400,12 +397,11 @@ sub command_line_setup { } # Find the absolute path to the test directory - $glob_mysql_test_dir= cwd(); - if ( $is_cygwin ) + $glob_mysql_test_dir= cwd(); + if (IS_CYGWIN) { - # Windows programs like 'mysqld' needs Windows paths - $glob_mysql_test_dir= `cygpath -m "$glob_mysql_test_dir"`; - chomp($glob_mysql_test_dir); + # Use mixed path format i.e c:/path/to/ + $glob_mysql_test_dir= mixed_path($glob_mysql_test_dir); } # In most cases, the base directory we find everything relative to, @@ -568,7 +564,7 @@ sub command_line_setup { # Version 4.1 and --vardir was specified # Only supported as a symlink from var/ # by setting up $opt_mem that symlink will be created - if ( ! $is_win32 ) + if ( ! IS_WINDOWS ) { # Only platforms that have native symlinks can use the vardir trick $opt_mem= $opt_vardir; @@ -584,7 +580,7 @@ sub command_line_setup { # We make the path absolute, as the server will do a chdir() before usage unless ( $opt_vardir =~ m,^/, or - ($is_win32 and $opt_vardir =~ m,^[a-z]:/,i) ) + (IS_WINDOWS and $opt_vardir =~ m,^[a-z]:/,i) ) { # Make absolute path, relative test dir $opt_vardir= "$glob_mysql_test_dir/$opt_vardir"; @@ -620,16 +616,15 @@ sub command_line_setup { if ( $opt_embedded_server ) { $opt_embedded_server= 1; - if ( $is_win32 ) + if ( IS_WINDOWS ) { # Add the location for libmysqld.dll to the path. my $separator= ";"; my $lib_mysqld= mtr_path_exists(vs_config_dirs('libmysqld','')); - if ( $is_cygwin ) + if ( IS_CYGWIN ) { - $lib_mysqld= `cygpath "$lib_mysqld"`; - chomp($lib_mysqld); + $lib_mysqld= posix_path($lib_mysqld); $separator= ":"; } $ENV{'PATH'}= "$ENV{'PATH'}".$separator.$lib_mysqld; @@ -802,7 +797,17 @@ sub collect_mysqld_features { # # --datadir must exist, mysqld will chdir into it # - my $list= `$exe_mysqld --no-defaults --datadir=$tmpdir --language=$path_language --skip-grant-tables --verbose --help`; + my $args; + mtr_init_args(\$args); + mtr_add_arg($args, "--no-defaults"); + mtr_add_arg($args, "--datadir=%s", mixed_path($tmpdir)); + mtr_add_arg($args, "--language=%s", $path_language); + mtr_add_arg($args, "--skip-grant-tables"); + mtr_add_arg($args, "--verbose"); + mtr_add_arg($args, "--help"); + + my $cmd= join(" ", $exe_mysqld, @$args); + my $list= `$cmd`; foreach my $line (split('\n', $list)) { @@ -964,7 +969,7 @@ sub client_debug_arg($$) { sub mysql_fix_arguments () { - return "" if ( $is_win32 ); + return "" if ( IS_WINDOWS ); my $exe= mtr_script_exists("$basedir/scripts/mysql_fix_privilege_tables", @@ -1202,7 +1207,7 @@ sub environment_setup { $ENV{'MYSQL_BINLOG'}= client_arguments("mysqlbinlog"); $ENV{'MYSQL'}= client_arguments("mysql"); $ENV{'MYSQL_UPGRADE'}= client_arguments("mysql_upgrade"); - $ENV{'MYSQLADMIN'}= mtr_native_path($exe_mysqladmin); + $ENV{'MYSQLADMIN'}= native_path($exe_mysqladmin); $ENV{'MYSQL_CLIENT_TEST'}= mysql_client_test_arguments(); $ENV{'MYSQL_FIX_SYSTEM_TABLES'}= mysql_fix_arguments(); $ENV{'EXE_MYSQL'}= $exe_mysql; @@ -1214,7 +1219,7 @@ sub environment_setup { my $exe_bug25714= mtr_exe_maybe_exists(vs_config_dirs('tests', 'bug25714'), "$basedir/tests/bug25714"); - $ENV{'MYSQL_BUG25714'}= mtr_native_path($exe_bug25714); + $ENV{'MYSQL_BUG25714'}= native_path($exe_bug25714); # ---------------------------------------------------- # mysql_fix_privilege_tables.sql @@ -1231,7 +1236,7 @@ sub environment_setup { mtr_exe_exists(vs_config_dirs('extra', 'my_print_defaults'), "$path_client_bindir/my_print_defaults", "$basedir/extra/my_print_defaults"); - $ENV{'MYSQL_MY_PRINT_DEFAULTS'}= mtr_native_path($exe_my_print_defaults); + $ENV{'MYSQL_MY_PRINT_DEFAULTS'}= native_path($exe_my_print_defaults); # ---------------------------------------------------- # perror @@ -1239,7 +1244,7 @@ sub environment_setup { my $exe_perror= mtr_exe_exists(vs_config_dirs('extra', 'perror'), "$basedir/extra/perror", "$path_client_bindir/perror"); - $ENV{'MY_PERROR'}= mtr_native_path($exe_perror); + $ENV{'MY_PERROR'}= native_path($exe_perror); # Create an environment variable to make it possible # to detect that valgrind is being used from test cases @@ -1491,7 +1496,7 @@ sub vs_config_dirs ($$) { $exe = "" if not defined $exe; # Don't look in these dirs when not on windows - return () unless $is_win32; + return () unless IS_WINDOWS; if ($opt_vs_config) { @@ -2614,7 +2619,7 @@ sub mysqld_arguments ($$$) { # When mysqld is run by a root user(euid is 0), it will fail # to start unless we specify what user to run as, see BUG#30630 my $euid= $>; - if (!$is_win32 and $euid == 0 and + if (!IS_WINDOWS and $euid == 0 and (grep(/^--user/, @$extra_opts)) == 0) { mtr_add_arg($args, "%s--user=root", $prefix); } @@ -2672,7 +2677,7 @@ sub mysqld_arguments ($$$) { mtr_add_arg($args, "%s%s", $prefix, "--core-file"); } - if ( $is_win32 ){ + if ( IS_WINDOWS ){ mtr_add_arg($args, "%s--log-error=%s", $prefix, $mysqld->{"path_myerr"}); } @@ -3259,8 +3264,7 @@ sub start_mysqltest ($) { # ---------------------------------------------------------------------- # export MYSQL_TEST variable containing /mysqltest # ---------------------------------------------------------------------- - $ENV{'MYSQL_TEST'}= - mtr_native_path($exe_mysqltest) . " " . join(" ", @$args); + $ENV{'MYSQL_TEST'}= mtr_args2str($exe_mysqltest, @$args); # ---------------------------------------------------------------------- # Add arguments that should not go into the MYSQL_TEST env var From 3dc9779480f37fc6891c26cebf4d05ad1ea8eda4 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 22 Feb 2008 12:23:46 +0100 Subject: [PATCH 058/705] Convert to mixed_path under cywin, not native_path --- mysql-test/lib/My/SafeProcess.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index d4c3d29520a..1c7672d1816 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -138,10 +138,10 @@ sub new { # } if (IS_CYGWIN){ - $path= native_path($path); - $input= native_path($input); - $output= native_path($output); - $error= native_path($error); + $path= mixed_path($path); + $input= mixed_path($input); + $output= mixed_path($output); + $error= mixed_path($error); } my @safe_args; From de4f78d919fe8b142b319e13c82d14742674487e Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 22 Feb 2008 12:32:02 +0100 Subject: [PATCH 059/705] Remove special hack for windows, log-error is already set in my.cnf file --- mysql-test/mysql-test-run.pl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 0f18bd3dd65..9ee9ba08c2e 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2677,10 +2677,6 @@ sub mysqld_arguments ($$$) { mtr_add_arg($args, "%s%s", $prefix, "--core-file"); } - if ( IS_WINDOWS ){ - mtr_add_arg($args, "%s--log-error=%s", $prefix, $mysqld->{"path_myerr"}); - } - return $args; } From 0b547b26db49d45b11770ed1aa50e841f0f36ea1 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 22 Feb 2008 15:38:10 +0100 Subject: [PATCH 060/705] Fix embedded server --- mysql-test/lib/My/ConfigFactory.pm | 26 +++++++++-- mysql-test/mysql-test-run.pl | 70 +++++++++++++++++------------- 2 files changed, 64 insertions(+), 32 deletions(-) diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index 4911e4caaa8..d4882d60e6c 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -295,7 +295,7 @@ my @mysqlbinlog_rules= # -# Generate a [client.] group pointing to be +# Generate a [client.] group to be # used for connecting to [mysqld.] # sub post_check_client_group { @@ -347,6 +347,25 @@ sub post_check_client_groups { } +# +# Generate [embedded] by copying the values +# needed from first [mysqld.] +# +sub post_check_embedded_group { + my ($self, $config)= @_; + + return unless $self->{ARGS}->{embedded}; + + my $first_mysqld= $config->first_like('mysqld.') or + croak "Can't run with embedded, config has no mysqld"; + + foreach my $option ( $first_mysqld->options() ) { + $config->insert('embedded', $option->name(), $option->value()) + } + +} + + sub resolve_at_variable { my ($self, $config, $group, $option)= @_; @@ -423,6 +442,7 @@ my @post_rules= \&post_check_client_groups, \&post_fix_mysql_cluster_section, \&post_fix_resolve_at_variables, + \&post_check_embedded_group, ); @@ -567,13 +587,13 @@ sub new_config { $config->insert('mysqlbinlog'), @mysqlbinlog_rules); - # Additional reuls required for [client] + # Additional rules required for [client] $self->run_rules_for_group($config, $config->insert('client'), @client_rules); - # Additional reuls required for [mysqltest] + # Additional rules required for [mysqltest] $self->run_rules_for_group($config, $config->insert('mysqltest'), @mysqltest_rules); diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 9ee9ba08c2e..315ff8ae1e6 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -615,7 +615,6 @@ sub command_line_setup { # -------------------------------------------------------------------------- if ( $opt_embedded_server ) { - $opt_embedded_server= 1; if ( IS_WINDOWS ) { # Add the location for libmysqld.dll to the path. @@ -2273,6 +2272,7 @@ sub run_testcase ($) { user => $opt_user, password => '', ssl => $opt_ssl_supported, + embedded => $opt_embedded_server, } ); @@ -2607,52 +2607,39 @@ sub mysqld_arguments ($$$) { my $mysqld= shift; my $extra_opts= shift; - my $prefix= ""; # If mysqltest server arg - if ( $opt_embedded_server ) - { - $prefix= "--server-arg="; - } - - mtr_add_arg($args, "%s--defaults-file=%s", $prefix, $path_config_file); - mtr_add_arg($args, "--defaults-group-suffix=%s", $mysqld->after('mysqld')); + mtr_add_arg($args, "--defaults-file=%s", $path_config_file); # When mysqld is run by a root user(euid is 0), it will fail # to start unless we specify what user to run as, see BUG#30630 my $euid= $>; if (!IS_WINDOWS and $euid == 0 and (grep(/^--user/, @$extra_opts)) == 0) { - mtr_add_arg($args, "%s--user=root", $prefix); + mtr_add_arg($args, "--user=root"); } if ( $opt_valgrind_mysqld ) { - mtr_add_arg($args, "%s--skip-safemalloc", $prefix); + mtr_add_arg($args, "--skip-safemalloc"); if ( $mysql_version_id < 50100 ) { - mtr_add_arg($args, "%s--skip-bdb", $prefix); + mtr_add_arg($args, "--skip-bdb"); } } if ( $mysql_version_id >= 50106 ) { # Turn on logging to both tables and file - mtr_add_arg($args, "%s--log-output=table,file", $prefix); + mtr_add_arg($args, "--log-output=table,file"); } # Check if "extra_opt" contains skip-log-bin my $skip_binlog= grep(/^(--|--loose-)skip-log-bin/, @$extra_opts); - if ( $opt_debug ) - { - mtr_add_arg($args, "%s--debug=d:t:i:A,%s/log/%s.trace", - $prefix, $path_vardir_trace, $mysqld->name()); - } - # Indicate to mysqld it will be debugged in debugger if ( $glob_debugger ) { - mtr_add_arg($args, "%s--gdb", $prefix); + mtr_add_arg($args, "--gdb"); } my $found_skip_core= 0; @@ -2669,12 +2656,12 @@ sub mysqld_arguments ($$$) { } else { - mtr_add_arg($args, "%s%s", $prefix, $arg); + mtr_add_arg($args, "%s", $arg); } } if ( !$found_skip_core ) { - mtr_add_arg($args, "%s%s", $prefix, "--core-file"); + mtr_add_arg($args, "%s", "--core-file"); } return $args; @@ -2702,8 +2689,15 @@ sub mysqld_start ($$) { valgrind_arguments($args, \$exe); } + mtr_add_arg($args, "--defaults-group-suffix=%s", $mysqld->after('mysqld')); mysqld_arguments($args,$mysqld,$extra_opts); + if ( $opt_debug ) + { + mtr_add_arg($args, "--debug=d:t:i:A,%s/log/%s.trace", + $path_vardir_trace, $mysqld->name()); + } + if ( $opt_gdb || $opt_manual_gdb ) { gdb_arguments(\$args, \$exe, $mysqld->name()); @@ -3073,11 +3067,15 @@ sub start_servers($) { return 1; } - my $extra_opts= get_extra_opts($mysqld, $tinfo); - mysqld_start($mysqld,$extra_opts); + if (!$opt_embedded_server) + { + my $extra_opts= get_extra_opts($mysqld, $tinfo); + mysqld_start($mysqld,$extra_opts); + + # Save this test case information, so next can examine it + $mysqld->{'started_tinfo'}= $tinfo; + } - # Save this test case information, so next can examine it - $mysqld->{'started_tinfo'}= $tinfo; } # Wait for clusters to start @@ -3094,6 +3092,8 @@ sub start_servers($) { # Wait for mysqlds to start foreach my $mysqld ( mysqlds() ) { + next if !started($mysqld); + if (sleep_until_file_created($mysqld->value('pid-file'), $opt_start_timeout, $mysqld->{'proc'}) == 0) { @@ -3252,10 +3252,22 @@ sub start_mysqltest ($) { mtr_add_arg($args, "--skip-ssl"); } - if ( defined $tinfo->{'include_file'} ) { - mtr_add_arg($args, "--include=%s", $tinfo->{'include_file'}); # MASV - } + if ( $opt_embedded_server ) + { + # Get the args needed for the embedded server + # and append them to args prefixed + # with --sever-arg= + + my $mysqld= $config->group('embedded') + or mtr_error("Could not get [embedded] section"); + + my $mysqld_args; + mtr_init_args(\$mysqld_args); + my $extra_opts= get_extra_opts($mysqld, $tinfo); + mysqld_arguments($mysqld_args, $mysqld, $extra_opts); + mtr_add_arg($args, "--server-arg=%s", $_) for @$mysqld_args; + } # ---------------------------------------------------------------------- # export MYSQL_TEST variable containing /mysqltest From 8d6d318c6b15a22bbe3a0c7aa8940e551b0e3705 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 25 Feb 2008 16:41:59 +0100 Subject: [PATCH 061/705] Only uise one file for current test Don't retry by default Fixes for --embedded --- mysql-test/lib/My/ConfigFactory.pm | 16 ++++++++--- mysql-test/lib/mtr_cases.pm | 11 ++++++++ mysql-test/mysql-test-run.pl | 45 +++++++++++++++--------------- mysql-test/t/csv.test | 2 +- mysql-test/t/innodb.test | 12 ++++---- mysql-test/t/ps_1general.test | 2 +- mysql-test/t/trigger.test | 2 +- 7 files changed, 54 insertions(+), 36 deletions(-) diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index d4882d60e6c..f1008fae360 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -352,14 +352,22 @@ sub post_check_client_groups { # needed from first [mysqld.] # sub post_check_embedded_group { - my ($self, $config)= @_; + my ($self, $config)= @_; - return unless $self->{ARGS}->{embedded}; + return unless $self->{ARGS}->{embedded}; - my $first_mysqld= $config->first_like('mysqld.') or - croak "Can't run with embedded, config has no mysqld"; + my $first_mysqld= $config->first_like('mysqld.') or + croak "Can't run with embedded, config has no mysqld"; + + my @no_copy = + ( + 'log-error', # Embedded server writes stderr to mysqltest's log file + ); foreach my $option ( $first_mysqld->options() ) { + # Don't copy options whose name is in "no_copy" list + next if grep ( $option->name() eq $_, @no_copy); + $config->insert('embedded', $option->name(), $option->value()) } diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 488ff21dabb..98c36ad572b 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -891,6 +891,16 @@ sub collect_one_test_case { } } + if ( $::opt_embedded_server ) + { + if ( $tinfo->{'not_embedded'} ) + { + $tinfo->{'skip'}= 1; + $tinfo->{'comment'}= "Not run for embedded server"; + return $tinfo; + } + } + # ---------------------------------------------------------------------- # Find config file to use if not already selected in .opt file # ---------------------------------------------------------------------- @@ -960,6 +970,7 @@ my @tags= ["include/master-slave.inc", "rpl_test", 1], ["include/ndb_master-slave.inc", "rpl_test", 1], ["include/federated.inc", "federated_test", 1], + ["include/not_embedded.inc", "not_embedded", 1], ); diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 315ff8ae1e6..6f58f0835bd 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -66,8 +66,9 @@ our $basedir; our $path_charsetsdir; our $path_client_bindir; our $path_language; -our $path_timefile; -our $path_current_test_log; + +our $path_current_testlog; +our $path_testlog; our $default_vardir; our $opt_vardir; # Path to use for var/ dir @@ -112,7 +113,7 @@ our $opt_view_protocol; our $opt_debug; our @opt_cases; # The test cases names in argv -my $opt_embedded_server; +our $opt_embedded_server; # Options used when connecting to an already running server my %opts_extern; @@ -735,8 +736,8 @@ sub command_line_setup { # socket path names. $sockdir = tempdir(CLEANUP => 0) if ( length($sockdir) >= 70 ); - $path_timefile= "$opt_vardir/log/mysqltest-time"; - $path_current_test_log= "$opt_vardir/log/current_test"; + $path_testlog= "$opt_vardir/log/mysqltest.log"; + $path_current_testlog= "$opt_vardir/log/current_test"; $path_ndb_testrun_log= "$opt_vardir/log/ndb_testrun.log"; } @@ -1753,7 +1754,7 @@ sub run_tests { { # Testcase failed, enter retry mode my $retries= 1; - while ($retries <= $opt_retry){ + while ($retries < $opt_retry){ mtr_report("\nRetrying, attempt($retries/$opt_retry)...\n"); if (run_testcase($tinfo) <= 0) @@ -2097,6 +2098,8 @@ sub run_testcase_check_skip_test($) } } + + return 0; } @@ -2183,8 +2186,8 @@ sub find_testcase_skipped_reason($) # Set default message $tinfo->{'comment'}= "Detected by testcase(no log file)"; - # Open mysqltest-time(the mysqltest log file) - my $F= IO::File->new($path_timefile) + # Open the test log file + my $F= IO::File->new($path_current_testlog) or return; my $reason; @@ -2199,7 +2202,7 @@ sub find_testcase_skipped_reason($) if ( ! $reason ) { - mtr_warning("Could not find reason for skipping test in $path_timefile"); + mtr_warning("Could not find reason for skipping test in $path_current_testlog"); $reason= "Detected by testcase(reason unknown) "; } $tinfo->{'comment'}= $reason; @@ -2297,7 +2300,7 @@ sub run_testcase ($) { } # Write start of testcase to log - mark_log($path_current_test_log, $tinfo); + mark_log($path_current_testlog, $tinfo); if (start_servers($tinfo)) { @@ -2368,7 +2371,7 @@ sub run_testcase ($) { { # Testcase itself tell us to skip this one $tinfo->{skip_detected_by_test}= 1; - # Try to get reason from mysqltest.log + # Try to get reason from test log file find_testcase_skipped_reason($tinfo); mtr_report_test_skipped($tinfo); } @@ -2393,16 +2396,11 @@ sub run_testcase ($) { } # Save info from this testcase run to mysqltest.log - my $path_mysqltest_log= "$opt_vardir/log/mysqltest.log"; - mtr_appendfile_to_file($path_current_test_log, $path_mysqltest_log) - if -f $path_current_test_log; - mtr_appendfile_to_file($path_timefile, $path_mysqltest_log) - if -f $path_timefile; - - # Remove the file that mysqltest writes info to - unlink($path_timefile); - # Remove the file that mysql-test-run writes info to - unlink($path_current_test_log); + if( -f $path_current_testlog) + { + mtr_appendfile_to_file($path_current_testlog, $path_testlog); + unlink($path_current_testlog); + } return ($res == 62) ? 0 : $res; @@ -2548,7 +2546,7 @@ sub after_test_failure ($) { sub report_failure_and_restart ($) { my $tinfo= shift; - mtr_report_test_failed($tinfo, $path_timefile); + mtr_report_test_failed($tinfo, $path_current_testlog); print "\n"; if ( $opt_force ) { @@ -3321,7 +3319,8 @@ sub start_mysqltest ($) { name => "mysqltest", path => $exe, args => \$args, - error => $path_timefile, + append => 1, + error => $path_current_testlog, verbose => $opt_verbose, ); mtr_verbose("Started $proc"); diff --git a/mysql-test/t/csv.test b/mysql-test/t/csv.test index 4cb300a223f..e222cf9b51e 100644 --- a/mysql-test/t/csv.test +++ b/mysql-test/t/csv.test @@ -1588,7 +1588,7 @@ create table bug15205 (val int(11) not null) engine=csv; create table bug15205_2 (val int(11) not null) engine=csv; --remove_file $MYSQLD_DATADIR/test/bug15205.CSV # system error (can't open the datafile) ---replace_result $MYSQLTEST_VARDIR . master-data/ '' +--replace_result $MYSQLTEST_VARDIR . mysqld.1/data/ '' --error 13 select * from bug15205; select * from bug15205_2; diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index 8fdbbfcde79..8ab33a91e60 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -1130,7 +1130,7 @@ drop table t2; # Test error handling # Embedded server doesn't chdir to data directory ---replace_result $MYSQLTEST_VARDIR . master-data/ '' +--replace_result $MYSQLTEST_VARDIR . mysqld.1/data/ '' --error ER_WRONG_FK_DEF create table t2 (id int(11) not null, id2 int(11) not null, constraint t1_id_fk foreign key (id2,id) references t1 (id)) engine = innodb; @@ -1323,7 +1323,7 @@ source include/varchar.inc; # # Embedded server doesn't chdir to data directory ---replace_result $MYSQLTEST_VARDIR . master-data/ '' +--replace_result $MYSQLTEST_VARDIR . mysqld.1/data/ '' create table t1 (v varchar(65530), key(v)); drop table t1; create table t1 (v varchar(65536)); @@ -1598,7 +1598,7 @@ disconnect b; set foreign_key_checks=0; create table t2 (a int primary key, b int, foreign key (b) references t1(a)) engine = innodb; # Embedded server doesn't chdir to data directory ---replace_result $MYSQLTEST_VARDIR . master-data/ '' +--replace_result $MYSQLTEST_VARDIR . mysqld.1/data/ '' -- error 1005 create table t1(a char(10) primary key, b varchar(20)) engine = innodb; set foreign_key_checks=1; @@ -1610,7 +1610,7 @@ drop table t2; set foreign_key_checks=0; create table t1(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=latin1; # Embedded server doesn't chdir to data directory ---replace_result $MYSQLTEST_VARDIR . master-data/ '' +--replace_result $MYSQLTEST_VARDIR . mysqld.1/data/ '' -- error 1005 create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=utf8; set foreign_key_checks=1; @@ -1641,7 +1641,7 @@ set foreign_key_checks=0; create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=latin1; create table t3(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=utf8; # Embedded server doesn't chdir to data directory ---replace_result $MYSQLTEST_VARDIR . master-data/ '' +--replace_result $MYSQLTEST_VARDIR . mysqld.1/data/ '' -- error 1025 rename table t3 to t1; set foreign_key_checks=1; @@ -2269,7 +2269,7 @@ ALTER TABLE t2 ADD FOREIGN KEY (a) REFERENCES t1 (a) ON DELETE SET NULL; # mysqltest first does replace_regex, then replace_result --replace_regex /'[^']*test\/#sql-[0-9a-f_]*'/'#sql-temporary'/ # Embedded server doesn't chdir to data directory ---replace_result $MYSQLTEST_VARDIR . master-data/ '' +--replace_result $MYSQLTEST_VARDIR . mysqld.1/data/ '' --error 1025 ALTER TABLE t2 MODIFY a INT NOT NULL; DELETE FROM t1; diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test index 42bf39890de..dff52ea4a0c 100644 --- a/mysql-test/t/ps_1general.test +++ b/mysql-test/t/ps_1general.test @@ -577,7 +577,7 @@ prepare stmt1 from ' rename table t5 to t6, t7 to t8 ' ; create table t5 (a int) ; # rename must fail, t7 does not exist # Clean up the filename here because embedded server reports whole path ---replace_result $MYSQLTEST_VARDIR . master-data/ '' t7.frm t7 +--replace_result $MYSQLTEST_VARDIR . mysqld.1/data/ '' t7.frm t7 --error 1017 execute stmt1 ; create table t7 (a int) ; diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test index 688cf7a996c..f84fefbda34 100644 --- a/mysql-test/t/trigger.test +++ b/mysql-test/t/trigger.test @@ -1148,7 +1148,7 @@ dummy EOF chmod 0000 $MYSQLD_DATADIR/test/t1_ai.TRN~; # Normalize the datadir path; the embedded server doesn't chdir to datadir ---replace_result $MYSQLTEST_VARDIR . master-data/ '' +--replace_result $MYSQLTEST_VARDIR . mysqld.1/data/ '' --error 1 rename table t1 to t2; # 't1' should be still there and triggers should work correctly From a0dd86232cc17143789b6f5bb2c9338350f1ed30 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 28 Feb 2008 10:52:04 +0100 Subject: [PATCH 062/705] Use car/tmp as tempdir for mysqld --bootstrap Run "mysql --bootstrap" with verbose if turned on --- mysql-test/mysql-test-run.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 6f58f0835bd..1ed675bb06c 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1981,7 +1981,7 @@ sub mysql_install_db { mtr_add_arg($args, "--datadir=%s", $data_dir); mtr_add_arg($args, "--loose-skip-innodb"); mtr_add_arg($args, "--loose-skip-ndbcluster"); - mtr_add_arg($args, "--tmpdir=."); + mtr_add_arg($args, "--tmpdir=%s", "$opt_vardir/tmp/"); mtr_add_arg($args, "--core-file"); if ( $opt_debug ) @@ -2057,6 +2057,7 @@ sub mysql_install_db { output => $path_bootstrap_log, error => $path_bootstrap_log, append => 1, + verbose => $opt_verbose, ) != 0) { mtr_error("Error executing mysqld --bootstrap\n" . From 0462076eacd374299d8599407a38ab8d516b5ed1 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 28 Feb 2008 11:49:14 +0100 Subject: [PATCH 063/705] Add variables fro myisamchk and myisampack --- mysql-test/mysql-test-run.pl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 1ed675bb06c..4a7fbb41d5f 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1238,6 +1238,23 @@ sub environment_setup { "$basedir/extra/my_print_defaults"); $ENV{'MYSQL_MY_PRINT_DEFAULTS'}= native_path($exe_my_print_defaults); + + # ---------------------------------------------------- + # Setup env so childs can execute myisampack and myisamchk + # ---------------------------------------------------- + $ENV{'MYISAMCHK'}= native_path(mtr_exe_exists( + vs_config_dirs('storage/myisam', 'myisamchk'), + vs_config_dirs('myisam', 'myisamchk'), + "$path_client_bindir/myisamchk", + "$basedir/storage/myisam/myisamchk", + "$basedir/myisam/myisamchk")); + $ENV{'MYISAMPACK'}= native_path(mtr_exe_exists( + vs_config_dirs('storage/myisam', 'myisampack'), + vs_config_dirs('myisam', 'myisampack'), + "$path_client_bindir/myisampack", + "$basedir/storage/myisam/myisampack", + "$basedir/myisam/myisampack")); + # ---------------------------------------------------- # perror # ---------------------------------------------------- From 06cf8665c5180ecc2387ec27b506e042e7244310 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 28 Feb 2008 18:55:46 +0100 Subject: [PATCH 064/705] Fix after merge --- mysql-test/extra/rpl_tests/rpl_charset.test | 2 -- mysql-test/lib/mtr_report.pm | 2 +- mysql-test/mysql-test-run.pl | 2 +- .../suite/binlog/r/binlog_start_comment.result | 2 +- mysql-test/suite/binlog/t/binlog_start_comment.test | 7 ++++--- mysql-test/t/drop.test | 3 ++- mysql-test/t/myisampack.test | 7 ++++--- mysql-test/t/mysqlcheck.test | 8 +++++--- sql/ha_ndbcluster_binlog.cc | 13 +++++++------ 9 files changed, 25 insertions(+), 21 deletions(-) diff --git a/mysql-test/extra/rpl_tests/rpl_charset.test b/mysql-test/extra/rpl_tests/rpl_charset.test index 4fb3c994c5a..8bcb60b0227 100644 --- a/mysql-test/extra/rpl_tests/rpl_charset.test +++ b/mysql-test/extra/rpl_tests/rpl_charset.test @@ -137,8 +137,6 @@ sync_slave_with_master; select hex(c1), hex(c2) from t1; connection master; -let $MYSQLD_DATADIR= `select @@datadir`; ---exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000001 drop table t1; sync_slave_with_master; diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index de5a1f05b34..0024c4a3f5b 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -75,7 +75,7 @@ sub mtr_report_test_skipped ($) { { if ( $tinfo->{skip_detected_by_test} ) { - mtr_report("[ skip.] $tinfo->{'comment'}"); + mtr_report("[ skip ]. $tinfo->{'comment'}"); } else { diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 4a7fbb41d5f..1bc74016bfe 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -302,7 +302,7 @@ sub command_line_setup { 'start-from=s' => \&collect_option, 'big-test' => \$opt_big_test, 'combination=s' => \@opt_combinations, - 'skip-combination' => \&collect_option, + 'skip-combinations' => \&collect_option, 'skip-im' => \&ignore_option, diff --git a/mysql-test/suite/binlog/r/binlog_start_comment.result b/mysql-test/suite/binlog/r/binlog_start_comment.result index 162968195f2..c5c906dfc4e 100644 --- a/mysql-test/suite/binlog/r/binlog_start_comment.result +++ b/mysql-test/suite/binlog/r/binlog_start_comment.result @@ -2,7 +2,7 @@ reset master; drop table if exists t1,t2; create table t1 (word varchar(20)) -- create table t1; create table t2 (word varchar(20)) -- create table t2; -load data infile '../std_data_ln/words.dat' into table t1 -- load data to t1; +load data infile '../../std_data/words.dat' into table t1 -- load data to t1; insert into t2 values ("Ada"); flush logs; select * from t2; diff --git a/mysql-test/suite/binlog/t/binlog_start_comment.test b/mysql-test/suite/binlog/t/binlog_start_comment.test index a5817eb69b7..98f2ca05505 100644 --- a/mysql-test/suite/binlog/t/binlog_start_comment.test +++ b/mysql-test/suite/binlog/t/binlog_start_comment.test @@ -10,15 +10,16 @@ drop table if exists t1,t2; --enable_warnings create table t1 (word varchar(20)) -- create table t1; create table t2 (word varchar(20)) -- create table t2; -load data infile '../std_data_ln/words.dat' into table t1 -- load data to t1; +load data infile '../../std_data/words.dat' into table t1 -- load data to t1; insert into t2 values ("Ada"); flush logs; select * from t2; ---exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog +let $MYSQLD_DATADIR= `select @@datadir`; +--exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog --exec $MYSQL --local-infile=1 < $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog flush logs; select * from t2; # clean up drop table t1,t2; -#--system rm $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog +remove_file $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog; diff --git a/mysql-test/t/drop.test b/mysql-test/t/drop.test index a79044436eb..2bd37f9ad0d 100644 --- a/mysql-test/t/drop.test +++ b/mysql-test/t/drop.test @@ -131,7 +131,8 @@ create table mysql_test.t1(f1 int); create table mysql_test.`#sql-347f_7` (f1 int); create table mysql_test.`#sql-347f_8` (f1 int); drop table mysql_test.`#sql-347f_8`; -copy_file $MYSQLTEST_VARDIR/master-data/mysql_test/t1.frm $MYSQLTEST_VARDIR/master-data/mysql_test/#sql-347f_6.frm; +let $MYSQLD_DATADIR= `select @@datadir`; +copy_file $MYSQLD_DATADIR/mysql_test/t1.frm $MYSQLD_DATADIR/mysql_test/#sql-347f_6.frm; drop database mysql_test; --echo End of 5.1 tests diff --git a/mysql-test/t/myisampack.test b/mysql-test/t/myisampack.test index 6598af6318a..89bd8b02bd1 100644 --- a/mysql-test/t/myisampack.test +++ b/mysql-test/t/myisampack.test @@ -26,8 +26,9 @@ INSERT INTO t1 VALUES (2.22402118719591e-05,2.37546284320705e-05,2.58463051055541e-05,1.83391609130854e-05,1.6300720519646e-05,1.74559091886791e-05,1.63733785575587e-05,2.26616253279828e-05,1.79541237435621e-05,45), (3.01092775359837e-05,3.23865212934412e-05,4.09444584045994e-05,0,2.15470966302776e-05,2.39082636344032e-05,2.28296706429177e-05,2.9007671511595e-05,2.44201138973326e-05,46); FLUSH TABLES; ---exec $MYISAMPACK -s $MYSQLTEST_VARDIR/master-data/test/t1 ---exec $MYISAMCHK -srq $MYSQLTEST_VARDIR/master-data/test/t1 ---exec $MYISAMCHK -s --unpack $MYSQLTEST_VARDIR/master-data/test/t1 +let $MYSQLD_DATADIR= `select @@datadir`; +--exec $MYISAMPACK -s $MYSQLD_DATADIR/test/t1 +--exec $MYISAMCHK -srq $MYSQLD_DATADIR/test/t1 +--exec $MYISAMCHK -s --unpack $MYSQLD_DATADIR/test/t1 CHECK TABLE t1 EXTENDED; DROP TABLE t1; diff --git a/mysql-test/t/mysqlcheck.test b/mysql-test/t/mysqlcheck.test index ba13a315cb8..2d96d00772c 100644 --- a/mysql-test/t/mysqlcheck.test +++ b/mysql-test/t/mysqlcheck.test @@ -55,9 +55,10 @@ create table t_bug25347 (a int); create view v_bug25347 as select * from t_bug25347; insert into t_bug25347 values (1),(2),(3); flush tables; +let $MYSQLD_DATADIR= `select @@datadir`; --echo removing and creating ---remove_file $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI ---write_file $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI +--remove_file $MYSQLD_DATADIR/d_bug25347/t_bug25347.MYI +--write_file $MYSQLD_DATADIR/d_bug25347/t_bug25347.MYI EOF --exec $MYSQL_CHECK --repair --databases d_bug25347 --error 130 @@ -79,7 +80,8 @@ use test; create table t1(a int); create view v1 as select * from t1; show tables; ---copy_file $MYSQLTEST_VARDIR/master-data/test/v1.frm $MYSQLTEST_VARDIR/master-data/test/v-1.frm +let $MYSQLD_DATADIR= `select @@datadir`; +--copy_file $MYSQLD_DATADIR/test/v1.frm $MYSQLD_DATADIR/test/v-1.frm show tables; --exec $MYSQL_CHECK --check-upgrade --fix-table-names --databases test show tables; diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index fc1568a5ea6..a86387f3df5 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -918,12 +918,9 @@ int ndbcluster_setup_binlog_table_shares(THD *thd) { pthread_mutex_lock(&LOCK_open); ndb_binlog_tables_inited= TRUE; - if (ndb_binlog_running) - { - if (ndb_extra_logging) - sql_print_information("NDB Binlog: ndb tables writable"); - close_cached_tables(NULL, NULL, TRUE, FALSE, FALSE); - } + if (ndb_extra_logging) + sql_print_information("NDB Binlog: ndb tables writable"); + close_cached_tables(NULL, NULL, TRUE, FALSE, FALSE); pthread_mutex_unlock(&LOCK_open); /* Signal injector thread that all is setup */ pthread_cond_signal(&injector_cond); @@ -2068,6 +2065,7 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb, ndb_schema_share->use_count)); free_share(&ndb_schema_share); ndb_schema_share= 0; + ndb_binlog_tables_inited= 0; pthread_mutex_unlock(&ndb_schema_share_mutex); /* end protect ndb_schema_share */ @@ -3268,6 +3266,7 @@ ndb_binlog_thread_handle_non_data_event(THD *thd, Ndb *ndb, share->key, share->use_count)); free_share(&ndb_apply_status_share); ndb_apply_status_share= 0; + ndb_binlog_tables_inited= 0; } DBUG_PRINT("error", ("CLUSTER FAILURE EVENT: " "%s received share: 0x%lx op: 0x%lx share op: 0x%lx " @@ -3287,6 +3286,7 @@ ndb_binlog_thread_handle_non_data_event(THD *thd, Ndb *ndb, share->key, share->use_count)); free_share(&ndb_apply_status_share); ndb_apply_status_share= 0; + ndb_binlog_tables_inited= 0; } /* ToDo: remove printout */ if (ndb_extra_logging) @@ -4310,6 +4310,7 @@ err: ndb_schema_share->use_count)); free_share(&ndb_schema_share); ndb_schema_share= 0; + ndb_binlog_tables_inited= 0; pthread_mutex_unlock(&ndb_schema_share_mutex); /* end protect ndb_schema_share */ } From ae9f0285c035352c4c515056ae159d94577730ca Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 3 Mar 2008 10:17:32 +0100 Subject: [PATCH 065/705] Update paths Add missing drop view --- .../extra/binlog_tests/mix_innodb_myisam_binlog.test | 7 ++++--- .../suite/binlog/r/binlog_row_mix_innodb_myisam.result | 2 +- .../suite/binlog/r/binlog_stm_mix_innodb_myisam.result | 4 ++-- mysql-test/suite/binlog/r/binlog_unsafe.result | 1 + mysql-test/suite/binlog/t/binlog_unsafe.test | 1 + 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test index 6879089a1b7..5db79e4f848 100644 --- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test +++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test @@ -317,17 +317,18 @@ connection con4; select get_lock("a",10); # wait for rollback to finish flush logs; +let $MYSQLD_DATADIR= `select @@datadir`; # we check that the error code of the "ROLLBACK" event is 0 and not # ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction # and does not make slave to stop) if (`select @@binlog_format = 'ROW'`) { - --exec $MYSQL_BINLOG --start-position=524 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output + --exec $MYSQL_BINLOG --start-position=524 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output } if (`select @@binlog_format = 'STATEMENT' || @@binlog_format = 'MIXED'`) { - --exec $MYSQL_BINLOG --start-position=555 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output + --exec $MYSQL_BINLOG --start-position=555 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output } --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR @@ -618,7 +619,7 @@ CREATE TABLE t5 (a int, PRIMARY KEY (a)) ENGINE=InnoDB; # execute --error ER_DUP_ENTRY - load data infile '../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2); + load data infile '../../std_data/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2); # check select * from t4; select count(*) from t1 /* must be 2 */; diff --git a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result index c1e636f8121..07c746e990c 100644 --- a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result +++ b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result @@ -653,7 +653,7 @@ delete from t1; create table t4 (a int default 0, b int primary key) engine=innodb; insert into t4 values (0, 17); reset master; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2); +load data infile '../../std_data/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2); ERROR 23000: Duplicate entry '17' for key 'PRIMARY' select * from t4; a b diff --git a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result index 2766db29e4d..89dd6df2157 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result +++ b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result @@ -611,7 +611,7 @@ delete from t1; create table t4 (a int default 0, b int primary key) engine=innodb; insert into t4 values (0, 17); reset master; -load data infile '../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2); +load data infile '../../std_data/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2); ERROR 23000: Duplicate entry '17' for key 'PRIMARY' select * from t4; a b @@ -625,7 +625,7 @@ master-bin.000001 # Query # # use `test`; BEGIN master-bin.000001 # Intvar # # INSERT_ID=10 master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=12 master-bin.000001 # Intvar # # INSERT_ID=10 -master-bin.000001 # Execute_load_query # # use `test`; load data infile '../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2) ;file_id=# +master-bin.000001 # Execute_load_query # # use `test`; load data infile '../../std_data/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2) ;file_id=# master-bin.000001 # Query # # use `test`; ROLLBACK /* the output must denote there is the query */; drop trigger trg_del_t2; diff --git a/mysql-test/suite/binlog/r/binlog_unsafe.result b/mysql-test/suite/binlog/r/binlog_unsafe.result index 47284ed8bc3..8467a18aa6b 100644 --- a/mysql-test/suite/binlog/r/binlog_unsafe.result +++ b/mysql-test/suite/binlog/r/binlog_unsafe.result @@ -11,3 +11,4 @@ Level Warning Code 1592 Message Statement is not safe to log in statement format. DROP TABLE t1,t2,t3; +DROP VIEW v1; diff --git a/mysql-test/suite/binlog/t/binlog_unsafe.test b/mysql-test/suite/binlog/t/binlog_unsafe.test index f34c22dc5f7..9f463f89ae3 100644 --- a/mysql-test/suite/binlog/t/binlog_unsafe.test +++ b/mysql-test/suite/binlog/t/binlog_unsafe.test @@ -14,5 +14,6 @@ INSERT INTO t1 SELECT UUID(); query_vertical SHOW WARNINGS; DROP TABLE t1,t2,t3; +DROP VIEW v1; From 3c12adf0255bd4a46ad9ee42be567105ba4a2d7d Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 3 Mar 2008 10:20:12 +0100 Subject: [PATCH 066/705] Add combinations file for binlog suite --- mysql-test/suite/binlog/combinations | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 mysql-test/suite/binlog/combinations diff --git a/mysql-test/suite/binlog/combinations b/mysql-test/suite/binlog/combinations new file mode 100644 index 00000000000..ea25611a5d4 --- /dev/null +++ b/mysql-test/suite/binlog/combinations @@ -0,0 +1,8 @@ +[row] +--binlog-format=row + +[stmt] +--binlog-format=statement + +[mix] +--binlog-format=mixed From 855ff4a34a08c111a3eff7a0a4ff1ed2a0f60faa Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 3 Mar 2008 10:39:28 +0100 Subject: [PATCH 067/705] Update result file for ndb_restore after changing include/ndb_backup.inc --- mysql-test/suite/ndb/r/ndb_restore.result | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/mysql-test/suite/ndb/r/ndb_restore.result b/mysql-test/suite/ndb/r/ndb_restore.result index d6a54213097..48c32bc14b6 100644 --- a/mysql-test/suite/ndb/r/ndb_restore.result +++ b/mysql-test/suite/ndb/r/ndb_restore.result @@ -286,12 +286,8 @@ auto_increment 10001 ALTER TABLE t7_c PARTITION BY LINEAR KEY (`dardtestard`); -CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; -DELETE FROM test.backup_info; -LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; -SELECT @the_backup_id:=backup_id FROM test.backup_info; -@the_backup_id:=backup_id - +CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP; +LOAD DATA INFILE 'DUMP_FILE' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; DROP TABLE test.backup_info; drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c,t10_c; select count(*) from t1; @@ -494,12 +490,8 @@ select * from t9_c) a; count(*) 3 drop table t1_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c,t10_c; -CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; -DELETE FROM test.backup_info; -LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; -SELECT @the_backup_id:=backup_id FROM test.backup_info; -@the_backup_id:=backup_id - +CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP; +LOAD DATA INFILE 'DUMP_FILE' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; DROP TABLE test.backup_info; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10; drop table if exists t2_c; From d8b8f944cddb844b8c345030a228c8d2def57e0b Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 3 Mar 2008 10:40:42 +0100 Subject: [PATCH 068/705] Inclue have_innodb.inc so that servers are started with innodb support --- mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test index 3c7c15926a4..a934b36d62d 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test @@ -6,6 +6,7 @@ source include/ndb_master-slave.inc; source include/have_ndb.inc; +source include/have_innodb.inc; source include/have_debug.inc; CREATE TABLE tmyisam (a int) ENGINE = MYISAM; From 05e89c1f439e1b63b9546e0cc62dfec4dd2e1896 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 3 Mar 2008 12:53:57 +0100 Subject: [PATCH 069/705] Apply patch --- mysql-test/mysql-test-run.pl | 48 +++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index da7185e6c60..23c1bb94819 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -65,6 +65,7 @@ our $basedir; our $path_charsetsdir; our $path_client_bindir; +our $path_client_libdir; our $path_language; our $path_current_testlog; @@ -358,6 +359,8 @@ sub command_line_setup { 'tmpdir=s' => \$opt_tmpdir, 'vardir=s' => \$opt_vardir, 'mem' => \$opt_mem, + 'client-bindir=s' => \$path_client_bindir, + 'client-libdir=s' => \$path_client_libdir, # Misc 'report-features' => \$opt_report_features, @@ -426,11 +429,19 @@ sub command_line_setup { # # Look for the client binaries directory - $path_client_bindir= mtr_path_exists("$basedir/client_release", - "$basedir/client_debug", - vs_config_dirs('client', ''), - "$basedir/client", - "$basedir/bin"); + if ($path_client_bindir) + { + # --client-bindir=path set on command line, check that the path exists + $path_client_bindir= mtr_path_exists($path_client_bindir); + } + else + { + $path_client_bindir= mtr_path_exists("$basedir/client_release", + "$basedir/client_debug", + vs_config_dirs('client', ''), + "$basedir/client", + "$basedir/bin"); + } # Look for language files and charsetsdir, use same share my $path_share= mtr_path_exists("$basedir/share/mysql", @@ -1066,19 +1077,25 @@ sub environment_setup { my @ld_library_paths; - # -------------------------------------------------------------------------- - # Setup LD_LIBRARY_PATH so the libraries from this distro/clone - # are used in favor of the system installed ones - # -------------------------------------------------------------------------- - if ( $source_dist ) + if ($path_client_libdir) { - push(@ld_library_paths, "$basedir/libmysql/.libs/", - "$basedir/libmysql_r/.libs/", - "$basedir/zlib.libs/"); + # Use the --client-libdir passed on commandline + push(@ld_library_paths, "$path_client_libdir"); } else { - push(@ld_library_paths, "$basedir/lib"); + # Setup LD_LIBRARY_PATH so the libraries from this distro/clone + # are used in favor of the system installed ones + if ( $source_dist ) + { + push(@ld_library_paths, "$basedir/libmysql/.libs/", + "$basedir/libmysql_r/.libs/", + "$basedir/zlib.libs/"); + } + else + { + push(@ld_library_paths, "$basedir/lib"); + } } # -------------------------------------------------------------------------- @@ -3614,6 +3631,9 @@ Options to control directories to use for tmpfs (/dev/shm) The option can also be set using environment variable MTR_MEM=[DIR] + client-bindir=PATH Path to the directory where client binaries are located + client-libdir=PATH Path to the directory where client libraries are located + Options to control what test suites or cases to run From 4a35e96462ec527758807661c0f4ee168dd291e7 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 4 Mar 2008 12:20:40 +0100 Subject: [PATCH 070/705] Fix windows paths also after eval --- client/mysqltest.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/client/mysqltest.c b/client/mysqltest.c index ca3bbf1d35f..4b2d160b5ed 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -441,6 +441,8 @@ void do_eval(DYNAMIC_STRING *query_eval, const char *query, void str_to_file(const char *fname, char *str, int size); void str_to_file2(const char *fname, char *str, int size, my_bool append); +void fix_win_paths(const char *val, int len); + #ifdef __WIN__ void free_tmp_sh_file(); void free_win_path_patterns(); @@ -594,6 +596,9 @@ void do_eval(DYNAMIC_STRING *query_eval, const char *query, break; } } +#ifdef __WIN__ + fix_win_paths(query_eval->str, query_eval->length); +#endif DBUG_VOID_RETURN; } From 0ad57d7a0c0bea5bbaa9a63534cab4ececa0e1a9 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 4 Mar 2008 12:32:51 +0100 Subject: [PATCH 071/705] Don't ignore SIGCHLD since that affects waitpid on some platforms Fix spelling error Move exit_code into local scope --- mysql-test/lib/My/SafeProcess/safe_process.cc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/mysql-test/lib/My/SafeProcess/safe_process.cc b/mysql-test/lib/My/SafeProcess/safe_process.cc index 71ba5f2f12d..85aaf970c6d 100644 --- a/mysql-test/lib/My/SafeProcess/safe_process.cc +++ b/mysql-test/lib/My/SafeProcess/safe_process.cc @@ -89,7 +89,6 @@ static void die(const char* fmt, ...) static void kill_child (void) { - int exit_code= 1; int status= 0; message("Killing child: %d", child_pid); @@ -99,6 +98,7 @@ static void kill_child (void) pid_t ret_pid= waitpid(child_pid, &status, 0); if (ret_pid == child_pid) { + int exit_code= 1; if (WIFEXITED(status)) { // Process has exited, collect return status @@ -113,7 +113,7 @@ static void kill_child (void) exit(exit_code); } - exit(exit_code); + exit(1); } @@ -122,13 +122,12 @@ static void handle_signal (int sig) message("Got signal %d, child_pid: %d", sig, child_pid); terminated= 1; + if (child_pid > 0) + kill_child(); + // Ignore further signals signal(SIGTERM, SIG_IGN); signal(SIGINT, SIG_IGN); - signal(SIGCHLD, SIG_IGN); - - if (child_pid > 0) - kill_child(); // Continune execution, allow the child to be started and // finally terminated by monitor loop @@ -237,7 +236,7 @@ int main(int argc, char* const argv[] ) break; } - // Check if child has exited, normally this wil be + // Check if child has exited, normally this will be // detected immediately with SIGCHLD handler int status= 0; pid_t ret_pid= waitpid(child_pid, &status, WNOHANG); From 5eb114bb4a92f42840333f1f6f5527f2f87b6354 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 6 Mar 2008 10:15:01 +0100 Subject: [PATCH 072/705] Removed unused "#!remove_datadir" Cleanup BACKUP dir from clusters datadir in case of test failure --- mysql-test/mysql-test-run.pl | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 23c1bb94819..e86c63fe257 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2573,13 +2573,15 @@ sub after_test_failure ($) { { foreach my $ndbd ( ndbds($cluster) ) { - my $datadir= $ndbd->value('DataDir'); - foreach my $fs_dir ( glob("$datadir/ndb_*_fs") ) { - if (-d $fs_dir) { - rmtree($fs_dir); - mtr_debug("Removing '$fs_dir'"); - } + my $data_dir= $ndbd->value('DataDir'); + foreach my $fs_dir ( glob("$data_dir/ndb_*_fs") ) { + rmtree($fs_dir); + mtr_debug("Removing '$fs_dir'"); } + + my $backup_dir= $ndbd->value('BackupDataDir'); + rmtree("$backup_dir/BACKUP"); + mtr_debug("Removing '$backup_dir'"); } } } @@ -3009,14 +3011,6 @@ sub stop_servers($$) { foreach my $server (@servers) { - # Remove datadir - if ( $server->option('#!remove-datadir') ) - { - my $datadir= $server->value('datadir'); - mtr_debug("Removing '$datadir'"); - rmtree($datadir); - } - # Mark server as stopped $server->{proc}= undef; From 4a5a4011c37887dbbcd6bcdc50fc9b91fa6d5a9f Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 6 Mar 2008 10:16:14 +0100 Subject: [PATCH 073/705] Make sure to remova any old files related to mysql.ndb_apply_status before trying to creeate the table --- mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test | 8 ++++++++ mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test | 8 ++++++++ mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test index 43ad901d746..3b075808481 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test @@ -12,6 +12,14 @@ -- connection slave -- source include/have_innodb.inc + +# Remove any old ndb_apply_status from slaves datadir +let $datadir= `SELECT @@datadir`; +--error 0,1 +remove_file $datadir/mysql/ndb_apply_status.frm; +--error 0,1 +remove_file $datadir/mysql/ndb_apply_status.ndb; + set @@global.slave_exec_mode= 'IDEMPOTENT'; CREATE TABLE mysql.ndb_apply_status ( server_id INT UNSIGNED NOT NULL, diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test index b19116ffd78..560efec255b 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test @@ -11,6 +11,14 @@ -- source include/master-slave.inc -- connection slave + +# Remove any old ndb_apply_status from slaves datadir +let $datadir= `SELECT @@datadir`; +--error 0,1 +remove_file $datadir/mysql/ndb_apply_status.frm; +--error 0,1 +remove_file $datadir/mysql/ndb_apply_status.ndb; + set @@global.slave_exec_mode= 'IDEMPOTENT'; CREATE TABLE mysql.ndb_apply_status ( server_id INT UNSIGNED NOT NULL, diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test index 67e8f7cea42..99eb5d50364 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test @@ -17,6 +17,14 @@ SET storage_engine=ndb; --echo === NDB -> MYISAM === --echo connection slave; + +# Remove any old ndb_apply_status from slaves datadir +let $datadir= `SELECT @@datadir`; +--error 0,1 +remove_file $datadir/mysql/ndb_apply_status.frm; +--error 0,1 +remove_file $datadir/mysql/ndb_apply_status.ndb; + set @@global.slave_exec_mode= 'IDEMPOTENT'; CREATE TABLE mysql.ndb_apply_status ( server_id INT UNSIGNED NOT NULL, From c7af2433b92b341986358821579ad5579bf48ad2 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 6 Mar 2008 10:19:41 +0100 Subject: [PATCH 074/705] Improve error messages --- mysql-test/lib/My/SafeProcess/safe_kill_win.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mysql-test/lib/My/SafeProcess/safe_kill_win.cc b/mysql-test/lib/My/SafeProcess/safe_kill_win.cc index 8049f626c93..74bb573eacb 100755 --- a/mysql-test/lib/My/SafeProcess/safe_kill_win.cc +++ b/mysql-test/lib/My/SafeProcess/safe_kill_win.cc @@ -41,12 +41,14 @@ int main(int argc, const char** argv ) /* Open the event to signal */ if ((shutdown_event= OpenEvent(EVENT_MODIFY_STATE, FALSE, safe_process_name)) == NULL){ - fprintf(stderr, "Failed to open shutdown_event\n"); + fprintf(stderr, "Failed to open shutdown_event '%s', error: %d\n", + safe_process_name, GetLastError()); exit(1); } if(SetEvent(shutdown_event) == 0) { - fprintf(stderr, "Failed to signal shutdown_event\n"); + fprintf(stderr, "Failed to signal shutdown_event '%s', error: %d\n", + safe_process_name, GetLastError()); CloseHandle(shutdown_event); exit(1); } From c7f2d6ef6c7c96341570b28c99510dfb7f7b2660 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 6 Mar 2008 17:55:16 +0100 Subject: [PATCH 075/705] Use retry=3 as default --- mysql-test/mysql-test-run.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index e86c63fe257..2cb446fe08d 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -160,7 +160,7 @@ my $opt_start_timeout = 30; # 30 seconds my $opt_start; my $opt_start_dirty; my $opt_repeat= 1; -my $opt_retry= 1; +my $opt_retry= 3; my $opt_retry_failure= 2; my $opt_strace_client; From 743b8d0f0e9a7e271d6e005937537bc9a38515fe Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 10 Mar 2008 12:53:35 +0100 Subject: [PATCH 076/705] Look for sourced file relative to test first --- mysql-test/lib/mtr_cases.pm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 98c36ad572b..ac426ecab9e 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -1004,13 +1004,19 @@ sub tags_from_test_file { $value =~ s/^\s+//; # Remove leading space $value =~ s/[[:space:]]+$//; # Remove ending space - my $sourced_file= "$::glob_mysql_test_dir/$value"; - if ( -f $sourced_file ) + # Sourced file may exist relative to test or + # in global location + foreach my $sourced_file (dirname($file). "/$value", + "$::glob_mysql_test_dir/$value") { - # Only source the file if it exists, we may get - # false positives in the regexes above if someone - # writes "source nnnn;" in a test case(such as mysqltest.test) - tags_from_test_file($tinfo, $sourced_file); + if ( -f $sourced_file ) + { + # Only source the file if it exists, we may get + # false positives in the regexes above if someone + # writes "source nnnn;" in a test case(such as mysqltest.test) + tags_from_test_file($tinfo, $sourced_file); + last; + } } } From 3b7c6573d690ae90bdbe3f422ab48f21df0a8e45 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 10 Mar 2008 12:54:15 +0100 Subject: [PATCH 077/705] Don't run federated tests for embedded --- mysql-test/suite/federated/federated.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/suite/federated/federated.inc b/mysql-test/suite/federated/federated.inc index 548a37249de..6f85f7f32c4 100644 --- a/mysql-test/suite/federated/federated.inc +++ b/mysql-test/suite/federated/federated.inc @@ -1,3 +1,4 @@ +--source include/not_embedded.inc --source have_federated_db.inc connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,); From 34605cc11062453edab2eae77f9791c784abf4d9 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 10 Mar 2008 12:54:46 +0100 Subject: [PATCH 078/705] Add retry logic for OpenEvent to avoid problems when the process to kill hasn't yet created the event --- .../lib/My/SafeProcess/safe_kill_win.cc | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/mysql-test/lib/My/SafeProcess/safe_kill_win.cc b/mysql-test/lib/My/SafeProcess/safe_kill_win.cc index 74bb573eacb..a9a4b08b9e5 100755 --- a/mysql-test/lib/My/SafeProcess/safe_kill_win.cc +++ b/mysql-test/lib/My/SafeProcess/safe_kill_win.cc @@ -29,6 +29,7 @@ int main(int argc, const char** argv ) DWORD pid= -1; HANDLE shutdown_event; char safe_process_name[32]= {0}; + int retry_open_event= 100; if (argc != 2) { fprintf(stderr, "safe_kill \n"); @@ -39,14 +40,33 @@ int main(int argc, const char** argv ) _snprintf(safe_process_name, sizeof(safe_process_name), "safe_process[%d]", pid); /* Open the event to signal */ - if ((shutdown_event= - OpenEvent(EVENT_MODIFY_STATE, FALSE, safe_process_name)) == NULL){ + while ((shutdown_event= + OpenEvent(EVENT_MODIFY_STATE, FALSE, safe_process_name)) == NULL) + { fprintf(stderr, "Failed to open shutdown_event '%s', error: %d\n", safe_process_name, GetLastError()); - exit(1); + + /* Just check to see if pid exists */ + HANDLE pid_handle= OpenProcess(SYNCHRONIZE, FALSE, pid); + if (pid_handle == NULL) + fprintf(stderr, "Could not open process with pid %d, error: %d\n", pid); + else + CloseHandle(pid_handle); + + if (retry_open_event--) + { + fprintf(stderr, "retrying...\n"); + Sleep(100); /* In milli seconds */ + } + else + { + fprintf(stderr, "No more retries, exiting"); + exit(1); + } } - if(SetEvent(shutdown_event) == 0) { + if(SetEvent(shutdown_event) == 0) + { fprintf(stderr, "Failed to signal shutdown_event '%s', error: %d\n", safe_process_name, GetLastError()); CloseHandle(shutdown_event); From afefb65cea6c0baa8d9970a2c9475a9caea762bc Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 10 Mar 2008 14:09:59 +0100 Subject: [PATCH 079/705] Print args in case requirement fails --- mysql-test/lib/My/SafeProcess.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index 1c7672d1816..dc600cbb7c5 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -124,8 +124,8 @@ sub new { @_ ); - my $path = delete($opts{'path'}) or die "path required"; - my $args = delete($opts{'args'}) or die "args required"; + my $path = delete($opts{'path'}) or die "path required @_"; + my $args = delete($opts{'args'}) or die "args required @_"; my $input = delete($opts{'input'}); my $output = delete($opts{'output'}); my $error = delete($opts{'error'}); From 5dbb4c96eb48eb42466a89529ceb6514f5885dc0 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 10 Mar 2008 16:00:39 +0100 Subject: [PATCH 080/705] Ignore all common signals Just retry OpenEvent a couple of times with a "yield" in between --- .../lib/My/SafeProcess/safe_kill_win.cc | 30 ++++++++----------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/mysql-test/lib/My/SafeProcess/safe_kill_win.cc b/mysql-test/lib/My/SafeProcess/safe_kill_win.cc index a9a4b08b9e5..12609993562 100755 --- a/mysql-test/lib/My/SafeProcess/safe_kill_win.cc +++ b/mysql-test/lib/My/SafeProcess/safe_kill_win.cc @@ -23,6 +23,7 @@ #include #include +#include int main(int argc, const char** argv ) { @@ -30,6 +31,10 @@ int main(int argc, const char** argv ) HANDLE shutdown_event; char safe_process_name[32]= {0}; int retry_open_event= 100; + /* Ignore any signals */ + signal(SIGINT, SIG_IGN); + signal(SIGBREAK, SIG_IGN); + signal(SIGTERM, SIG_IGN); if (argc != 2) { fprintf(stderr, "safe_kill \n"); @@ -37,31 +42,20 @@ int main(int argc, const char** argv ) } pid= atoi(argv[1]); - _snprintf(safe_process_name, sizeof(safe_process_name), "safe_process[%d]", pid); + _snprintf(safe_process_name, sizeof(safe_process_name), + "safe_process[%d]", pid); /* Open the event to signal */ while ((shutdown_event= OpenEvent(EVENT_MODIFY_STATE, FALSE, safe_process_name)) == NULL) { - fprintf(stderr, "Failed to open shutdown_event '%s', error: %d\n", - safe_process_name, GetLastError()); - - /* Just check to see if pid exists */ - HANDLE pid_handle= OpenProcess(SYNCHRONIZE, FALSE, pid); - if (pid_handle == NULL) - fprintf(stderr, "Could not open process with pid %d, error: %d\n", pid); - else - CloseHandle(pid_handle); - if (retry_open_event--) - { - fprintf(stderr, "retrying...\n"); - Sleep(100); /* In milli seconds */ - } + Sleep(0); /* yield */ else { - fprintf(stderr, "No more retries, exiting"); - exit(1); + fprintf(stderr, "Failed to open shutdown_event '%s', error: %d\n", + safe_process_name, GetLastError()); + exit(3); } } @@ -70,7 +64,7 @@ int main(int argc, const char** argv ) fprintf(stderr, "Failed to signal shutdown_event '%s', error: %d\n", safe_process_name, GetLastError()); CloseHandle(shutdown_event); - exit(1); + exit(4); } CloseHandle(shutdown_event); exit(0); From 20b3c1559011a54982f3ffad9ea25a5a4b56943f Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 10 Mar 2008 16:37:37 +0100 Subject: [PATCH 081/705] Improve error message dir -> croak --- mysql-test/lib/My/SafeProcess.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index dc600cbb7c5..d037265fa3e 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -49,7 +49,7 @@ package My::SafeProcess; # use strict; - +use Carp; use POSIX qw(WNOHANG); use My::SafeProcess::Base; @@ -73,7 +73,7 @@ END { sub is_child { my ($self, $parent_pid)= @_; - die "usage: \$safe_proc->is_child()" unless (@_ == 2 and ref $self); + croak "usage: \$safe_proc->is_child()" unless (@_ == 2 and ref $self); return ($self->{PARENT} == $parent_pid); } @@ -124,8 +124,8 @@ sub new { @_ ); - my $path = delete($opts{'path'}) or die "path required @_"; - my $args = delete($opts{'args'}) or die "args required @_"; + my $path = delete($opts{'path'}) or croak "path required @_"; + my $args = delete($opts{'args'}) or croak "args required @_"; my $input = delete($opts{'input'}); my $output = delete($opts{'output'}); my $error = delete($opts{'error'}); @@ -198,7 +198,7 @@ sub run { # sub timer { my $class= shift; - my $duration= shift or die "duration required"; + my $duration= shift or croak "duration required"; my $parent_pid= $$; my $pid= My::SafeProcess::Base::_safe_fork(); @@ -296,7 +296,7 @@ sub shutdown { # sub start_kill { my ($self)= @_; - die "usage: \$safe_proc->start_kill()" unless (@_ == 1 and ref $self); + croak "usage: \$safe_proc->start_kill()" unless (@_ == 1 and ref $self); #print "start_kill $self\n"; if (defined $safe_kill and $self->{SAFE_WINPID}){ @@ -321,7 +321,7 @@ sub start_kill { # sub kill { my ($self)= @_; - die "usage: \$safe_proc->kill()" unless (@_ == 1 and ref $self); + croak "usage: \$safe_proc->kill()" unless (@_ == 1 and ref $self); $self->start_kill(); $self->wait_one(); @@ -355,7 +355,7 @@ sub _collect { # sub wait_one { my ($self, $timeout)= @_; - die "usage: \$safe_proc->wait_one([timeout])" unless ref $self; + croak "usage: \$safe_proc->wait_one([timeout])" unless ref $self; #print "wait_one $self, $timeout\n"; From 6967aa18e55391a3c548c4178f307dfddff6ce71 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 10 Mar 2008 16:38:28 +0100 Subject: [PATCH 082/705] Cleanup with/skip/supported-ndbcluster --- mysql-test/mysql-test-run.pl | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 2cb446fe08d..c05febeda65 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -181,8 +181,7 @@ our $opt_warnings= 1; our $opt_skip_ndbcluster= 0; our $opt_skip_ndbcluster_slave= 0; -our $opt_with_ndbcluster= 0; -our $glob_ndbcluster_supported= 0; +our $opt_with_ndbcluster; our $opt_ndb_extra_test= 0; our $exe_ndb_mgm=""; @@ -1101,7 +1100,7 @@ sub environment_setup { # -------------------------------------------------------------------------- # Add the path where libndbclient can be found # -------------------------------------------------------------------------- - if ( $glob_ndbcluster_supported ) + if ( !$opt_skip_ndbcluster ) { push(@ld_library_paths, "$basedir/storage/ndb/src/.libs"); } @@ -1549,28 +1548,20 @@ sub check_ndbcluster_support ($) { if ($opt_skip_ndbcluster) { mtr_report(" - skipping ndbcluster"); - $opt_skip_ndbcluster_slave= 1; + $opt_skip_ndbcluster_slave= $opt_skip_ndbcluster; return; } if ( ! $mysqld_variables{'ndb-connectstring'} ) { mtr_report(" - skipping ndbcluster, mysqld not compiled with ndbcluster"); - $opt_skip_ndbcluster= 1; - $opt_skip_ndbcluster_slave= 1; + $opt_skip_ndbcluster= 2; + $opt_skip_ndbcluster_slave= 2; return; } - $glob_ndbcluster_supported= 1; mtr_report(" - using ndbcluster when necessary, mysqld supports it"); - if ( $mysql_version_id < 50100 ) - { - # Slave cluster is not supported until 5.1 - $opt_skip_ndbcluster_slave= 1; - - } - return; } From de8654e0f441659c6791d9ecbe51fd50ab0cb05a Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 10 Mar 2008 16:40:19 +0100 Subject: [PATCH 083/705] Mark test that includes "ndb_master-slave.inc" as ndb_test --- mysql-test/lib/mtr_cases.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 98c36ad572b..71ecaffc4de 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -820,7 +820,7 @@ sub collect_one_test_case { if ( $tinfo->{'ndb_test'} ) { # This is a NDB test - if ( ! $::glob_ndbcluster_supported ) + if ( $::opt_skip_ndbcluster == 2 ) { # Ndb is not supported, skip it $tinfo->{'skip'}= 1; @@ -969,6 +969,7 @@ my @tags= ["include/have_ndb_extra.inc", "ndb_extra", 1], ["include/master-slave.inc", "rpl_test", 1], ["include/ndb_master-slave.inc", "rpl_test", 1], + ["include/ndb_master-slave.inc", "ndb_test", 1], ["include/federated.inc", "federated_test", 1], ["include/not_embedded.inc", "not_embedded", 1], ); From 9d142ff0a812f0c4fbb0b9fd04135f25e19c5060 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 11 Mar 2008 08:20:44 +0100 Subject: [PATCH 084/705] Temporarily turn on verbose on windows --- mysql-test/mysql-test-run.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index c05febeda65..aa3f790f333 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -87,6 +87,7 @@ my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb"; our $opt_suites= $DEFAULT_SUITES; our $opt_verbose= 0; # Verbose output, enable with --verbose +$opt_verbose= 1 if IS_WINDOWS; our $opt_verbose_restart= 0; # Verbose output for restarts my $exe_mysqld; From 4dd397e457e43911b2d4e5a2c9a87a76eec7a85c Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 12 Mar 2008 10:34:24 +0100 Subject: [PATCH 085/705] Show which servers have been started for --start-and-exit and --start-dirty --- mysql-test/mysql-test-run.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index aa3f790f333..339bc1b31d1 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2343,7 +2343,8 @@ sub run_testcase ($) { if ( $opt_start or $opt_start_dirty ) { $suite_timeout_proc->kill(); - mtr_report("\nServers started, waiting for any of them to die..."); + mtr_report("\nStarted", started(all_servers())); + mtr_report("Waiting for server(s) to exit..."); my $proc= My::SafeProcess->wait_any(); if ( grep($proc eq $_, started(all_servers())) ) { From 0dba42cf7cf3e01c222c851b452f9e6269b96901 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 12 Mar 2008 11:32:18 +0100 Subject: [PATCH 086/705] Improve process kill on windows --- mysql-test/lib/My/SafeProcess.pm | 26 ++++++++++++------- .../lib/My/SafeProcess/safe_process_win.cc | 1 + 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index d037265fa3e..049dd0adda6 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -217,7 +217,7 @@ sub timer { } # Child, install signal handlers and sleep for "duration" - $SIG{INT}= 'DEFAULT'; + $SIG{INT}= 'IGNORE'; $SIG{TERM}= sub { #print STDERR "timer $$: woken up, exiting!\n"; @@ -281,11 +281,15 @@ sub shutdown { return if (@kill_processes == 0); foreach my $proc (@kill_processes){ - $proc->start_kill(); + if ($proc->start_kill() == 0){ + # Uncertain status, don't wait blocking + # for this process + $proc->{WAIT_ONE_TIMEOUT}= 0; + } } foreach my $proc (@kill_processes){ - $proc->wait_one(); + $proc->wait_one($proc->{WAIT_ONE_TIMEOUT}); } return; } @@ -298,20 +302,20 @@ sub start_kill { my ($self)= @_; croak "usage: \$safe_proc->start_kill()" unless (@_ == 1 and ref $self); #print "start_kill $self\n"; + my $ret= 1; if (defined $safe_kill and $self->{SAFE_WINPID}){ # Use my_safe_kill to tell my_safe_process # it's time to kill it's child and return my $pid= $self->{SAFE_WINPID}; - my $ret= system($safe_kill, $pid); - #print STDERR "start_kill, safe_killed $pid, ret: $ret\n"; + $ret= (system($safe_kill, $pid) >> 8) == 0; } else { my $pid= $self->{SAFE_PID}; die "Can't kill not started process" unless defined $pid; - my $ret= kill(15, $pid); - #print STDERR "start_kill, sent signal 15 to $pid, ret: $ret\n"; + $ret= kill(15, $pid); } - return 1; + print STDERR "$self already killed\n" unless $ret; + return $ret; } @@ -323,8 +327,10 @@ sub kill { my ($self)= @_; croak "usage: \$safe_proc->kill()" unless (@_ == 1 and ref $self); - $self->start_kill(); - $self->wait_one(); + if ($self->start_kill()) + { + $self->wait_one(); + } return 1; } diff --git a/mysql-test/lib/My/SafeProcess/safe_process_win.cc b/mysql-test/lib/My/SafeProcess/safe_process_win.cc index 1547070ce20..6fabd1e70aa 100755 --- a/mysql-test/lib/My/SafeProcess/safe_process_win.cc +++ b/mysql-test/lib/My/SafeProcess/safe_process_win.cc @@ -85,6 +85,7 @@ static void die(const char* fmt, ...) va_end(args); if (int last_err= GetLastError()) fprintf(stderr, "error: %d, %s\n", last_err, strerror(last_err)); + fflush(stderr); exit(1); } From 08a901091c05229d43255eed82a740d9fbb117e1 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 12 Mar 2008 12:19:36 +0100 Subject: [PATCH 087/705] Repair any table in mysql database as part of cleaning up from previous runs --- mysql-test/t/mysqlcheck.test | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mysql-test/t/mysqlcheck.test b/mysql-test/t/mysqlcheck.test index 2d96d00772c..22b7f007b7e 100644 --- a/mysql-test/t/mysqlcheck.test +++ b/mysql-test/t/mysqlcheck.test @@ -14,6 +14,9 @@ DROP TABLE IF EXISTS t1, `t``1`, `t 1`; drop view if exists v1; drop database if exists client_test_db; +# Repair any tables in mysql, sometimes the slow_log is marked as crashed +# after server has been killed +--exec $MYSQL_CHECK --repair --databases mysql > /dev/null 2>&1 --enable_warnings # From 4458b5faa0a63c6ce2b3ba453364ce7fea62a5e1 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 12 Mar 2008 12:20:40 +0100 Subject: [PATCH 088/705] Add extra checks of Last_errno in SHOW SLAVE STATUS for extra diagnostics --- .../suite/rpl_ndb/r/rpl_ndb_circular.result | 3 +++ mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test | 15 +++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result index e4b5e9b9216..96e50da739b 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result @@ -5,12 +5,15 @@ reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; RESET MASTER; +Last errno after reset master on slave: 0 CHANGE MASTER TO master_host="127.0.0.1",master_port=SLAVE_PORT,master_user="root"; START SLAVE; +Last errno after start slave: 0 CREATE TABLE t1 (a int key, b int) ENGINE=ndb; SHOW TABLES; Tables_in_test t1 +Last errno after table on both: 0 INSERT INTO t1 VALUES (1,2); INSERT INTO t1 VALUES (2,3); SELECT * FROM t1 ORDER BY a; diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test index c1a48d08c53..8a70a2d67de 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test @@ -5,11 +5,22 @@ --connection slave RESET MASTER; + +# Check Last_errno +let $the_last_errno= query_get_value(SHOW SLAVE STATUS, Last_Errno, 1); +echo Last errno after reset master on slave: $the_last_errno; + --connection master + --replace_result $SLAVE_MYPORT SLAVE_PORT --eval CHANGE MASTER TO master_host="127.0.0.1",master_port=$SLAVE_MYPORT,master_user="root" START SLAVE; + +# Check Last_errno +let $the_last_errno= query_get_value(SHOW SLAVE STATUS, Last_Errno, 1); +echo Last errno after start slave: $the_last_errno; + # create the table on the "slave" --connection slave CREATE TABLE t1 (a int key, b int) ENGINE=ndb; @@ -20,6 +31,10 @@ CREATE TABLE t1 (a int key, b int) ENGINE=ndb; # now we should have a table on the master as well SHOW TABLES; +# Check Last_errno +let $the_last_errno= query_get_value(SHOW SLAVE STATUS, Last_Errno, 1); +echo Last errno after table on both: $the_last_errno; + # insert some values on the slave and master --connection master INSERT INTO t1 VALUES (1,2); From af585cf4d8d458aa07a79a052009e6169ead0930 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 12 Mar 2008 12:35:30 +0100 Subject: [PATCH 089/705] Also copy [mysqld] section to [embedded] --- mysql-test/include/default_mysqld.cnf | 2 +- mysql-test/lib/My/ConfigFactory.pm | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf index 2f1af5242c6..265f88f5bc3 100644 --- a/mysql-test/include/default_mysqld.cnf +++ b/mysql-test/include/default_mysqld.cnf @@ -15,7 +15,7 @@ max_heap_table_size= 1M loose-innodb_data_file_path= ibdata1:10M:autoextend -set-variable= slave_net_timeout=120 +slave-net-timeout=120 log-bin diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index f1008fae360..29988d0013b 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -349,22 +349,27 @@ sub post_check_client_groups { # # Generate [embedded] by copying the values -# needed from first [mysqld.] +# needed from the default [mysqld] section +# and from first [mysqld.] # sub post_check_embedded_group { my ($self, $config)= @_; return unless $self->{ARGS}->{embedded}; + my $mysqld= $config->group('mysqld') or + croak "Can't run with embedded, config has no default mysqld section"; + my $first_mysqld= $config->first_like('mysqld.') or croak "Can't run with embedded, config has no mysqld"; my @no_copy = ( 'log-error', # Embedded server writes stderr to mysqltest's log file + 'slave-net-timeout', # Embedded server are not build with replication ); - foreach my $option ( $first_mysqld->options() ) { + foreach my $option ( $mysqld->options(), $first_mysqld->options() ) { # Don't copy options whose name is in "no_copy" list next if grep ( $option->name() eq $_, @no_copy); From c74678e2279bea30a2a1b0d440424b4e601dc58b Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 13 Mar 2008 17:07:11 +0100 Subject: [PATCH 090/705] New Makefile.am for mysql-test makes it pass also "make distcheck" and "make install" --- mysql-test/Makefile.am | 91 ++++++++++++++++++----- mysql-test/lib/My/SafeProcess/Makefile.am | 9 ++- 2 files changed, 82 insertions(+), 18 deletions(-) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index b9ed71902f0..593396adbf6 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -17,30 +17,87 @@ ## Process this file with automake to create Makefile.in -testdir = $(prefix)/mysql-test +testdir = $(prefix)/mysql-test -EXTRA_DIST = README \ - mysql-test-run.pl \ - mysql-stress-test.pl \ - t r include suite extra \ - lib std_data \ - valgrind.supp +test_SCRIPTS = mtr \ + mysql-test-run \ + mysql-test-run.pl \ + mysql-stress-test.pl -test_SCRIPTS = mtr mysql-test-run -CLEANFILES = $(test_SCRIPTS) +nobase_test_DATA = lib/mtr_cases.pm \ + lib/mtr_gcov.pl \ + lib/mtr_gprof.pl \ + lib/mtr_io.pl \ + lib/mtr_match.pl \ + lib/mtr_misc.pl \ + lib/mtr_process.pl \ + lib/mtr_report.pm \ + lib/mtr_stress.pl \ + lib/mtr_unique.pl \ + lib/My/ConfigFactory.pm \ + lib/My/Config.pm \ + lib/My/Find.pm \ + lib/My/Options.pm \ + lib/My/Platform.pm \ + lib/My/SafeProcess.pm \ + lib/My/File/Path.pm \ + lib/My/SafeProcess/Base.pm \ + lib/My/SafeProcess/safe_process.pl -SUBDIRS = lib/My/SafeProcess +SUBDIRS = lib/My/SafeProcess +EXTRA_DIST = README \ + valgrind.supp \ + $(test_SCRIPTS) \ + $(nobase_test_DATA) -# Install all files and files in directories listed in EXTRA_DIST -install-data-local: - for f in `(cd $(srcdir); find $(EXTRA_DIST) -type f)`; \ - do \ - d=$(DESTDIR)$(testdir)/`dirname $$f`; \ - mkdir -p $$d ; \ - $(INSTALL_DATA) $(srcdir)/$$f $$d ; \ +# List of directories containing test + result files and the +# related test data files that should be copied +TEST_DIRS = t r include std_data std_data/parts \ + extra/binlog_tests/ extra/rpl_tests \ + suite/binlog suite/binlog/t suite/binlog/r suite/binlog/std_data \ + suite/bugs/data suite/bugs/t suite/bugs/r \ + suite/federated \ + suite/funcs_1 suite/funcs_1/bitdata suite/funcs_1/data \ + suite/funcs_1/include suite/funcs_1/lib suite/funcs_1/r \ + suite/funcs_1/t suite/funcs_1/views suite/funcs_1/cursors \ + suite/funcs_1/datadict suite/funcs_1/storedproc suite/funcs_1/triggers \ + suite/funcs_2 suite/funcs_2/charset suite/funcs_2/data \ + suite/funcs_2/include suite/funcs_2/lib suite/funcs_2/r \ + suite/funcs_2/t \ + suite/jp suite/jp/t suite/jp/r suite/jp/std_data \ + suite/manual/t suite/manual/r \ + suite/ndb_team suite/ndb_team/t suite/ndb_team/r \ + suite/rpl suite/rpl/data suite/rpl/include suite/rpl/r \ + suite/rpl/t \ + suite/stress/include suite/stress/t suite/stress/r \ + suite/ndb suite/ndb/t suite/ndb/r \ + suite/rpl_ndb suite/rpl_ndb/t suite/rpl_ndb/r \ + suite/parts suite/parts/t suite/parts/r suite/parts/inc + +# Used by dist-hook and install-data-local to copy all +# test files into either dist or install directory +install_test_files: + @if test -z "$(INSTALL_TO_DIR)"; then \ + echo "Set INSTALL_TO_DIR!" && exit 1; \ + fi + @for dir in $(TEST_DIRS); do \ + from_dir="$(srcdir)/$$dir"; \ + to_dir="$(INSTALL_TO_DIR)/$$dir"; \ + $(mkinstalldirs) "$$to_dir"; \ + for f in `(cd $$from_dir && ls)`; do \ + if test -f "$$from_dir/$$f"; then \ + $(INSTALL_DATA) "$$from_dir/$$f" "$$to_dir/$$f" ; \ + fi; \ + done \ done +dist-hook: + $(MAKE) INSTALL_TO_DIR="$(distdir)" install_test_files + +install-data-local: + $(MAKE) INSTALL_TO_DIR="$(DESTDIR)$(testdir)" install_test_files + uninstall-local: @RM@ -f -r $(DESTDIR)$(testdir) diff --git a/mysql-test/lib/My/SafeProcess/Makefile.am b/mysql-test/lib/My/SafeProcess/Makefile.am index 6ad43949b11..623c0e9a87a 100644 --- a/mysql-test/lib/My/SafeProcess/Makefile.am +++ b/mysql-test/lib/My/SafeProcess/Makefile.am @@ -13,9 +13,16 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -bin_PROGRAMS = my_safe_process +safedir = $(prefix)/mysql-test/lib/My/SafeProcess +#nobase_bin_PROGRAMS = ... +safe_PROGRAMS = my_safe_process my_safe_process_SOURCES = safe_process.cc +EXTRA_DIST = safe_kill_win.cc \ + safe_process_win.cc \ + CMakeLists.txt + + # Don't update the files from bitkeeper %::SCCS/s.% From 0d1d46c7e2c5296e3aafb099799ef09a5ab8a443 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 13 Mar 2008 17:16:42 +0100 Subject: [PATCH 091/705] Find ndb binaries Verbose SafeProcess.pm --- mysql-test/lib/My/Find.pm | 25 +++- mysql-test/lib/My/SafeProcess.pm | 53 ++++---- .../lib/My/SafeProcess/safe_kill_win.cc | 2 +- mysql-test/lib/mtr_cases.pm | 8 -- mysql-test/mysql-test-run.pl | 125 ++++++------------ .../suite/rpl_ndb/t/rpl_ndb_circular.test | 8 +- 6 files changed, 93 insertions(+), 128 deletions(-) diff --git a/mysql-test/lib/My/Find.pm b/mysql-test/lib/My/Find.pm index 6b4d5732c36..b8906dee1ca 100644 --- a/mysql-test/lib/My/Find.pm +++ b/mysql-test/lib/My/Find.pm @@ -26,12 +26,15 @@ use Carp; use My::Platform; use base qw(Exporter); -our @EXPORT= qw(my_find_bin my_find_dir); +our @EXPORT= qw(my_find_bin my_find_dir NOT_REQUIRED); our $vs_config_dir; my $bin_extension= ".exe" if IS_WINDOWS; +# Helper function to be used for fourth parameter to find functions +sub NOT_REQUIRED { return 0; } + # # my_find_bin - find an executable with "name_1...name_n" in # paths "path_1...path_n" and return the full path @@ -44,13 +47,21 @@ my $bin_extension= ".exe" if IS_WINDOWS; # ["client", "bin"], # "mysql"); # +# +# To check if something exists, use the required parameter +# set to 0, the function will return an empty string if the +# binary is not found +# my $mysql_exe= my_find_bin($basedir, +# ["client", "bin"], +# "mysql", 0); +# # NOTE: The function honours MTR_VS_CONFIG environment variable # # sub my_find_bin { - my ($base, $paths, $names)= @_; - croak "usage: my_find_bin(, , )" - unless @_ == 3; + my ($base, $paths, $names, $required)= @_; + croak "usage: my_find_bin(, , , [])" + unless @_ == 4 or @_ == 3; # ------------------------------------------------------- # Find and return the first executable @@ -58,6 +69,10 @@ sub my_find_bin { foreach my $path (my_find_paths($base, $paths, $names, $bin_extension)) { return $path if ( -x $path or (IS_WINDOWS and -f $path) ); } + if (defined $required and $required == NOT_REQUIRED){ + # Return empty string to indicate not found + return ""; + } find_error($base, $paths, $names); } @@ -79,7 +94,7 @@ sub my_find_bin { # # sub my_find_dir { - my ($base, $paths, $dirs)= @_; + my ($base, $paths, $dirs, $required)= @_; croak "usage: my_find_dir(, [, ])" unless (@_ == 3 or @_ == 2); diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index 049dd0adda6..76eab4962fa 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -59,6 +59,7 @@ use My::Find; use My::Platform; my %running; +my $_verbose= IS_WINDOWS; END { # Kill any children still running @@ -85,33 +86,17 @@ if (IS_WIN32PERL or IS_CYGWIN){ # Use my_safe_process.exe my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"], "my_safe_process"); - die "Could not find my_safe_process" unless $exe; push(@safe_process_cmd, $exe); # Use my_safe_kill.exe $safe_kill= my_find_bin(".", "lib/My/SafeProcess", "my_safe_kill"); - die "Could not find my_safe_kill" unless $safe_kill; } else { - my $use_safe_process_binary= 1; - if ($use_safe_process_binary) { - # Use my_safe_process - my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"], - "my_safe_process"); - die "Could not find my_safe_process" unless $exe; - push(@safe_process_cmd, $exe); - } - else - { - # Use safe_process.pl - my $script= "lib/My/SafeProcess/safe_process.pl"; - $script= "../$script" unless -f $script; - die "Could not find safe_process.pl" unless -f $script; - - # Call $script with Perl interpreter - push(@safe_process_cmd, $^X, $script); - } + # Use my_safe_process + my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"], + "my_safe_process"); + push(@safe_process_cmd, $exe); } @@ -248,14 +233,14 @@ sub timer { sub shutdown { my $shutdown_timeout= shift; my @processes= @_; + _verbose("shutdown, timeout: $shutdown_timeout, @processes"); return if (@processes == 0); - #print "shutdown: @processes\n"; - # Call shutdown function if process has one, else # use kill foreach my $proc (@processes){ + _verbose(" proc: $proc"); my $shutdown= $proc->{SAFE_SHUTDOWN}; if ($shutdown_timeout > 0 and defined $shutdown){ $shutdown->(); @@ -301,7 +286,7 @@ sub shutdown { sub start_kill { my ($self)= @_; croak "usage: \$safe_proc->start_kill()" unless (@_ == 1 and ref $self); - #print "start_kill $self\n"; + _verbose("start_kill: $self"); my $ret= 1; if (defined $safe_kill and $self->{SAFE_WINPID}){ @@ -309,6 +294,7 @@ sub start_kill { # it's time to kill it's child and return my $pid= $self->{SAFE_WINPID}; $ret= (system($safe_kill, $pid) >> 8) == 0; + print `tasklist` unless $ret; } else { my $pid= $self->{SAFE_PID}; die "Can't kill not started process" unless defined $pid; @@ -327,10 +313,8 @@ sub kill { my ($self)= @_; croak "usage: \$safe_proc->kill()" unless (@_ == 1 and ref $self); - if ($self->start_kill()) - { - $self->wait_one(); - } + $self->start_kill(); + $self->wait_one(); return 1; } @@ -338,8 +322,8 @@ sub kill { sub _collect { my ($self)= @_; - #print "_collect\n"; $self->{EXIT_STATUS}= $?; + _verbose("_collect: $self"); # Take the process out of running list my $pid= $self->{SAFE_PID}; @@ -363,15 +347,17 @@ sub wait_one { my ($self, $timeout)= @_; croak "usage: \$safe_proc->wait_one([timeout])" unless ref $self; - #print "wait_one $self, $timeout\n"; + _verbose("wait_one $self, $timeout"); if ( ! defined($self->{SAFE_PID}) ) { # No pid => not running + _verbose("No pid => not running"); return 0; } if ( defined $self->{EXIT_STATUS} ) { # Exit status already set => not running + _verbose("Exit status already set => not running"); return 0; } @@ -400,6 +386,7 @@ sub wait_one { $blocking= 1; $use_alarm= 0; } + #_verbose("blocking: $blocking, use_alarm: $use_alarm"); my $retpid; eval @@ -419,18 +406,22 @@ sub wait_one { die "Got unexpected: $@" if ($@ !~ /waitpid timeout/); if (!defined $retpid) { # Got timeout + _verbose("Got timeout"); return 1; } # Got pid _and_ alarm, continue + _verbose("Got pid and alarm, continue"); } if ( $retpid == 0 ) { # 0 => still running + _verbose("0 => still running"); return 1; } if ( not $blocking and $retpid == -1 ) { # still running + _verbose("still running"); return 1; } @@ -514,5 +505,9 @@ sub self2str { $str.= "]"; } +sub _verbose { + return unless $_verbose; + print STDERR " ## ", @_, "\n"; +} 1; diff --git a/mysql-test/lib/My/SafeProcess/safe_kill_win.cc b/mysql-test/lib/My/SafeProcess/safe_kill_win.cc index 12609993562..9955a9f72f2 100755 --- a/mysql-test/lib/My/SafeProcess/safe_kill_win.cc +++ b/mysql-test/lib/My/SafeProcess/safe_kill_win.cc @@ -50,7 +50,7 @@ int main(int argc, const char** argv ) OpenEvent(EVENT_MODIFY_STATE, FALSE, safe_process_name)) == NULL) { if (retry_open_event--) - Sleep(0); /* yield */ + Sleep(100); else { fprintf(stderr, "Failed to open shutdown_event '%s', error: %d\n", diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 989eb5a57f0..a8b1fc6bc59 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -803,13 +803,6 @@ sub collect_one_test_case { return $tinfo } - if ( $tinfo->{'ndb_extra'} and ! $::opt_ndb_extra_test ) - { - $tinfo->{'skip'}= 1; - $tinfo->{'comment'}= "Test need 'ndb_extra' option"; - return $tinfo - } - if ( $tinfo->{'need_debug'} && ! $::debug_compiled_binaries ) { $tinfo->{'skip'}= 1; @@ -966,7 +959,6 @@ my @tags= ["include/have_debug.inc", "need_debug", 1], ["include/have_ndb.inc", "ndb_test", 1], ["include/have_multi_ndb.inc", "ndb_test", 1], - ["include/have_ndb_extra.inc", "ndb_extra", 1], ["include/master-slave.inc", "rpl_test", 1], ["include/ndb_master-slave.inc", "rpl_test", 1], ["include/ndb_master-slave.inc", "ndb_test", 1], diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 339bc1b31d1..6761eccd181 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -47,6 +47,7 @@ use My::Platform; use My::SafeProcess; use My::ConfigFactory; use My::Options; +use My::Find; use mtr_cases; use mtr_report; @@ -94,8 +95,6 @@ my $exe_mysqld; our $exe_mysql; our $exe_mysqladmin; our $exe_mysqltest; -our $exe_ndbd; -our $exe_ndb_mgmd= ""; our $exe_libtool; my $opt_big_test= 0; @@ -183,14 +182,10 @@ our $opt_warnings= 1; our $opt_skip_ndbcluster= 0; our $opt_skip_ndbcluster_slave= 0; our $opt_with_ndbcluster; -our $opt_ndb_extra_test= 0; -our $exe_ndb_mgm=""; -our $exe_ndb_waiter; -our $path_ndb_tools_dir= ""; -our $path_ndb_examples_dir= ""; -our $exe_ndb_example= ""; -our $path_ndb_testrun_log; +my $exe_ndbd; +my $exe_ndb_mgmd; +my $exe_ndb_waiter; our $path_sql_dir; @@ -295,7 +290,6 @@ sub command_line_setup { 'skip-ndbcluster|skip-ndb' => \$opt_skip_ndbcluster, 'skip-ndbcluster-slave|skip-ndb-slave' => \$opt_skip_ndbcluster_slave, - 'ndb-extra-test' => \$opt_ndb_extra_test, 'suite|suites=s' => \$opt_suites, 'skip-rpl' => \&collect_option, 'skip-test=s' => \&collect_option, @@ -749,7 +743,6 @@ sub command_line_setup { $path_testlog= "$opt_vardir/log/mysqltest.log"; $path_current_testlog= "$opt_vardir/log/current_test"; - $path_ndb_testrun_log= "$opt_vardir/log/ndb_testrun.log"; } @@ -880,44 +873,6 @@ sub collect_mysqld_features { } -sub executable_setup_ndb () { - - # Look for ndb tols and binaries - my $ndb_path= mtr_file_exists("$basedir/ndb", - "$basedir/storage/ndb", - "$basedir/bin"); - - $exe_ndbd= - mtr_exe_maybe_exists("$ndb_path/src/kernel/ndbd", - "$ndb_path/ndbd"); - $exe_ndb_mgm= - mtr_exe_maybe_exists("$ndb_path/src/mgmclient/ndb_mgm", - "$ndb_path/ndb_mgm"); - $exe_ndb_mgmd= - mtr_exe_maybe_exists("$ndb_path/src/mgmsrv/ndb_mgmd", - "$ndb_path/ndb_mgmd"); - $exe_ndb_waiter= - mtr_exe_maybe_exists("$ndb_path/tools/ndb_waiter", - "$ndb_path/ndb_waiter"); - - # May not exist - $path_ndb_tools_dir= mtr_file_exists("$ndb_path/tools", - "$ndb_path"); - # May not exist - $path_ndb_examples_dir= - mtr_file_exists("$ndb_path/ndbapi-examples", - "$ndb_path/examples"); - # May not exist - $exe_ndb_example= - mtr_file_exists("$path_ndb_examples_dir/ndbapi_simple/ndbapi_simple"); - - return ( $exe_ndbd eq "" or - $exe_ndb_mgm eq "" or - $exe_ndb_mgmd eq "" or - $exe_ndb_waiter eq ""); -} - - sub executable_setup () { # @@ -940,14 +895,23 @@ sub executable_setup () { $exe_mysqladmin= mtr_exe_exists("$path_client_bindir/mysqladmin"); $exe_mysql= mtr_exe_exists("$path_client_bindir/mysql"); - if ( ! $opt_skip_ndbcluster and executable_setup_ndb()) { - mtr_warning("Could not find all required ndb binaries, " . - "all ndb tests will fail, use --skip-ndbcluster to " . - "skip testing it."); + if ( ! $opt_skip_ndbcluster ) + { + $exe_ndbd= + my_find_bin($basedir, + ["storage/ndb/src/kernel", "libexec"], + "ndbd"); + + $exe_ndb_mgmd= + my_find_bin($basedir, + ["storage/ndb/src/mgmsrv", "libexec"], + "ndb_mgmd"); + + $exe_ndb_waiter= + my_find_bin($basedir, + ["storage/ndb/tools/", "bin"], + "ndb_waiter"); - foreach my $cluster ( clusters()) { - $cluster->{"executable_setup_failed"}= 1; - } } # Look for mysqltest executable @@ -1204,13 +1168,30 @@ sub environment_setup { # ---------------------------------------------------- # Setup env for NDB # ---------------------------------------------------- - $ENV{'NDB_MGM'}= $exe_ndb_mgm; - $ENV{'NDB_EXTRA_TEST'}= $opt_ndb_extra_test; - $ENV{'NDB_TOOLS_DIR'}= $path_ndb_tools_dir; - $ENV{'NDB_TOOLS_OUTPUT'}= $path_ndb_testrun_log; - $ENV{'NDB_EXAMPLES_DIR'}= $path_ndb_examples_dir; - $ENV{'NDB_EXAMPLES_BINARY'}= $exe_ndb_example; - $ENV{'NDB_EXAMPLES_OUTPUT'}= $path_ndb_testrun_log; + if ( ! $opt_skip_ndbcluster ) + { + $ENV{'NDB_MGM'}= + my_find_bin($basedir, + ["storage/ndb/src/mgmclient", "bin"], + "ndb_mgm"); + + $ENV{'NDB_TOOLS_DIR'}= + my_find_dir($basedir, + ["storage/ndb/tools", "bin"]); + + $ENV{'NDB_EXAMPLES_DIR'}= + my_find_dir($basedir, + ["storage/ndb/ndbapi-examples", "bin"]); + + $ENV{'NDB_EXAMPLES_BINARY'}= + my_find_bin($basedir, + ["storage/ndb/ndbapi-examples/ndbapi_simple", "bin"], + "ndbapi_simple", NOT_REQUIRED); + + my $path_ndb_testrun_log= "$opt_vardir/log/ndb_testrun.log"; + $ENV{'NDB_TOOLS_OUTPUT'}= $path_ndb_testrun_log; + $ENV{'NDB_EXAMPLES_OUTPUT'}= $path_ndb_testrun_log; + } # ---------------------------------------------------- # mysql clients @@ -2110,23 +2091,6 @@ sub run_testcase_check_skip_test($) return 1; } - if ($tinfo->{'ndb_test'}) - { - foreach my $cluster ( clusters() ) - { - # If test needs this cluster, check binaries was found ok - if ( $cluster->{'executable_setup_failed'} ) - { - $tinfo->{comment}= - "Failed to find cluster binaries"; - mtr_report_test_failed($tinfo, undef); - return 1; - } - } - } - - - return 0; } @@ -3628,7 +3592,6 @@ Options to control what test suites or cases to run with-ndbcluster-only Run only tests that include "ndb" in the filename skip-ndb[cluster] Skip all tests that need cluster skip-ndb[cluster]-slave Skip all tests that need a slave cluster - ndb-extra Run extra tests from ndb directory do-test=PREFIX or REGEX Run test cases which name are prefixed with PREFIX or fulfills REGEX diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test index 8a70a2d67de..54c7f9c0621 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test @@ -6,8 +6,8 @@ --connection slave RESET MASTER; -# Check Last_errno -let $the_last_errno= query_get_value(SHOW SLAVE STATUS, Last_Errno, 1); +# Check Last_IO_Errno +let $the_last_errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1); echo Last errno after reset master on slave: $the_last_errno; --connection master @@ -18,7 +18,7 @@ START SLAVE; # Check Last_errno -let $the_last_errno= query_get_value(SHOW SLAVE STATUS, Last_Errno, 1); +let $the_last_errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1); echo Last errno after start slave: $the_last_errno; # create the table on the "slave" @@ -32,7 +32,7 @@ CREATE TABLE t1 (a int key, b int) ENGINE=ndb; SHOW TABLES; # Check Last_errno -let $the_last_errno= query_get_value(SHOW SLAVE STATUS, Last_Errno, 1); +let $the_last_errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1); echo Last errno after table on both: $the_last_errno; # insert some values on the slave and master From 0e7e96fc0b334fc66b1f70316fb9949ba358e437 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 14 Mar 2008 13:29:41 +0100 Subject: [PATCH 092/705] Add std_data/ndb_backupXX to list of dirs to copy --- mysql-test/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 593396adbf6..58b63383a0f 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -54,6 +54,8 @@ EXTRA_DIST = README \ # List of directories containing test + result files and the # related test data files that should be copied TEST_DIRS = t r include std_data std_data/parts \ + std_data/ndb_backup50 std_data/ndb_backup51 \ + std_data/ndb_backup51_data_be std_data/ndb_backup51_data_le \ extra/binlog_tests/ extra/rpl_tests \ suite/binlog suite/binlog/t suite/binlog/r suite/binlog/std_data \ suite/bugs/data suite/bugs/t suite/bugs/r \ From 60dcedb7c28ced4f54786fb92cfa74276fe8e528 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 14 Mar 2008 13:34:39 +0100 Subject: [PATCH 093/705] Add additional printouts Fix formatting --- .../lib/My/SafeProcess/safe_process_win.cc | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/mysql-test/lib/My/SafeProcess/safe_process_win.cc b/mysql-test/lib/My/SafeProcess/safe_process_win.cc index 6fabd1e70aa..8aa603a8793 100755 --- a/mysql-test/lib/My/SafeProcess/safe_process_win.cc +++ b/mysql-test/lib/My/SafeProcess/safe_process_win.cc @@ -289,25 +289,28 @@ int main(int argc, const char** argv ) if (TerminateJobObject(job_handle, 201) == 0) message("TerminateJobObject failed"); CloseHandle(job_handle); - + message("Job terminated and closed"); if (wait_res != WAIT_OBJECT_0 + CHILD) { - /* The child has not yet returned, wait for it */ + /* The child has not yet returned, wait for it */ message("waiting for child to exit"); - if ((wait_res= WaitForSingleObject(wait_handles[CHILD], INFINITE)) != WAIT_OBJECT_0) - { + if ((wait_res= WaitForSingleObject(wait_handles[CHILD], INFINITE)) + != WAIT_OBJECT_0) + { message("child wait failed: %d", wait_res); - } - else - { - message("child wait succeeded"); - } + } + else + { + message("child wait succeeded"); + } /* Child's exit code should now be 201, no need to get it */ } + message("Closing handles"); for (int i= 0; i < NUM_HANDLES; i++) CloseHandle(wait_handles[i]); + message("Exiting, exit_code: %d", child_exit_code); exit(child_exit_code); } From eaf8435cc340772b7e393ac0410af5630f0f338a Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 14 Mar 2008 13:59:43 +0100 Subject: [PATCH 094/705] Turn off vernose for windows --- mysql-test/mysql-test-run.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 6761eccd181..43a0c684de9 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -88,7 +88,6 @@ my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb"; our $opt_suites= $DEFAULT_SUITES; our $opt_verbose= 0; # Verbose output, enable with --verbose -$opt_verbose= 1 if IS_WINDOWS; our $opt_verbose_restart= 0; # Verbose output for restarts my $exe_mysqld; From 1e39c3cc70cd28e3599c1199fc4b42488ac45cae Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 14 Mar 2008 14:01:12 +0100 Subject: [PATCH 095/705] kickstart the fake cygwin process in case safe_kill fails Loop twice over process to shutdown, first handle thise that has been shutdown and then continue with the ones that have been killed --- mysql-test/lib/My/SafeProcess.pm | 64 +++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 14 deletions(-) diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index 76eab4962fa..f078466ddc0 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -100,6 +100,17 @@ else } +sub _process_alive { + my ($pid)= @_; + + return kill(0, $pid) unless IS_WINDOWS; + + my @list= split(/,/, `tasklist /FI "PID eq $pid" /NH /FO CSV`); + my $ret_pid= eval($list[1]); + return ($ret_pid == $pid); +} + + sub new { my $class= shift; @@ -244,6 +255,7 @@ sub shutdown { my $shutdown= $proc->{SAFE_SHUTDOWN}; if ($shutdown_timeout > 0 and defined $shutdown){ $shutdown->(); + $proc->{WAS_SHUTDOWN}= 1; } else { $proc->start_kill(); @@ -252,8 +264,10 @@ sub shutdown { my @kill_processes= (); - # Wait for shutdown_timeout for processes to exit + # Wait max shutdown_timeout seconds for those process + # that has been shutdown foreach my $proc (@processes){ + next unless $proc->{WAS_SHUTDOWN}; my $ret= $proc->wait_one($shutdown_timeout); if ($ret != 0) { push(@kill_processes, $proc); @@ -262,20 +276,29 @@ sub shutdown { $shutdown_timeout= 0; } + # Wait infinitely for those process + # that has been killed + foreach my $proc (@processes){ + next if $proc->{WAS_SHUTDOWN}; + my $ret= $proc->wait_one(undef); + if ($ret != 0) { + warn "Wait for killed process failed!"; + push(@kill_processes, $proc); + # Try one more time, best option... + } + } + # Return if all servers has exited return if (@kill_processes == 0); foreach my $proc (@kill_processes){ - if ($proc->start_kill() == 0){ - # Uncertain status, don't wait blocking - # for this process - $proc->{WAIT_ONE_TIMEOUT}= 0; - } + $proc->start_kill(); } foreach my $proc (@kill_processes){ - $proc->wait_one($proc->{WAIT_ONE_TIMEOUT}); + $proc->wait_one(undef); } + return; } @@ -289,18 +312,31 @@ sub start_kill { _verbose("start_kill: $self"); my $ret= 1; - if (defined $safe_kill and $self->{SAFE_WINPID}){ + my $pid; + if (IS_WINDOWS) + { + die "INTERNAL ERROR: no safe_kill" unless defined $safe_kill; + die "INTERNAL ERROR: no winpid" unless defined $self->{SAFE_WINPID}; + # Use my_safe_kill to tell my_safe_process # it's time to kill it's child and return - my $pid= $self->{SAFE_WINPID}; - $ret= (system($safe_kill, $pid) >> 8) == 0; - print `tasklist` unless $ret; - } else { - my $pid= $self->{SAFE_PID}; + $pid= $self->{SAFE_WINPID}; + $ret= system($safe_kill, $pid) >> 8; + if (IS_CYGWIN and $ret == 3) + { + print "safe_process is gone, kickstart the fake process\n"; + if (kill(15, $self->{SAFE_PID}) != 1){ + print STDERR "Failed to kickstart the fake process\n"; + } + } + } + else + { + $pid= $self->{SAFE_PID}; die "Can't kill not started process" unless defined $pid; $ret= kill(15, $pid); } - print STDERR "$self already killed\n" unless $ret; + return $ret; } From ddbdbb1bc89182ba8f7b9863dfcc963705d5127c Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 14 Mar 2008 15:25:11 +0100 Subject: [PATCH 096/705] Revert extra debug printouts --- mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result | 3 --- mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test | 13 ------------- 2 files changed, 16 deletions(-) diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result index 96e50da739b..e4b5e9b9216 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result @@ -5,15 +5,12 @@ reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; RESET MASTER; -Last errno after reset master on slave: 0 CHANGE MASTER TO master_host="127.0.0.1",master_port=SLAVE_PORT,master_user="root"; START SLAVE; -Last errno after start slave: 0 CREATE TABLE t1 (a int key, b int) ENGINE=ndb; SHOW TABLES; Tables_in_test t1 -Last errno after table on both: 0 INSERT INTO t1 VALUES (1,2); INSERT INTO t1 VALUES (2,3); SELECT * FROM t1 ORDER BY a; diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test index 54c7f9c0621..f6ef21625a8 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test @@ -6,21 +6,12 @@ --connection slave RESET MASTER; -# Check Last_IO_Errno -let $the_last_errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1); -echo Last errno after reset master on slave: $the_last_errno; - --connection master - --replace_result $SLAVE_MYPORT SLAVE_PORT --eval CHANGE MASTER TO master_host="127.0.0.1",master_port=$SLAVE_MYPORT,master_user="root" START SLAVE; -# Check Last_errno -let $the_last_errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1); -echo Last errno after start slave: $the_last_errno; - # create the table on the "slave" --connection slave CREATE TABLE t1 (a int key, b int) ENGINE=ndb; @@ -31,10 +22,6 @@ CREATE TABLE t1 (a int key, b int) ENGINE=ndb; # now we should have a table on the master as well SHOW TABLES; -# Check Last_errno -let $the_last_errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1); -echo Last errno after table on both: $the_last_errno; - # insert some values on the slave and master --connection master INSERT INTO t1 VALUES (1,2); From b933ae23e3de25793e3c2a9ae2c460408e29457a Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 14 Mar 2008 15:42:27 +0100 Subject: [PATCH 097/705] Mask columns 35 and 36 since Last_IO_errno is not reset du to bug#34654 --- mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result | 8 ++++---- mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result index e4b5e9b9216..2daacb351a9 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result @@ -52,8 +52,8 @@ Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No -Last_IO_Errno 0 -Last_IO_Error +Last_IO_Errno # +Last_IO_Error # Last_SQL_Errno 0 Last_SQL_Error SELECT * FROM t1 ORDER BY a; @@ -95,8 +95,8 @@ Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No -Last_IO_Errno 0 -Last_IO_Error +Last_IO_Errno # +Last_IO_Error # Last_SQL_Errno 0 Last_SQL_Error STOP SLAVE; diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test index f6ef21625a8..2cc46e2420e 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test @@ -39,13 +39,15 @@ INSERT INTO t1 VALUES (2,3); --connection slave SELECT * FROM t1 ORDER BY a; #SELECT * FROM t2 ORDER BY a; ---replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # +# BUG#34654 Last_IO_Errno is not reset - Mask columns 35 and 36 +--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # --query_vertical show slave status; # connect to master and ensure data it there. --connection master SELECT * FROM t1 ORDER BY a; #SELECT * FROM t2 ORDER BY a; ---replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # +# BUG#34654 Last_IO_Errno is not reset - Mask columns 35 and 36 +--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # --query_vertical show slave status; # stop replication on "master" as not to replicate From 9cc1698fea324362ca0fd9ed60152c602e21dccc Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 14 Mar 2008 17:59:03 +0100 Subject: [PATCH 098/705] Add missing DROP TABLE --- mysql-test/r/archive.result | 1 + mysql-test/r/create.result | 1 + mysql-test/r/group_by.result | 1 + mysql-test/t/archive.test | 1 + mysql-test/t/create.test | 1 + mysql-test/t/group_by.test | 1 + 6 files changed, 6 insertions(+) diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result index e9eb50fc805..8c26ea1ff82 100644 --- a/mysql-test/r/archive.result +++ b/mysql-test/r/archive.result @@ -12694,3 +12694,4 @@ SELECT * FROM t1 ORDER BY a; a b 1 NULL 2 NULL +DROP TABLE t1; diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index 4bdcca81b74..d698107382e 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -1786,6 +1786,7 @@ t2 CREATE TABLE `t2` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; +DROP TABLE t1; # -- End of test case for Bug#21380. diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result index 268f290ddca..a1e7d403035 100644 --- a/mysql-test/r/group_by.result +++ b/mysql-test/r/group_by.result @@ -1478,6 +1478,7 @@ NULL 1 2 DROP TABLE t1; +DROP TABLE t2; CREATE TABLE t1 ( a INT, b INT ); SELECT b c, (SELECT a FROM t1 WHERE b = c) FROM t1; diff --git a/mysql-test/t/archive.test b/mysql-test/t/archive.test index b42c8446a32..7139d95ab49 100644 --- a/mysql-test/t/archive.test +++ b/mysql-test/t/archive.test @@ -1598,3 +1598,4 @@ CREATE TABLE t1(a INT NOT NULL AUTO_INCREMENT, b BLOB, KEY(a)) ENGINE=archive; INSERT INTO t1 VALUES (NULL, NULL),(NULL, NULL); FLUSH TABLE t1; SELECT * FROM t1 ORDER BY a; +DROP TABLE t1; diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test index 09170cbc4f5..e986495624b 100644 --- a/mysql-test/t/create.test +++ b/mysql-test/t/create.test @@ -1380,6 +1380,7 @@ SHOW CREATE TABLE t2; --echo DROP TABLE t2; +DROP TABLE t1; --echo --echo # -- End of test case for Bug#21380. diff --git a/mysql-test/t/group_by.test b/mysql-test/t/group_by.test index 3211db5d6ed..d5dad3c1032 100644 --- a/mysql-test/t/group_by.test +++ b/mysql-test/t/group_by.test @@ -945,6 +945,7 @@ EXPLAIN SELECT b from t2 GROUP BY b; SELECT b from t2 GROUP BY b; DROP TABLE t1; +DROP TABLE t2; # # Bug #31797: error while parsing subqueries -- WHERE is parsed as HAVING From d8a6ff5d60a21ac2f985b599b238815b21f9d56e Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 14 Mar 2008 19:15:01 +0100 Subject: [PATCH 099/705] Only use safe_kill if SAFE_WINPID is defined --- mysql-test/lib/My/SafeProcess.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index f078466ddc0..defc18c3a00 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -313,7 +313,7 @@ sub start_kill { my $ret= 1; my $pid; - if (IS_WINDOWS) + if (IS_WINDOWS and defined $self->{SAFE_WINPID}) { die "INTERNAL ERROR: no safe_kill" unless defined $safe_kill; die "INTERNAL ERROR: no winpid" unless defined $self->{SAFE_WINPID}; From 1752b140c3307071f369fd77bf72c86e1d844b42 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 14 Mar 2008 21:02:52 +0100 Subject: [PATCH 100/705] Bug #34654 RESET SLAVE and STOP SLAVE/START SLAVE does not clear Last_XYZ_Errno --- mysql-test/extra/rpl_tests/rpl_row_tabledefs.test | 12 ++++++------ .../suite/rpl/r/rpl_row_tabledefs_2myisam.result | 12 ++++++------ .../suite/rpl/r/rpl_row_tabledefs_3innodb.result | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test b/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test index 0e391cb0f37..3b03caee35c 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test +++ b/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test @@ -122,7 +122,7 @@ INSERT INTO t1_nodef VALUES (1,2); connection slave; --source include/wait_for_slave_sql_to_stop.inc --replace_result $MASTER_MYPORT MASTER_PORT ---replace_column 1 # 4 # 7 # 8 # 9 # 20 22 # 23 # 33 # 36 38 +--replace_column 1 # 4 # 7 # 8 # 9 # 20 22 # 23 # 33 # 35 36 38 --query_vertical SHOW SLAVE STATUS SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; START SLAVE; @@ -142,7 +142,7 @@ sync_slave_with_master; --echo **** On Slave **** SELECT * FROM t2; --replace_result $MASTER_MYPORT MASTER_PORT ---replace_column 1 # 4 # 7 # 8 # 9 # 20 22 # 23 # 33 # 36 38 +--replace_column 1 # 4 # 7 # 8 # 9 # 20 22 # 23 # 33 # 35 36 38 --query_vertical SHOW SLAVE STATUS connection master; @@ -154,7 +154,7 @@ INSERT INTO t4 VALUES (4); connection slave; --source include/wait_for_slave_sql_to_stop.inc --replace_result $MASTER_MYPORT MASTER_PORT ---replace_column 1 # 4 # 7 # 8 # 9 # 20 22 # 23 # 33 # 36 38 +--replace_column 1 # 4 # 7 # 8 # 9 # 20 22 # 23 # 33 # 35 36 38 --query_vertical SHOW SLAVE STATUS SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; START SLAVE; @@ -168,7 +168,7 @@ INSERT INTO t5 VALUES (5,10,25); connection slave; --source include/wait_for_slave_sql_to_stop.inc --replace_result $MASTER_MYPORT MASTER_PORT ---replace_column 1 # 4 # 7 # 8 # 9 # 20 22 # 23 # 33 # 36 38 +--replace_column 1 # 4 # 7 # 8 # 9 # 20 22 # 23 # 33 # 35 36 38 --query_vertical SHOW SLAVE STATUS SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; START SLAVE; @@ -182,7 +182,7 @@ INSERT INTO t6 VALUES (6,12,36); connection slave; --source include/wait_for_slave_sql_to_stop.inc --replace_result $MASTER_MYPORT MASTER_PORT ---replace_column 1 # 4 # 7 # 8 # 9 # 20 22 # 23 # 33 # 36 38 +--replace_column 1 # 4 # 7 # 8 # 9 # 20 22 # 23 # 33 # 35 36 38 --query_vertical SHOW SLAVE STATUS SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; START SLAVE; @@ -191,7 +191,7 @@ connection master; INSERT INTO t9 VALUES (6); sync_slave_with_master; --replace_result $SLAVE_MYPORT SLAVE_PORT ---replace_column 1 # 4 # 7 # 8 # 9 # 20 22 # 23 # 33 # 36 38 +--replace_column 1 # 4 # 7 # 8 # 9 # 20 22 # 23 # 33 # 35 36 38 --query_vertical SHOW SLAVE STATUS # Testing some tables extra field that can be null and cannot be null diff --git a/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result b/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result index e81d4f7454e..a6a2181cd2a 100644 --- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result +++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result @@ -140,7 +140,7 @@ Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No -Last_IO_Errno 0 +Last_IO_Errno Last_IO_Error Last_SQL_Errno 1364 Last_SQL_Error @@ -191,7 +191,7 @@ Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No -Last_IO_Errno 0 +Last_IO_Errno Last_IO_Error Last_SQL_Errno 0 Last_SQL_Error @@ -232,7 +232,7 @@ Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No -Last_IO_Errno 0 +Last_IO_Errno Last_IO_Error Last_SQL_Errno 1535 Last_SQL_Error @@ -275,7 +275,7 @@ Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No -Last_IO_Errno 0 +Last_IO_Errno Last_IO_Error Last_SQL_Errno 1535 Last_SQL_Error @@ -318,7 +318,7 @@ Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No -Last_IO_Errno 0 +Last_IO_Errno Last_IO_Error Last_SQL_Errno 1535 Last_SQL_Error @@ -360,7 +360,7 @@ Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No -Last_IO_Errno 0 +Last_IO_Errno Last_IO_Error Last_SQL_Errno 0 Last_SQL_Error diff --git a/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result index a6834be5a86..02e8c074354 100644 --- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result +++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result @@ -140,7 +140,7 @@ Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No -Last_IO_Errno 0 +Last_IO_Errno Last_IO_Error Last_SQL_Errno 1364 Last_SQL_Error @@ -191,7 +191,7 @@ Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No -Last_IO_Errno 0 +Last_IO_Errno Last_IO_Error Last_SQL_Errno 0 Last_SQL_Error @@ -232,7 +232,7 @@ Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No -Last_IO_Errno 0 +Last_IO_Errno Last_IO_Error Last_SQL_Errno 1535 Last_SQL_Error @@ -275,7 +275,7 @@ Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No -Last_IO_Errno 0 +Last_IO_Errno Last_IO_Error Last_SQL_Errno 1535 Last_SQL_Error @@ -318,7 +318,7 @@ Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No -Last_IO_Errno 0 +Last_IO_Errno Last_IO_Error Last_SQL_Errno 1535 Last_SQL_Error @@ -360,7 +360,7 @@ Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No -Last_IO_Errno 0 +Last_IO_Errno Last_IO_Error Last_SQL_Errno 0 Last_SQL_Error From 932ca861e461fb01d549b765e401ec84c5d6c46d Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 14 Mar 2008 21:06:01 +0100 Subject: [PATCH 101/705] Bug#34654 RESET SLAVE and STOP SLAVE/START SLAVE does not clear Last_XYZ_Errno --- .../suite/rpl_ndb/r/rpl_ndb_circular_simplex.result | 8 ++++---- mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result index 18c00583df1..01f8d94da48 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result @@ -49,8 +49,8 @@ Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No -Last_IO_Errno 0 -Last_IO_Error +Last_IO_Errno # +Last_IO_Error # Last_SQL_Errno 0 Last_SQL_Error SELECT * FROM t1 ORDER BY a; @@ -98,7 +98,7 @@ Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No -Last_IO_Errno 0 -Last_IO_Error +Last_IO_Errno # +Last_IO_Error # Last_SQL_Errno 0 Last_SQL_Error diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test index fcbff1392f4..d5ddfc2b739 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test @@ -49,7 +49,7 @@ sync_with_master; # Check that there is no error in replication --replace_result $SLAVE_MYPORT SLAVE_PORT ---replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # +--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # query_vertical SHOW SLAVE STATUS; # Check that we have the data on the master @@ -76,5 +76,5 @@ SELECT * FROM t1 ORDER BY a; # Check that there is no error in replication --replace_result $MASTER_MYPORT MASTER_PORT ---replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # +--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # query_vertical SHOW SLAVE STATUS; From 9201ff3c362dd25a29ae9a704abe242247af0eeb Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 25 Mar 2008 09:19:03 +0100 Subject: [PATCH 102/705] Find mysqld binary from it's basedir --- mysql-test/mysql-test-run.pl | 46 +++++++++++++++++------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 43a0c684de9..c065add1465 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -90,7 +90,6 @@ our $opt_suites= $DEFAULT_SUITES; our $opt_verbose= 0; # Verbose output, enable with --verbose our $opt_verbose_restart= 0; # Verbose output for restarts -my $exe_mysqld; our $exe_mysql; our $exe_mysqladmin; our $exe_mysqltest; @@ -416,11 +415,6 @@ sub command_line_setup { $basedir= dirname($basedir); } - # - # Find the mysqld executable to be able to find the mysqld version - # number as early as possible - # - # Look for the client binaries directory if ($path_client_bindir) { @@ -456,20 +450,7 @@ sub command_line_setup { "$basedir/scripts"); } - $exe_mysqld= mtr_exe_exists (vs_config_dirs('sql', 'mysqld'), - vs_config_dirs('sql', 'mysqld-debug'), - "$basedir/sql/mysqld", - "$path_client_bindir/mysqld-max-nt", - "$path_client_bindir/mysqld-max", - "$path_client_bindir/mysqld-nt", - "$path_client_bindir/mysqld", - "$path_client_bindir/mysqld-debug", - "$path_client_bindir/mysqld-max", - "$basedir/libexec/mysqld", - "$basedir/bin/mysqld", - "$basedir/sbin/mysqld"); - - # Use the mysqld found above to find out what features are available + # Run the mysqld to find out what features are available collect_mysqld_features(); if ( $opt_comment ) @@ -809,6 +790,7 @@ sub collect_mysqld_features { mtr_add_arg($args, "--verbose"); mtr_add_arg($args, "--help"); + my $exe_mysqld= find_mysqld($basedir); my $cmd= join(" ", $exe_mysqld, @$args); my $list= `$cmd`; @@ -872,6 +854,24 @@ sub collect_mysqld_features { } +sub find_mysqld { + my ($mysqld_basedir)= @_; + + my @mysqld_names= ("mysqld", "mysqld-max-nt", "mysqld-max", + "mysqld-nt"); + + if ( $opt_debug ){ + # Put mysqld-debug first in the list of binaries to look for + mtr_verbose("Adding mysqld-debug first in list of binaries to look for"); + unshift(@mysqld_names, "mysqld-debug"); + } + + return my_find_bin($mysqld_basedir, + ["sql", "libexec", "sbin"], + [@mysqld_names]); +} + + sub executable_setup () { # @@ -889,7 +889,6 @@ sub executable_setup () { } } - # Look for the client binaries $exe_mysqladmin= mtr_exe_exists("$path_client_bindir/mysqladmin"); $exe_mysql= mtr_exe_exists("$path_client_bindir/mysql"); @@ -929,7 +928,6 @@ sub executable_setup () { } - sub client_debug_arg($$) { my ($args, $client_name)= @_; @@ -2004,7 +2002,7 @@ sub mysql_install_db { # --bootstrap or --skip-grant-tables options. The user can set # MYSQLD_BOOTSTRAP to the full path to a mysqld which does accept # --bootstrap, to accommodate this. - my $exe_mysqld_bootstrap = $ENV{'MYSQLD_BOOTSTRAP'} || $exe_mysqld; + my $exe_mysqld_bootstrap = $ENV{'MYSQLD_BOOTSTRAP'} || find_mysqld($basedir); # ---------------------------------------------------------------------- # export MYSQLD_BOOTSTRAP_CMD variable containing /mysqld @@ -2673,7 +2671,7 @@ sub mysqld_start ($$) { mtr_verbose(My::Options::toStr("mysqld_start", @$extra_opts)); - my $exe= $exe_mysqld; + my $exe= find_mysqld($mysqld->value('basedir')); my $wait_for_pid_file= 1; mtr_error("Internal error: mysqld should never be started for embedded") From dfa3be4944cfefeba029c3ac2e1b8de8b284f0c1 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 25 Mar 2008 16:29:32 +0100 Subject: [PATCH 103/705] Bug#34761 Mysql-test-run.pl script hangs on Windows --- mysql-test/mysql-test-run.pl | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index c065add1465..b221b28f12d 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -43,6 +43,7 @@ use My::File::Path; # Patched version of File::Path use File::Basename; use File::Copy; use File::Temp qw / tempdir /; +use File::Spec::Functions qw / splitdir /; use My::Platform; use My::SafeProcess; use My::ConfigFactory; @@ -85,7 +86,7 @@ my $path_config_file; # The generated config file, var/my.cnf our $opt_vs_config = $ENV{'MTR_VS_CONFIG'}; my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb"; -our $opt_suites= $DEFAULT_SUITES; +my $opt_suites; our $opt_verbose= 0; # Verbose output, enable with --verbose our $opt_verbose_restart= 0; # Verbose output for restarts @@ -220,7 +221,34 @@ sub main { gcov_prepare(); } - # Figure out which tests we are going to run + mtr_report("Collecting tests..."); + + if (!$opt_suites) + { + $opt_suites= $DEFAULT_SUITES; + + # Check for any extra suites to enable based on the path name + my %extra_suites= + ( + "mysql-5.1-new-ndb" => "ndb_team", + "mysql-5.1-new-ndb-merge" => "ndb_team", + "mysql-5.1-telco-6.2" => "ndb_team", + "mysql-5.1-telco-6.2-merge" => "ndb_team", + "mysql-5.1-telco-6.3" => "ndb_team", + "mysql-6.0-ndb" => "ndb_team", + ); + + foreach my $dir ( reverse splitdir($basedir) ) + { + my $extra_suite= $extra_suites{$dir}; + if (defined $extra_suite){ + mtr_report("Found extra suite: $extra_suite"); + $opt_suites= "$extra_suite,$opt_suites"; + last; + } + } + } + mtr_report("Collecting tests..."); my $tests= collect_test_cases($opt_suites, \@opt_cases); @@ -3600,7 +3628,7 @@ Options to control what test suites or cases to run suite[s]=NAME1,..,NAMEN Collect tests in suites from the comma separated list of suite names. - The default is: "$opt_suites" + The default is: "$DEFAULT_SUITES" skip-rpl Skip the replication test cases. big-test Set the environment variable BIG_TEST, which can be checked from test cases. From 201ce48d5d36a5291ec470acc7f7a38a6c6968a2 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 26 Mar 2008 07:22:42 +0100 Subject: [PATCH 104/705] After merge fixes --- mysql-test/include/commit.inc | 4 ++-- mysql-test/lib/mtr_report.pm | 7 +++++-- mysql-test/mysql-test-run.pl | 2 -- mysql-test/r/commit_1innodb.result | 4 ++-- mysql-test/suite/binlog/r/binlog_multi_engine.result | 2 +- mysql-test/suite/binlog/r/binlog_unsafe.result | 1 - mysql-test/suite/binlog/t/binlog_unsafe.test | 1 - 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/mysql-test/include/commit.inc b/mysql-test/include/commit.inc index 38c123295fb..0e6c13f9a4a 100644 --- a/mysql-test/include/commit.inc +++ b/mysql-test/include/commit.inc @@ -267,7 +267,7 @@ select * from t2; insert into t2 (a) values (1026); --replace_result $MYSQLTEST_VARDIR .. --error ER_DUP_ENTRY -eval load data infile "../std_data_ln/words.dat" into table t1 (a) set a:=f2(26); +eval load data infile "../../std_data/words.dat" into table t1 (a) set a:=f2(26); select * from t2; rollback; @@ -740,6 +740,6 @@ call p_verify_status_increment(0, 0, 0, 0); --echo # --echo # Cleanup --echo # -drop table t1; +drop table t1, t2, t3; drop procedure p_verify_status_increment; drop function f1; diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index 47b21665283..bbde54abbf9 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -455,11 +455,14 @@ sub mtr_report_stats ($) { # that can be copy pasted to rerun only failing tests print "Failing test(s):"; + my %seen= (); foreach my $tinfo (@$tests) { - if ( $tinfo->{'result'} eq 'MTR_RES_FAILED' ) + my $tname= $tinfo->{'name'}; + if ( $tinfo->{'result'} eq 'MTR_RES_FAILED' and ! $seen{$tname}) { - print " $tinfo->{'name'}"; + print " $tname"; + $seen{$tname}= 1; } } print "\n\n"; diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index b221b28f12d..78d51abccec 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -221,8 +221,6 @@ sub main { gcov_prepare(); } - mtr_report("Collecting tests..."); - if (!$opt_suites) { $opt_suites= $DEFAULT_SUITES; diff --git a/mysql-test/r/commit_1innodb.result b/mysql-test/r/commit_1innodb.result index 76eee3874d6..f9be8c2b519 100644 --- a/mysql-test/r/commit_1innodb.result +++ b/mysql-test/r/commit_1innodb.result @@ -263,7 +263,7 @@ rollback; select * from t2; a insert into t2 (a) values (1026); -load data infile "../std_data_ln/words.dat" into table t1 (a) set a:=f2(26); +load data infile "../../std_data/words.dat" into table t1 (a) set a:=f2(26); ERROR 23000: Duplicate entry '26' for key 'a' select * from t2; a @@ -879,6 +879,6 @@ SUCCESS # # Cleanup # -drop table t1; +drop table t1, t2, t3; drop procedure p_verify_status_increment; drop function f1; diff --git a/mysql-test/suite/binlog/r/binlog_multi_engine.result b/mysql-test/suite/binlog/r/binlog_multi_engine.result index 728d6a96e5c..5fe0c93487e 100644 --- a/mysql-test/suite/binlog/r/binlog_multi_engine.result +++ b/mysql-test/suite/binlog/r/binlog_multi_engine.result @@ -37,7 +37,7 @@ mysqld-bin.000001 # Query # # use `test`; TRUNCATE t1b mysqld-bin.000001 # Query # # use `test`; TRUNCATE t1n RESET MASTER; SET SESSION BINLOG_FORMAT=MIXED; -INSERTs INTO t1b VALUES (1,1), (1,2), (2,1), (2,2); +INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2); INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2); INSERT INTO t1n VALUES (1,1), (1,2), (2,1), (2,2); UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c; diff --git a/mysql-test/suite/binlog/r/binlog_unsafe.result b/mysql-test/suite/binlog/r/binlog_unsafe.result index b507bb08a06..e7c0702af46 100644 --- a/mysql-test/suite/binlog/r/binlog_unsafe.result +++ b/mysql-test/suite/binlog/r/binlog_unsafe.result @@ -192,4 +192,3 @@ DROP PROCEDURE proc4; DROP FUNCTION func5; DROP PREPARE prep6; DROP TABLE t1, t2, t3, trigger_table, trigger_table2; -DROP VIEW v1; diff --git a/mysql-test/suite/binlog/t/binlog_unsafe.test b/mysql-test/suite/binlog/t/binlog_unsafe.test index a8b373f65b7..f57ab668c58 100644 --- a/mysql-test/suite/binlog/t/binlog_unsafe.test +++ b/mysql-test/suite/binlog/t/binlog_unsafe.test @@ -236,4 +236,3 @@ DROP PROCEDURE proc4; DROP FUNCTION func5; DROP PREPARE prep6; DROP TABLE t1, t2, t3, trigger_table, trigger_table2; -DROP VIEW v1; From d4eecb9677081aa41a1eb6896344a680cc10afcd Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 2 Apr 2008 10:06:36 +0200 Subject: [PATCH 105/705] Add mtr database --- mysql-test/mysql-test-run.pl | 8 ++++++-- mysql-test/r/1st.result | 1 + mysql-test/r/drop.result | 2 ++ mysql-test/r/information_schema.result | 4 ++++ mysql-test/r/ps_1general.result | 1 + mysql-test/r/schema.result | 1 + mysql-test/r/show_check.result | 1 + mysql-test/suite/binlog/r/binlog_database.result | 1 + mysql-test/suite/rpl/r/rpl_loaddata_m.result | 1 + mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result | 2 ++ 10 files changed, 20 insertions(+), 2 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 78d51abccec..d0d7a761107 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2041,7 +2041,7 @@ sub mysql_install_db { my $bootstrap_sql_file= "$opt_vardir/tmp/bootstrap.sql"; # Use the mysql database for system tables - mtr_tofile($bootstrap_sql_file, "use mysql"); + mtr_tofile($bootstrap_sql_file, "use mysql\n"); # Add the offical mysql system tables # for a production system @@ -2067,7 +2067,11 @@ sub mysql_install_db { # Remove anonymous users mtr_tofile($bootstrap_sql_file, - "DELETE FROM mysql.user where user= '';"); + "DELETE FROM mysql.user where user= '';\n"); + + # Create mtr database + mtr_tofile($bootstrap_sql_file, + "CREATE DATABASE mtr;\n"); # Log bootstrap command my $path_bootstrap_log= "$opt_vardir/log/bootstrap.log"; diff --git a/mysql-test/r/1st.result b/mysql-test/r/1st.result index 60190629dd0..4a82f8c66e9 100644 --- a/mysql-test/r/1st.result +++ b/mysql-test/r/1st.result @@ -1,6 +1,7 @@ show databases; Database information_schema +mtr mysql test show tables in mysql; diff --git a/mysql-test/r/drop.result b/mysql-test/r/drop.result index 71d6fcc7cd0..675c85d676e 100644 --- a/mysql-test/r/drop.result +++ b/mysql-test/r/drop.result @@ -47,6 +47,7 @@ create database mysqltest; show databases; Database information_schema +mtr mysql mysqltest test @@ -58,6 +59,7 @@ drop database mysqltest; show databases; Database information_schema +mtr mysql test drop database mysqltest; diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index 18864148d29..faf3e0bb411 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -9,11 +9,13 @@ create user mysqltest_3@localhost; create user mysqltest_3; select * from information_schema.SCHEMATA where schema_name > 'm'; CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH +NULL mtr latin1 latin1_swedish_ci NULL NULL mysql latin1 latin1_swedish_ci NULL NULL test latin1 latin1_swedish_ci NULL select schema_name from information_schema.schemata; schema_name information_schema +mtr mysql test show databases like 't%'; @@ -22,6 +24,7 @@ test show databases; Database information_schema +mtr mysql test show databases where `database` = 't%'; @@ -351,6 +354,7 @@ create view v0 (c) as select schema_name from information_schema.schemata; select * from v0; c information_schema +mtr mysql test explain select * from v0; diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result index 1c5f0e4dfd6..41307b62133 100644 --- a/mysql-test/r/ps_1general.result +++ b/mysql-test/r/ps_1general.result @@ -259,6 +259,7 @@ prepare stmt4 from ' show databases '; execute stmt4; Database information_schema +mtr mysql test prepare stmt4 from ' show tables from test like ''t2%'' '; diff --git a/mysql-test/r/schema.result b/mysql-test/r/schema.result index 538abd8d039..564fb3626df 100644 --- a/mysql-test/r/schema.result +++ b/mysql-test/r/schema.result @@ -7,6 +7,7 @@ show schemas; Database information_schema foo +mtr mysql test drop schema foo; diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index d1eb213670e..d1005de8173 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -140,6 +140,7 @@ Catalog Database Table Table_alias Column Column_alias Type Length Max length Is def SCHEMATA SCHEMA_NAME Database 253 64 18 N 1 0 8 Database information_schema +mtr mysql test show databases like "test%"; diff --git a/mysql-test/suite/binlog/r/binlog_database.result b/mysql-test/suite/binlog/r/binlog_database.result index 7deffb86244..c43d3bc6f57 100644 --- a/mysql-test/suite/binlog/r/binlog_database.result +++ b/mysql-test/suite/binlog/r/binlog_database.result @@ -52,5 +52,6 @@ master-bin.000001 # Query # # drop database testing_1 show databases; Database information_schema +mtr mysql test diff --git a/mysql-test/suite/rpl/r/rpl_loaddata_m.result b/mysql-test/suite/rpl/r/rpl_loaddata_m.result index 1d263a41e1b..a1294d515fa 100644 --- a/mysql-test/suite/rpl/r/rpl_loaddata_m.result +++ b/mysql-test/suite/rpl/r/rpl_loaddata_m.result @@ -21,6 +21,7 @@ COUNT(*) SHOW DATABASES; Database information_schema +mtr mysql mysqltest test diff --git a/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result b/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result index f49c23248e5..bf668fb7ccc 100644 --- a/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result +++ b/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result @@ -9,6 +9,7 @@ CREATE DATABASE test_ignore; SHOW DATABASES; Database information_schema +mtr mysql test test_ignore @@ -33,6 +34,7 @@ master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F SHOW DATABASES; Database information_schema +mtr mysql test USE test; From 16d4936e3ba980130c50d7838df19f59a9063165 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 2 Apr 2008 10:08:44 +0200 Subject: [PATCH 106/705] Set verbose to off by default --- mysql-test/lib/My/SafeProcess.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index defc18c3a00..4d703d73b9a 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -59,7 +59,7 @@ use My::Find; use My::Platform; my %running; -my $_verbose= IS_WINDOWS; +my $_verbose= 0; END { # Kill any children still running From 0a4d373f3d44c898a794188f58cdd96233d63805 Mon Sep 17 00:00:00 2001 From: "sven@riska.(none)" <> Date: Wed, 2 Apr 2008 16:49:22 +0700 Subject: [PATCH 107/705] BUG#34541: mysqlbinlog prints 'set;' in stm mode after changing autocommit mode Problem: a typo in the code. When autocommit, foreign_key_checks, sql_auto_is_null, or unique_checks changes, it prints "SET", and then a comma-separated list of assignments. However, it does not print the assignment to the @@autocommit variable. Fix: print the @@autocommit variable. --- mysql-test/r/mysqlbinlog.result | 16 ++--- mysql-test/r/mysqlbinlog2.result | 70 +++++++++---------- mysql-test/r/user_var-binlog.result | 2 +- .../suite/binlog/r/binlog_base64_flag.result | 2 +- .../binlog/r/binlog_stm_ctype_ucs.result | 2 +- .../suite/rpl/r/rpl_row_mysqlbinlog.result | 8 +-- sql/log_event.cc | 8 ++- 7 files changed, 55 insertions(+), 53 deletions(-) diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result index 7c5fdf5f3d0..ad04649d3f3 100644 --- a/mysql-test/r/mysqlbinlog.result +++ b/mysql-test/r/mysqlbinlog.result @@ -20,7 +20,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -66,7 +66,7 @@ DELIMITER /*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -98,7 +98,7 @@ DELIMITER /*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -120,7 +120,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -166,7 +166,7 @@ DELIMITER /*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -198,7 +198,7 @@ DELIMITER /*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -298,7 +298,7 @@ DELIMITER /*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -348,7 +348,7 @@ DELIMITER /*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/r/mysqlbinlog2.result b/mysql-test/r/mysqlbinlog2.result index 89fc4b87d29..dba9bdc9d70 100644 --- a/mysql-test/r/mysqlbinlog2.result +++ b/mysql-test/r/mysqlbinlog2.result @@ -22,7 +22,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1579609942/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -65,7 +65,7 @@ SET INSERT_ID=1/*!*/; use test/*!*/; SET TIMESTAMP=1579609942/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -104,7 +104,7 @@ SET INSERT_ID=4/*!*/; use test/*!*/; SET TIMESTAMP=1579609946/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -130,7 +130,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1579609942/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -165,7 +165,7 @@ SET INSERT_ID=4/*!*/; use test/*!*/; SET TIMESTAMP=1579609946/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -188,7 +188,7 @@ SET INSERT_ID=3/*!*/; use test/*!*/; SET TIMESTAMP=1579609944/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -218,7 +218,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1579609942/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -249,7 +249,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1579609942/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -284,7 +284,7 @@ SET INSERT_ID=6/*!*/; use test/*!*/; SET TIMESTAMP=1579609943/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -307,7 +307,7 @@ SET INSERT_ID=1/*!*/; use test/*!*/; SET TIMESTAMP=1579609942/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -338,7 +338,7 @@ SET INSERT_ID=6/*!*/; use test/*!*/; SET TIMESTAMP=1579609943/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -361,7 +361,7 @@ SET INSERT_ID=4/*!*/; use test/*!*/; SET TIMESTAMP=1579609946/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -380,7 +380,7 @@ SET INSERT_ID=6/*!*/; use test/*!*/; SET TIMESTAMP=1579609943/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -402,7 +402,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1579609942/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -448,7 +448,7 @@ SET INSERT_ID=3/*!*/; use test/*!*/; SET TIMESTAMP=1579609944/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -471,7 +471,7 @@ SET INSERT_ID=6/*!*/; use test/*!*/; SET TIMESTAMP=1579609943/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -493,7 +493,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1579609942/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -523,7 +523,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1579609942/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -566,7 +566,7 @@ SET INSERT_ID=1/*!*/; use test/*!*/; SET TIMESTAMP=1579609942/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -604,7 +604,7 @@ SET INSERT_ID=4/*!*/; use test/*!*/; SET TIMESTAMP=1579609946/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -630,7 +630,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1579609942/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -664,7 +664,7 @@ SET INSERT_ID=4/*!*/; use test/*!*/; SET TIMESTAMP=1579609946/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -687,7 +687,7 @@ SET INSERT_ID=3/*!*/; use test/*!*/; SET TIMESTAMP=1579609944/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -717,7 +717,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1579609942/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -747,7 +747,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1579609942/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -782,7 +782,7 @@ SET INSERT_ID=6/*!*/; use test/*!*/; SET TIMESTAMP=1579609943/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -805,7 +805,7 @@ SET INSERT_ID=1/*!*/; use test/*!*/; SET TIMESTAMP=1579609942/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -836,7 +836,7 @@ SET INSERT_ID=6/*!*/; use test/*!*/; SET TIMESTAMP=1579609943/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -858,7 +858,7 @@ SET INSERT_ID=4/*!*/; use test/*!*/; SET TIMESTAMP=1579609946/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -877,7 +877,7 @@ SET INSERT_ID=6/*!*/; use test/*!*/; SET TIMESTAMP=1579609943/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -899,7 +899,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1579609942/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -945,7 +945,7 @@ SET INSERT_ID=3/*!*/; use test/*!*/; SET TIMESTAMP=1579609944/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -968,7 +968,7 @@ SET INSERT_ID=6/*!*/; use test/*!*/; SET TIMESTAMP=1579609943/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -990,7 +990,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1579609942/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1020,7 +1020,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1579609942/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/r/user_var-binlog.result b/mysql-test/r/user_var-binlog.result index 3a7d59798ae..05efea79fe7 100644 --- a/mysql-test/r/user_var-binlog.result +++ b/mysql-test/r/user_var-binlog.result @@ -22,7 +22,7 @@ SET @`a b`:=_latin1 0x68656C6C6F COLLATE `latin1_swedish_ci`/*!*/; use test/*!*/; SET TIMESTAMP=10000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_base64_flag.result b/mysql-test/suite/binlog/r/binlog_base64_flag.result index 557f584fcc1..aaea2ca31ba 100644 --- a/mysql-test/suite/binlog/r/binlog_base64_flag.result +++ b/mysql-test/suite/binlog/r/binlog_base64_flag.result @@ -36,7 +36,7 @@ DELIMITER /*!*/; # at 102 <#>use test/*!*/; SET TIMESTAMP=1196959712/*!*/; -<#>SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +<#>SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result b/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result index 1b14686a97d..b7edf7fedb8 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result +++ b/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result @@ -16,7 +16,7 @@ SET @`v`:=_ucs2 0x006100620063 COLLATE `ucs2_general_ci`/*!*/; use test/*!*/; SET TIMESTAMP=10000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result b/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result index 2d9d801047b..2cb316c6a1f 100644 --- a/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result +++ b/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result @@ -159,7 +159,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -181,7 +181,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -290,7 +290,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -321,7 +321,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/sql/log_event.cc b/sql/log_event.cc index 15f1a957149..ff553760831 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -2142,11 +2142,13 @@ void Query_log_event::print_query_header(IO_CACHE* file, bool need_comma= 0; my_b_printf(file, "SET "); print_set_option(file, tmp, OPTION_NO_FOREIGN_KEY_CHECKS, ~flags2, - "@@session.foreign_key_checks", &need_comma); + "@@session.foreign_key_checks", &need_comma); print_set_option(file, tmp, OPTION_AUTO_IS_NULL, flags2, - "@@session.sql_auto_is_null", &need_comma); + "@@session.sql_auto_is_null", &need_comma); print_set_option(file, tmp, OPTION_RELAXED_UNIQUE_CHECKS, ~flags2, - "@@session.unique_checks", &need_comma); + "@@session.unique_checks", &need_comma); + print_set_option(file, tmp, OPTION_NOT_AUTOCOMMIT, ~flags2, + "@@session.autocommit", &need_comma); my_b_printf(file,"%s\n", print_event_info->delimiter); print_event_info->flags2= flags2; } From fd8d82aed75227934ad11e37f4c14159bf490d12 Mon Sep 17 00:00:00 2001 From: "skozlov/ksm@mysql.com/virtop.(none)" <> Date: Wed, 2 Apr 2008 19:41:49 +0400 Subject: [PATCH 108/705] Bug#30128, The reason that sometimes events were executed because without STARTS clause server fires immediately after creating event and time between create and delete event sometimes is enough for firing. So adding STARTS clause moves first execution in future after drop of event. --- mysql-test/include/rpl_events.inc | 16 ++++++++++++---- mysql-test/suite/rpl/r/rpl_events.result | 16 ++++++++-------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/mysql-test/include/rpl_events.inc b/mysql-test/include/rpl_events.inc index e1bf5500923..b0b2abbc2bb 100644 --- a/mysql-test/include/rpl_events.inc +++ b/mysql-test/include/rpl_events.inc @@ -63,7 +63,9 @@ SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name DROP EVENT IF EXISTS test.slave_once; --enable_warnings -CREATE EVENT test.slave_once ON SCHEDULE EVERY 5 MINUTE DO +# Create an event on slave and check its state. An event shouldn't be executed +# so set start time in 1 hour. +CREATE EVENT test.slave_once ON SCHEDULE EVERY 5 MINUTE STARTS CURRENT_TIMESTAMP + INTERVAL 1 HOUR DO INSERT IGNORE INTO t1(id, c) VALUES (3, 'from slave_once'); --echo "Checking event status on the slave for originator value = slave's server_id" @@ -82,8 +84,11 @@ connection master; DROP EVENT IF EXISTS test.justonce; --enable_warnings +# Create an event on master and check its state on slave. An event shouldn't be executed +# so set start time in 1 hour. Check that changes of event statement replicated to slave + --echo "Creating event test.er on the master" -CREATE EVENT test.er ON SCHEDULE EVERY 3 SECOND DO +CREATE EVENT test.er ON SCHEDULE EVERY 3 SECOND STARTS CURRENT_TIMESTAMP + INTERVAL 1 HOUR DO INSERT IGNORE INTO t1(id, c) VALUES (4, 'from er'); --echo "Checking event status on the master" @@ -96,7 +101,7 @@ SELECT db, name, status, originator, body FROM mysql.event WHERE db = 'test' AND connection master; --echo "Altering event test.er on the master" -ALTER EVENT test.er ON SCHEDULE EVERY 5 SECOND DO +ALTER EVENT test.er ON SCHEDULE EVERY 5 SECOND STARTS CURRENT_TIMESTAMP + INTERVAL 1 HOUR DO INSERT IGNORE INTO t1(id, c) VALUES (5, 'from alter er'); --echo "Checking event status on the master" @@ -124,8 +129,11 @@ SELECT db, name, status, originator FROM mysql.event WHERE db = 'test'; # test the DISABLE ON SLAVE for setting event SLAVESIDE_DISABLED as status # on CREATE EVENT +# Create an event on slave and check its status. An event shouldn't be executed +# so set start time in 1 hour. + --echo "Creating event test.slave_terminate on the slave" -CREATE EVENT test.slave_terminate ON SCHEDULE EVERY 3 SECOND DO +CREATE EVENT test.slave_terminate ON SCHEDULE EVERY 3 SECOND STARTS CURRENT_TIMESTAMP + INTERVAL 1 HOUR DO INSERT IGNORE INTO t1(id, c) VALUES (6, 'from slave_terminate'); --echo "Checking event status on the slave" diff --git a/mysql-test/suite/rpl/r/rpl_events.result b/mysql-test/suite/rpl/r/rpl_events.result index 273004b0a43..b26b8aac3a9 100644 --- a/mysql-test/suite/rpl/r/rpl_events.result +++ b/mysql-test/suite/rpl/r/rpl_events.result @@ -40,7 +40,7 @@ db name status originator test justonce SLAVESIDE_DISABLED 1 "Dropping event test.slave_once on the slave" DROP EVENT IF EXISTS test.slave_once; -CREATE EVENT test.slave_once ON SCHEDULE EVERY 5 MINUTE DO +CREATE EVENT test.slave_once ON SCHEDULE EVERY 5 MINUTE STARTS CURRENT_TIMESTAMP + INTERVAL 1 HOUR DO INSERT IGNORE INTO t1(id, c) VALUES (3, 'from slave_once'); "Checking event status on the slave for originator value = slave's server_id" SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'slave_once'; @@ -51,7 +51,7 @@ DROP EVENT IF EXISTS test.slave_once; "Dropping event test.justonce on the master" DROP EVENT IF EXISTS test.justonce; "Creating event test.er on the master" -CREATE EVENT test.er ON SCHEDULE EVERY 3 SECOND DO +CREATE EVENT test.er ON SCHEDULE EVERY 3 SECOND STARTS CURRENT_TIMESTAMP + INTERVAL 1 HOUR DO INSERT IGNORE INTO t1(id, c) VALUES (4, 'from er'); "Checking event status on the master" SELECT db, name, status, originator, body FROM mysql.event WHERE db = 'test' AND name = 'er'; @@ -62,7 +62,7 @@ SELECT db, name, status, originator, body FROM mysql.event WHERE db = 'test' AND db name status originator body test er SLAVESIDE_DISABLED 1 INSERT IGNORE INTO t1(id, c) VALUES (4, 'from er') "Altering event test.er on the master" -ALTER EVENT test.er ON SCHEDULE EVERY 5 SECOND DO +ALTER EVENT test.er ON SCHEDULE EVERY 5 SECOND STARTS CURRENT_TIMESTAMP + INTERVAL 1 HOUR DO INSERT IGNORE INTO t1(id, c) VALUES (5, 'from alter er'); "Checking event status on the master" SELECT db, name, status, originator, body FROM mysql.event WHERE db = 'test' AND name = 'er'; @@ -81,7 +81,7 @@ db name status originator SELECT db, name, status, originator FROM mysql.event WHERE db = 'test'; db name status originator "Creating event test.slave_terminate on the slave" -CREATE EVENT test.slave_terminate ON SCHEDULE EVERY 3 SECOND DO +CREATE EVENT test.slave_terminate ON SCHEDULE EVERY 3 SECOND STARTS CURRENT_TIMESTAMP + INTERVAL 1 HOUR DO INSERT IGNORE INTO t1(id, c) VALUES (6, 'from slave_terminate'); "Checking event status on the slave" SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'slave_terminate'; @@ -135,7 +135,7 @@ db name status originator test justonce SLAVESIDE_DISABLED 1 "Dropping event test.slave_once on the slave" DROP EVENT IF EXISTS test.slave_once; -CREATE EVENT test.slave_once ON SCHEDULE EVERY 5 MINUTE DO +CREATE EVENT test.slave_once ON SCHEDULE EVERY 5 MINUTE STARTS CURRENT_TIMESTAMP + INTERVAL 1 HOUR DO INSERT IGNORE INTO t1(id, c) VALUES (3, 'from slave_once'); "Checking event status on the slave for originator value = slave's server_id" SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'slave_once'; @@ -146,7 +146,7 @@ DROP EVENT IF EXISTS test.slave_once; "Dropping event test.justonce on the master" DROP EVENT IF EXISTS test.justonce; "Creating event test.er on the master" -CREATE EVENT test.er ON SCHEDULE EVERY 3 SECOND DO +CREATE EVENT test.er ON SCHEDULE EVERY 3 SECOND STARTS CURRENT_TIMESTAMP + INTERVAL 1 HOUR DO INSERT IGNORE INTO t1(id, c) VALUES (4, 'from er'); "Checking event status on the master" SELECT db, name, status, originator, body FROM mysql.event WHERE db = 'test' AND name = 'er'; @@ -157,7 +157,7 @@ SELECT db, name, status, originator, body FROM mysql.event WHERE db = 'test' AND db name status originator body test er SLAVESIDE_DISABLED 1 INSERT IGNORE INTO t1(id, c) VALUES (4, 'from er') "Altering event test.er on the master" -ALTER EVENT test.er ON SCHEDULE EVERY 5 SECOND DO +ALTER EVENT test.er ON SCHEDULE EVERY 5 SECOND STARTS CURRENT_TIMESTAMP + INTERVAL 1 HOUR DO INSERT IGNORE INTO t1(id, c) VALUES (5, 'from alter er'); "Checking event status on the master" SELECT db, name, status, originator, body FROM mysql.event WHERE db = 'test' AND name = 'er'; @@ -176,7 +176,7 @@ db name status originator SELECT db, name, status, originator FROM mysql.event WHERE db = 'test'; db name status originator "Creating event test.slave_terminate on the slave" -CREATE EVENT test.slave_terminate ON SCHEDULE EVERY 3 SECOND DO +CREATE EVENT test.slave_terminate ON SCHEDULE EVERY 3 SECOND STARTS CURRENT_TIMESTAMP + INTERVAL 1 HOUR DO INSERT IGNORE INTO t1(id, c) VALUES (6, 'from slave_terminate'); "Checking event status on the slave" SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'slave_terminate'; From 70827ee13ec0574ec01be123bbf76943e67e1853 Mon Sep 17 00:00:00 2001 From: "mkindahl@dl145h.mysql.com" <> Date: Wed, 2 Apr 2008 20:47:16 +0200 Subject: [PATCH 109/705] Post-merge fixes to make tests pass. --- mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result b/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result index a066928fc13..49aa64adfb5 100644 --- a/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result +++ b/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result @@ -17,7 +17,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=10000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; From 2e5a32906646ae4c50820e101c25afd7e9724f61 Mon Sep 17 00:00:00 2001 From: "skozlov/ksm@mysql.com/virtop.(none)" <> Date: Wed, 2 Apr 2008 22:50:54 +0400 Subject: [PATCH 110/705] Bug#28772, added waiting Until_Log_Pos when slave starting with UNTIL clause and then waiting stop of slave. It helps to avoid issues when slave starts too slowly. --- mysql-test/suite/rpl/r/rpl_row_until.result | 6 +++--- mysql-test/suite/rpl/t/rpl_row_until.test | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mysql-test/suite/rpl/r/rpl_row_until.result b/mysql-test/suite/rpl/r/rpl_row_until.result index 383d1a03a22..a0c82a2d4a8 100644 --- a/mysql-test/suite/rpl/r/rpl_row_until.result +++ b/mysql-test/suite/rpl/r/rpl_row_until.result @@ -150,7 +150,7 @@ Last_SQL_Errno 0 Last_SQL_Error start slave; stop slave; -start slave until master_log_file='master-bin.000001', master_log_pos=740; +start slave sql_thread until master_log_file='master-bin.000001', master_log_pos=740; SHOW SLAVE STATUS; Slave_IO_State # Master_Host 127.0.0.1 @@ -162,7 +162,7 @@ Read_Master_Log_Pos 750 Relay_Log_File # Relay_Log_Pos # Relay_Master_Log_File master-bin.000001 -Slave_IO_Running Yes +Slave_IO_Running No Slave_SQL_Running No Replicate_Do_DB Replicate_Ignore_DB @@ -200,7 +200,7 @@ start slave until relay_log_file='slave-relay-bin.000002'; ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=561; ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL -start slave sql_thread; +start slave; start slave until master_log_file='master-bin.000001', master_log_pos=740; Warnings: Note 1254 Slave is already running diff --git a/mysql-test/suite/rpl/t/rpl_row_until.test b/mysql-test/suite/rpl/t/rpl_row_until.test index 610eec305df..acf36df390f 100644 --- a/mysql-test/suite/rpl/t/rpl_row_until.test +++ b/mysql-test/suite/rpl/t/rpl_row_until.test @@ -58,7 +58,10 @@ stop slave; --source include/wait_for_slave_to_stop.inc # this should stop immediately as we are already there -start slave until master_log_file='master-bin.000001', master_log_pos=740; +start slave sql_thread until master_log_file='master-bin.000001', master_log_pos=740; +--let $slave_param= Until_Log_Pos +--let $slave_param_value= 740 +--source include/wait_for_slave_param.inc --source include/wait_for_slave_sql_to_stop.inc # here the sql slave thread should be stopped --replace_result bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004 @@ -76,5 +79,5 @@ start slave until relay_log_file='slave-relay-bin.000002'; --error 1277 start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=561; # Warning should be given for second command -start slave sql_thread; +start slave; start slave until master_log_file='master-bin.000001', master_log_pos=740; From f1312d30bba46b199ca94eaa44153bf2c6f99545 Mon Sep 17 00:00:00 2001 From: "msvensson@shellback.(none)" <> Date: Thu, 3 Apr 2008 10:27:56 +0200 Subject: [PATCH 111/705] Dynamically set debug flag for session only - avoid restart - keep all in one file - fix --check-testcase --- mysql-test/r/error_simulation.result | 1 + mysql-test/t/error_simulation-master.opt | 1 - mysql-test/t/error_simulation.test | 7 ++++++- 3 files changed, 7 insertions(+), 2 deletions(-) delete mode 100644 mysql-test/t/error_simulation-master.opt diff --git a/mysql-test/r/error_simulation.result b/mysql-test/r/error_simulation.result index 77599ba303b..6153dad2534 100644 --- a/mysql-test/r/error_simulation.result +++ b/mysql-test/r/error_simulation.result @@ -13,6 +13,7 @@ INSERT INTO t1 VALUES ('AAAAAAAAAH','AAAAAAAAAH'), ('AAAAAAAAAI','AAAAAAAAAI'), ('AAAAAAAAAJ','AAAAAAAAAJ'), ('AAAAAAAAAK','AAAAAAAAAK'); set tmp_table_size=1024; +set session debug="d,raise_error"; SELECT MAX(a) FROM t1 GROUP BY a,b; ERROR 23000: Can't write; duplicate key in table 'tmp_table' set tmp_table_size=default; diff --git a/mysql-test/t/error_simulation-master.opt b/mysql-test/t/error_simulation-master.opt deleted file mode 100644 index edb77cfa85e..00000000000 --- a/mysql-test/t/error_simulation-master.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-debug=d,raise_error diff --git a/mysql-test/t/error_simulation.test b/mysql-test/t/error_simulation.test index 2f6ea5eac87..f730c95208e 100644 --- a/mysql-test/t/error_simulation.test +++ b/mysql-test/t/error_simulation.test @@ -21,10 +21,15 @@ INSERT INTO t1 VALUES set tmp_table_size=1024; +# Set debug flag so an error is returned when +# tmp table in query is converted from heap to myisam +set session debug="d,raise_error"; + --replace_regex /in table '[^']+'/in table 'tmp_table'/ --error ER_DUP_KEY SELECT MAX(a) FROM t1 GROUP BY a,b; set tmp_table_size=default; - DROP TABLE t1; + + From 95d9608d3ef3e1e827f94f99d693b71ca705212f Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 3 Apr 2008 21:40:10 +0200 Subject: [PATCH 112/705] Fix paths in test and result files --- mysql-test/r/loaddata.result | 8 +- mysql-test/r/myisam.result | 2 +- mysql-test/r/partition_not_windows.result | 12 +-- mysql-test/r/symlink.result | 8 +- .../{ => suite/binlog}/r/binlog_index.result | 6 +- .../t/binlog_auto_increment_bug33029.test | 10 ++- .../{ => suite/binlog}/t/binlog_index.test | 14 ++- .../suite/rpl/t/rpl_row_mysqlbinlog.test | 2 +- mysql-test/t/drop.test | 13 +-- mysql-test/t/loaddata.test | 8 +- mysql-test/t/myisam.test | 5 +- mysql-test/t/partition_not_windows.test | 89 ++++++++++--------- mysql-test/t/symlink.test | 27 +++--- 13 files changed, 110 insertions(+), 94 deletions(-) rename mysql-test/{ => suite/binlog}/r/binlog_index.result (71%) rename mysql-test/{ => suite/binlog}/t/binlog_index.test (74%) diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result index d01feed8099..3aef9ef636d 100644 --- a/mysql-test/r/loaddata.result +++ b/mysql-test/r/loaddata.result @@ -277,7 +277,7 @@ CREATE VIEW v1 AS SELECT * FROM t1; CREATE VIEW v2 AS SELECT 1 + 2 AS c0, c1, c2 FROM t1; CREATE VIEW v3 AS SELECT 1 AS d1, 2 AS d2; -LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v1 +LOAD DATA INFILE '../../std_data/bug35469.dat' INTO TABLE v1 FIELDS ESCAPED BY '\\' TERMINATED BY ',' ENCLOSED BY '"' @@ -297,7 +297,7 @@ c1 c2 DELETE FROM t1; -LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v2 +LOAD DATA INFILE '../../std_data/bug35469.dat' INTO TABLE v2 FIELDS ESCAPED BY '\\' TERMINATED BY ',' ENCLOSED BY '"' @@ -317,14 +317,14 @@ c0 c1 c2 DELETE FROM t1; -LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v2 +LOAD DATA INFILE '../../std_data/bug35469.dat' INTO TABLE v2 FIELDS ESCAPED BY '\\' TERMINATED BY ',' ENCLOSED BY '"' LINES TERMINATED BY '\n' (c0, c2); ERROR HY000: Invalid column reference (v2.c0) in LOAD DATA -LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v3 +LOAD DATA INFILE '../../std_data/bug35469.dat' INTO TABLE v3 FIELDS ESCAPED BY '\\' TERMINATED BY ',' ENCLOSED BY '"' diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index 112a7b7649b..2a25f2db0e1 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -2194,7 +2194,7 @@ KEY (c1), KEY (c2) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0; -MyISAM file: MYSQLTEST_VARDIR/master-data/test/t1 +MyISAM file: MYSQLD_DATADIR/test/t1 Record format: Packed Character set: utf8_general_ci (33) Data records: 0 Deleted blocks: 0 diff --git a/mysql-test/r/partition_not_windows.result b/mysql-test/r/partition_not_windows.result index 44afdea3855..c7fdcf6de2b 100644 --- a/mysql-test/r/partition_not_windows.result +++ b/mysql-test/r/partition_not_windows.result @@ -35,20 +35,20 @@ DROP TABLE t1, t2; set @@sql_mode=@org_mode; CREATE TABLE t1(a INT) PARTITION BY KEY (a) -(PARTITION p0 DATA DIRECTORY 'TEST_DIR/master-data/test'); +(PARTITION p0 DATA DIRECTORY 'MYSQLD_DATADIR/test'); ERROR HY000: Incorrect arguments to DATA DIRECTORY CREATE TABLE t1(a INT) PARTITION BY KEY (a) -(PARTITION p0 INDEX DIRECTORY 'TEST_DIR/master-data/test'); +(PARTITION p0 INDEX DIRECTORY 'MYSQLD_DATADIR/test'); ERROR HY000: Incorrect arguments to INDEX DIRECTORY CREATE TABLE ts (id INT, purchased DATE) PARTITION BY RANGE(YEAR(purchased)) SUBPARTITION BY HASH(TO_DAYS(purchased)) ( PARTITION p0 VALUES LESS THAN (1990) ( SUBPARTITION s0a -DATA DIRECTORY = 'TEST_DIR/master-data/test', +DATA DIRECTORY = 'MYSQLD_DATADIR/test', SUBPARTITION s0b -DATA DIRECTORY = 'TEST_DIR/master-data/test' +DATA DIRECTORY = 'MYSQLD_DATADIR/test' )); ERROR HY000: Incorrect arguments to DATA DIRECTORY CREATE TABLE ts (id INT, purchased DATE) @@ -56,9 +56,9 @@ PARTITION BY RANGE(YEAR(purchased)) SUBPARTITION BY HASH(TO_DAYS(purchased)) ( PARTITION p0 VALUES LESS THAN (1990) ( SUBPARTITION s0a -INDEX DIRECTORY = 'TEST_DIR/master-data/test', +INDEX DIRECTORY = 'MYSQLD_DATADIR/test', SUBPARTITION s0b -INDEX DIRECTORY = 'TEST_DIR/master-data/test' +INDEX DIRECTORY = 'MYSQLD_DATADIR/test' )); ERROR HY000: Incorrect arguments to INDEX DIRECTORY DROP TABLE IF EXISTS `example`; diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result index bda0d7d1451..41b0c2b2488 100644 --- a/mysql-test/r/symlink.result +++ b/mysql-test/r/symlink.result @@ -151,16 +151,16 @@ CREATE TABLE t1 (a INT) ENGINE MYISAM; DROP TABLE t1; End of 5.0 tests CREATE TABLE t1(a INT) -INDEX DIRECTORY='TEST_DIR/master-data/mysql'; +INDEX DIRECTORY='MYSQLD_DATADIR/mysql'; ERROR HY000: Incorrect arguments to INDEX DIRECTORY CREATE TABLE t1(a INT) -DATA DIRECTORY='TEST_DIR/master-data/test'; +DATA DIRECTORY='MYSQLD_DATADIR/test'; ERROR HY000: Incorrect arguments to DATA DIRECTORY CREATE TABLE t1(a INT) -DATA DIRECTORY='TEST_DIR/master-data/'; +DATA DIRECTORY='MYSQLD_DATADIR/'; ERROR HY000: Incorrect arguments to DATA DIRECTORY CREATE TABLE t1(a INT) -INDEX DIRECTORY='TEST_DIR/master-data'; +INDEX DIRECTORY='MYSQLD_DATADIR'; ERROR HY000: Incorrect arguments to INDEX DIRECTORY CREATE TABLE t1(a INT) INDEX DIRECTORY='TEST_DIR/master-data_var'; diff --git a/mysql-test/r/binlog_index.result b/mysql-test/suite/binlog/r/binlog_index.result similarity index 71% rename from mysql-test/r/binlog_index.result rename to mysql-test/suite/binlog/r/binlog_index.result index 9f3c3746bd4..a3a20662df4 100644 --- a/mysql-test/r/binlog_index.result +++ b/mysql-test/suite/binlog/r/binlog_index.result @@ -9,7 +9,7 @@ master-bin.000003 # master-bin.000004 # purge binary logs TO 'master-bin.000004'; Warnings: -Warning 1612 Being purged log MYSQLTEST_VARDIR/log/master-bin.000001 was not found +Warning 1612 Being purged log ./master-bin.000001 was not found *** must show a list starting from the 'TO' argument of PURGE *** show binary logs; Log_name File_size @@ -20,7 +20,7 @@ flush logs; flush logs; *** must be a warning master-bin.000001 was not found *** Warnings: -Warning 1612 Being purged log MYSQLTEST_VARDIR/log/master-bin.000001 was not found +Warning 1612 Being purged log ./master-bin.000001 was not found *** must show one record, of the active binlog, left in the index file after PURGE *** show binary logs; Log_name File_size @@ -33,7 +33,7 @@ purge binary logs TO 'master-bin.000002'; ERROR HY000: Fatal error during log purge show warnings; Level Code Message -Error 1377 a problem with deleting MYSQLTEST_VARDIR/log/master-bin.000001; consider examining correspondence of your binlog index file to the actual binlog files +Error 1377 a problem with deleting ./master-bin.000001; consider examining correspondence of your binlog index file to the actual binlog files Error 1377 Fatal error during log purge reset master; End of tests diff --git a/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test b/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test index e77c9398c59..b5590329795 100644 --- a/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test +++ b/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test @@ -17,9 +17,11 @@ source include/have_log_bin.inc; -copy_file $MYSQL_TEST_DIR/std_data/bug33029-slave-relay-bin.000001 $MYSQLTEST_VARDIR/master-data/slave-relay-bin.000001; +let $MYSQLD_DATADIR= `select @@datadir`; -write_file $MYSQLTEST_VARDIR/master-data/slave-relay-bin.index; +copy_file $MYSQL_TEST_DIR/std_data/bug33029-slave-relay-bin.000001 $MYSQLD_DATADIR/slave-relay-bin.000001; + +write_file $MYSQLD_DATADIR/slave-relay-bin.index; slave-relay-bin.000001 EOF @@ -46,8 +48,8 @@ DROP FUNCTION IF EXISTS f1; DROP TRIGGER IF EXISTS tr1; enable_warnings; -remove_file $MYSQLTEST_VARDIR/master-data/slave-relay-bin.000001; -remove_file $MYSQLTEST_VARDIR/master-data/slave-relay-bin.index; +remove_file $MYSQLD_DATADIR/slave-relay-bin.000001; +remove_file $MYSQLD_DATADIR/slave-relay-bin.index; stop slave sql_thread; let $keep_connection=1; source include/wait_for_slave_sql_to_stop.inc; diff --git a/mysql-test/t/binlog_index.test b/mysql-test/suite/binlog/t/binlog_index.test similarity index 74% rename from mysql-test/t/binlog_index.test rename to mysql-test/suite/binlog/t/binlog_index.test index 1e44a9b02e2..ef465a13e12 100644 --- a/mysql-test/t/binlog_index.test +++ b/mysql-test/suite/binlog/t/binlog_index.test @@ -14,10 +14,10 @@ flush logs; source include/show_binary_logs.inc; -remove_file $MYSQLTEST_VARDIR/log/master-bin.000001; +let $MYSQLD_DATADIR= `select @@datadir`; +remove_file $MYSQLD_DATADIR/master-bin.000001; # there must be a warning with file names ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR purge binary logs TO 'master-bin.000004'; --echo *** must show a list starting from the 'TO' argument of PURGE *** @@ -32,12 +32,11 @@ reset master; flush logs; flush logs; flush logs; -remove_file $MYSQLTEST_VARDIR/log/master-bin.000001; +remove_file $MYSQLD_DATADIR/master-bin.000001; --echo *** must be a warning master-bin.000001 was not found *** let $date=`select NOW() + INTERVAL 1 MINUTE`; --disable_query_log ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval purge binary logs BEFORE '$date'; --enable_query_log @@ -55,14 +54,13 @@ flush logs; flush logs; flush logs; -remove_file $MYSQLTEST_VARDIR/log/master-bin.000001; -mkdir $MYSQLTEST_VARDIR/log/master-bin.000001; +remove_file $MYSQLD_DATADIR/master-bin.000001; +mkdir $MYSQLD_DATADIR/master-bin.000001; --error ER_BINLOG_PURGE_FATAL_ERR purge binary logs TO 'master-bin.000002'; ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR show warnings; -rmdir $MYSQLTEST_VARDIR/log/master-bin.000001; +rmdir $MYSQLD_DATADIR/master-bin.000001; --disable_warnings reset master; --enable_warnings diff --git a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test index bc2ec7db678..62b46eeb58e 100644 --- a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test +++ b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test @@ -170,7 +170,7 @@ select "--- Test 2 position test --" as ""; --enable_query_log let $MYSQLD_DATADIR= `select @@datadir;`; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR ---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=416 --start-position=569 $MYSQLD_DATADIR/master-bin.000001 +--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=416 --stop-position=569 $MYSQLD_DATADIR/master-bin.000001 # These are tests for remote binlog. # They should return the same as previous test. diff --git a/mysql-test/t/drop.test b/mysql-test/t/drop.test index ef8b59ff1fc..4f0777922b8 100644 --- a/mysql-test/t/drop.test +++ b/mysql-test/t/drop.test @@ -149,17 +149,18 @@ DROP DATABASE IF EXISTS mysql_test; CREATE DATABASE mysql_test; ---copy_file $MYSQLTEST_VARDIR/master-data/mysql/proc.frm $MYSQLTEST_VARDIR/tmp/bug29958.proc.frm ---copy_file $MYSQLTEST_VARDIR/master-data/mysql/proc.MYD $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYD ---copy_file $MYSQLTEST_VARDIR/master-data/mysql/proc.MYI $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYI +let $MYSQLD_DATADIR= `select @@datadir`; +--copy_file $MYSQLD_DATADIR/mysql/proc.frm $MYSQLTEST_VARDIR/tmp/bug29958.proc.frm +--copy_file $MYSQLD_DATADIR/mysql/proc.MYD $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYD +--copy_file $MYSQLD_DATADIR/mysql/proc.MYI $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYI DROP TABLE mysql.proc; DROP DATABASE mysql_test; ---copy_file $MYSQLTEST_VARDIR/tmp/bug29958.proc.frm $MYSQLTEST_VARDIR/master-data/mysql/proc.frm ---copy_file $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYD $MYSQLTEST_VARDIR/master-data/mysql/proc.MYD ---copy_file $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYI $MYSQLTEST_VARDIR/master-data/mysql/proc.MYI +--copy_file $MYSQLTEST_VARDIR/tmp/bug29958.proc.frm $MYSQLD_DATADIR/mysql/proc.frm +--copy_file $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYD $MYSQLD_DATADIR/mysql/proc.MYD +--copy_file $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYI $MYSQLD_DATADIR/mysql/proc.MYI --echo --echo # -- diff --git a/mysql-test/t/loaddata.test b/mysql-test/t/loaddata.test index 72e25846a51..9d319d4820c 100644 --- a/mysql-test/t/loaddata.test +++ b/mysql-test/t/loaddata.test @@ -264,7 +264,7 @@ CREATE VIEW v2 AS SELECT 1 + 2 AS c0, c1, c2 FROM t1; CREATE VIEW v3 AS SELECT 1 AS d1, 2 AS d2; --echo -LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v1 +LOAD DATA INFILE '../../std_data/bug35469.dat' INTO TABLE v1 FIELDS ESCAPED BY '\\' TERMINATED BY ',' ENCLOSED BY '"' @@ -280,7 +280,7 @@ SELECT * FROM v1; DELETE FROM t1; --echo -LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v2 +LOAD DATA INFILE '../../std_data/bug35469.dat' INTO TABLE v2 FIELDS ESCAPED BY '\\' TERMINATED BY ',' ENCLOSED BY '"' @@ -297,7 +297,7 @@ DELETE FROM t1; --echo --error ER_LOAD_DATA_INVALID_COLUMN -LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v2 +LOAD DATA INFILE '../../std_data/bug35469.dat' INTO TABLE v2 FIELDS ESCAPED BY '\\' TERMINATED BY ',' ENCLOSED BY '"' @@ -305,7 +305,7 @@ LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v2 --echo --error ER_NON_UPDATABLE_TABLE -LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v3 +LOAD DATA INFILE '../../std_data/bug35469.dat' INTO TABLE v3 FIELDS ESCAPED BY '\\' TERMINATED BY ',' ENCLOSED BY '"' diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test index 21ffa0683b6..2f3cdd044b3 100644 --- a/mysql-test/t/myisam.test +++ b/mysql-test/t/myisam.test @@ -1458,8 +1458,9 @@ CREATE TABLE t1 ( KEY (c1), KEY (c2) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0; ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR ---exec $MYISAMCHK -d $MYSQLTEST_VARDIR/master-data/test/t1 +let $MYSQLD_DATADIR= `select @@datadir`; +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR +--exec $MYISAMCHK -d $MYSQLD_DATADIR/test/t1 DROP TABLE t1; --echo End of 5.1 tests diff --git a/mysql-test/t/partition_not_windows.test b/mysql-test/t/partition_not_windows.test index d7108d5af98..333e12e2b16 100644 --- a/mysql-test/t/partition_not_windows.test +++ b/mysql-test/t/partition_not_windows.test @@ -11,8 +11,8 @@ # Bug 20770 Partitions: DATA DIRECTORY clause change in reorganize # doesn't remove old directory +let $MYSQLD_DATADIR= `select @@datadir`; let $data_directory = DATA DIRECTORY = '$MYSQLTEST_VARDIR/tmp'; - let $inx_directory = INDEX DIRECTORY = '$MYSQLTEST_VARDIR/tmp'; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR @@ -23,12 +23,12 @@ subpartition by hash (a) (SUBPARTITION subpart00, SUBPARTITION subpart01)); --echo # Checking if file exists before alter ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1.frm ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1.par ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0#SP#subpart00.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0#SP#subpart00.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0#SP#subpart01.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0#SP#subpart01.MYI +--file_exists $MYSQLD_DATADIR/test/t1.frm +--file_exists $MYSQLD_DATADIR/test/t1.par +--file_exists $MYSQLD_DATADIR/test/t1#P#p0#SP#subpart00.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p0#SP#subpart00.MYI +--file_exists $MYSQLD_DATADIR/test/t1#P#p0#SP#subpart01.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p0#SP#subpart01.MYI --file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p0#SP#subpart00.MYD --file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p0#SP#subpart01.MYD --file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p0#SP#subpart00.MYI @@ -42,16 +42,16 @@ eval ALTER TABLE t1 REORGANIZE PARTITION p0 INTO (SUBPARTITION subpart20, SUBPARTITION subpart21)); --echo # Checking if file exists after alter ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1.frm ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1.par ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1#SP#subpart10.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1#SP#subpart10.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1#SP#subpart11.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1#SP#subpart11.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p2#SP#subpart20.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p2#SP#subpart20.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p2#SP#subpart21.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p2#SP#subpart21.MYI +--file_exists $MYSQLD_DATADIR/test/t1.frm +--file_exists $MYSQLD_DATADIR/test/t1.par +--file_exists $MYSQLD_DATADIR/test/t1#P#p1#SP#subpart10.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p1#SP#subpart10.MYI +--file_exists $MYSQLD_DATADIR/test/t1#P#p1#SP#subpart11.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p1#SP#subpart11.MYI +--file_exists $MYSQLD_DATADIR/test/t1#P#p2#SP#subpart20.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p2#SP#subpart20.MYI +--file_exists $MYSQLD_DATADIR/test/t1#P#p2#SP#subpart21.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p2#SP#subpart21.MYI --file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p1#SP#subpart10.MYD --file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p1#SP#subpart11.MYD --file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p2#SP#subpart20.MYD @@ -93,39 +93,43 @@ set @@sql_mode=@org_mode; # # Bug#32167: another privilege bypass with DATA/INDEX DIRECTORY # ---replace_result $MYSQLTEST_VARDIR TEST_DIR ---error ER_WRONG_ARGUMENTS -eval CREATE TABLE t1(a INT) -PARTITION BY KEY (a) -(PARTITION p0 DATA DIRECTORY '$MYSQLTEST_VARDIR/master-data/test'); ---replace_result $MYSQLTEST_VARDIR TEST_DIR ---error ER_WRONG_ARGUMENTS -eval CREATE TABLE t1(a INT) -PARTITION BY KEY (a) -(PARTITION p0 INDEX DIRECTORY '$MYSQLTEST_VARDIR/master-data/test'); ---replace_result $MYSQLTEST_VARDIR TEST_DIR +let $MYSQLD_DATADIR= `select @@datadir`; + +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR +--error ER_WRONG_ARGUMENTS +eval CREATE TABLE t1(a INT) +PARTITION BY KEY (a) +(PARTITION p0 DATA DIRECTORY '$MYSQLD_DATADIR/test'); + +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR +--error ER_WRONG_ARGUMENTS +eval CREATE TABLE t1(a INT) +PARTITION BY KEY (a) +(PARTITION p0 INDEX DIRECTORY '$MYSQLD_DATADIR/test'); + +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR --error ER_WRONG_ARGUMENTS eval CREATE TABLE ts (id INT, purchased DATE) PARTITION BY RANGE(YEAR(purchased)) SUBPARTITION BY HASH(TO_DAYS(purchased)) ( PARTITION p0 VALUES LESS THAN (1990) ( SUBPARTITION s0a - DATA DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test', + DATA DIRECTORY = '$MYSQLD_DATADIR/test', SUBPARTITION s0b - DATA DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test' + DATA DIRECTORY = '$MYSQLD_DATADIR/test' )); ---replace_result $MYSQLTEST_VARDIR TEST_DIR +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR --error ER_WRONG_ARGUMENTS eval CREATE TABLE ts (id INT, purchased DATE) PARTITION BY RANGE(YEAR(purchased)) SUBPARTITION BY HASH(TO_DAYS(purchased)) ( PARTITION p0 VALUES LESS THAN (1990) ( SUBPARTITION s0a - INDEX DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test', + INDEX DIRECTORY = '$MYSQLD_DATADIR/test', SUBPARTITION s0b - INDEX DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test' + INDEX DIRECTORY = '$MYSQLD_DATADIR/test' )); # End Windows specific test failures. @@ -165,21 +169,24 @@ INDEX DIRECTORY = '$MYSQLTEST_VARDIR/p2Index', PARTITION p3 DATA DIRECTORY = '$MYSQLTEST_VARDIR/p3Data' INDEX DIRECTORY = '$MYSQLTEST_VARDIR/p3Index' ); + +let $MYSQLD_DATADIR= `select @@datadir`; + --echo # Checking that MyISAM .MYD and .MYI are in test db and data/idx dir ---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p0.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p0.MYD +--file_exists $MYSQLD_DATADIR/test/example#P#p0.MYI +--file_exists $MYSQLD_DATADIR/test/example#P#p0.MYD --file_exists $MYSQLTEST_VARDIR/p0Data/example#P#p0.MYD --file_exists $MYSQLTEST_VARDIR/p0Index/example#P#p0.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p1.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p1.MYD +--file_exists $MYSQLD_DATADIR/test/example#P#p1.MYI +--file_exists $MYSQLD_DATADIR/test/example#P#p1.MYD --file_exists $MYSQLTEST_VARDIR/p1Data/example#P#p1.MYD --file_exists $MYSQLTEST_VARDIR/p1Index/example#P#p1.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p2.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p2.MYD +--file_exists $MYSQLD_DATADIR/test/example#P#p2.MYI +--file_exists $MYSQLD_DATADIR/test/example#P#p2.MYD --file_exists $MYSQLTEST_VARDIR/p2Data/example#P#p2.MYD --file_exists $MYSQLTEST_VARDIR/p2Index/example#P#p2.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p3.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p3.MYD +--file_exists $MYSQLD_DATADIR/test/example#P#p3.MYI +--file_exists $MYSQLD_DATADIR/test/example#P#p3.MYD --file_exists $MYSQLTEST_VARDIR/p3Data/example#P#p3.MYD --file_exists $MYSQLTEST_VARDIR/p3Index/example#P#p3.MYI DROP TABLE example; diff --git a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test index 7de9f6c6de0..d6a95974764 100644 --- a/mysql-test/t/symlink.test +++ b/mysql-test/t/symlink.test @@ -177,14 +177,15 @@ drop table t1; # # Bug #29325: create table overwrites .MYD file of other table (datadir) # +let $MYSQLD_DATADIR= `select @@datadir`; SET SESSION keep_files_on_create = TRUE; ---write_file $MYSQLTEST_VARDIR/master-data/test/t1.MYD +--write_file $MYSQLD_DATADIR/test/t1.MYD EOF --disable_abort_on_error --error 1,1,ER_TABLE_EXISTS_ERROR CREATE TABLE t1 (a INT) ENGINE MYISAM; --error 0,1 ---remove_file $MYSQLTEST_VARDIR/master-data/test/t1.MYD; +--remove_file $MYSQLD_DATADIR/test/t1.MYD; --enable_abort_on_error SET SESSION keep_files_on_create = FALSE; CREATE TABLE t1 (a INT) ENGINE MYISAM; @@ -195,22 +196,27 @@ DROP TABLE t1; # # Bug#32167: another privilege bypass with DATA/INDEX DIRECTORY # ---replace_result $MYSQLTEST_VARDIR TEST_DIR +let $MYSQLD_DATADIR= `select @@datadir`; +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR --error 1210 eval CREATE TABLE t1(a INT) -INDEX DIRECTORY='$MYSQLTEST_VARDIR/master-data/mysql'; ---replace_result $MYSQLTEST_VARDIR TEST_DIR +INDEX DIRECTORY='$MYSQLD_DATADIR/mysql'; + +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR --error 1210 eval CREATE TABLE t1(a INT) -DATA DIRECTORY='$MYSQLTEST_VARDIR/master-data/test'; ---replace_result $MYSQLTEST_VARDIR TEST_DIR +DATA DIRECTORY='$MYSQLD_DATADIR/test'; + +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR --error 1210 eval CREATE TABLE t1(a INT) -DATA DIRECTORY='$MYSQLTEST_VARDIR/master-data/'; ---replace_result $MYSQLTEST_VARDIR TEST_DIR +DATA DIRECTORY='$MYSQLD_DATADIR/'; + +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR --error 1210 eval CREATE TABLE t1(a INT) -INDEX DIRECTORY='$MYSQLTEST_VARDIR/master-data'; +INDEX DIRECTORY='$MYSQLD_DATADIR'; + --replace_result $MYSQLTEST_VARDIR TEST_DIR --error 1 eval CREATE TABLE t1(a INT) @@ -218,6 +224,7 @@ INDEX DIRECTORY='$MYSQLTEST_VARDIR/master-data_var'; # BUG#25677 - With --skip-symbolic-links option on, DATA DIRECTORY clause is # silently ignored # + SET @OLD_SQL_MODE=@@SQL_MODE, @@SQL_MODE='NO_DIR_IN_CREATE'; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval CREATE TABLE t1(a INT) DATA DIRECTORY='$MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY='$MYSQLTEST_VARDIR/tmp'; From cea71680eb4821270b82a46d8537e8d3e5ac34da Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 4 Apr 2008 17:46:48 +0200 Subject: [PATCH 113/705] Fix paths MYSQLTEST_VARDIR/master-data -> MYSQLD_DATADIR --- .../suite/parts/inc/partition_check_drop.inc | 12 +- .../suite/parts/inc/partition_layout.inc | 5 +- .../parts/inc/partition_layout_check1.inc | 22 +- .../parts/inc/partition_layout_check2.inc | 17 +- .../parts/r/partition_alter1_myisam.result | 1984 ++++---- .../parts/r/partition_alter2_myisam.result | 4464 ++++++++--------- .../parts/r/partition_alter3_innodb.result | 104 +- .../parts/r/partition_alter3_myisam.result | 480 +- .../parts/r/partition_basic_innodb.result | 256 +- .../parts/r/partition_basic_myisam.result | 992 ++-- .../r/partition_basic_symlink_myisam.result | 2170 ++++---- .../parts/r/partition_engine_myisam.result | 176 +- .../parts/r/partition_syntax_myisam.result | 160 +- .../t/partition_basic_symlink_innodb.test | 27 +- 14 files changed, 5443 insertions(+), 5426 deletions(-) diff --git a/mysql-test/suite/parts/inc/partition_check_drop.inc b/mysql-test/suite/parts/inc/partition_check_drop.inc index 34a921374e6..f7a12355639 100644 --- a/mysql-test/suite/parts/inc/partition_check_drop.inc +++ b/mysql-test/suite/parts/inc/partition_check_drop.inc @@ -21,15 +21,19 @@ if ($no_debug) --disable_query_log } +# Get the MySQL Servers datadir without ending slash +let $MYSQLD_DATADIR= `select LEFT(@@datadir, LENGTH(@@datadir)-1)`; +#echo MYSQLD_DATADIR: $MYSQLD_DATADIR; + if ($do_file_tests) { # List the files belonging to the table t1 ---exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $MYSQLTEST_VARDIR/master-data/test/tmp2 || true +--exec ls $MYSQLD_DATADIR/test/t1* > $MYSQLD_DATADIR/test/tmp2 || true if ($with_directories) { ---exec ls $MYSQLTEST_VARDIR/tmp/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 || true +--exec ls $MYSQLTEST_VARDIR/tmp/t1* >> $MYSQLD_DATADIR/test/tmp2 || true } -eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/master-data/test/tmp2'')'); +eval SET @aux = CONCAT('load_file(''$MYSQLD_DATADIR','/test/tmp2'')'); let $file_list= `SELECT @aux`; } if (!$do_file_tests) @@ -61,7 +65,7 @@ if ($found_garbage) } # Do a manual cleanup, because the following tests should not suffer from # remaining files - --exec rm -f $MYSQLTEST_VARDIR/master-data/test/t1* || true + --exec rm -f $MYSQLD_DATADIR/test/t1* || true if ($with_directories) { --exec rm -f $MYSQLTEST_VARDIR/tmp/t1* || true diff --git a/mysql-test/suite/parts/inc/partition_layout.inc b/mysql-test/suite/parts/inc/partition_layout.inc index b9835cb4d55..16d5d5bf6f1 100644 --- a/mysql-test/suite/parts/inc/partition_layout.inc +++ b/mysql-test/suite/parts/inc/partition_layout.inc @@ -9,6 +9,7 @@ eval SHOW CREATE TABLE t1; # listing of files belonging to the table t1 if ($ls) { - --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR - --exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/t1* + let $MYSQLD_DATADIR= `select @@datadir`; + --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR + --exec ls $MYSQLD_DATADIR/test/t1* } diff --git a/mysql-test/suite/parts/inc/partition_layout_check1.inc b/mysql-test/suite/parts/inc/partition_layout_check1.inc index b953d858adb..fb02c10f139 100644 --- a/mysql-test/suite/parts/inc/partition_layout_check1.inc +++ b/mysql-test/suite/parts/inc/partition_layout_check1.inc @@ -25,23 +25,27 @@ if ($no_debug) # Clean the table holding the definition of t1 DELETE FROM t0_definition; +# Get the MySQL Servers datadir without ending slash +let $MYSQLD_DATADIR= `select LEFT(@@datadir, LENGTH(@@datadir)-1)`; +#echo MYSQLD_DATADIR: $MYSQLD_DATADIR; + # Dump the current definition of the table t1 to tmp1 # This complicated method - let another mysqltest collect the output - is used # because of two reasons # - SHOW CREATE TABLE t1 is at least currently most probably more reliable than # the corresponding SELECT on the INFORMATION_SCHEMA # - SHOW CREATE TABLE .. cannot write its out put into a file like SELECT ---exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $MYSQLTEST_VARDIR/master-data/test/tmp1 2>&1 || true +--exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $MYSQLD_DATADIR/test/tmp1 2>&1 || true if ($do_file_tests) { # List the files belonging to the table t1 ---exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true +--exec ls $MYSQLD_DATADIR/test/t1* > $MYSQLD_DATADIR/test/tmp2 2>&1 || true if ($with_directories) { ---exec ls $MYSQLTEST_VARDIR/mysql-test-data-dir/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true ---exec ls $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true +--exec ls $MYSQLTEST_VARDIR/mysql-test-data-dir/t1* >> $MYSQLD_DATADIR/test/tmp2 2>&1 || true +--exec ls $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1* >> $MYSQLD_DATADIR/test/tmp2 2>&1 || true } -eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/master-data/test/tmp2'' +eval SET @aux = CONCAT('load_file(''$MYSQLD_DATADIR','/test/tmp2'' )'); let $file_list= `SELECT @aux`; } @@ -52,7 +56,7 @@ let $file_list= '--- not determined ---'; # Insert the current definition of the table t1 into t0_definition eval INSERT INTO t0_definition SET state = 'old', - create_command = load_file('$MYSQLTEST_VARDIR/master-data/test/tmp1'), + create_command = load_file('$MYSQLD_DATADIR/test/tmp1'), file_list = $file_list; # Print the create table statement into the protocol @@ -64,9 +68,9 @@ if ($do_file_tests) if ($ls) { # Print the list of files into the protocol - eval SELECT REPLACE(file_list,'$MYSQLTEST_VARDIR','\$MYSQLTEST_VARDIR') - AS "unified filelist" - FROM t0_definition WHERE state = 'old'; + replace_result $MYSQLD_DATADIR MYSQLD_DATADIR $MYSQLTEST_VARDIR MYSQLTEST_VARDIR; + SELECT file_list AS "unified filelist" + FROM t0_definition WHERE state = 'old'; } } --enable_query_log diff --git a/mysql-test/suite/parts/inc/partition_layout_check2.inc b/mysql-test/suite/parts/inc/partition_layout_check2.inc index 716baa7d042..020960adce1 100644 --- a/mysql-test/suite/parts/inc/partition_layout_check2.inc +++ b/mysql-test/suite/parts/inc/partition_layout_check2.inc @@ -26,18 +26,23 @@ if ($no_debug) # Clean the table holding the definition of t1 DELETE FROM t0_definition WHERE state = 'new'; + +# Get the MySQL Servers datadir without ending slash +let $MYSQLD_DATADIR= `select LEFT(@@datadir, LENGTH(@@datadir)-1)`; +#echo MYSQLD_DATADIR: $MYSQLD_DATADIR; + # Dump the current definition of the table t1 to tmp1 ---exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $MYSQLTEST_VARDIR/master-data/test/tmp1 2>&1 || true +--exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $MYSQLD_DATADIR/test/tmp1 2>&1 || true if ($do_file_tests) { # List the files belonging to the table t1 ---exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true +--exec ls $MYSQLD_DATADIR/test/t1* > $MYSQLD_DATADIR/test/tmp2 2>&1 || true if ($with_directories) { ---exec ls $MYSQLTEST_VARDIR/mysql-test-data-dir/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true ---exec ls $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true +--exec ls $MYSQLTEST_VARDIR/mysql-test-data-dir/t1* >> $MYSQLD_DATADIR/test/tmp2 2>&1 || true +--exec ls $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1* >> $MYSQLD_DATADIR/test/tmp2 2>&1 || true } -eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/master-data/test/tmp2'')'); +eval SET @aux = CONCAT('load_file(''$MYSQLD_DATADIR','/test/tmp2'')'); let $file_list= `SELECT @aux`; } if (!$do_file_tests) @@ -47,7 +52,7 @@ let $file_list= '--- not determined ---'; # Insert the current definition of the table t1 into t0_definition eval INSERT INTO t0_definition SET state = 'new', - create_command = load_file('$MYSQLTEST_VARDIR/master-data/test/tmp1'), + create_command = load_file('$MYSQLD_DATADIR/test/tmp1'), file_list = $file_list; # Print the old and new table layout, if they differ diff --git a/mysql-test/suite/parts/r/partition_alter1_myisam.result b/mysql-test/suite/parts/r/partition_alter1_myisam.result index 273c0bca81c..b8d1dc3093d 100644 --- a/mysql-test/suite/parts/r/partition_alter1_myisam.result +++ b/mysql-test/suite/parts/r/partition_alter1_myisam.result @@ -236,12 +236,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -751,18 +751,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1280,24 +1280,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1813,20 +1813,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2338,24 +2338,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2873,24 +2873,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3406,24 +3406,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3937,26 +3937,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4467,12 +4467,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4982,18 +4982,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5511,24 +5511,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6044,20 +6044,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6569,24 +6569,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7104,24 +7104,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7637,24 +7637,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8168,26 +8168,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8703,12 +8703,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9218,18 +9218,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9747,24 +9747,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -10280,20 +10280,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -10805,24 +10805,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -11338,24 +11338,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -11871,24 +11871,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -12402,26 +12402,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -12932,12 +12932,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -13447,18 +13447,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -13976,24 +13976,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -14509,20 +14509,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -15034,24 +15034,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -15567,24 +15567,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -16100,24 +16100,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -16631,26 +16631,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -17167,12 +17167,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -17630,18 +17630,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -18107,24 +18107,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -18588,20 +18588,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -19061,24 +19061,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -19544,24 +19544,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -20025,24 +20025,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -20504,26 +20504,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -20986,12 +20986,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -21449,18 +21449,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -21926,24 +21926,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -22407,20 +22407,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -22880,24 +22880,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -23361,24 +23361,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -23842,24 +23842,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -24321,26 +24321,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -24799,12 +24799,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -25262,18 +25262,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -25739,24 +25739,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -26220,20 +26220,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -26693,24 +26693,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -27174,24 +27174,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -27655,24 +27655,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -28134,26 +28134,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -28612,12 +28612,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -29075,18 +29075,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -29552,24 +29552,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -30033,20 +30033,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -30506,24 +30506,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -30987,24 +30987,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -31468,24 +31468,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -31947,26 +31947,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_alter2_myisam.result b/mysql-test/suite/parts/r/partition_alter2_myisam.result index 0c019cbd699..181b5a52c69 100644 --- a/mysql-test/suite/parts/r/partition_alter2_myisam.result +++ b/mysql-test/suite/parts/r/partition_alter2_myisam.result @@ -76,12 +76,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -539,18 +539,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1016,24 +1016,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1497,20 +1497,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1970,24 +1970,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2453,24 +2453,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2934,24 +2934,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3413,26 +3413,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3893,12 +3893,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4408,18 +4408,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4937,24 +4937,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5470,20 +5470,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5995,24 +5995,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6530,24 +6530,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7063,24 +7063,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7594,26 +7594,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8124,12 +8124,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8639,18 +8639,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9168,24 +9168,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9701,20 +9701,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -10226,24 +10226,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -10761,24 +10761,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -11294,24 +11294,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -11825,26 +11825,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -12359,12 +12359,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -12822,18 +12822,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -13299,24 +13299,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -13780,20 +13780,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -14253,24 +14253,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -14736,24 +14736,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -15217,24 +15217,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -15696,26 +15696,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -16174,12 +16174,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -16637,18 +16637,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -17114,24 +17114,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -17595,20 +17595,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -18068,24 +18068,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -18549,24 +18549,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -19030,24 +19030,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -19509,26 +19509,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -19989,12 +19989,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -20504,18 +20504,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -21033,24 +21033,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -21566,20 +21566,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -22091,24 +22091,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -22626,24 +22626,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -23159,24 +23159,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -23690,26 +23690,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -24220,12 +24220,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -24735,18 +24735,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -25264,24 +25264,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -25797,20 +25797,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -26322,24 +26322,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -26855,24 +26855,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -27388,24 +27388,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -27919,26 +27919,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -28449,12 +28449,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -28964,18 +28964,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -29493,24 +29493,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -30026,20 +30026,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -30551,24 +30551,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -31086,24 +31086,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -31619,24 +31619,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -32150,26 +32150,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -32680,12 +32680,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -33195,18 +33195,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -33724,24 +33724,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -34257,20 +34257,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -34782,24 +34782,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -35315,24 +35315,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -35848,24 +35848,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -36379,26 +36379,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -36917,12 +36917,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -37382,18 +37382,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -37861,24 +37861,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -38344,20 +38344,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -38817,24 +38817,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -39302,24 +39302,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -39783,24 +39783,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -40264,26 +40264,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -40746,12 +40746,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -41263,18 +41263,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -41794,24 +41794,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -42329,20 +42329,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -42854,24 +42854,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -43391,24 +43391,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -43924,24 +43924,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -44457,26 +44457,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -44989,12 +44989,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -45506,18 +45506,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -46037,24 +46037,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -46572,20 +46572,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -47097,24 +47097,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -47634,24 +47634,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -48167,24 +48167,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -48700,26 +48700,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -49235,12 +49235,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -49701,18 +49701,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -50181,24 +50181,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -50665,20 +50665,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -51143,24 +51143,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -51629,24 +51629,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -52115,24 +52115,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -52597,26 +52597,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -53078,12 +53078,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -53544,18 +53544,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -54024,24 +54024,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -54508,20 +54508,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -54986,24 +54986,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -55472,24 +55472,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -55958,24 +55958,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -56440,26 +56440,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -56923,12 +56923,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -57441,18 +57441,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -57973,24 +57973,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -58509,20 +58509,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -59039,24 +59039,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -59577,24 +59577,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -60115,24 +60115,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -60649,26 +60649,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -61182,12 +61182,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -61700,18 +61700,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -62232,24 +62232,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -62768,20 +62768,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -63298,24 +63298,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -63836,24 +63836,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -64374,24 +64374,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -64908,26 +64908,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -65441,12 +65441,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -65959,18 +65959,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -66491,24 +66491,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -67027,20 +67027,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -67557,24 +67557,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -68095,24 +68095,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -68633,24 +68633,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -69167,26 +69167,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -69700,12 +69700,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -70218,18 +70218,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -70750,24 +70750,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -71286,20 +71286,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -71816,24 +71816,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -72354,24 +72354,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -72892,24 +72892,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -73426,26 +73426,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_alter3_innodb.result b/mysql-test/suite/parts/r/partition_alter3_innodb.result index edeca8f55b3..db1b9215d9e 100644 --- a/mysql-test/suite/parts/r/partition_alter3_innodb.result +++ b/mysql-test/suite/parts/r/partition_alter3_innodb.result @@ -56,7 +56,7 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLD_DATADIR/test/t1.frm EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 20 Using where @@ -77,8 +77,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -94,8 +94,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (DAYOFYEAR(f_date)) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -109,8 +109,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -130,8 +130,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part1 ALL NULL NULL NULL NULL 7 Using where @@ -149,8 +149,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 5 Using where @@ -165,8 +165,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB, PARTITION p6 ENGINE = InnoDB, PARTITION p7 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 3 Using where @@ -193,8 +193,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB, PARTITION p6 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p6 ALL NULL NULL NULL NULL 3 Using where @@ -208,8 +208,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p4 ALL NULL NULL NULL NULL 4 Using where @@ -223,8 +223,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 4 Using where @@ -238,8 +238,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 5 Using where @@ -253,8 +253,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part1 ALL NULL NULL NULL NULL 7 Using where @@ -268,8 +268,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 10 Using where @@ -283,8 +283,8 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -302,7 +302,7 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLD_DATADIR/test/t1.frm EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 20 Using where @@ -341,7 +341,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLD_DATADIR/test/t1.frm EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 20 Using where @@ -363,8 +363,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -387,8 +387,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part7 ALL NULL NULL NULL NULL 7 Using where @@ -406,8 +406,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part7 ALL NULL NULL NULL NULL 5 Using where @@ -425,8 +425,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB, PARTITION p6 ENGINE = InnoDB, PARTITION p7 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p6 ALL NULL NULL NULL NULL 3 Using where @@ -451,8 +451,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB, PARTITION p6 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 4 Using where @@ -469,8 +469,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part7 ALL NULL NULL NULL NULL 3 Using where @@ -487,8 +487,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p4 ALL NULL NULL NULL NULL 10 Using where @@ -505,8 +505,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part7 ALL NULL NULL NULL NULL 5 Using where @@ -523,8 +523,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part7 ALL NULL NULL NULL NULL 7 Using where @@ -541,8 +541,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 10 Using where @@ -559,8 +559,8 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -581,7 +581,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLD_DATADIR/test/t1.frm EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 20 Using where diff --git a/mysql-test/suite/parts/r/partition_alter3_myisam.result b/mysql-test/suite/parts/r/partition_alter3_myisam.result index 1c897324adc..76344c35215 100644 --- a/mysql-test/suite/parts/r/partition_alter3_myisam.result +++ b/mysql-test/suite/parts/r/partition_alter3_myisam.result @@ -56,9 +56,9 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLD_DATADIR/test/t1.MYD +MYSQLD_DATADIR/test/t1.MYI +MYSQLD_DATADIR/test/t1.frm EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 20 Using where @@ -79,10 +79,10 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -98,10 +98,10 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (DAYOFYEAR(f_date)) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -115,10 +115,10 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -138,14 +138,14 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part7.MYD +MYSQLD_DATADIR/test/t1#P#part7.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part1 ALL NULL NULL NULL NULL 7 Using where @@ -163,16 +163,16 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part7.MYD +MYSQLD_DATADIR/test/t1#P#part7.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 5 Using where @@ -187,24 +187,24 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM, PARTITION p6 ENGINE = MyISAM, PARTITION p7 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p7.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p7.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1#P#p5.MYD +MYSQLD_DATADIR/test/t1#P#p5.MYI +MYSQLD_DATADIR/test/t1#P#p6.MYD +MYSQLD_DATADIR/test/t1#P#p6.MYI +MYSQLD_DATADIR/test/t1#P#p7.MYD +MYSQLD_DATADIR/test/t1#P#p7.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part7.MYD +MYSQLD_DATADIR/test/t1#P#part7.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 3 Using where @@ -231,22 +231,22 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM, PARTITION p6 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1#P#p5.MYD +MYSQLD_DATADIR/test/t1#P#p5.MYI +MYSQLD_DATADIR/test/t1#P#p6.MYD +MYSQLD_DATADIR/test/t1#P#p6.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part7.MYD +MYSQLD_DATADIR/test/t1#P#part7.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p6 ALL NULL NULL NULL NULL 3 Using where @@ -260,20 +260,20 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1#P#p5.MYD +MYSQLD_DATADIR/test/t1#P#p5.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part7.MYD +MYSQLD_DATADIR/test/t1#P#part7.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p4 ALL NULL NULL NULL NULL 4 Using where @@ -287,18 +287,18 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part7.MYD +MYSQLD_DATADIR/test/t1#P#part7.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 4 Using where @@ -312,16 +312,16 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part7.MYD +MYSQLD_DATADIR/test/t1#P#part7.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 5 Using where @@ -335,14 +335,14 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part7.MYD +MYSQLD_DATADIR/test/t1#P#part7.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part1 ALL NULL NULL NULL NULL 7 Using where @@ -356,12 +356,12 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 10 Using where @@ -375,10 +375,10 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -396,9 +396,9 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLD_DATADIR/test/t1.MYD +MYSQLD_DATADIR/test/t1.MYI +MYSQLD_DATADIR/test/t1.frm EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10'; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 20 Using where @@ -431,9 +431,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLD_DATADIR/test/t1.MYD +MYSQLD_DATADIR/test/t1.MYI +MYSQLD_DATADIR/test/t1.frm EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 20 Using where @@ -455,10 +455,10 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -481,14 +481,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part7.MYD +MYSQLD_DATADIR/test/t1#P#part7.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part7 ALL NULL NULL NULL NULL 7 Using where @@ -506,16 +506,16 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part7.MYD +MYSQLD_DATADIR/test/t1#P#part7.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part7 ALL NULL NULL NULL NULL 5 Using where @@ -533,24 +533,24 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM, PARTITION p6 ENGINE = MyISAM, PARTITION p7 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p7.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p7.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1#P#p5.MYD +MYSQLD_DATADIR/test/t1#P#p5.MYI +MYSQLD_DATADIR/test/t1#P#p6.MYD +MYSQLD_DATADIR/test/t1#P#p6.MYI +MYSQLD_DATADIR/test/t1#P#p7.MYD +MYSQLD_DATADIR/test/t1#P#p7.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part7.MYD +MYSQLD_DATADIR/test/t1#P#part7.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p6 ALL NULL NULL NULL NULL 3 Using where @@ -575,22 +575,22 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM, PARTITION p6 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1#P#p5.MYD +MYSQLD_DATADIR/test/t1#P#p5.MYI +MYSQLD_DATADIR/test/t1#P#p6.MYD +MYSQLD_DATADIR/test/t1#P#p6.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part7.MYD +MYSQLD_DATADIR/test/t1#P#part7.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 4 Using where @@ -607,20 +607,20 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1#P#p5.MYD +MYSQLD_DATADIR/test/t1#P#p5.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part7.MYD +MYSQLD_DATADIR/test/t1#P#part7.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part7 ALL NULL NULL NULL NULL 3 Using where @@ -637,18 +637,18 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part7.MYD +MYSQLD_DATADIR/test/t1#P#part7.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p4 ALL NULL NULL NULL NULL 10 Using where @@ -665,16 +665,16 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part7.MYD +MYSQLD_DATADIR/test/t1#P#part7.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part7 ALL NULL NULL NULL NULL 5 Using where @@ -691,14 +691,14 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part7.MYD +MYSQLD_DATADIR/test/t1#P#part7.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 part7 ALL NULL NULL NULL NULL 7 Using where @@ -715,12 +715,12 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 10 Using where @@ -737,10 +737,10 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM) */ -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0 ALL NULL NULL NULL NULL 20 Using where @@ -761,9 +761,9 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI -MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm +MYSQLD_DATADIR/test/t1.MYD +MYSQLD_DATADIR/test/t1.MYI +MYSQLD_DATADIR/test/t1.frm EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 20 Using where diff --git a/mysql-test/suite/parts/r/partition_basic_innodb.result b/mysql-test/suite/parts/r/partition_basic_innodb.result index 7f5e7df6061..877725e1e37 100644 --- a/mysql-test/suite/parts/r/partition_basic_innodb.result +++ b/mysql-test/suite/parts/r/partition_basic_innodb.result @@ -75,8 +75,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -527,8 +527,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -987,8 +987,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, PARTITION part0 VALUES IN (0) ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) ENGINE = InnoDB, PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1445,8 +1445,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1899,8 +1899,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2359,8 +2359,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = InnoDB, SUBPARTITION subpart12 ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = InnoDB, SUBPARTITION subpart22 ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = InnoDB, SUBPARTITION subpart32 ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2821,8 +2821,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = InnoDB, SUBPARTITION sp12 ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = InnoDB, SUBPARTITION sp22 ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = InnoDB, SUBPARTITION sp32 ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = InnoDB, SUBPARTITION sp42 ENGINE = InnoDB)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3277,8 +3277,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB, PARTITION part2 VALUES IN (1) ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3731,8 +3731,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4183,8 +4183,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4643,8 +4643,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, PARTITION part0 VALUES IN (0) ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) ENGINE = InnoDB, PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5101,8 +5101,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5555,8 +5555,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6013,8 +6013,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = InnoDB, SUBPARTITION subpart12 ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = InnoDB, SUBPARTITION subpart22 ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = InnoDB, SUBPARTITION subpart32 ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6471,8 +6471,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = InnoDB, SUBPARTITION sp12 ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = InnoDB, SUBPARTITION sp22 ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = InnoDB, SUBPARTITION sp32 ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = InnoDB, SUBPARTITION sp42 ENGINE = InnoDB)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6927,8 +6927,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB, PARTITION part2 VALUES IN (1) ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7387,8 +7387,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7876,8 +7876,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8373,8 +8373,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, PARTITION part0 VALUES IN (0) ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) ENGINE = InnoDB, PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8868,8 +8868,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9359,8 +9359,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9856,8 +9856,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = InnoDB, SUBPARTITION subpart12 ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = InnoDB, SUBPARTITION subpart22 ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = InnoDB, SUBPARTITION subpart32 ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -10355,8 +10355,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = InnoDB, SUBPARTITION sp12 ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = InnoDB, SUBPARTITION sp22 ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = InnoDB, SUBPARTITION sp32 ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = InnoDB, SUBPARTITION sp42 ENGINE = InnoDB)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -10848,8 +10848,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB, PARTITION part2 VALUES IN (1) ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -11338,8 +11338,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -11827,8 +11827,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -12324,8 +12324,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, PARTITION part0 VALUES IN (0) ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) ENGINE = InnoDB, PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -12819,8 +12819,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -13310,8 +13310,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -13807,8 +13807,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = InnoDB, SUBPARTITION subpart12 ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = InnoDB, SUBPARTITION subpart22 ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = InnoDB, SUBPARTITION subpart32 ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -14306,8 +14306,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = InnoDB, SUBPARTITION sp12 ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = InnoDB, SUBPARTITION sp22 ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = InnoDB, SUBPARTITION sp32 ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = InnoDB, SUBPARTITION sp42 ENGINE = InnoDB)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -14799,8 +14799,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB, PARTITION part2 VALUES IN (1) ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -15289,8 +15289,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -15794,8 +15794,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -16307,8 +16307,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, PARTITION part0 VALUES IN (0) ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) ENGINE = InnoDB, PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -16818,8 +16818,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -17325,8 +17325,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -17838,8 +17838,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = InnoDB, SUBPARTITION subpart12 ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = InnoDB, SUBPARTITION subpart22 ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = InnoDB, SUBPARTITION subpart32 ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -18353,8 +18353,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = InnoDB, SUBPARTITION sp12 ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = InnoDB, SUBPARTITION sp22 ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = InnoDB, SUBPARTITION sp32 ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = InnoDB, SUBPARTITION sp42 ENGINE = InnoDB)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -18862,8 +18862,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB, PARTITION part2 VALUES IN (1) ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -19373,8 +19373,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -19862,8 +19862,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -20359,8 +20359,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, PARTITION part0 VALUES IN (0) ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) ENGINE = InnoDB, PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -20854,8 +20854,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -21345,8 +21345,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -21840,8 +21840,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = InnoDB, SUBPARTITION subpart12 ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = InnoDB, SUBPARTITION subpart22 ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = InnoDB, SUBPARTITION subpart32 ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -22335,8 +22335,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = InnoDB, SUBPARTITION sp12 ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = InnoDB, SUBPARTITION sp22 ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = InnoDB, SUBPARTITION sp32 ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = InnoDB, SUBPARTITION sp42 ENGINE = InnoDB)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -22828,8 +22828,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB, PARTITION part2 VALUES IN (1) ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -23318,8 +23318,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -23807,8 +23807,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -24304,8 +24304,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, PARTITION part0 VALUES IN (0) ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) ENGINE = InnoDB, PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -24799,8 +24799,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -25290,8 +25290,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -25785,8 +25785,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = InnoDB, SUBPARTITION subpart12 ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = InnoDB, SUBPARTITION subpart22 ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = InnoDB, SUBPARTITION subpart32 ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -26280,8 +26280,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = InnoDB, SUBPARTITION sp12 ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = InnoDB, SUBPARTITION sp22 ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = InnoDB, SUBPARTITION sp32 ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = InnoDB, SUBPARTITION sp42 ENGINE = InnoDB)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -26773,8 +26773,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB, PARTITION part2 VALUES IN (1) ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -27263,8 +27263,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -27768,8 +27768,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -28281,8 +28281,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, PARTITION part0 VALUES IN (0) ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) ENGINE = InnoDB, PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -28792,8 +28792,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -29299,8 +29299,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -29810,8 +29810,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = InnoDB, SUBPARTITION subpart12 ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = InnoDB, SUBPARTITION subpart22 ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = InnoDB, SUBPARTITION subpart32 ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -30321,8 +30321,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = InnoDB, SUBPARTITION sp12 ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = InnoDB, SUBPARTITION sp22 ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = InnoDB, SUBPARTITION sp32 ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = InnoDB, SUBPARTITION sp42 ENGINE = InnoDB)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -30830,8 +30830,8 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB, PARTITION part2 VALUES IN (1) ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_basic_myisam.result b/mysql-test/suite/parts/r/partition_basic_myisam.result index 4d1f160eace..7238f1a0097 100644 --- a/mysql-test/suite/parts/r/partition_basic_myisam.result +++ b/mysql-test/suite/parts/r/partition_basic_myisam.result @@ -75,12 +75,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -533,18 +533,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1005,24 +1005,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1481,20 +1481,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1949,24 +1949,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2427,24 +2427,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2907,24 +2907,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3381,26 +3381,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3855,12 +3855,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4313,18 +4313,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4785,24 +4785,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5261,20 +5261,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5729,24 +5729,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6205,24 +6205,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6681,24 +6681,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7155,26 +7155,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7635,12 +7635,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8146,18 +8146,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8671,24 +8671,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9200,20 +9200,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9721,24 +9721,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -10252,24 +10252,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -10785,24 +10785,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -11312,26 +11312,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -11843,12 +11843,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -12354,18 +12354,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -12879,24 +12879,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -13408,20 +13408,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -13929,24 +13929,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -14458,24 +14458,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -14987,24 +14987,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -15514,26 +15514,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result b/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result index 65ca09846b6..9b7f0598879 100644 --- a/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result +++ b/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result @@ -85,16 +85,16 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -562,28 +562,28 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p5.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p5.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1#P#p5.MYD +MYSQLD_DATADIR/test/t1#P#p5.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p3.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p4.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p5.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p3.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p4.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p5.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1052,40 +1052,40 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_3.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_N.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_2.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_3.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_N.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1556,32 +1556,32 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parte.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partf.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parte.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partf.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2044,40 +2044,40 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp1.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp1.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2542,40 +2542,40 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart11.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart12.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart21.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart22.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart31.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart32.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart41.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart42.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart11.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart12.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart21.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart22.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart31.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart32.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart41.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart42.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3058,40 +3058,40 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp11.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp12.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp21.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp22.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp31.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp32.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp41.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp42.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp11.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp12.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp21.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp22.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp31.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp32.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp41.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp42.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3554,44 +3554,44 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp2.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp2.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp2.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp2.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4052,16 +4052,16 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4529,28 +4529,28 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p5.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p5.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1#P#p5.MYD +MYSQLD_DATADIR/test/t1#P#p5.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p3.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p4.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p5.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p3.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p4.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p5.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5019,40 +5019,40 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_3.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_N.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_2.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_3.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_N.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5523,32 +5523,32 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parte.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partf.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parte.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partf.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6011,40 +6011,40 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp1.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp1.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6507,40 +6507,40 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart11.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart12.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart21.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart22.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart31.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart32.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart41.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart42.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart11.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart12.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart21.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart22.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart31.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart32.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart41.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart42.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7023,40 +7023,40 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp11.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp12.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp21.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp22.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp31.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp32.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp41.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp42.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp11.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp12.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp21.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp22.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp31.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp32.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp41.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp42.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7519,44 +7519,44 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp2.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp2.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp2.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp2.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8023,16 +8023,16 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8553,28 +8553,28 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p5.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p5.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1#P#p5.MYD +MYSQLD_DATADIR/test/t1#P#p5.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p3.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p4.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p5.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p3.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p4.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p5.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9096,40 +9096,40 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_3.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_N.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_2.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_3.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_N.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9653,32 +9653,32 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parte.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partf.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parte.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partf.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -10194,40 +10194,40 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp1.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp1.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -10745,40 +10745,40 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart11.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart12.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart21.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart22.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart31.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart32.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart41.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart42.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart11.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart12.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart21.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart22.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart31.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart32.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart41.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart42.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -11314,40 +11314,40 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp11.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp12.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp21.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp22.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp31.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp32.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp41.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp42.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp11.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp12.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp21.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp22.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp31.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp32.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp41.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp42.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -11863,44 +11863,44 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp2.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp2.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp2.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp2.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -12418,16 +12418,16 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -12948,28 +12948,28 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p4.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p5.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p4.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p5.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1#P#p5.MYD +MYSQLD_DATADIR/test/t1#P#p5.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p3.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p4.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p5.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p3.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p4.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p5.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -13491,40 +13491,40 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_3.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_N.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_2.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_3.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_N.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -14048,32 +14048,32 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partf.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parte.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parte.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partf.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parte.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partf.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -14589,40 +14589,40 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp1.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp1.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -15138,40 +15138,40 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart11.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart12.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart21.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart22.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart31.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart32.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart41.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart42.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart11.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart12.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart21.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart22.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart31.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart32.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart41.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart42.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -15707,40 +15707,40 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp11.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp12.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp21.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp22.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp31.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp32.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp41.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp42.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp11.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp12.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp21.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp22.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp31.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp32.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp41.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp42.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -16256,44 +16256,44 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp2.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp2.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp2.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp2.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -16807,15 +16807,15 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p2 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -ls: $MYSQLTEST_VARDIR/mysql-test-data-dir/t1*: No such file or directory -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +ls: MYSQLTEST_VARDIR/mysql-test-data-dir/t1*: No such file or directory +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -17331,23 +17331,23 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, PARTITION p2 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p3.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p3.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p5.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1#P#p5.MYD +MYSQLD_DATADIR/test/t1#P#p5.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p3.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p3.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p5.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -17869,33 +17869,33 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_2.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_N.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_3.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -18413,26 +18413,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parte.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parte.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partf.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -18944,32 +18944,32 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp1.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp0.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp1.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp1.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp0.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp1.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -19487,32 +19487,32 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart22 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart11.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart12.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart31.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart32.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart21.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart22.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart31.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart32.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -20040,38 +20040,38 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp12 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp11.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp21.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp22.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp31.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp32.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp41.MYD +MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp42.MYD +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp11.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp12.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp22.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp31.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp32.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp41.MYI +MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp42.MYI # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_engine_myisam.result b/mysql-test/suite/parts/r/partition_engine_myisam.result index 2dfea58995e..435fa80c0b7 100644 --- a/mysql-test/suite/parts/r/partition_engine_myisam.result +++ b/mysql-test/suite/parts/r/partition_engine_myisam.result @@ -70,12 +70,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -534,12 +534,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -999,16 +999,16 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1529,16 +1529,16 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2035,16 +2035,16 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2502,16 +2502,16 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2969,12 +2969,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3434,16 +3434,16 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3904,16 +3904,16 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4367,10 +4367,10 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4826,12 +4826,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (1000) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_syntax_myisam.result b/mysql-test/suite/parts/r/partition_syntax_myisam.result index ed610aafcfa..9ccc7ec7700 100644 --- a/mysql-test/suite/parts/r/partition_syntax_myisam.result +++ b/mysql-test/suite/parts/r/partition_syntax_myisam.result @@ -662,12 +662,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,2)) (PARTITION part1 VALUES IN (NULL) ENGINE = MyISAM, PARTITION part3 VALUES IN (1) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par DROP TABLE t1; # 3.5.3 Reveal that IN (...NULL) is not mapped to IN(0) @@ -694,14 +694,14 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,2)) (PARTITION part1 VALUES IN (NULL) ENGINE = MyISAM, PARTITION part2 VALUES IN (0) ENGINE = MyISAM, PARTITION part3 VALUES IN (1) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par DROP TABLE t1; @@ -734,10 +734,10 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par DROP TABLE t1; # 4.1.2 no partition number, named partitions @@ -761,12 +761,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par DROP TABLE t1; # 4.1.3 variations on no partition/subpartition number, named partitions, @@ -852,20 +852,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (20) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (2147483646) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par DROP TABLE t1; #------------------------------------------------------------------------ @@ -893,12 +893,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par DROP TABLE t1; CREATE TABLE t1 ( @@ -924,16 +924,16 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part1 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part2 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par DROP TABLE t1; CREATE TABLE t1 ( @@ -956,10 +956,10 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 1 */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par DROP TABLE t1; CREATE TABLE t1 ( @@ -985,12 +985,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 1 (PARTITION part1 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part2 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par DROP TABLE t1; CREATE TABLE t1 ( @@ -1732,12 +1732,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par DROP TABLE t1; CREATE TABLE t1 ( @@ -1766,16 +1766,16 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (1000) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm -$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par DROP TABLE t1; # 4.3.2 (positive) number of partition/subpartition , diff --git a/mysql-test/suite/parts/t/partition_basic_symlink_innodb.test b/mysql-test/suite/parts/t/partition_basic_symlink_innodb.test index 51e6397c018..17c6a845b25 100644 --- a/mysql-test/suite/parts/t/partition_basic_symlink_innodb.test +++ b/mysql-test/suite/parts/t/partition_basic_symlink_innodb.test @@ -35,6 +35,9 @@ --disable_warnings DROP TABLE IF EXISTS t1; --enable_warnings + +let $MYSQLD_DATADIR= `select @@datadir`; + --mkdir $MYSQLTEST_VARDIR/mysql-test-data-dir --mkdir $MYSQLTEST_VARDIR/mysql-test-idx-dir --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR @@ -49,17 +52,17 @@ PARTITION BY HASH (c1) INDEX DIRECTORY = '$MYSQLTEST_VARDIR/mysql-test-idx-dir' ); --echo # Verifying .frm and .par files ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1.frm ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1.par +--file_exists $MYSQLD_DATADIR/test/t1.frm +--file_exists $MYSQLD_DATADIR/test/t1.par --echo # Verifying that there are no MyISAM files --error 1 ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p0.MYD --error 1 ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI +--file_exists $MYSQLD_DATADIR/test/t1#P#p0.MYI --error 1 ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p1.MYD --error 1 ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI +--file_exists $MYSQLD_DATADIR/test/t1#P#p1.MYI --error 1 --file_exists $MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p0.MYD --error 1 @@ -73,12 +76,12 @@ FLUSH TABLES; SHOW CREATE TABLE t1; ALTER TABLE t1 ENGINE = MyISAM; --echo # Verifying .frm, .par and MyISAM files (.MYD, MYI) ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1.frm ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1.par ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI +--file_exists $MYSQLD_DATADIR/test/t1.frm +--file_exists $MYSQLD_DATADIR/test/t1.par +--file_exists $MYSQLD_DATADIR/test/t1#P#p0.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p0.MYI +--file_exists $MYSQLD_DATADIR/test/t1#P#p1.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p1.MYI --file_exists $MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p0.MYD --file_exists $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p0.MYI --file_exists $MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD From b2fe75a1ec3a4fa229f062aff42c357d346aa384 Mon Sep 17 00:00:00 2001 From: "skozlov/ksm@mysql.com/virtop.(none)" <> Date: Sat, 5 Apr 2008 15:09:53 +0400 Subject: [PATCH 114/705] Fix for binlog_index test case: hide difference for paths from warning messages between Windows and Unix --- mysql-test/suite/binlog/r/binlog_index.result | 6 +++--- mysql-test/suite/binlog/t/binlog_index.test | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mysql-test/suite/binlog/r/binlog_index.result b/mysql-test/suite/binlog/r/binlog_index.result index a3a20662df4..c3eabb14f59 100644 --- a/mysql-test/suite/binlog/r/binlog_index.result +++ b/mysql-test/suite/binlog/r/binlog_index.result @@ -9,7 +9,7 @@ master-bin.000003 # master-bin.000004 # purge binary logs TO 'master-bin.000004'; Warnings: -Warning 1612 Being purged log ./master-bin.000001 was not found +Warning 1612 Being purged log master-bin.000001 was not found *** must show a list starting from the 'TO' argument of PURGE *** show binary logs; Log_name File_size @@ -20,7 +20,7 @@ flush logs; flush logs; *** must be a warning master-bin.000001 was not found *** Warnings: -Warning 1612 Being purged log ./master-bin.000001 was not found +Warning 1612 Being purged log master-bin.000001 was not found *** must show one record, of the active binlog, left in the index file after PURGE *** show binary logs; Log_name File_size @@ -33,7 +33,7 @@ purge binary logs TO 'master-bin.000002'; ERROR HY000: Fatal error during log purge show warnings; Level Code Message -Error 1377 a problem with deleting ./master-bin.000001; consider examining correspondence of your binlog index file to the actual binlog files +Error 1377 a problem with deleting master-bin.000001; consider examining correspondence of your binlog index file to the actual binlog files Error 1377 Fatal error during log purge reset master; End of tests diff --git a/mysql-test/suite/binlog/t/binlog_index.test b/mysql-test/suite/binlog/t/binlog_index.test index ef465a13e12..13287465b88 100644 --- a/mysql-test/suite/binlog/t/binlog_index.test +++ b/mysql-test/suite/binlog/t/binlog_index.test @@ -13,11 +13,11 @@ flush logs; flush logs; source include/show_binary_logs.inc; - let $MYSQLD_DATADIR= `select @@datadir`; remove_file $MYSQLD_DATADIR/master-bin.000001; # there must be a warning with file names +replace_regex /\.[\\\/]master/master/; purge binary logs TO 'master-bin.000004'; --echo *** must show a list starting from the 'TO' argument of PURGE *** @@ -37,6 +37,7 @@ remove_file $MYSQLD_DATADIR/master-bin.000001; --echo *** must be a warning master-bin.000001 was not found *** let $date=`select NOW() + INTERVAL 1 MINUTE`; --disable_query_log +replace_regex /\.[\\\/]master/master/; eval purge binary logs BEFORE '$date'; --enable_query_log @@ -59,6 +60,7 @@ mkdir $MYSQLD_DATADIR/master-bin.000001; --error ER_BINLOG_PURGE_FATAL_ERR purge binary logs TO 'master-bin.000002'; +replace_regex /\.[\\\/]master/master/; show warnings; rmdir $MYSQLD_DATADIR/master-bin.000001; --disable_warnings From a5d13561aa2234b8c79edc9fc84aef1dc3187bee Mon Sep 17 00:00:00 2001 From: "skozlov/ksm@mysql.com/virtop.(none)" <> Date: Sat, 5 Apr 2008 21:33:42 +0400 Subject: [PATCH 115/705] Added clean up for test case: to replicate drop of database to slave --- mysql-test/suite/rpl/t/rpl_binlog_grant.test | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/suite/rpl/t/rpl_binlog_grant.test b/mysql-test/suite/rpl/t/rpl_binlog_grant.test index e95f69a3f99..31163927ce2 100644 --- a/mysql-test/suite/rpl/t/rpl_binlog_grant.test +++ b/mysql-test/suite/rpl/t/rpl_binlog_grant.test @@ -42,3 +42,4 @@ show grants for x@y; show binlog events; drop user x@y; drop database d1; +--sync_slave_with_master From aa70d95222751d1ab851a00a836f0793a0ef8795 Mon Sep 17 00:00:00 2001 From: "skozlov/ksm@mysql.com/virtop.(none)" <> Date: Mon, 7 Apr 2008 16:36:21 +0400 Subject: [PATCH 116/705] rpl_slave_status.test Added waiting start/stop slave via primitives. --- .../suite/rpl/r/rpl_slave_status.result | 32 +++++----- mysql-test/suite/rpl/t/rpl_slave_status.test | 62 ++++++++++--------- 2 files changed, 49 insertions(+), 45 deletions(-) diff --git a/mysql-test/suite/rpl/r/rpl_slave_status.result b/mysql-test/suite/rpl/r/rpl_slave_status.result index 08f79d01e7a..753f5d79168 100644 --- a/mysql-test/suite/rpl/r/rpl_slave_status.result +++ b/mysql-test/suite/rpl/r/rpl_slave_status.result @@ -4,21 +4,21 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -grant replication slave on *.* to rpl@127.0.0.1 identified by 'rpl'; -stop slave; -change master to master_user='rpl',master_password='rpl'; -start slave; -drop table if exists t1; -create table t1 (n int); -insert into t1 values (1); -select * from t1; +GRANT REPLICATION SLAVE ON *.* TO rpl@127.0.0.1 IDENTIFIED BY 'rpl'; +STOP SLAVE; +CHANGE MASTER TO master_user='rpl',master_password='rpl'; +START SLAVE; +DROP TABLE IF EXISTS t1; +CREATE TABLE t1 (n int); +INSERT INTO t1 VALUES (1); +SELECT * FROM t1; n 1 -delete from mysql.user where user='rpl'; -flush privileges; -stop slave; -start slave; -show slave status; +DELETE FROM mysql.user WHERE user='rpl'; +FLUSH PRIVILEGES; +STOP SLAVE; +START SLAVE; +SHOW SLAVE STATUS; Slave_IO_State # Master_Host 127.0.0.1 Master_User rpl @@ -57,6 +57,6 @@ Last_IO_Errno # Last_IO_Error # Last_SQL_Errno 0 Last_SQL_Error -drop table t1; -delete from mysql.user where user='rpl'; -drop table t1; +DROP TABLE t1; +DELETE FROM mysql.user WHERE user='rpl'; +DROP TABLE t1; diff --git a/mysql-test/suite/rpl/t/rpl_slave_status.test b/mysql-test/suite/rpl/t/rpl_slave_status.test index 0b1644ab8a0..6b0830b0929 100644 --- a/mysql-test/suite/rpl/t/rpl_slave_status.test +++ b/mysql-test/suite/rpl/t/rpl_slave_status.test @@ -1,42 +1,46 @@ ---source include/master-slave.inc - ############################################################################ # Test case for BUG#10780 # # REQUIREMENT # A slave without replication privileges should have Slave_IO_Running = No +############################################################################ +--source include/master-slave.inc # 1. Create new replication user -connection master; -grant replication slave on *.* to rpl@127.0.0.1 identified by 'rpl'; +--connection master +GRANT REPLICATION SLAVE ON *.* TO rpl@127.0.0.1 IDENTIFIED BY 'rpl'; -connection slave; -stop slave; -change master to master_user='rpl',master_password='rpl'; -start slave; +--connection slave +STOP SLAVE; +--source include/wait_for_slave_to_stop.inc +CHANGE MASTER TO master_user='rpl',master_password='rpl'; +START SLAVE; +--source include/wait_for_slave_to_start.inc # 2. Do replication as new user -connection master; +--connection master --disable_warnings -drop table if exists t1; +DROP TABLE IF EXISTS t1; --enable_warnings -create table t1 (n int); -insert into t1 values (1); -save_master_pos; -connection slave; -sync_with_master; -select * from t1; +CREATE TABLE t1 (n int); +INSERT INTO t1 VALUES (1); +--sync_slave_with_master +SELECT * FROM t1; # 3. Delete new replication user -connection master; -delete from mysql.user where user='rpl'; -flush privileges; -connection slave; +--connection master +DELETE FROM mysql.user WHERE user='rpl'; +FLUSH PRIVILEGES; +--connection slave # 4. Restart slave without privileges # (slave.err will contain access denied error for this START SLAVE command) -stop slave; -start slave; +STOP SLAVE; +--source include/wait_for_slave_to_stop.inc +START SLAVE; +--let $slave_param= Slave_SQL_Running +--let $slave_param_value= Yes +--source include/wait_for_slave_param.inc # 5. Make sure Slave_IO_Running = No --replace_result $MASTER_MYPORT MASTER_MYPORT @@ -44,16 +48,16 @@ start slave; # "Connecting to master" or "Waiting for master update" --replace_column 1 # 7 # 8 # 9 # 22 # 23 # 35 # 36 # --vertical_results -show slave status; +SHOW SLAVE STATUS; # Cleanup (Note that slave IO thread is not running) -connection slave; -drop table t1; -delete from mysql.user where user='rpl'; +--connection slave +DROP TABLE t1; +DELETE FROM mysql.user WHERE user='rpl'; # cleanup: slave io thread has been stopped "irrecoverably" # so we clean up mess manually -connection master; -drop table t1; +--connection master +DROP TABLE t1; -# end of 4.1 tests +# End of 4.1 tests From 5d20a6eea85f6d8c55fb18b615f7fba9cd08f33b Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 8 Apr 2008 10:11:07 +0200 Subject: [PATCH 117/705] Fix comment --- mysql-test/suite/rpl/my.cnf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/suite/rpl/my.cnf b/mysql-test/suite/rpl/my.cnf index c57cc775ec3..ea4caeb2ddd 100644 --- a/mysql-test/suite/rpl/my.cnf +++ b/mysql-test/suite/rpl/my.cnf @@ -1,4 +1,4 @@ -# Use settings from rpl_1slave_raw.cnf +# Use settings from rpl_1slave_base.cnf # add setting to connect the slave to the master by default !include rpl_1slave_base.cnf From 15d2940fe107b7cdbe81481aa0bab1fd05fa33f4 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 8 Apr 2008 11:02:06 +0200 Subject: [PATCH 118/705] Remove faulty underscore in --defaults-group-suffix for mysqldump --- mysql-test/mysql-test-run.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index d0d7a761107..eb7f164cd28 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1021,7 +1021,7 @@ sub mysqldump_arguments ($) { my $args; mtr_init_args(\$args); mtr_add_arg($args, "--defaults-file=%s", $path_config_file); - mtr_add_arg($args, "--defaults-group-suffix=_%s", $group_suffix); + mtr_add_arg($args, "--defaults-group-suffix=%s", $group_suffix); client_debug_arg($args, "mysqldump-$group_suffix"); return mtr_args2str($exe, @$args); } From 433c1c3d7b8e57d9c52f1c18cf1ec72be93fc7d9 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 8 Apr 2008 16:51:26 +0200 Subject: [PATCH 119/705] Check warnings in servers error log as part of test case --- mysql-test/include/check-warnings.test | 8 + mysql-test/include/default_mysqld.cnf | 2 +- mysql-test/include/mtr_warnings.sql | 290 ++++++++++++++++++ mysql-test/lib/mtr_cases.pm | 4 +- mysql-test/lib/{mtr_match.pl => mtr_match.pm} | 21 +- mysql-test/lib/mtr_report.pm | 248 ++------------- mysql-test/mysql-test-run.pl | 185 +++++++++-- mysql-test/r/information_schema.result | 36 ++- mysql-test/r/mysql_upgrade.result | 12 + mysql-test/r/mysqlcheck.result | 3 + mysql-test/r/sp-destruct.result | 4 +- mysql-test/r/sp-error.result | 2 + mysql-test/r/sp-security.result | 4 +- mysql-test/r/sp.result | 10 +- mysql-test/suite/rpl/r/rpl_bug33931.result | 2 + mysql-test/suite/rpl/r/rpl_idempotency.result | 2 + mysql-test/suite/rpl/t/rpl_bug33931-slave.opt | 1 - mysql-test/suite/rpl/t/rpl_bug33931.test | 8 + mysql-test/suite/rpl/t/rpl_idempotency.test | 8 +- mysql-test/t/information_schema.test | 36 ++- mysql-test/t/sp-destruct.test | 4 +- mysql-test/t/sp-error.test | 10 + mysql-test/t/sp-security.test | 4 +- mysql-test/t/sp.test | 8 +- 24 files changed, 593 insertions(+), 319 deletions(-) create mode 100644 mysql-test/include/check-warnings.test create mode 100644 mysql-test/include/mtr_warnings.sql rename mysql-test/lib/{mtr_match.pl => mtr_match.pm} (87%) delete mode 100644 mysql-test/suite/rpl/t/rpl_bug33931-slave.opt diff --git a/mysql-test/include/check-warnings.test b/mysql-test/include/check-warnings.test new file mode 100644 index 00000000000..5b451550456 --- /dev/null +++ b/mysql-test/include/check-warnings.test @@ -0,0 +1,8 @@ + +# +# This test is executed once after each test to check the servers +# for unexpected warnings found in the servers error log +# +--disable_query_log +call mtr.check_warnings(); +--enable_query_log diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf index 265f88f5bc3..ad0090aaf36 100644 --- a/mysql-test/include/default_mysqld.cnf +++ b/mysql-test/include/default_mysqld.cnf @@ -17,5 +17,5 @@ loose-innodb_data_file_path= ibdata1:10M:autoextend slave-net-timeout=120 -log-bin +log-bin=mysqld-bin diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql new file mode 100644 index 00000000000..65aa9a5842f --- /dev/null +++ b/mysql-test/include/mtr_warnings.sql @@ -0,0 +1,290 @@ +delimiter ||; + +use mtr|| + +-- +-- Load table with the patterns that are considered +-- as suspicious and should be examined further +-- +CREATE TABLE suspicious_patterns ( + pattern VARCHAR(255) +)|| + + +-- +-- Declare a trigger that makes sure +-- no invalid patterns can be inserted +-- into suspicious_patterns +-- +/*!50002 +CREATE DEFINER=root@localhost TRIGGER sp_insert +BEFORE INSERT ON suspicious_patterns +FOR EACH ROW BEGIN + DECLARE dummy INT; + SELECT "" REGEXP NEW.pattern INTO dummy; +END +*/|| + + +-- +-- Insert patterns for the lines we should check +-- +INSERT INTO suspicious_patterns VALUES + ("^Warning:|mysqld: Warning|\\[Warning\\]"), + ("^Error:|\\[ERROR\\]"), + ("^==.* at 0x"), + ("InnoDB: Warning"), + ("^safe_mutex:|allocated at line"), + ("missing DBUG_RETURN"), + ("Attempting backtrace"), + ("Assertion .* failed")|| + + +-- +-- Create table where testcases can insert patterns to +-- be supressed +-- +CREATE TABLE test_supressions ( + pattern VARCHAR(255) +)|| + + +-- +-- Declare a trigger that makes sure +-- no invalid patterns can be inserted +-- into test_supressions +-- +/*!50002 +CREATE DEFINER=root@localhost TRIGGER ts_insert +BEFORE INSERT ON test_supressions +FOR EACH ROW BEGIN + DECLARE dummy INT; + SELECT "" REGEXP NEW.pattern INTO dummy; +END +*/|| + + +-- +-- Load table with patterns that will be supressed globally(always) +-- +CREATE TABLE global_supressions ( + pattern VARCHAR(255) +)|| + + +-- Declare a trigger that makes sure +-- no invalid patterns can be inserted +-- into global_supressions +-- +/*!50002 +CREATE DEFINER=root@localhost TRIGGER gs_insert +BEFORE INSERT ON global_supressions +FOR EACH ROW BEGIN + DECLARE dummy INT; + SELECT "" REGEXP NEW.pattern INTO dummy; +END +*/|| + + + +-- +-- Insert patterns that should always be supressed +-- +INSERT INTO global_supressions VALUES + ("'SELECT UNIX_TIMESTAMP\\(\\)' failed on master"), + ("Aborted connection"), + ("Client requested master to start replication from impossible position"), + ("Could not find first log file name in binary log"), + ("Enabling keys got errno"), + ("Error reading master configuration"), + ("Error reading packet"), + ("Event Scheduler"), + ("Failed to open log"), + ("Failed to open the existing master info file"), + ("Forcing shutdown of [0-9]* plugins"), + + /* + Due to timing issues, it might be that this warning + is printed when the server shuts down and the + computer is loaded. + */ + + ("Got error [0-9]* when reading table"), + ("Incorrect definition of table"), + ("Incorrect information in file"), + ("InnoDB: Warning: we did not need to do crash recovery"), + ("Invalid \\(old\\?\\) table or database name"), + ("Lock wait timeout exceeded"), + ("Log entry on master is longer than max_allowed_packet"), + ("unknown option '--loose-"), + ("unknown variable 'loose-"), + ("You have forced lower_case_table_names to 0 through a command-line option"), + ("Setting lower_case_table_names=2"), + ("NDB Binlog:"), + ("NDB: failed to setup table"), + ("NDB: only row based binary logging"), + ("Neither --relay-log nor --relay-log-index were used"), + ("Query partially completed"), + ("Slave I.O thread aborted while waiting for relay log"), + ("Slave SQL thread is stopped because UNTIL condition"), + ("Slave SQL thread retried transaction"), + ("Slave \\(additional info\\)"), + ("Slave: .*Duplicate column name"), + ("Slave: .*master may suffer from"), + ("Slave: According to the master's version"), + ("Slave: Column [0-9]* type mismatch"), + ("Slave: Error .* doesn't exist"), + ("Slave: Error .*Deadlock found"), + ("Slave: Error .*Unknown table"), + ("Slave: Error in Write_rows event: "), + ("Slave: Field .* of table .* has no default value"), + ("Slave: Field .* doesn't have a default value"), + ("Slave: Query caused different errors on master and slave"), + ("Slave: Table .* doesn't exist"), + ("Slave: Table width mismatch"), + ("Slave: The incident LOST_EVENTS occured on the master"), + ("Slave: Unknown error.* 1105"), + ("Slave: Can't drop database.* database doesn't exist"), + ("Slave SQL:.*(Error_code: \[\[:digit:\]\]+|Query:.*)"), + ("Sort aborted"), + ("Time-out in NDB"), + ("Warning:\s+One can only use the --user.*root"), + ("Warning:\s+Setting lower_case_table_names=2"), + ("Warning:\s+Table:.* on (delete|rename)"), + ("You have an error in your SQL syntax"), + ("deprecated"), + ("description of time zone"), + ("equal MySQL server ids"), + ("error .*connecting to master"), + ("error reading log entry"), + ("lower_case_table_names is set"), + ("skip-name-resolve mode"), + ("slave SQL thread aborted"), + ("Slave: .*Duplicate entry"), + + /* + Special case, made as specific as possible, for: + Bug #28436: Incorrect position in SHOW BINLOG EVENTS causes + server coredump + */ + + ("Error in Log_event::read_log_event\\\(\\\): 'Sanity check failed', data_len: 258, event_type: 49"), + + ("Statement is not safe to log in statement format"), + + /* test case for Bug#bug29807 copies a stray frm into database */ + ("InnoDB: Error: table `test`.`bug29807` does not exist in the InnoDB internal"), + ("Cannot find or open table test\/bug29807 from"), + + /* innodb foreign key tests that fail in ALTER or RENAME produce this */ + ("InnoDB: Error: in ALTER TABLE `test`.`t[12]`"), + ("InnoDB: Error: in RENAME TABLE table `test`.`t1`"), + ("InnoDB: Error: table `test`.`t[12]` does not exist in the InnoDB internal"), + + /* Test case for Bug#14233 produces the following warnings: */ + ("Stored routine 'test'.'bug14233_1': invalid value in column mysql.proc"), + ("Stored routine 'test'.'bug14233_2': invalid value in column mysql.proc"), + ("Stored routine 'test'.'bug14233_3': invalid value in column mysql.proc"), + + /* + BUG#32080 - Excessive warnings on Solaris: setrlimit could not + change the size of core files + */ + ("setrlimit could not change the size of core files to 'infinity'"), + + /* + rpl_extrColmaster_*.test, the slave thread produces warnings + when it get updates to a table that has more columns on the + master + */ + ("Slave: Unknown column 'c7' in 't15' Error_code: 1054"), + ("Slave: Can't DROP 'c7'.* 1091"), + ("Slave: Key column 'c6'.* 1072"), + + ("THE_LAST_SUPPRESSION")|| + + +-- +-- Procedure that uses the above created tables to check +-- the servers error log for warnings +-- +CREATE DEFINER=root@localhost PROCEDURE check_warnings() +BEGIN + -- + -- Load the server .err file into "error_log" table + -- + CREATE TEMPORARY TABLE error_log ( + row INT AUTO_INCREMENT PRIMARY KEY, + line mediumtext NULL + ); + + SELECT variable_value INTO @log_error + FROM information_schema.global_variables + WHERE variable_name='LOG_ERROR'; + + SET @text= load_file(@log_error); + -- select @text; + + WHILE LOCATE('\n', @text) DO + INSERT error_log (line) + VALUES ( + SUBSTR(@text, 1, LOCATE('\n', @text)-1) + ); + SET @text= SUBSTR(@text FROM LOCATE('\n', @text)+1); + END WHILE; + + -- select * from error_log; + + -- + -- Remove all lines belonging to previous tests + -- + SELECT COALESCE(MAX(row),0) INTO @max_row + FROM error_log + WHERE line REGEXP "^CURRENT_TEST:"; + DELETE FROM error_log WHERE row < @max_row; + + CREATE TEMPORARY TABLE suspect_lines AS + SELECT DISTINCT el.line, 0 as "supressed" + FROM error_log el, suspicious_patterns ep + WHERE el.line REGEXP ep.pattern; + + -- Mark lines that are supressed by global supressions + UPDATE suspect_lines sl, global_supressions gs + SET supressed=1 + WHERE sl.line REGEXP gs.pattern; + + -- Mark lines that are supressed by test specific supressions + UPDATE suspect_lines sl, test_supressions ts + SET supressed=2 + WHERE sl.line REGEXP ts.pattern; + + SELECT COUNT(*) INTO @num_warnings FROM suspect_lines + WHERE supressed=0; + + IF @num_warnings > 0 THEN + SELECT @log_error; + SELECT line as log_error + FROM suspect_lines WHERE supressed=0; + SELECT * FROM test_supressions; + ELSE + SELECT "OK"; + END IF; + + -- Cleanup for next test + TRUNCATE test_supressions; + +END|| + +-- +-- Declare a procedure testcases can use to insert test +-- specific supressions +-- +/*!50001 +CREATE DEFINER=root@localhost +PROCEDURE add_supression(pattern VARCHAR(255)) +BEGIN + INSERT INTO test_supressions (pattern) VALUES (pattern); +END +*/|| + + diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index a8b1fc6bc59..52eb84118b7 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -25,6 +25,7 @@ use base qw(Exporter); our @EXPORT= qw(collect_option collect_test_cases); use mtr_report; +use mtr_match; # Options used for the collect phase our $start_from; @@ -55,7 +56,6 @@ use IO::File(); use My::Config; use My::Platform; -require "mtr_match.pl"; require "mtr_misc.pl"; # Precompiled regex's for tests to do or skip @@ -425,7 +425,7 @@ sub collect_one_suite($) if (@combinations) { - print " - adding combinations\n"; + print " - adding combinations for $suite\n"; #print_testcases(@cases); my @new_cases; diff --git a/mysql-test/lib/mtr_match.pl b/mysql-test/lib/mtr_match.pm similarity index 87% rename from mysql-test/lib/mtr_match.pl rename to mysql-test/lib/mtr_match.pm index 96aa43f4fa2..40afd4e0336 100644 --- a/mysql-test/lib/mtr_match.pl +++ b/mysql-test/lib/mtr_match.pm @@ -18,20 +18,17 @@ # and is part of the translation of the Bourne shell script with the # same name. +package mtr_match; use strict; -sub mtr_match_prefix ($$); -sub mtr_match_extension ($$); -sub mtr_match_any_exact ($$); +use base qw(Exporter); +our @EXPORT= qw(mtr_match_prefix + mtr_match_extension + mtr_match_substring); -############################################################################## # -# -# -############################################################################## - # Match a prefix and return what is after the prefix - +# sub mtr_match_prefix ($$) { my $string= shift; my $prefix= shift; @@ -47,8 +44,9 @@ sub mtr_match_prefix ($$) { } +# # Match extension and return the name without extension - +# sub mtr_match_extension ($$) { my $file= shift; my $ext= shift; @@ -64,8 +62,9 @@ sub mtr_match_extension ($$) { } +# # Match a substring anywere in a string - +# sub mtr_match_substring ($$) { my $string= shift; my $substring= shift; diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index 8b40177c5e0..a3c0f26c8fd 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -29,6 +29,7 @@ our @EXPORT= qw(report_option mtr_print_line mtr_print_thick_line mtr_report_test_failed mtr_report_test_skipped mtr_report_stats); +use mtr_match; require "mtr_io.pl"; my $tot_real_time= 0; @@ -115,7 +116,13 @@ sub mtr_report_test_failed ($$) { $tinfo->{'result'}= 'MTR_RES_FAILED'; my $test_failures= $tinfo->{'failures'} || 0; $tinfo->{'failures'}= $test_failures + 1; - if ( defined $tinfo->{'timeout'} ) + if ( defined $tinfo->{'warnings'} ) + { + mtr_report("[ fail ] Found warnings in server log file!"); + mtr_report($tinfo->{'warnings'}); + return; + } + elsif ( defined $tinfo->{'timeout'} ) { mtr_report("[ fail ] timeout"); return; @@ -161,7 +168,7 @@ sub mtr_report_stats ($) { my $tot_failed= 0; my $tot_tests= 0; my $tot_restarts= 0; - my $found_problems= 0; # Some warnings in the logfiles are errors... + my $found_problems= 0; foreach my $tinfo (@$tests) { @@ -183,6 +190,16 @@ sub mtr_report_stats ($) { { $tot_restarts++; } + + # Look for warnings produced by mysqltest + my $base_file= mtr_match_extension($tinfo->{'result_file'}, + "result"); # Trim extension + my $warning_file= "$base_file.warnings"; + if ( -f $warning_file ) + { + $found_problems= 1; + mtr_warning("Check myqltest warnings in '$warning_file'"); + } } # ---------------------------------------------------------------------- @@ -198,231 +215,12 @@ sub mtr_report_stats ($) { time - $BASETIME, "seconds executing testcases"); } - # ---------------------------------------------------------------------- - # If a debug run, there might be interesting information inside - # the "var/log/*.err" files. We save this info in "var/log/warnings" - # ---------------------------------------------------------------------- - if ( $::opt_warnings ) + my $warnlog= "$::opt_vardir/log/warnings"; + if ( -f $warnlog ) { - # Save and report if there was any fatal warnings/errors in err logs - - my $warnlog= "$::opt_vardir/log/warnings"; - - unless ( open(WARN, ">$warnlog") ) - { - mtr_warning("can't write to the file \"$warnlog\": $!"); - } - else - { - # We report different types of problems in order - foreach my $pattern ( "^Warning:", - "\\[Warning\\]", - "\\[ERROR\\]", - "^Error:", "^==.* at 0x", - "InnoDB: Warning", - "InnoDB: Error", - "^safe_mutex:", - "missing DBUG_RETURN", - "mysqld: Warning", - "allocated at line", - "Attempting backtrace", "Assertion .* failed" ) - { - foreach my $errlog ( sort glob("$::opt_vardir/log/*.err") ) - { - my $testname= ""; - unless ( open(ERR, $errlog) ) - { - mtr_warning("can't read $errlog"); - next; - } - my $leak_reports_expected= undef; - while ( ) - { - # There is a test case that purposely provokes a - # SAFEMALLOC leak report, even though there is no actual - # leak. We need to detect this, and ignore the warning in - # that case. - if (/Begin safemalloc memory dump:/) { - $leak_reports_expected= 1; - } elsif (/End safemalloc memory dump./) { - $leak_reports_expected= undef; - } - - # Skip some non fatal warnings from the log files - if ( - /\"SELECT UNIX_TIMESTAMP\(\)\" failed on master/ or - /Aborted connection/ or - /Client requested master to start replication from impossible position/ or - /Could not find first log file name in binary log/ or - /Enabling keys got errno/ or - /Error reading master configuration/ or - /Error reading packet/ or - /Event Scheduler/ or - /Failed to open log/ or - /Failed to open the existing master info file/ or - /Forcing shutdown of [0-9]* plugins/ or - /Can't open shared library .*\bha_example\b/ or - /Couldn't load plugin .*\bha_example\b/ or - - # Due to timing issues, it might be that this warning - # is printed when the server shuts down and the - # computer is loaded. - /Forcing close of thread \d+ user: '.*?'/ or - - /Got error [0-9]* when reading table/ or - /Incorrect definition of table/ or - /Incorrect information in file/ or - /InnoDB: Warning: we did not need to do crash recovery/ or - /Invalid \(old\?\) table or database name/ or - /Lock wait timeout exceeded/ or - /Log entry on master is longer than max_allowed_packet/ or - /unknown option '--loose-/ or - /unknown variable 'loose-/ or - /You have forced lower_case_table_names to 0 through a command-line option/ or - /Setting lower_case_table_names=2/ or - /NDB Binlog:/ or - /NDB: failed to setup table/ or - /NDB: only row based binary logging/ or - /Neither --relay-log nor --relay-log-index were used/ or - /Query partially completed/ or - /Slave I.O thread aborted while waiting for relay log/ or - /Slave SQL thread is stopped because UNTIL condition/ or - /Slave SQL thread retried transaction/ or - /Slave \(additional info\)/ or - /Slave: .*Duplicate column name/ or - /Slave: .*master may suffer from/ or - /Slave: According to the master's version/ or - /Slave: Column [0-9]* type mismatch/ or - /Slave: Error .* doesn't exist/ or - /Slave: Error .*Deadlock found/ or - /Slave: Error .*Unknown table/ or - /Slave: Error in Write_rows event: / or - /Slave: Field .* of table .* has no default value/ or - /Slave: Field .* doesn't have a default value/ or - /Slave: Query caused different errors on master and slave/ or - /Slave: Table .* doesn't exist/ or - /Slave: Table width mismatch/ or - /Slave: The incident LOST_EVENTS occured on the master/ or - /Slave: Unknown error.* 1105/ or - /Slave: Can't drop database.* database doesn't exist/ or - /Slave SQL:.*(?:Error_code: \d+|Query:.*)/ or - /Sort aborted/ or - /Time-out in NDB/ or - /One can only use the --user.*root/ or - /Setting lower_case_table_names=2/ or - /Table:.* on (delete|rename)/ or - /You have an error in your SQL syntax/ or - /deprecated/ or - /description of time zone/ or - /equal MySQL server ids/ or - /error .*connecting to master/ or - /error reading log entry/ or - /lower_case_table_names is set/ or - /skip-name-resolve mode/ or - /slave SQL thread aborted/ or - /Slave: .*Duplicate entry/ or - # Special case for Bug #26402 in show_check.test - # Question marks are not valid file name parts - # on Windows platforms. Ignore this error message. - /\QCan't find file: '.\test\????????.frm'\E/ or - # Special case, made as specific as possible, for: - # Bug #28436: Incorrect position in SHOW BINLOG EVENTS causes - # server coredump - /\QError in Log_event::read_log_event(): 'Sanity check failed', data_len: 258, event_type: 49\E/ or - /Statement is not safe to log in statement format/ or - - # test case for Bug#bug29807 copies a stray frm into database - /InnoDB: Error: table `test`.`bug29807` does not exist in the InnoDB internal/ or - /Cannot find or open table test\/bug29807 from/ or - - # innodb foreign key tests that fail in ALTER or RENAME produce this - /InnoDB: Error: in ALTER TABLE `test`.`t[12]`/ or - /InnoDB: Error: in RENAME TABLE table `test`.`t1`/ or - /InnoDB: Error: table `test`.`t[12]` does not exist in the InnoDB internal/ or - - # Test case for Bug#14233 produces the following warnings: - /Stored routine 'test'.'bug14233_1': invalid value in column mysql.proc/ or - /Stored routine 'test'.'bug14233_2': invalid value in column mysql.proc/ or - /Stored routine 'test'.'bug14233_3': invalid value in column mysql.proc/ or - - # BUG#29839 - lowercase_table3.test: Cannot find table test/T1 - # from the internal data dictiona - /Cannot find table test\/BUG29839 from the internal data dictionary/ or - # BUG#32080 - Excessive warnings on Solaris: setrlimit could not - # change the size of core files - /setrlimit could not change the size of core files to 'infinity'/ or - - # rpl_extrColmaster_*.test, the slave thread produces warnings - # when it get updates to a table that has more columns on the - # master - /Slave: Unknown column 'c7' in 't15' Error_code: 1054/ or - /Slave: Can't DROP 'c7'.* 1091/ or - /Slave: Key column 'c6'.* 1072/ or - - # rpl_idempotency.test produces warnings for the slave. - ($testname eq 'rpl.rpl_idempotency' and - (/Slave: Can\'t find record in \'t1\' Error_code: 1032/ or - /Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452/ - )) or - - # These tests does "kill" on queries, causing sporadic errors when writing to logs - (($testname eq 'rpl.rpl_skip_error' or - $testname eq 'rpl.rpl_err_ignoredtable' or - $testname eq 'binlog.binlog_killed_simulate' or - $testname eq 'binlog.binlog_killed') and - (/Failed to write to mysql\.\w+_log/ - )) or - - # rpl_bug33931 has deliberate failures - ($testname eq 'rpl.rpl_bug33931' and - (/Failed during slave.*thread initialization/ - )) or - - # rpl_temporary has an error on slave that can be ignored - ($testname eq 'rpl.rpl_temporary' and - (/Slave: Can\'t find record in \'user\' Error_code: 1032/ - )) or - - # Test case for Bug#31590 produces the following error: - /Out of sort memory; increase server sort buffer size/ - ) - { - next; # Skip these lines - } - if ( /CURRENT_TEST: (.*)/ ) - { - $testname= $1; - } - if ( /$pattern/ ) - { - if ($leak_reports_expected) { - next; - } - $found_problems= 1; - print WARN basename($errlog) . ": $testname: $_"; - } - } - } - } - - if ( $::opt_check_testcases ) - { - # Look for warnings produced by mysqltest in testname.warnings - foreach my $test_warning_file - ( glob("$::glob_mysql_test_dir/r/*.warnings") ) - { - $found_problems= 1; - print WARN "Check myqltest warnings in $test_warning_file\n"; - } - } - - if ( $found_problems ) - { - mtr_warning("Got errors/warnings while running tests, please examine", - "\"$warnlog\" for details."); - } - } + mtr_warning("Got errors/warnings while running tests, please examine", + "'$warnlog' for details."); } print "\n"; diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index d0d7a761107..4afb4e34d76 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -11,7 +11,6 @@ # See the "MySQL Test framework manual" for more information # http://dev.mysql.com/doc/mysqltest/en/index.html # -# Please keep the test framework tools identical in all versions! # ############################################################################## @@ -51,11 +50,11 @@ use My::Options; use My::Find; use mtr_cases; use mtr_report; +use mtr_match; require "lib/mtr_process.pl"; require "lib/mtr_io.pl"; require "lib/mtr_gcov.pl"; -require "lib/mtr_match.pl"; require "lib/mtr_misc.pl"; require "lib/mtr_unique.pl"; @@ -330,7 +329,7 @@ sub command_line_setup { # Test case authoring 'record' => \$opt_record, - 'check-testcases' => \$opt_check_testcases, + 'check-testcases!' => \$opt_check_testcases, 'mark-progress' => \$opt_mark_progress, # Extra options used when starting mysqld @@ -1984,17 +1983,48 @@ sub initialize_servers { # -# Copy the reference database into selected datadir +# Remove all newline characters expect after semicolon # -sub copy_install_db ($) { - my $path_data_dir= shift; +sub sql_to_bootstrap { + my ($sql) = @_; + my @lines= split(/\n/, $sql); + my $result= "\n"; + my $delimiter= ';'; - # Don't install over another db - mtr_error("There is already an installed db in '$path_data_dir'") - if -d $path_data_dir; + foreach my $line (@lines) { - # copy the installed db into place - copytree("$opt_vardir/install.db", $path_data_dir); + # Change current delimiter if line starts with "delimiter" + if ( $line =~ /^delimiter (.*)/ ) { + my $new= $1; + # Remove old delimiter from end of new + $new=~ s/\Q$delimiter\E$//; + $delimiter = $new; + mtr_debug("changed delimiter to $delimiter"); + # No need to add the delimiter to result + next; + } + + # Add newline if line ends with $delimiter + # and convert the current delimiter to semicolon + if ( $line =~ /\Q$delimiter\E$/ ){ + $line =~ s/\Q$delimiter\E$/;/; + $result.= "$line\n"; + mtr_debug("Added default delimiter"); + next; + } + + # Remove comments starting with -- + if ( $line =~ /^\s*--/ ) { + mtr_debug("Discarded $line"); + next; + } + + # Default, just add the line without newline + # but with a space as separator + $result.= "$line "; + + } + return $result; } @@ -2073,6 +2103,10 @@ sub mysql_install_db { mtr_tofile($bootstrap_sql_file, "CREATE DATABASE mtr;\n"); + # Add help tables and data for warning detection and supression + mtr_tofile($bootstrap_sql_file, + sql_to_bootstrap(mtr_grab_file("include/mtr_warnings.sql"))); + # Log bootstrap command my $path_bootstrap_log= "$opt_vardir/log/bootstrap.log"; mtr_tofile($path_bootstrap_log, @@ -2169,11 +2203,12 @@ sub do_before_run_mysqltest($) } -sub run_check_testcase_all($$) +sub check_testcase($$) { my ($tinfo, $mode)= @_; my $result; + # Parallell( mysqlds(), run_check_testcase, check_testcase_failed ); foreach my $mysqld ( mysqlds() ) { if ( defined $mysqld->{'proc'} ) @@ -2352,7 +2387,7 @@ sub run_testcase ($) { if ( $opt_check_testcases ) { - run_check_testcase_all($tinfo, "before") + check_testcase($tinfo, "before") } my $test= start_mysqltest($tinfo); @@ -2380,11 +2415,20 @@ sub run_testcase ($) { if ( $res == 0 ) { - mtr_report_test_passed($tinfo, $opt_timer); + if ( $opt_warnings and check_warnings($tinfo) ) + { + # Found unexpected warnings + report_failure_and_restart($tinfo); + $res= 1; + } + else + { + mtr_report_test_passed($tinfo, $opt_timer); + } if ( $opt_check_testcases ) { - if (run_check_testcase_all($tinfo, "after")) + if (check_testcase($tinfo, "after")) { # Stop all servers that are known to be running stop_all_servers(); @@ -2484,6 +2528,93 @@ sub run_testcase ($) { } +# Run include/check-warnings.test +# +# RETURN VALUE +# 0 OK +# 1 Check failed +# +sub run_check_warnings ($$) { + my $tinfo= shift; + my $mysqld= shift; + + my $name= "warnings-".$mysqld->name(); + my $tname= $tinfo->{name}; + + my $args; + mtr_init_args(\$args); + + mtr_add_arg($args, "--defaults-file=%s", $path_config_file); + mtr_add_arg($args, "--defaults-group-suffix=%s", $mysqld->after('mysqld')); + + mtr_add_arg($args, "--silent"); + mtr_add_arg($args, "--skip-safemalloc"); + mtr_add_arg($args, "--test-file=%s", "include/check-warnings.test"); + + my $errfile= "$opt_vardir/tmp/$name.err"; + my $res= My::SafeProcess->run + ( + name => $name, + path => $exe_mysqltest, + error => $errfile, + output => $errfile, + args => \$args, + ); + + if ( $res == 0 ) + { + my $report= mtr_grab_file($errfile); + if ($report ne "OK\nOK\n") + { + # Log to var/log/warnings file + mtr_tofile("$opt_vardir/log/warnings", + $tname."\n", + $report); + + $res= 1; + $tinfo->{'warnings'}.= $report; + + } + } + elsif ( $res == 62 ) + { + # One of the features needed to run check_warnings.test was not + # available, check skipped + $res= 0; + } + elsif ( $res ) + { + mtr_report("\nCould not execute 'check-warnings' for testcase '$tname':"); + mtr_printfile($errfile); + $res= 0; # Ignore error + } + return $res; +} + + +# +# Loop through our list of processes and check the error log +# for unexepcted errors and warnings +# +sub check_warnings ($) { + my ($tinfo)= @_; + my $res= 0; + + # Clear previous warnings + $tinfo->{warnings}= undef; + + # Parallell( mysqlds(), run_check_warning, check_warning_failed); + foreach my $mysqld ( mysqlds() ) + { + if (run_check_warnings($tinfo, $mysqld)){ + $res= 1; + mtr_report(); + } + } + return $res; +} + + # # Loop through our list of processes and look for and entry # with the provided pid, if found check for the file indicating @@ -2568,6 +2699,11 @@ sub after_test_failure ($) { mtr_debug("Removing '$backup_dir'"); } } + + # Remove all files in var/tmp + rmtree($opt_tmpdir); + mkpath($opt_tmpdir); + } @@ -3064,7 +3200,8 @@ sub start_servers($) { } # Copy datadir from installed system db - copy_install_db($datadir) unless -d $datadir; + copytree("$opt_vardir/install.db", $datadir) + unless -d $datadir; # Write start of testcase to log file mark_log($mysqld->value('log-error'), $tinfo); @@ -3144,17 +3281,11 @@ sub run_check_testcase ($$$) { my $args; mtr_init_args(\$args); - mtr_add_arg($args, "--no-defaults"); + mtr_add_arg($args, "--defaults-file=%s", $path_config_file); + mtr_add_arg($args, "--defaults-group-suffix=%s", $mysqld->after('mysqld')); + mtr_add_arg($args, "--silent"); mtr_add_arg($args, "--skip-safemalloc"); - mtr_add_arg($args, "--tmpdir=%s", $opt_tmpdir); - mtr_add_arg($args, "--character-sets-dir=%s", $path_charsetsdir); - - mtr_add_arg($args, "--socket=%s", $mysqld->value('socket')); - mtr_add_arg($args, "--port=%d", $mysqld->value('port')); - mtr_add_arg($args, "--database=test"); - mtr_add_arg($args, "--user=%s", $opt_user); - mtr_add_arg($args, "--password="); mtr_add_arg($args, "--result-file=%s", "$opt_vardir/tmp/$name.result"); mtr_add_arg($args, "--test-file=%s", "include/check-testcase.test"); @@ -3177,12 +3308,12 @@ sub run_check_testcase ($$$) { mtr_report("\nThe check of testcase '$tname' failed, this is the\n", "diff between before and after:\n"); # Test failed, display the report mysqltest has created - mtr_printfile("$opt_vardir/tmp/$name.err"); + mtr_printfile($errfile); } elsif ( $res ) { mtr_report("\nCould not execute 'check-testcase' $mode testcase '$tname':"); - mtr_printfile("$opt_vardir/tmp/$name.err"); + mtr_printfile($errfile); mtr_report(); } return $res; diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index 5e9e5c6f31c..980e539534a 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -36,7 +36,11 @@ create table t3(a int, KEY a_data (a)); create table mysqltest.t4(a int); create table t5 (id int auto_increment primary key); insert into t5 values (10); -create view v1 (c) as select table_name from information_schema.TABLES where table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status'; +create view v1 (c) as +SELECT table_name FROM information_schema.TABLES +WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest') AND +table_name<>'ndb_binlog_index' AND +table_name<>'ndb_apply_status'; select * from v1; c CHARACTER_SETS @@ -272,19 +276,19 @@ select * from t1; select * from t2; end| select parameter_style, sql_data_access, dtd_identifier -from information_schema.routines; +from information_schema.routines where routine_schema='test'; parameter_style sql_data_access dtd_identifier SQL CONTAINS SQL NULL SQL CONTAINS SQL int(11) -show procedure status; +show procedure status where db='test'; Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation test sel2 PROCEDURE root@localhost # # DEFINER latin1 latin1_swedish_ci latin1_swedish_ci -show function status; +show function status where db='test'; Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation test sub1 FUNCTION root@localhost # # DEFINER latin1 latin1_swedish_ci latin1_swedish_ci select a.ROUTINE_NAME from information_schema.ROUTINES a, information_schema.SCHEMATA b where -a.ROUTINE_SCHEMA = b.SCHEMA_NAME; +a.ROUTINE_SCHEMA = b.SCHEMA_NAME AND b.SCHEMA_NAME='test'; ROUTINE_NAME sel2 sub1 @@ -295,14 +299,14 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE # ALL NULL NULL NULL NULL NULL 1 SIMPLE # ALL NULL NULL NULL NULL NULL Using where; Using join buffer select a.ROUTINE_NAME, b.name from information_schema.ROUTINES a, -mysql.proc b where a.ROUTINE_NAME = convert(b.name using utf8) order by 1; +mysql.proc b where a.ROUTINE_NAME = convert(b.name using utf8) AND a.ROUTINE_SCHEMA='test' order by 1; ROUTINE_NAME name sel2 sel2 sub1 sub1 -select count(*) from information_schema.ROUTINES; +select count(*) from information_schema.ROUTINES where routine_schema='test'; count(*) 2 -create view v1 as select routine_schema, routine_name from information_schema.routines +create view v1 as select routine_schema, routine_name from information_schema.routines where routine_schema='test' order by routine_schema, routine_name; select * from v1; routine_schema routine_name @@ -850,7 +854,7 @@ VIEWS TABLE_NAME select delete from mysql.user where user='mysqltest_4'; delete from mysql.db where user='mysqltest_4'; flush privileges; -SELECT table_schema, count(*) FROM information_schema.TABLES where table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status' GROUP BY TABLE_SCHEMA; +SELECT table_schema, count(*) FROM information_schema.TABLES WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest') AND table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status' GROUP BY TABLE_SCHEMA; table_schema count(*) information_schema 28 mysql 22 @@ -890,7 +894,7 @@ if new.j = -1 then set @fired:= "Yes"; end if; end AFTER NULL root@localhost latin1 latin1_swedish_ci latin1_swedish_ci -select * from information_schema.triggers; +select * from information_schema.triggers where trigger_schema in ('mysql', 'information_schema', 'test', 'mysqltest'); TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION NULL test trg1 INSERT NULL test t1 0 NULL begin if new.j > 10 then @@ -1079,7 +1083,7 @@ BEGIN SELECT 'foo' FROM DUAL; END | ERROR 42000: Unknown database 'information_schema' -select ROUTINE_NAME from routines; +select ROUTINE_NAME from routines where ROUTINE_SCHEMA='information_schema'; ROUTINE_NAME grant all on information_schema.* to 'user1'@'localhost'; ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema' @@ -1161,7 +1165,7 @@ use mysql; INSERT INTO `proc` VALUES ('test','','PROCEDURE','','SQL','CONTAINS_SQL', 'NO','DEFINER','','','BEGIN\r\n \r\nEND','root@%','2006-03-02 18:40:03', '2006-03-02 18:40:03','','','utf8','utf8_general_ci','utf8_general_ci','n/a'); -select routine_name from information_schema.routines; +select routine_name from information_schema.routines where ROUTINE_SCHEMA='test'; routine_name delete from proc where name=''; @@ -1195,7 +1199,7 @@ CREATE FUNCTION f1() RETURNS INT RETURN @a + 1; CREATE USER mysql_bug20230@localhost; GRANT EXECUTE ON PROCEDURE p1 TO mysql_bug20230@localhost; GRANT EXECUTE ON FUNCTION f1 TO mysql_bug20230@localhost; -SELECT ROUTINE_NAME, ROUTINE_DEFINITION FROM INFORMATION_SCHEMA.ROUTINES; +SELECT ROUTINE_NAME, ROUTINE_DEFINITION FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE_SCHEMA='test'; ROUTINE_NAME ROUTINE_DEFINITION f1 RETURN @a + 1 p1 SET @a= 1 @@ -1207,7 +1211,7 @@ SHOW CREATE FUNCTION f1; Function sql_mode Create Function character_set_client collation_connection Database Collation f1 CREATE DEFINER=`root`@`localhost` FUNCTION `f1`() RETURNS int(11) RETURN @a + 1 latin1 latin1_swedish_ci latin1_swedish_ci -SELECT ROUTINE_NAME, ROUTINE_DEFINITION FROM INFORMATION_SCHEMA.ROUTINES; +SELECT ROUTINE_NAME, ROUTINE_DEFINITION FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE_SCHEMA='test'; ROUTINE_NAME ROUTINE_DEFINITION f1 NULL p1 NULL @@ -1310,12 +1314,12 @@ TABLE_PRIVILEGES TABLE_SCHEMA TRIGGERS TRIGGER_SCHEMA USER_PRIVILEGES GRANTEE VIEWS TABLE_SCHEMA -SELECT MAX(table_name) FROM information_schema.tables; +SELECT MAX(table_name) FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test'); MAX(table_name) VIEWS SELECT table_name from information_schema.tables WHERE table_name=(SELECT MAX(table_name) -FROM information_schema.tables); +FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test')); table_name VIEWS DROP TABLE IF EXISTS bug23037; diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result index 31846f68b7b..8f4c311a7a7 100644 --- a/mysql-test/r/mysql_upgrade.result +++ b/mysql-test/r/mysql_upgrade.result @@ -1,4 +1,7 @@ Run mysql_upgrade once +mtr.global_supressions OK +mtr.suspicious_patterns OK +mtr.test_supressions OK mysql.columns_priv OK mysql.db OK mysql.event OK @@ -29,6 +32,9 @@ mysql.user OK Run it again - should say already completed This installation of MySQL is already upgraded to VERSION, use --force if you still need to run mysql_upgrade Force should run it regardless of wether it's been run before +mtr.global_supressions OK +mtr.suspicious_patterns OK +mtr.test_supressions OK mysql.columns_priv OK mysql.db OK mysql.event OK @@ -59,6 +65,9 @@ mysql.user OK CREATE USER mysqltest1@'%' IDENTIFIED by 'sakila'; GRANT ALL ON *.* TO mysqltest1@'%'; Run mysql_upgrade with password protected account +mtr.global_supressions OK +mtr.suspicious_patterns OK +mtr.test_supressions OK mysql.columns_priv OK mysql.db OK mysql.event OK @@ -91,6 +100,9 @@ Run mysql_upgrade with a non existing server socket mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errno) when trying to connect FATAL ERROR: Upgrade failed set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE'; +mtr.global_supressions OK +mtr.suspicious_patterns OK +mtr.test_supressions OK mysql.columns_priv OK mysql.db OK mysql.event OK diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result index b8fdd04d24a..8a819496eeb 100644 --- a/mysql-test/r/mysqlcheck.result +++ b/mysql-test/r/mysqlcheck.result @@ -1,6 +1,9 @@ DROP TABLE IF EXISTS t1, `t``1`, `t 1`; drop view if exists v1; drop database if exists client_test_db; +mtr.global_supressions OK +mtr.suspicious_patterns OK +mtr.test_supressions OK mysql.columns_priv OK mysql.db OK mysql.event OK diff --git a/mysql-test/r/sp-destruct.result b/mysql-test/r/sp-destruct.result index ae294f05b25..d7d44061b76 100644 --- a/mysql-test/r/sp-destruct.result +++ b/mysql-test/r/sp-destruct.result @@ -84,7 +84,7 @@ drop table t1; drop function bug14233_1; drop function bug14233_2; drop procedure bug14233_3; -show procedure status; +show procedure status where db=DATABASE(); Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation -show function status; +show function status where db=DATABASE(); Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result index 5ac61821cea..de3ec91b632 100644 --- a/mysql-test/r/sp-error.result +++ b/mysql-test/r/sp-error.result @@ -1,4 +1,5 @@ drop table if exists t1, t2; +SELECT * FROM mysql.proc INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/proc.txt'; delete from mysql.proc; create procedure syntaxerror(t int)| ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 @@ -1650,3 +1651,4 @@ begin declare continue handler for sqlstate '00000' set @x=0; end$$ ERROR 42000: Bad SQLSTATE: '00000' +LOAD DATA INFILE '../../tmp/proc.txt' INTO TABLE mysql.proc; diff --git a/mysql-test/r/sp-security.result b/mysql-test/r/sp-security.result index cf26f0076d7..66177395ac9 100644 --- a/mysql-test/r/sp-security.result +++ b/mysql-test/r/sp-security.result @@ -142,13 +142,13 @@ use db2; alter procedure q modifies sql data; drop procedure q; use test; -select type,db,name from mysql.proc; +select type,db,name from mysql.proc where db like 'db%'; type db name FUNCTION db1_secret db PROCEDURE db1_secret stamp drop database db1_secret; drop database db2; -select type,db,name from mysql.proc; +select type,db,name from mysql.proc where db like 'db%'; type db name delete from mysql.user where user='user1' or user='user2'; delete from mysql.user where user='' and host='%'; diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index 768e0cc07a5..ab6f5c27db3 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -1322,7 +1322,7 @@ end; end if; end loop; end latin1 latin1_swedish_ci latin1_swedish_ci -show procedure status like '%p%'| +show procedure status where name like '%p%' and db='test'| Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation test ip PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER latin1 latin1_swedish_ci latin1_swedish_ci test opp PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER latin1 latin1_swedish_ci latin1_swedish_ci @@ -1335,7 +1335,7 @@ i p drop table t3| drop procedure opp| drop procedure ip| -show procedure status like '%p%'| +show procedure status where name like '%p%' and db='test'| Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation drop table if exists t3| create table t3 ( f bigint unsigned not null )| @@ -1945,12 +1945,12 @@ drop procedure bug2260| drop procedure if exists bug2267_1| create procedure bug2267_1() begin -show procedure status; +show procedure status where db='test'; end| drop procedure if exists bug2267_2| create procedure bug2267_2() begin -show function status; +show function status where db='test'; end| drop procedure if exists bug2267_3| create procedure bug2267_3() @@ -1977,7 +1977,7 @@ call bug2267_3()| Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation bug2267_1 CREATE DEFINER=`root`@`localhost` PROCEDURE `bug2267_1`() begin -show procedure status; +show procedure status where db='test'; end latin1 latin1_swedish_ci latin1_swedish_ci call bug2267_4()| Function sql_mode Create Function character_set_client collation_connection Database Collation diff --git a/mysql-test/suite/rpl/r/rpl_bug33931.result b/mysql-test/suite/rpl/r/rpl_bug33931.result index 4043f04215b..6c3c3f550dc 100644 --- a/mysql-test/suite/rpl/r/rpl_bug33931.result +++ b/mysql-test/suite/rpl/r/rpl_bug33931.result @@ -1,6 +1,8 @@ reset master; +call mtr.add_supression("Failed during slave.*thread initialization"); stop slave; reset slave; +SET GLOBAL debug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init"; start slave; show slave status; Slave_IO_State # diff --git a/mysql-test/suite/rpl/r/rpl_idempotency.result b/mysql-test/suite/rpl/r/rpl_idempotency.result index 5a4052864ad..f02ff899ad5 100644 --- a/mysql-test/suite/rpl/r/rpl_idempotency.result +++ b/mysql-test/suite/rpl/r/rpl_idempotency.result @@ -4,6 +4,8 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; +call mtr.add_supression("Slave: Can\'t find record in \'t1\' Error_code: 1032"); +call mtr.add_supression("Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452"); CREATE TABLE t1 (a INT PRIMARY KEY); CREATE TABLE t2 (a INT); INSERT INTO t1 VALUES (-1),(-2),(-3); diff --git a/mysql-test/suite/rpl/t/rpl_bug33931-slave.opt b/mysql-test/suite/rpl/t/rpl_bug33931-slave.opt deleted file mode 100644 index 55fe328a41d..00000000000 --- a/mysql-test/suite/rpl/t/rpl_bug33931-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-debug=d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init diff --git a/mysql-test/suite/rpl/t/rpl_bug33931.test b/mysql-test/suite/rpl/t/rpl_bug33931.test index 788f79d4c1c..8b788f62f23 100644 --- a/mysql-test/suite/rpl/t/rpl_bug33931.test +++ b/mysql-test/suite/rpl/t/rpl_bug33931.test @@ -13,10 +13,18 @@ connection master; reset master; connection slave; + +# Add supression for expected warnings in slaves error log +call mtr.add_supression("Failed during slave.*thread initialization"); + --disable_warnings stop slave; --enable_warnings reset slave; + +# Set debug flags on slave to force errors to occur +SET GLOBAL debug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init"; + start slave; connection master; diff --git a/mysql-test/suite/rpl/t/rpl_idempotency.test b/mysql-test/suite/rpl/t/rpl_idempotency.test index cec91a6f4b7..0dc687a8656 100644 --- a/mysql-test/suite/rpl/t/rpl_idempotency.test +++ b/mysql-test/suite/rpl/t/rpl_idempotency.test @@ -7,6 +7,10 @@ source include/have_innodb.inc; connection slave; source include/have_innodb.inc; +# Add supression for expected warning(s) in slaves error log +call mtr.add_supression("Slave: Can\'t find record in \'t1\' Error_code: 1032"); +call mtr.add_supression("Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452"); + connection master; CREATE TABLE t1 (a INT PRIMARY KEY); CREATE TABLE t2 (a INT); @@ -393,15 +397,13 @@ sync_slave_with_master; #connection slave; set global slave_exec_mode='STRICT'; - # cleanup for bug#31609 tests connection master; set @@session.binlog_format= @save_binlog_format; drop table t1,t2,ti2,ti1; -sync_slave_with_master; - +--source include/master-slave-end.inc --echo *** end of tests diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test index bb9cb127d07..699d3af6709 100644 --- a/mysql-test/t/information_schema.test +++ b/mysql-test/t/information_schema.test @@ -37,7 +37,11 @@ create table t3(a int, KEY a_data (a)); create table mysqltest.t4(a int); create table t5 (id int auto_increment primary key); insert into t5 values (10); -create view v1 (c) as select table_name from information_schema.TABLES where table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status'; +create view v1 (c) as + SELECT table_name FROM information_schema.TABLES + WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest') AND + table_name<>'ndb_binlog_index' AND + table_name<>'ndb_apply_status'; select * from v1; select c,table_name from v1 @@ -133,25 +137,25 @@ delimiter ;| # Bug#7222 information_schema: errors in "routines" # select parameter_style, sql_data_access, dtd_identifier -from information_schema.routines; +from information_schema.routines where routine_schema='test'; --replace_column 5 # 6 # -show procedure status; +show procedure status where db='test'; --replace_column 5 # 6 # -show function status; +show function status where db='test'; select a.ROUTINE_NAME from information_schema.ROUTINES a, information_schema.SCHEMATA b where -a.ROUTINE_SCHEMA = b.SCHEMA_NAME; +a.ROUTINE_SCHEMA = b.SCHEMA_NAME AND b.SCHEMA_NAME='test'; --replace_column 3 # explain select a.ROUTINE_NAME from information_schema.ROUTINES a, information_schema.SCHEMATA b where a.ROUTINE_SCHEMA = b.SCHEMA_NAME; select a.ROUTINE_NAME, b.name from information_schema.ROUTINES a, -mysql.proc b where a.ROUTINE_NAME = convert(b.name using utf8) order by 1; -select count(*) from information_schema.ROUTINES; +mysql.proc b where a.ROUTINE_NAME = convert(b.name using utf8) AND a.ROUTINE_SCHEMA='test' order by 1; +select count(*) from information_schema.ROUTINES where routine_schema='test'; -create view v1 as select routine_schema, routine_name from information_schema.routines +create view v1 as select routine_schema, routine_name from information_schema.routines where routine_schema='test' order by routine_schema, routine_name; select * from v1; drop view v1; @@ -528,7 +532,7 @@ flush privileges; # Bug #9404 information_schema: Weird error messages # with SELECT SUM() ... GROUP BY queries # -SELECT table_schema, count(*) FROM information_schema.TABLES where table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status' GROUP BY TABLE_SCHEMA; +SELECT table_schema, count(*) FROM information_schema.TABLES WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest') AND table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status' GROUP BY TABLE_SCHEMA; # @@ -557,7 +561,7 @@ begin end| delimiter ;| show triggers; -select * from information_schema.triggers; +select * from information_schema.triggers where trigger_schema in ('mysql', 'information_schema', 'test', 'mysqltest'); drop trigger trg1; drop trigger trg2; @@ -727,7 +731,7 @@ BEGIN SELECT 'foo' FROM DUAL; END | delimiter ;| -select ROUTINE_NAME from routines; +select ROUTINE_NAME from routines where ROUTINE_SCHEMA='information_schema'; # # Bug #10734 Grant of privileges other than 'select' and 'create view' should fail on schema # @@ -827,7 +831,7 @@ use mysql; INSERT INTO `proc` VALUES ('test','','PROCEDURE','','SQL','CONTAINS_SQL', 'NO','DEFINER','','','BEGIN\r\n \r\nEND','root@%','2006-03-02 18:40:03', '2006-03-02 18:40:03','','','utf8','utf8_general_ci','utf8_general_ci','n/a'); -select routine_name from information_schema.routines; +select routine_name from information_schema.routines where ROUTINE_SCHEMA='test'; delete from proc where name=''; use test; @@ -874,13 +878,13 @@ CREATE USER mysql_bug20230@localhost; GRANT EXECUTE ON PROCEDURE p1 TO mysql_bug20230@localhost; GRANT EXECUTE ON FUNCTION f1 TO mysql_bug20230@localhost; -SELECT ROUTINE_NAME, ROUTINE_DEFINITION FROM INFORMATION_SCHEMA.ROUTINES; +SELECT ROUTINE_NAME, ROUTINE_DEFINITION FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE_SCHEMA='test'; SHOW CREATE PROCEDURE p1; SHOW CREATE FUNCTION f1; connect (conn1, localhost, mysql_bug20230,,); -SELECT ROUTINE_NAME, ROUTINE_DEFINITION FROM INFORMATION_SCHEMA.ROUTINES; +SELECT ROUTINE_NAME, ROUTINE_DEFINITION FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE_SCHEMA='test'; SHOW CREATE PROCEDURE p1; SHOW CREATE FUNCTION f1; CALL p1(); @@ -931,10 +935,10 @@ SELECT t.table_name, c1.column_name # INFORMARTION_SCHEMA.TABLES # -SELECT MAX(table_name) FROM information_schema.tables; +SELECT MAX(table_name) FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test'); SELECT table_name from information_schema.tables WHERE table_name=(SELECT MAX(table_name) - FROM information_schema.tables); + FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test')); # # Bug #23037: Bug in field "Default" of query "SHOW COLUMNS FROM table" # diff --git a/mysql-test/t/sp-destruct.test b/mysql-test/t/sp-destruct.test index ae2bb9f7ea3..14c38a2fdb4 100644 --- a/mysql-test/t/sp-destruct.test +++ b/mysql-test/t/sp-destruct.test @@ -153,5 +153,5 @@ drop function bug14233_1; drop function bug14233_2; drop procedure bug14233_3; # Assert: These should show nothing. -show procedure status; -show function status; +show procedure status where db=DATABASE(); +show function status where db=DATABASE(); diff --git a/mysql-test/t/sp-error.test b/mysql-test/t/sp-error.test index 6896a1ab832..1faa524f8d3 100644 --- a/mysql-test/t/sp-error.test +++ b/mysql-test/t/sp-error.test @@ -6,6 +6,10 @@ drop table if exists t1, t2; --enable_warnings +# Backup the mysql.proc table +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +eval SELECT * FROM mysql.proc INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/proc.txt'; + # Make sure we don't have any procedures left. delete from mysql.proc; @@ -2421,3 +2425,9 @@ delimiter ;$$ #--enable_warnings #create procedure bugNNNN... #create function bugNNNN... + +# +# CLEANUP and RESTORE +# +LOAD DATA INFILE '../../tmp/proc.txt' INTO TABLE mysql.proc; +remove_file $MYSQLTEST_VARDIR/tmp/proc.txt; diff --git a/mysql-test/t/sp-security.test b/mysql-test/t/sp-security.test index 91de14116d4..b372c05b6e3 100644 --- a/mysql-test/t/sp-security.test +++ b/mysql-test/t/sp-security.test @@ -243,11 +243,11 @@ disconnect con2user1; disconnect con3anon; disconnect con4user2; use test; -select type,db,name from mysql.proc; +select type,db,name from mysql.proc where db like 'db%'; drop database db1_secret; drop database db2; # Make sure the routines are gone -select type,db,name from mysql.proc; +select type,db,name from mysql.proc where db like 'db%'; # Get rid of the users delete from mysql.user where user='user1' or user='user2'; delete from mysql.user where user='' and host='%'; diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test index 464530bec00..ac90217f891 100644 --- a/mysql-test/t/sp.test +++ b/mysql-test/t/sp.test @@ -1540,7 +1540,7 @@ begin end| show create procedure opp| --replace_column 4 'root@localhost' 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00' -show procedure status like '%p%'| +show procedure status where name like '%p%' and db='test'| # This isn't the fastest way in the world to compute prime numbers, so # don't be too ambitious. ;-) @@ -1558,7 +1558,7 @@ drop table t3| drop procedure opp| drop procedure ip| --replace_column 4 'root@localhost' 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00' -show procedure status like '%p%'| +show procedure status where name like '%p%' and db='test'| # Fibonacci, for recursion test. (Yet Another Numerical series :) @@ -2280,7 +2280,7 @@ drop procedure if exists bug2267_1| --enable_warnings create procedure bug2267_1() begin - show procedure status; + show procedure status where db='test'; end| --disable_warnings @@ -2288,7 +2288,7 @@ drop procedure if exists bug2267_2| --enable_warnings create procedure bug2267_2() begin - show function status; + show function status where db='test'; end| --disable_warnings From 8d334260f5de0dd04650db2b5514bb519f609f22 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 8 Apr 2008 18:05:19 +0200 Subject: [PATCH 120/705] Fix rename of mtr_match.pl to mtr_match.pm in Makefile --- mysql-test/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 58b63383a0f..31804714900 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -28,7 +28,7 @@ nobase_test_DATA = lib/mtr_cases.pm \ lib/mtr_gcov.pl \ lib/mtr_gprof.pl \ lib/mtr_io.pl \ - lib/mtr_match.pl \ + lib/mtr_match.pm \ lib/mtr_misc.pl \ lib/mtr_process.pl \ lib/mtr_report.pm \ From 7fcbf9f21e4af7d8d68ef91b2f9b955b7f5dc4b2 Mon Sep 17 00:00:00 2001 From: "msvensson@shellback.(none)" <> Date: Wed, 9 Apr 2008 09:43:20 +0200 Subject: [PATCH 121/705] Mereg events_restart_phase* to events_restart --- mysql-test/include/restart_mysqld.inc | 15 +++ .../include/wait_until_disconnected.inc | 21 ++++ ...rt_phase2.result => events_restart.result} | 22 ++++ mysql-test/r/events_restart_phase1.result | 16 --- mysql-test/r/events_restart_phase3.result | 6 - mysql-test/t/events_restart-master.opt | 1 + mysql-test/t/events_restart.test | 106 ++++++++++++++++++ mysql-test/t/events_restart_phase1.test | 43 ------- mysql-test/t/events_restart_phase2-master.opt | 1 - mysql-test/t/events_restart_phase2.test | 41 ------- mysql-test/t/events_restart_phase3-master.opt | 1 - mysql-test/t/events_restart_phase3.test | 21 ---- 12 files changed, 165 insertions(+), 129 deletions(-) create mode 100644 mysql-test/include/restart_mysqld.inc create mode 100644 mysql-test/include/wait_until_disconnected.inc rename mysql-test/r/{events_restart_phase2.result => events_restart.result} (75%) delete mode 100644 mysql-test/r/events_restart_phase1.result delete mode 100644 mysql-test/r/events_restart_phase3.result create mode 100644 mysql-test/t/events_restart-master.opt create mode 100644 mysql-test/t/events_restart.test delete mode 100644 mysql-test/t/events_restart_phase1.test delete mode 100644 mysql-test/t/events_restart_phase2-master.opt delete mode 100644 mysql-test/t/events_restart_phase2.test delete mode 100644 mysql-test/t/events_restart_phase3-master.opt delete mode 100644 mysql-test/t/events_restart_phase3.test diff --git a/mysql-test/include/restart_mysqld.inc b/mysql-test/include/restart_mysqld.inc new file mode 100644 index 00000000000..6bd95c80b60 --- /dev/null +++ b/mysql-test/include/restart_mysqld.inc @@ -0,0 +1,15 @@ + +# Write file to make mysql-test-run.pl expect crash and restart +--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect + +--exec $MYSQLADMIN --defaults-file=$MYSQLTEST_VARDIR/my.cnf shutdown + +# Call script that will poll the server waiting for it to be gone +--source include/wait_until_disconnected.inc + +# Turn on reconnect +--enable_reconnect + +# Call script that will poll the server waiting for it to be back online again +--source include/wait_until_connected_again.inc + diff --git a/mysql-test/include/wait_until_disconnected.inc b/mysql-test/include/wait_until_disconnected.inc new file mode 100644 index 00000000000..18a76386e2e --- /dev/null +++ b/mysql-test/include/wait_until_disconnected.inc @@ -0,0 +1,21 @@ +# +# Include this script to wait until the connection to the +# server has been dropped +--disable_result_log +--disable_query_log +let $counter= 500; +let $mysql_errno= 9999; +while (!$mysql_errno) +{ + --error 0,2002,2006 + show status; + + dec $counter; + if (!$counter) + { + --die Server failed to dissapear + } + --sleep 0.1 +} +--enable_query_log +--enable_result_log diff --git a/mysql-test/r/events_restart_phase2.result b/mysql-test/r/events_restart.result similarity index 75% rename from mysql-test/r/events_restart_phase2.result rename to mysql-test/r/events_restart.result index 60ddf06bf23..4db61d357ce 100644 --- a/mysql-test/r/events_restart_phase2.result +++ b/mysql-test/r/events_restart.result @@ -1,3 +1,19 @@ +set global event_scheduler=off; +drop database if exists events_test; +create database events_test; +use events_test; +create table execution_log(name char(10)); +create event abc1 on schedule every 1 second do +insert into execution_log value('abc1'); +create event abc2 on schedule every 1 second do +insert into execution_log value('abc2'); +create event abc3 on schedule every 1 second do +insert into execution_log value('abc3'); +create table event_like like mysql.event; +insert into event_like select * from mysql.event; +alter table mysql.event +change column body body longtext character set utf8 collate utf8_bin; +"Now we restart the server" use events_test; select @@event_scheduler; @@event_scheduler @@ -40,3 +56,9 @@ Restore the original mysql.event table drop table mysql.event; rename table event_like to mysql.event; Now let's restart the server again +use events_test; +select @@event_scheduler; +@@event_scheduler +ON +drop table execution_log; +drop database events_test; diff --git a/mysql-test/r/events_restart_phase1.result b/mysql-test/r/events_restart_phase1.result deleted file mode 100644 index 7b1de62f2ef..00000000000 --- a/mysql-test/r/events_restart_phase1.result +++ /dev/null @@ -1,16 +0,0 @@ -set global event_scheduler=off; -drop database if exists events_test; -create database events_test; -use events_test; -create table execution_log(name char(10)); -create event abc1 on schedule every 1 second do -insert into execution_log value('abc1'); -create event abc2 on schedule every 1 second do -insert into execution_log value('abc2'); -create event abc3 on schedule every 1 second do -insert into execution_log value('abc3'); -create table event_like like mysql.event; -insert into event_like select * from mysql.event; -alter table mysql.event -change column body body longtext character set utf8 collate utf8_bin; -"Now we restart the server" diff --git a/mysql-test/r/events_restart_phase3.result b/mysql-test/r/events_restart_phase3.result deleted file mode 100644 index abed0a2babc..00000000000 --- a/mysql-test/r/events_restart_phase3.result +++ /dev/null @@ -1,6 +0,0 @@ -use events_test; -select @@event_scheduler; -@@event_scheduler -ON -drop table execution_log; -drop database events_test; diff --git a/mysql-test/t/events_restart-master.opt b/mysql-test/t/events_restart-master.opt new file mode 100644 index 00000000000..f93413a61e5 --- /dev/null +++ b/mysql-test/t/events_restart-master.opt @@ -0,0 +1 @@ +--event-scheduler diff --git a/mysql-test/t/events_restart.test b/mysql-test/t/events_restart.test new file mode 100644 index 00000000000..e155fe2ea16 --- /dev/null +++ b/mysql-test/t/events_restart.test @@ -0,0 +1,106 @@ +# Can't test with embedded server that doesn't support grants +-- source include/not_embedded.inc + +# +# Test that when the server is restarted, it checks mysql.event table, +# and disables the scheduler if it's not up to date. +# + +# Switch off the scheduler for now. +set global event_scheduler=off; + +--disable_warnings +drop database if exists events_test; +--enable_warnings +create database events_test; +use events_test; +create table execution_log(name char(10)); + +create event abc1 on schedule every 1 second do + insert into execution_log value('abc1'); +create event abc2 on schedule every 1 second do + insert into execution_log value('abc2'); +create event abc3 on schedule every 1 second do + insert into execution_log value('abc3'); +# +# There are various conditions when a server would regard mysql.event +# table as damaged: +# - the table has more column than specified in the compiled in value, but +# the version of the server which created the table is the same +# - the column count in the table is less than the compiled in value +# - some column has an incompatible type specification (for what is an +# incompatible type specification please refer to the comments in the source +# +# Unfortunately, in order to test a condition, we need to restart the +# server. Therefore, here we test only one simple case: changing the data +# type of the 'body' field to blob. +# +# First, let's do a backup to not depend on actual definition of mysql.event +create table event_like like mysql.event; +insert into event_like select * from mysql.event; +# Now let's alter the table and restart the server +alter table mysql.event + change column body body longtext character set utf8 collate utf8_bin; +--echo "Now we restart the server" + +--source include/restart_mysqld.inc + +use events_test; +# Event scheduler should be disabled: the system tables are damaged +select @@event_scheduler; +# Try various Event Scheduler operation and check the output. +--error ER_EVENTS_DB_ERROR +show events; +--error ER_EVENTS_DB_ERROR +select event_name from information_schema.events; +--error ER_EVENTS_DB_ERROR +show create event intact_check; +--error ER_EVENTS_DB_ERROR +drop event no_such_event; +--error ER_EVENTS_DB_ERROR +create event intact_check_1 on schedule every 5 hour do select 5; +--error ER_EVENTS_DB_ERROR +alter event intact_check_1 on schedule every 8 hour do select 8; +--error ER_EVENTS_DB_ERROR +alter event intact_check_1 rename to intact_check_2; +--error ER_EVENTS_DB_ERROR +drop event intact_check_1; +--error ER_EVENTS_DB_ERROR +drop event intact_check_2; +--error ER_EVENTS_DB_ERROR +drop event intact_check; +--error ER_EVENTS_DB_ERROR +set global event_scheduler=on; +--error ER_EVENTS_DB_ERROR +set global event_scheduler=off; +show variables like 'event_scheduler'; +--echo Make sure that we still can create and drop databases, +--echo and no warnings are produced. +drop database if exists mysqltest_database_not_exists; +create database mysqltest_db1; +drop database mysqltest_db1; +--echo Restore the original mysql.event table +drop table mysql.event; +rename table event_like to mysql.event; +--echo Now let's restart the server again + +--source include/restart_mysqld.inc + +# We need this file primarily to make sure that the scheduler is restarted +# and enabled after we have restored mysql.event table. +# This is the final step of the "cleanup". +# +# Make sure also that events are executed OK after restart, just in case. +use events_test; +# Make sure the scheduler was started successfully +select @@event_scheduler; +let $wait_condition=select count(distinct name)=3 from execution_log; +--source include/wait_condition.inc +drop table execution_log; +# Will drop all events +drop database events_test; + +let $wait_condition= + select count(*) = 0 from information_schema.processlist + where db='events_test' and command = 'Connect' and user=current_user(); +--source include/wait_condition.inc diff --git a/mysql-test/t/events_restart_phase1.test b/mysql-test/t/events_restart_phase1.test deleted file mode 100644 index 6a94ef12222..00000000000 --- a/mysql-test/t/events_restart_phase1.test +++ /dev/null @@ -1,43 +0,0 @@ -# Can't test with embedded server that doesn't support grants --- source include/not_embedded.inc -# -# Test that when the server is restarted, it checks mysql.event table, -# and disables the scheduler if it's not up to date. -# - -# Switch off the scheduler for now. -set global event_scheduler=off; - ---disable_warnings -drop database if exists events_test; ---enable_warnings -create database events_test; -use events_test; -create table execution_log(name char(10)); - -create event abc1 on schedule every 1 second do - insert into execution_log value('abc1'); -create event abc2 on schedule every 1 second do - insert into execution_log value('abc2'); -create event abc3 on schedule every 1 second do - insert into execution_log value('abc3'); -# -# There are various conditions when a server would regard mysql.event -# table as damaged: -# - the table has more column than specified in the compiled in value, but -# the version of the server which created the table is the same -# - the column count in the table is less than the compiled in value -# - some column has an incompatible type specification (for what is an -# incompatible type specification please refer to the comments in the source -# -# Unfortunately, in order to test a condition, we need to restart the -# server. Therefore, here we test only one simple case: changing the data -# type of the 'body' field to blob. -# -# First, let's do a backup to not depend on actual definition of mysql.event -create table event_like like mysql.event; -insert into event_like select * from mysql.event; -# Now let's alter the table and restart the server -alter table mysql.event - change column body body longtext character set utf8 collate utf8_bin; ---echo "Now we restart the server" diff --git a/mysql-test/t/events_restart_phase2-master.opt b/mysql-test/t/events_restart_phase2-master.opt deleted file mode 100644 index b60aeb8d9b3..00000000000 --- a/mysql-test/t/events_restart_phase2-master.opt +++ /dev/null @@ -1 +0,0 @@ ---event-scheduler=on --force-restart diff --git a/mysql-test/t/events_restart_phase2.test b/mysql-test/t/events_restart_phase2.test deleted file mode 100644 index c3f799634b3..00000000000 --- a/mysql-test/t/events_restart_phase2.test +++ /dev/null @@ -1,41 +0,0 @@ -# Can't test with embedded server that doesn't support grants --- source include/not_embedded.inc - -use events_test; -# Event scheduler should be disabled: the system tables are damaged -select @@event_scheduler; -# Try various Event Scheduler operation and check the output. ---error ER_EVENTS_DB_ERROR -show events; ---error ER_EVENTS_DB_ERROR -select event_name from information_schema.events; ---error ER_EVENTS_DB_ERROR -show create event intact_check; ---error ER_EVENTS_DB_ERROR -drop event no_such_event; ---error ER_EVENTS_DB_ERROR -create event intact_check_1 on schedule every 5 hour do select 5; ---error ER_EVENTS_DB_ERROR -alter event intact_check_1 on schedule every 8 hour do select 8; ---error ER_EVENTS_DB_ERROR -alter event intact_check_1 rename to intact_check_2; ---error ER_EVENTS_DB_ERROR -drop event intact_check_1; ---error ER_EVENTS_DB_ERROR -drop event intact_check_2; ---error ER_EVENTS_DB_ERROR -drop event intact_check; ---error ER_EVENTS_DB_ERROR -set global event_scheduler=on; ---error ER_EVENTS_DB_ERROR -set global event_scheduler=off; -show variables like 'event_scheduler'; ---echo Make sure that we still can create and drop databases, ---echo and no warnings are produced. -drop database if exists mysqltest_database_not_exists; -create database mysqltest_db1; -drop database mysqltest_db1; ---echo Restore the original mysql.event table -drop table mysql.event; -rename table event_like to mysql.event; ---echo Now let's restart the server again diff --git a/mysql-test/t/events_restart_phase3-master.opt b/mysql-test/t/events_restart_phase3-master.opt deleted file mode 100644 index 656b9e1b017..00000000000 --- a/mysql-test/t/events_restart_phase3-master.opt +++ /dev/null @@ -1 +0,0 @@ ---event-scheduler=1 diff --git a/mysql-test/t/events_restart_phase3.test b/mysql-test/t/events_restart_phase3.test deleted file mode 100644 index 04d879e50ec..00000000000 --- a/mysql-test/t/events_restart_phase3.test +++ /dev/null @@ -1,21 +0,0 @@ -# Can't test with embedded server that doesn't support grants --- source include/not_embedded.inc -# -# We need this file primarily to make sure that the scheduler is restarted -# and enabled after we have restored mysql.event table. -# This is the final step of the "cleanup". -# -# Make sure also that events are executed OK after restart, just in case. -use events_test; -# Make sure the scheduler was started successfully -select @@event_scheduler; -let $wait_condition=select count(distinct name)=3 from execution_log; ---source include/wait_condition.inc -drop table execution_log; -# Will drop all events -drop database events_test; - -let $wait_condition= - select count(*) = 0 from information_schema.processlist - where db='events_test' and command = 'Connect' and user=current_user(); ---source include/wait_condition.inc From 3253a936da96ea28ebc38ef77db9173f7a64613e Mon Sep 17 00:00:00 2001 From: "msvensson@shellback.(none)" <> Date: Wed, 9 Apr 2008 09:44:08 +0200 Subject: [PATCH 122/705] Update comment to reflect reality --- mysql-test/include/check-testcase.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/include/check-testcase.test b/mysql-test/include/check-testcase.test index b5d77ba8244..2f9d43c7778 100644 --- a/mysql-test/include/check-testcase.test +++ b/mysql-test/include/check-testcase.test @@ -13,7 +13,7 @@ show global variables where Variable_name != 'timestamp'; # Dump all databases, there should be none -# except mysql, test and information_schema +# except those that was created during bootstrap show databases; # The test database should not contain any tables From 08a92bf01036459de4febf25dae74c7b758a7a43 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 9 Apr 2008 09:44:30 +0200 Subject: [PATCH 123/705] Reset debug flag before test ends --- mysql-test/suite/rpl/r/rpl_bug33931.result | 1 + mysql-test/suite/rpl/t/rpl_bug33931.test | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/rpl/r/rpl_bug33931.result b/mysql-test/suite/rpl/r/rpl_bug33931.result index 6c3c3f550dc..f20cc03df89 100644 --- a/mysql-test/suite/rpl/r/rpl_bug33931.result +++ b/mysql-test/suite/rpl/r/rpl_bug33931.result @@ -43,3 +43,4 @@ Last_IO_Errno 0 Last_IO_Error Last_SQL_Errno 0 Last_SQL_Error +SET GLOBAL debug=""; diff --git a/mysql-test/suite/rpl/t/rpl_bug33931.test b/mysql-test/suite/rpl/t/rpl_bug33931.test index 8b788f62f23..ae51793bba8 100644 --- a/mysql-test/suite/rpl/t/rpl_bug33931.test +++ b/mysql-test/suite/rpl/t/rpl_bug33931.test @@ -41,5 +41,8 @@ source include/wait_for_slave_to_stop.inc; --replace_column 1 # 8 # 9 # 23 # 33 # query_vertical show slave status; -# no clean-up is needed +# +# Cleanup +# +SET GLOBAL debug=""; From 74b43edce2dac656b9eea313f7a6b804ad66f7cb Mon Sep 17 00:00:00 2001 From: "msvensson@shellback.(none)" <> Date: Wed, 9 Apr 2008 09:48:06 +0200 Subject: [PATCH 124/705] Restore settings before test ends --- mysql-test/r/events_bugs.result | 1 + mysql-test/t/events_bugs.test | 3 +++ 2 files changed, 4 insertions(+) diff --git a/mysql-test/r/events_bugs.result b/mysql-test/r/events_bugs.result index 814cf42d16c..11e9109439b 100644 --- a/mysql-test/r/events_bugs.result +++ b/mysql-test/r/events_bugs.result @@ -736,3 +736,4 @@ select name from mysql.event where name = 'p' and sql_mode = @full_mode; name drop event e1; DROP DATABASE events_test; +SET GLOBAL event_scheduler= 'ON'; diff --git a/mysql-test/t/events_bugs.test b/mysql-test/t/events_bugs.test index b3b2f37e36f..5f1fb3696dd 100644 --- a/mysql-test/t/events_bugs.test +++ b/mysql-test/t/events_bugs.test @@ -971,4 +971,7 @@ let $wait_condition= DROP DATABASE events_test; +# Restore event_schedulre setting to how it was when test started +SET GLOBAL event_scheduler= 'ON'; + # THIS MUST BE THE LAST LINE in this file. From eee737d8235326080ab43976beab9c5e74ac8513 Mon Sep 17 00:00:00 2001 From: "msvensson@shellback.(none)" <> Date: Wed, 9 Apr 2008 11:05:53 +0200 Subject: [PATCH 125/705] Fix not_embedded_server to check if the value of com_select changed regardless of it's current value --- mysql-test/r/not_embedded_server.result | 7 +------ mysql-test/t/not_embedded_server.test | 10 ++++++++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/mysql-test/r/not_embedded_server.result b/mysql-test/r/not_embedded_server.result index 1b734136e6c..89f48a1ea56 100644 --- a/mysql-test/r/not_embedded_server.result +++ b/mysql-test/r/not_embedded_server.result @@ -4,9 +4,4 @@ ID USER HOST DB COMMAND TIME STATE INFO number root localhost test Query time executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!='Daemon' deallocate prepare stmt1; FLUSH STATUS; -SHOW GLOBAL STATUS LIKE 'com_select'; -Variable_name Value -Com_select 102 -SHOW GLOBAL STATUS LIKE 'com_select'; -Variable_name Value -Com_select 102 +Value of com_select did not change diff --git a/mysql-test/t/not_embedded_server.test b/mysql-test/t/not_embedded_server.test index ffc13cf80f7..fe6b8825a87 100644 --- a/mysql-test/t/not_embedded_server.test +++ b/mysql-test/t/not_embedded_server.test @@ -48,10 +48,16 @@ while ($i) --enable_query_log --enable_result_log -SHOW GLOBAL STATUS LIKE 'com_select'; +let $before= query_get_value(SHOW GLOBAL STATUS LIKE 'com_select',Value,1); --change_user -SHOW GLOBAL STATUS LIKE 'com_select'; +let $after= query_get_value(SHOW GLOBAL STATUS LIKE 'com_select',Value,1); + +if (`select $after != $before`){ + SHOW GLOBAL STATUS LIKE 'com_select'; + die The value of com_select changed during change_user; +} +echo Value of com_select did not change; # End of 5.1 tests From d348362d2443a840da72cae0cee827d6111abe19 Mon Sep 17 00:00:00 2001 From: "msvensson@shellback.(none)" <> Date: Wed, 9 Apr 2008 12:27:39 +0200 Subject: [PATCH 126/705] Turn on --check-testcase by default Don't log check_warnings to binlog --- mysql-test/include/check-testcase.test | 55 ++------------------------ mysql-test/include/mtr_check.sql | 51 ++++++++++++++++++++++++ mysql-test/include/mtr_warnings.sql | 3 ++ mysql-test/mysql-test-run.pl | 6 ++- 4 files changed, 62 insertions(+), 53 deletions(-) create mode 100644 mysql-test/include/mtr_check.sql diff --git a/mysql-test/include/check-testcase.test b/mysql-test/include/check-testcase.test index 2f9d43c7778..6dcb01c13cf 100644 --- a/mysql-test/include/check-testcase.test +++ b/mysql-test/include/check-testcase.test @@ -7,58 +7,9 @@ # In that way its possible to check that a testcase does not have # any unwanted side affects. # - -# Dump all global variables except those -# that are supposed to change -show global variables where Variable_name != 'timestamp'; - -# Dump all databases, there should be none -# except those that was created during bootstrap -show databases; - -# The test database should not contain any tables -show tables from test; - -# Dump the "mysql" database and its tables -use mysql; -show tables; -show create table columns_priv; -show create table db; -show create table func; -show create table help_category; -show create table help_keyword; -show create table help_relation; -show create table help_relation; -show create table host; -show create table proc; -show create table procs_priv; -show create table tables_priv; -show create table time_zone; -show create table time_zone_leap_second; -show create table time_zone_name; -show create table time_zone_transition; -show create table time_zone_transition_type; -show create table user; - -# Select data from system tables to make sure they have been properly -# restored after test -select * from columns_priv; -select * from db order by host, db, user; -select * from func; -select * from help_category; -select * from help_keyword; -select * from help_relation; -select * from help_relation; -select * from host; -select * from proc; -select * from procs_priv; -select * from tables_priv; -select * from time_zone; -select * from time_zone_leap_second; -select * from time_zone_name; -select * from time_zone_transition; -select * from time_zone_transition_type; -select * from user; +--disable_query_log +call mtr.check_testcase(); +--enable_query_log diff --git a/mysql-test/include/mtr_check.sql b/mysql-test/include/mtr_check.sql new file mode 100644 index 00000000000..9dd8a065da2 --- /dev/null +++ b/mysql-test/include/mtr_check.sql @@ -0,0 +1,51 @@ +delimiter ||; + +use mtr|| + +-- +-- Procedure used to check if server has been properly +-- restored after testcase has been run +-- +CREATE DEFINER=root@localhost PROCEDURE check_testcase() +BEGIN + + -- Dump all global variables except those + -- that are supposed to change + SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES + WHERE variable_name != 'timestamp'; + + -- Dump all databases, there should be none + -- except those that was created during bootstrap + SELECT * FROM INFORMATION_SCHEMA.SCHEMATA; + + -- The test database should not contain any tables + SELECT table_name FROM INFORMATION_SCHEMA.TABLES + WHERE table_schema='test'; + + -- Show "mysql" database, tables and columns + SELECT table_name, table_type, engine FROM INFORMATION_SCHEMA.TABLES + WHERE table_schema='mysql'; + SELECT * FROM INFORMATION_SCHEMA.COLUMNS + WHERE table_schema='mysql'; + + -- Checksum system tables to make sure they have been properly + -- restored after test + checksum table + mysql.columns_priv, + mysql.db, + mysql.func, + mysql.help_category, + mysql.help_keyword, + mysql.help_relation, + mysql.host, + mysql.proc, + mysql.procs_priv, + mysql.tables_priv, + mysql.time_zone, + mysql.time_zone_leap_second, + mysql.time_zone_name, + mysql.time_zone_transition, + mysql.time_zone_transition_type, + mysql.user; + +END|| diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index 65aa9a5842f..1a79b69c30a 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -210,6 +210,9 @@ INSERT INTO global_supressions VALUES -- CREATE DEFINER=root@localhost PROCEDURE check_warnings() BEGIN + + -- Don't write these queries to binlog + SET SQL_LOG_BIN=0; -- -- Load the server .err file into "error_log" table -- diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index e817ca51cd4..7e8ed7ee422 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -145,7 +145,7 @@ my $opt_mtr_build_thread= $ENV{'MTR_BUILD_THREAD'} || "auto"; my $opt_record; my $opt_report_features; -our $opt_check_testcases; +our $opt_check_testcases= 1; my $opt_mark_progress; my $opt_sleep; @@ -2107,6 +2107,10 @@ sub mysql_install_db { mtr_tofile($bootstrap_sql_file, sql_to_bootstrap(mtr_grab_file("include/mtr_warnings.sql"))); + # Add procedures for checking server is restored after testcase + mtr_tofile($bootstrap_sql_file, + sql_to_bootstrap(mtr_grab_file("include/mtr_check.sql"))); + # Log bootstrap command my $path_bootstrap_log= "$opt_vardir/log/bootstrap.log"; mtr_tofile($path_bootstrap_log, From f4661f34a6db7d07585586674d8eee2d26bd8fb0 Mon Sep 17 00:00:00 2001 From: "msvensson@shellback.(none)" <> Date: Wed, 9 Apr 2008 14:38:42 +0200 Subject: [PATCH 127/705] Fix return code from check-warnings to indicate if test failed or not. No more string matching --- mysql-test/include/check-warnings.test | 6 +++++- mysql-test/include/mtr_check.sql | 2 +- mysql-test/include/mtr_warnings.sql | 8 ++++++-- mysql-test/mysql-test-run.pl | 18 ++++++------------ 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/mysql-test/include/check-warnings.test b/mysql-test/include/check-warnings.test index 5b451550456..e29f4300562 100644 --- a/mysql-test/include/check-warnings.test +++ b/mysql-test/include/check-warnings.test @@ -4,5 +4,9 @@ # for unexpected warnings found in the servers error log # --disable_query_log -call mtr.check_warnings(); +call mtr.check_warnings(@result); +if (`select @result = 0`){ + skip OK; +} +echo Found warnings; --enable_query_log diff --git a/mysql-test/include/mtr_check.sql b/mysql-test/include/mtr_check.sql index 9dd8a065da2..65a1471e485 100644 --- a/mysql-test/include/mtr_check.sql +++ b/mysql-test/include/mtr_check.sql @@ -19,7 +19,7 @@ BEGIN SELECT * FROM INFORMATION_SCHEMA.SCHEMATA; -- The test database should not contain any tables - SELECT table_name FROM INFORMATION_SCHEMA.TABLES + SELECT table_name AS tables_in_test FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='test'; -- Show "mysql" database, tables and columns diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index 1a79b69c30a..e344b44b8f2 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -208,7 +208,7 @@ INSERT INTO global_supressions VALUES -- Procedure that uses the above created tables to check -- the servers error log for warnings -- -CREATE DEFINER=root@localhost PROCEDURE check_warnings() +CREATE DEFINER=root@localhost PROCEDURE check_warnings(OUT result INT) BEGIN -- Don't write these queries to binlog @@ -225,6 +225,7 @@ BEGIN FROM information_schema.global_variables WHERE variable_name='LOG_ERROR'; + SET @@session.max_allowed_packet= 1024*1024*1024; SET @text= load_file(@log_error); -- select @text; @@ -269,8 +270,11 @@ BEGIN SELECT line as log_error FROM suspect_lines WHERE supressed=0; SELECT * FROM test_supressions; + -- Return 2 -> check failed + SELECT 2 INTO result; ELSE - SELECT "OK"; + -- Return 0 -> OK + SELECT 0 INTO RESULT; END IF; -- Cleanup for next test diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 7e8ed7ee422..9cfd4d71908 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2568,22 +2568,16 @@ sub run_check_warnings ($$) { if ( $res == 0 ) { my $report= mtr_grab_file($errfile); - if ($report ne "OK\nOK\n") - { - # Log to var/log/warnings file - mtr_tofile("$opt_vardir/log/warnings", + # Log to var/log/warnings file + mtr_tofile("$opt_vardir/log/warnings", $tname."\n", $report); - $res= 1; - $tinfo->{'warnings'}.= $report; - - } + $res= 1; + $tinfo->{'warnings'}.= $report; } - elsif ( $res == 62 ) - { - # One of the features needed to run check_warnings.test was not - # available, check skipped + elsif ( $res == 62 ) { + # Test case was ok and called "skip" $res= 0; } elsif ( $res ) From 6c266a9d544ef81ddcf33e96d9df6ce4915f02d1 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 9 Apr 2008 18:42:05 +0200 Subject: [PATCH 128/705] Bug#35943 Failure to create mysql.ndb_schema shoudl not be logged if tabe already exist --- sql/ha_ndbcluster_binlog.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index 940e67b64f3..baf86d739eb 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -815,9 +815,10 @@ static int ndbcluster_create_ndb_apply_status_table(THD *thd) " end_pos BIGINT UNSIGNED NOT NULL, " " PRIMARY KEY USING HASH (server_id) ) ENGINE=NDB CHARACTER SET latin1"); - const int no_print_error[5]= {ER_TABLE_EXISTS_ERROR, + const int no_print_error[6]= {ER_TABLE_EXISTS_ERROR, 701, 702, + 721, // Table already exist 4009, 0}; // do not print error 701 etc run_query(thd, buf, end, no_print_error, TRUE); @@ -876,9 +877,10 @@ static int ndbcluster_create_schema_table(THD *thd) " type INT UNSIGNED NOT NULL," " PRIMARY KEY USING HASH (db,name) ) ENGINE=NDB CHARACTER SET latin1"); - const int no_print_error[5]= {ER_TABLE_EXISTS_ERROR, + const int no_print_error[6]= {ER_TABLE_EXISTS_ERROR, 701, 702, + 721, // Table already exist 4009, 0}; // do not print error 701 etc run_query(thd, buf, end, no_print_error, TRUE); From 0ceb3244e50066a0428be7aaf21a2f7f6b8440f9 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 9 Apr 2008 22:06:02 +0200 Subject: [PATCH 129/705] Improve readability of check testcase data and add order by --- mysql-test/include/mtr_check.sql | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/mysql-test/include/mtr_check.sql b/mysql-test/include/mtr_check.sql index 65a1471e485..a6913dd8a10 100644 --- a/mysql-test/include/mtr_check.sql +++ b/mysql-test/include/mtr_check.sql @@ -23,10 +23,18 @@ BEGIN WHERE table_schema='test'; -- Show "mysql" database, tables and columns - SELECT table_name, table_type, engine FROM INFORMATION_SCHEMA.TABLES - WHERE table_schema='mysql'; - SELECT * FROM INFORMATION_SCHEMA.COLUMNS - WHERE table_schema='mysql'; + SELECT CONCAT(table_schema, '.', table_name) AS tables_in_mysql + FROM INFORMATION_SCHEMA.TABLES + WHERE table_schema='mysql' AND table_name != 'ndb_apply_status' + ORDER BY tables_in_mysql; + SELECT CONCAT(table_schema, '.', table_name) AS columns_in_mysql, + column_name, ordinal_position, column_default, is_nullable, + data_type, character_maximum_length, character_octet_length, + numeric_precision, numeric_scale, character_set_name, + collation_name, column_type, column_key, extra, column_comment + FROM INFORMATION_SCHEMA.COLUMNS + WHERE table_schema='mysql' AND table_name != 'ndb_apply_status' + ORDER BY columns_in_mysql; -- Checksum system tables to make sure they have been properly -- restored after test From 806b107a1c861349cc46599330d460b21575f451 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 10 Apr 2008 13:16:32 +0200 Subject: [PATCH 130/705] Fix problem where test case timeout was not detected after expected crash server restart. The test timeout process was killed not restarted. --- mysql-test/mysql-test-run.pl | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 9cfd4d71908..6f0d79e5c06 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2405,16 +2405,14 @@ sub run_testcase ($) { } mtr_verbose("Got $proc"); - # ---------------------------------------------------- - # Stop the test case timer - # ---------------------------------------------------- - $test_timeout_proc->kill(); - # ---------------------------------------------------- # Was it the test program that exited # ---------------------------------------------------- if ($proc eq $test) { + # Stop the test case timer + $test_timeout_proc->kill(); + my $res= $test->exit_status(); if ( $res == 0 ) @@ -2488,6 +2486,11 @@ sub run_testcase ($) { next; } + # ---------------------------------------------------- + # Stop the test case timer + # ---------------------------------------------------- + $test_timeout_proc->kill(); + # ---------------------------------------------------- # It's not mysqltest that has exited, kill it # ---------------------------------------------------- From 5ffa7d2fcaf94e3d98949ffe66410a1191a22b77 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 11 Apr 2008 10:30:06 +0200 Subject: [PATCH 131/705] Bug#35986 valgrind warning in DbugParse for empty string in SET GLOBAL DEBUG="" - Code in DbugParse was reading from beyond end of the control string --- dbug/dbug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbug/dbug.c b/dbug/dbug.c index 666ab2b3e3c..1cebbbcf72a 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -493,7 +493,7 @@ static void DbugParse(CODE_STATE *cs, const char *control) } end= DbugStrTok(control); - while (1) + while (control < end) { int c, sign= (*control == '+') ? 1 : (*control == '-') ? -1 : 0; if (sign) control++; From be3371d33a53625beaa43378fecafefd364bb44a Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 11 Apr 2008 15:32:34 +0200 Subject: [PATCH 132/705] Drop all tables before test case ends --- mysql-test/suite/ndb/r/ndb_read_multi_range.result | 2 +- mysql-test/suite/ndb/r/ndb_single_user.result | 4 ++-- mysql-test/suite/ndb/t/ndb_read_multi_range.test | 2 +- mysql-test/suite/ndb/t/ndb_single_user.test | 5 +++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mysql-test/suite/ndb/r/ndb_read_multi_range.result b/mysql-test/suite/ndb/r/ndb_read_multi_range.result index 4c3496f3f47..113fb28bb78 100644 --- a/mysql-test/suite/ndb/r/ndb_read_multi_range.result +++ b/mysql-test/suite/ndb/r/ndb_read_multi_range.result @@ -491,4 +491,4 @@ select * from t2 order by id; id 3 drop trigger kaboom; -drop table t1; +drop table t1, t2; diff --git a/mysql-test/suite/ndb/r/ndb_single_user.result b/mysql-test/suite/ndb/r/ndb_single_user.result index 0a4f7cd0b5f..8133e540d71 100644 --- a/mysql-test/suite/ndb/r/ndb_single_user.result +++ b/mysql-test/suite/ndb/r/ndb_single_user.result @@ -1,5 +1,4 @@ -use test; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10; +drop table if exists t1,t2; create table t1 (a int key, b int unique, c int) engine ndb; ERROR HY000: Can't create table 'test.t1' (errno: 299) CREATE LOGFILE GROUP lg1 @@ -85,6 +84,7 @@ update t1 set b=b+100 where a > 7; delete from t1; insert into t1 select * from t2; create unique index new_index on t1 (b,c); +drop table t2; drop table t1; ERROR 42S02: Unknown table 't1' create index new_index_fail on t1 (c); diff --git a/mysql-test/suite/ndb/t/ndb_read_multi_range.test b/mysql-test/suite/ndb/t/ndb_read_multi_range.test index 1965874940b..1c439e65099 100644 --- a/mysql-test/suite/ndb/t/ndb_read_multi_range.test +++ b/mysql-test/suite/ndb/t/ndb_read_multi_range.test @@ -337,4 +337,4 @@ delete from t1 where id in (1,2); select * from t2 order by id; drop trigger kaboom; -drop table t1; +drop table t1, t2; diff --git a/mysql-test/suite/ndb/t/ndb_single_user.test b/mysql-test/suite/ndb/t/ndb_single_user.test index 76a4307f226..a64ac066a49 100644 --- a/mysql-test/suite/ndb/t/ndb_single_user.test +++ b/mysql-test/suite/ndb/t/ndb_single_user.test @@ -3,8 +3,7 @@ -- source include/not_embedded.inc --disable_warnings -use test; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10; +drop table if exists t1,t2; --enable_warnings # operations allowed while cluster is in single user mode @@ -103,6 +102,8 @@ insert into t1 select * from t2; # - prior to bugfix this would fail create unique index new_index on t1 (b,c); +drop table t2; + # test some sql on other mysqld --connection server2 --error 1051 From e549ec7f6a31d88ccd7236f6a667cbe964c23dc5 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 14 Apr 2008 12:57:37 +0200 Subject: [PATCH 133/705] Temporary re-enable the "always restart slave" --- mysql-test/mysql-test-run.pl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 6f0d79e5c06..ebd21090a76 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3007,6 +3007,17 @@ sub server_need_restart { } } + # Temporary re-enable the "always restart slave" hack + # this should be removed asap, but will require that each rpl + # testcase cleanup better after itself - ie. stop and reset + # replication + # Use the "#!use-slave-opt" marker to detect that this is a "slave" + # server + if ( $server->option("#!use-slave-opt") ){ + mtr_verbose_restart($server, "Always restart slave(s)"); + return 1; + } + my $is_mysqld= grep ($server eq $_, mysqlds()); if ($is_mysqld) { From 596aca33f537ec5a1c0c2bf37365775938fe1b70 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 14 Apr 2008 14:25:57 +0200 Subject: [PATCH 134/705] Set mysqladmin shutdown timeout to 60 seconds --- mysql-test/include/restart_mysqld.inc | 2 +- mysql-test/mysql-test-run.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/include/restart_mysqld.inc b/mysql-test/include/restart_mysqld.inc index 6bd95c80b60..106563d287d 100644 --- a/mysql-test/include/restart_mysqld.inc +++ b/mysql-test/include/restart_mysqld.inc @@ -2,7 +2,7 @@ # Write file to make mysql-test-run.pl expect crash and restart --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect ---exec $MYSQLADMIN --defaults-file=$MYSQLTEST_VARDIR/my.cnf shutdown +--exec $MYSQLADMIN --defaults-file=$MYSQLTEST_VARDIR/my.cnf --shutdown-timeout=60 shutdown # Call script that will poll the server waiting for it to be gone --source include/wait_until_disconnected.inc diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index ebd21090a76..86da2219807 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2633,7 +2633,7 @@ sub check_expected_crash_and_restart { my $expect_file= "$opt_vardir/tmp/".$mysqld->name().".expect"; if ( -f $expect_file ) { - mtr_verbose("Crash was expected, file $expect_file exists"); + mtr_report("Crash was expected, file '$expect_file' exists"); # Start server with same settings as last time mysqld_start($mysqld, $mysqld->{'started_opts'}); unlink($expect_file); From 31569606b2d98be74a8956958b8c49099808ce32 Mon Sep 17 00:00:00 2001 From: "skozlov/ksm@mysql.com/virtop.(none)" <> Date: Sun, 20 Apr 2008 16:32:08 +0400 Subject: [PATCH 135/705] WL#3734 Testing slave group execution --- .../suite/rpl/r/rpl_slave_grp_exec.result | 123 ++++++++++++ .../suite/rpl/t/rpl_slave_grp_exec-master.opt | 1 + .../suite/rpl/t/rpl_slave_grp_exec-slave.opt | 1 + .../suite/rpl/t/rpl_slave_grp_exec.test | 182 ++++++++++++++++++ 4 files changed, 307 insertions(+) create mode 100644 mysql-test/suite/rpl/r/rpl_slave_grp_exec.result create mode 100644 mysql-test/suite/rpl/t/rpl_slave_grp_exec-master.opt create mode 100644 mysql-test/suite/rpl/t/rpl_slave_grp_exec-slave.opt create mode 100644 mysql-test/suite/rpl/t/rpl_slave_grp_exec.test diff --git a/mysql-test/suite/rpl/r/rpl_slave_grp_exec.result b/mysql-test/suite/rpl/r/rpl_slave_grp_exec.result new file mode 100644 index 00000000000..cfd309e6251 --- /dev/null +++ b/mysql-test/suite/rpl/r/rpl_slave_grp_exec.result @@ -0,0 +1,123 @@ +stop slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +start slave; + +*** Preparing data *** +CREATE TABLE t1 (a INT NOT NULL, b VARCHAR(10)) ENGINE=MyISAM; +CREATE TABLE t2 LIKE t1; +CREATE TABLE t3 LIKE t1; +CREATE TRIGGER tr1 BEFORE UPDATE ON t1 +FOR EACH ROW BEGIN +UPDATE t2 SET b='YY' WHERE a=NEW.a; +END| +CREATE TRIGGER tr2 AFTER UPDATE ON t1 +FOR EACH ROW BEGIN +UPDATE t3 SET b='ZZ' WHERE a=NEW.a; +END| + +*** Test non-transactional group w/o PK *** +INSERT INTO t3 VALUES(1, 'AA'); +INSERT INTO t2 VALUES(1, 'AA'); +INSERT INTO t1 VALUES(1, 'AA'); +RENAME TABLE t3 TO t3_bak; +UPDATE t1 SET b = 'XX' WHERE a = 1; +SELECT * FROM t1 ORDER BY a; +a b +1 XX +SELECT * FROM t2 ORDER BY a; +a b +1 YY +SELECT * FROM t3 ORDER BY a; +a b +1 ZZ +SHOW TABLES LIKE 't%'; +Tables_in_test (t%) +t1 +t2 +t3_bak +SELECT * FROM t1 ORDER BY a; +a b +1 AA_for_row_or_XX_for_stmt_mixed +SELECT * FROM t2 ORDER BY a; +a b +1 AA_for_row_or_YY_for_stmt_mixed +STOP SLAVE; +RENAME TABLE t3_bak TO t3; +START SLAVE; +TRUNCATE t1; +TRUNCATE t2; +TRUNCATE t3; + +*** Test non-transactional group w/ PK *** +ALTER TABLE t1 ADD PRIMARY KEY (a); +ALTER TABLE t2 ADD PRIMARY KEY (a); +ALTER TABLE t3 ADD PRIMARY KEY (a); +RENAME TABLE t3 TO t3_bak; +INSERT INTO t3 VALUES(2, 'B'); +INSERT INTO t2 VALUES(2, 'B'); +INSERT INTO t1 VALUES(2, 'B'); +UPDATE t1 SET b = 'X' WHERE a = 2; +SELECT * FROM t1 ORDER BY a; +a b +2 X +SELECT * FROM t2 ORDER BY a; +a b +2 YY +SELECT * FROM t3 ORDER BY a; +a b +2 ZZ +SHOW TABLES LIKE 't%'; +Tables_in_test (t%) +t1 +t2 +t3_bak +SELECT * FROM t1 ORDER BY a; +a b +SELECT * FROM t2 ORDER BY a; +a b +STOP SLAVE; +RENAME TABLE t3_bak TO t3; +START SLAVE; +TRUNCATE t1; +TRUNCATE t2; +TRUNCATE t3; + +*** Test transactional group w/ PK *** +ALTER TABLE t1 ENGINE=InnoDB; +ALTER TABLE t2 ENGINE=InnoDB; +ALTER TABLE t3 ENGINE=InnoDB; +RENAME TABLE t3 TO t3_bak; +BEGIN; +INSERT INTO t1 VALUES (3, 'C'), (4, 'D'); +INSERT INTO t2 VALUES (3, 'C'), (4, 'D'); +INSERT INTO t3 VALUES (3, 'C'), (4, 'D'); +COMMIT; +SELECT * FROM t1 ORDER BY a; +a b +3 C +4 D +SELECT * FROM t2 ORDER BY a; +a b +3 C +4 D +SELECT * FROM t3 ORDER BY a; +a b +3 C +4 D +SHOW TABLES LIKE 't%'; +Tables_in_test (t%) +t1 +t2 +t3_bak +SELECT * FROM t1 ORDER BY a; +a b +SELECT * FROM t2 ORDER BY a; +a b +STOP SLAVE; +RENAME TABLE t3_bak TO t3; +START SLAVE; +*** Clean up *** +DROP TABLE t1,t2,t3; diff --git a/mysql-test/suite/rpl/t/rpl_slave_grp_exec-master.opt b/mysql-test/suite/rpl/t/rpl_slave_grp_exec-master.opt new file mode 100644 index 00000000000..627becdbfb5 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_slave_grp_exec-master.opt @@ -0,0 +1 @@ +--innodb diff --git a/mysql-test/suite/rpl/t/rpl_slave_grp_exec-slave.opt b/mysql-test/suite/rpl/t/rpl_slave_grp_exec-slave.opt new file mode 100644 index 00000000000..627becdbfb5 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_slave_grp_exec-slave.opt @@ -0,0 +1 @@ +--innodb diff --git a/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test b/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test new file mode 100644 index 00000000000..94d8ffb4edc --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test @@ -0,0 +1,182 @@ +############################################################# +# Author: Serge Kozlov +# Date: 03/21/2008 +# Purpose: +# WL#3734 Test: slave group execution +# Testing slave group execution: stop in middle of the group +# (of events) should be immpossible on slave. +# Group of events means set of statements between BEGIN/COMMIT +# for transactional engines or a statement for +# non-transactional engines that fires triggers and +# affects to another tables. +# Implementation of slave stop in middle of the group: +# Delete the table on slave before start of the group +# on master where this table is participant of the group. +# So sql thread will failed inside of the group. +# Expected results: +# 1. For non-transactional engines w/o PK slave should trying +# to complete executing of the group. +# 2. For non-transactional engines slave should stop on +# start position of the group. +############################################################# +--source include/have_innodb.inc +--source include/master-slave.inc +--echo + +# Create tables and data +--echo *** Preparing data *** +--connection master +CREATE TABLE t1 (a INT NOT NULL, b VARCHAR(10)) ENGINE=MyISAM; +CREATE TABLE t2 LIKE t1; +CREATE TABLE t3 LIKE t1; + +DELIMITER |; +CREATE TRIGGER tr1 BEFORE UPDATE ON t1 + FOR EACH ROW BEGIN + UPDATE t2 SET b='YY' WHERE a=NEW.a; + END| +CREATE TRIGGER tr2 AFTER UPDATE ON t1 + FOR EACH ROW BEGIN + UPDATE t3 SET b='ZZ' WHERE a=NEW.a; + END| +DELIMITER ;| +--echo + +# Test non-transactional group with MyISAM tables w/o PK. +# Data for t1,t2 should be replicated for SBR even t3 +# doesn't exist on slave +--echo *** Test non-transactional group w/o PK *** + +--connection master +INSERT INTO t3 VALUES(1, 'AA'); +INSERT INTO t2 VALUES(1, 'AA'); +INSERT INTO t1 VALUES(1, 'AA'); +--sync_slave_with_master + +RENAME TABLE t3 TO t3_bak; + +--connection master +UPDATE t1 SET b = 'XX' WHERE a = 1; +SELECT * FROM t1 ORDER BY a; +SELECT * FROM t2 ORDER BY a; +SELECT * FROM t3 ORDER BY a; + +--connection slave +--source include/wait_for_slave_sql_to_stop.inc +SHOW TABLES LIKE 't%'; +if (`SELECT @@BINLOG_FORMAT = 'ROW'`) { +--replace_regex /AA/AA_for_row_or_XX_for_stmt_mixed/ + SELECT * FROM t1 ORDER BY a; +--replace_regex /AA/AA_for_row_or_YY_for_stmt_mixed/ + SELECT * FROM t2 ORDER BY a; +} +if (!`SELECT @@BINLOG_FORMAT = 'ROW'`) { +--replace_regex /XX/AA_for_row_or_XX_for_stmt_mixed/ + SELECT * FROM t1 ORDER BY a; +--replace_regex /YY/AA_for_row_or_YY_for_stmt_mixed/ + SELECT * FROM t2 ORDER BY a; +} + +STOP SLAVE; +--source include/wait_for_slave_to_stop.inc +RENAME TABLE t3_bak TO t3; +START SLAVE; +--source include/wait_for_slave_to_start.inc + +--connection master +TRUNCATE t1; +TRUNCATE t2; +TRUNCATE t3; +--sync_slave_with_master +--echo + + +# Test non-transactional group with MyISAM tables and PK. +# No data replicated because update based on PK +--echo *** Test non-transactional group w/ PK *** + +--connection master +ALTER TABLE t1 ADD PRIMARY KEY (a); +ALTER TABLE t2 ADD PRIMARY KEY (a); +ALTER TABLE t3 ADD PRIMARY KEY (a); +--sync_slave_with_master +RENAME TABLE t3 TO t3_bak; + +--connection master +INSERT INTO t3 VALUES(2, 'B'); +INSERT INTO t2 VALUES(2, 'B'); +INSERT INTO t1 VALUES(2, 'B'); +UPDATE t1 SET b = 'X' WHERE a = 2; + +--connection slave +--source include/wait_for_slave_sql_to_stop.inc + +--connection master +SELECT * FROM t1 ORDER BY a; +SELECT * FROM t2 ORDER BY a; +SELECT * FROM t3 ORDER BY a; + +--connection slave +SHOW TABLES LIKE 't%'; +SELECT * FROM t1 ORDER BY a; +SELECT * FROM t2 ORDER BY a; + +STOP SLAVE; +--source include/wait_for_slave_to_stop.inc +RENAME TABLE t3_bak TO t3; +START SLAVE; +--source include/wait_for_slave_to_start.inc + +--connection master +TRUNCATE t1; +TRUNCATE t2; +TRUNCATE t3; +--sync_slave_with_master +--echo + + +# Test transactional group with InnoDB tables with PK +# No data replicated if errors happens inside transaction +--echo *** Test transactional group w/ PK *** + +--connection master +ALTER TABLE t1 ENGINE=InnoDB; +ALTER TABLE t2 ENGINE=InnoDB; +ALTER TABLE t3 ENGINE=InnoDB; + +--connection slave +RENAME TABLE t3 TO t3_bak; + +--connection master +BEGIN; +INSERT INTO t1 VALUES (3, 'C'), (4, 'D'); +INSERT INTO t2 VALUES (3, 'C'), (4, 'D'); +INSERT INTO t3 VALUES (3, 'C'), (4, 'D'); +COMMIT; + +--connection slave +--source include/wait_for_slave_sql_to_stop.inc + +--connection master +SELECT * FROM t1 ORDER BY a; +SELECT * FROM t2 ORDER BY a; +SELECT * FROM t3 ORDER BY a; + +--connection slave +SHOW TABLES LIKE 't%'; +SELECT * FROM t1 ORDER BY a; +SELECT * FROM t2 ORDER BY a; + +STOP SLAVE; +--source include/wait_for_slave_to_stop.inc +RENAME TABLE t3_bak TO t3; +START SLAVE; +--source include/wait_for_slave_to_start.inc + +# Clean up +--echo *** Clean up *** +--connection master +DROP TABLE t1,t2,t3; +--sync_slave_with_master + +# End of 5.1 test From 9198608e8aa44eaf6dcab3e9b03ede4192a97e81 Mon Sep 17 00:00:00 2001 From: "skozlov/ksm@mysql.com/virtop.(none)" <> Date: Sun, 20 Apr 2008 22:24:00 +0400 Subject: [PATCH 136/705] Fix for main.events_restart --- mysql-test/include/wait_until_connected_again.inc | 2 +- mysql-test/include/wait_until_disconnected.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/include/wait_until_connected_again.inc b/mysql-test/include/wait_until_connected_again.inc index dc96f646cb3..9879cd5ec9f 100644 --- a/mysql-test/include/wait_until_connected_again.inc +++ b/mysql-test/include/wait_until_connected_again.inc @@ -6,7 +6,7 @@ let $counter= 500; while ($mysql_errno) { - --error 0,2002,2006 + --error 0,1053,2002,2006 show status; dec $counter; diff --git a/mysql-test/include/wait_until_disconnected.inc b/mysql-test/include/wait_until_disconnected.inc index 18a76386e2e..66a09f3c971 100644 --- a/mysql-test/include/wait_until_disconnected.inc +++ b/mysql-test/include/wait_until_disconnected.inc @@ -7,7 +7,7 @@ let $counter= 500; let $mysql_errno= 9999; while (!$mysql_errno) { - --error 0,2002,2006 + --error 0,1053,2002,2006 show status; dec $counter; From 2ba565cde7238705f2ca57f23556501c42ed9b4d Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 21 Apr 2008 14:16:54 +0200 Subject: [PATCH 137/705] Add "kill_server", call shutdown on current conneciton and then make sure the server dissapears Check return code of 'mysql_ping' Add "shutdown", call 'mysql_shutdown' on the current connection --- client/mysqltest.c | 129 +++++++++++++++++- mysql-test/include/restart_mysqld.inc | 13 +- .../include/wait_until_connected_again.inc | 6 +- 3 files changed, 141 insertions(+), 7 deletions(-) diff --git a/client/mysqltest.c b/client/mysqltest.c index 5c79b395246..c61a7591502 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -268,6 +268,7 @@ enum enum_commands { Q_WRITE_FILE, Q_COPY_FILE, Q_PERL, Q_DIE, Q_EXIT, Q_SKIP, Q_CHMOD_FILE, Q_APPEND_FILE, Q_CAT_FILE, Q_DIFF_FILES, Q_SEND_QUIT, Q_CHANGE_USER, Q_MKDIR, Q_RMDIR, + Q_SHUTDOWN, Q_KILL_SERVER, Q_UNKNOWN, /* Unknown command. */ Q_COMMENT, /* Comments, ignored. */ @@ -359,6 +360,8 @@ const char *command_names[]= "change_user", "mkdir", "rmdir", + "shutdown", + "kill_server", 0 }; @@ -3806,6 +3809,120 @@ void do_set_charset(struct st_command *command) } +/* + Run query and return one field in the result set from the + first row and +*/ + +int query_get_string(MYSQL* mysql, const char* query, + int column, DYNAMIC_STRING* ds) +{ + MYSQL_RES *res; + MYSQL_ROW row; + + if (mysql_query(mysql,query) || !(res=mysql_store_result(mysql))) + die("'%s' failed: %d %s", query, + mysql_errno(mysql), mysql_error(mysql)); + if (!(row=mysql_fetch_row(res)) || !row[column]) + { + mysql_free_result(res); + ds= 0; + return 1; + } + init_dynamic_string(ds, row[1], strlen(row[column]), 32); + mysql_free_result(res); + return 0; +} + + +/* + Shutdown the server of current connection and + make sure it goes away within seconds + + NOTE! Currently only works with local server + + SYNOPSIS + do_kill_server() + command called command + + DESCRIPTION + kill_server [] + +*/ + +void do_kill_server(struct st_command *command) +{ + int timeout=60, pid; + DYNAMIC_STRING* ds_pidfile_name; + MYSQL* mysql = &cur_con->mysql; + static DYNAMIC_STRING ds_timeout; + const struct command_arg kill_args[] = { + "timeout", ARG_STRING, FALSE, &ds_timeout, "Timeout before killing server" + }; + DBUG_ENTER("do_kill_server"); + + check_command_args(command, command->first_argument, + kill_args, sizeof(kill_args)/sizeof(struct command_arg), + ' '); + + if (ds_timeout.length) + { + timeout= atoi(ds_timeout.str); + if (timeout == 0) + die("Illegal argument for timeout: '%s'", ds_timeout.str); + } + + /* Get the servers pid_file name and use it to read pid */ + if (query_get_string(mysql, "SHOW VARIABLES LIKE 'pid_file'", 1, + ds_pidfile_name)) + die("Failed to get pid_file from server"); + + /* Read the pid from the file */ + { + int fd; + char buff[32]; + + if ((fd= my_open(ds_pidfile_name->str, O_RDONLY, MYF(0))) < 0) + die("Failed to open file '%s'", ds_pidfile_name->str); + if (my_read(fd, (uchar*)&buff, + sizeof(buff), MYF(0)) <= 0){ + my_close(fd, MYF(0)); + die("pid file was empty"); + } + + pid= atoi(buff); + if (pid == 0){ + my_close(fd, MYF(0)); + die("pid file was empty"); + } + DBUG_PRINT("info", ("Read pid %d from '%s'", pid, ds_pidfile_name->str)); + my_close(fd, MYF(0)); + } + DBUG_PRINT("info", ("Got pid %d", pid)); + + /* Tell server to shutdown */ + if (mysql_shutdown(&cur_con->mysql, SHUTDOWN_DEFAULT)) + die("mysql_shutdown failed"); + + /* Check that server dies */ + while(timeout--){ + if (kill(0, pid) < 0){ + DBUG_PRINT("info", ("Sleeping, timeout: %d", timeout)); + break; + } + DBUG_PRINT("info", ("Sleeping, timeout: %d", timeout)); + my_sleep(1); + } + + /* Kill the server */ + DBUG_PRINT("info", ("Killing server, pid: %d", pid)); + (void)kill(9, pid); + + DBUG_VOID_RETURN; + +} + + #if MYSQL_VERSION_ID >= 50000 /* List of error names to error codes, available from 5.0 */ typedef struct @@ -7192,8 +7309,16 @@ int main(int argc, char **argv) command->last_argument= command->end; break; case Q_PING: - (void) mysql_ping(&cur_con->mysql); - break; + handle_command_error(command, mysql_ping(&cur_con->mysql)); + break; + case Q_SHUTDOWN: + handle_command_error(command, + mysql_shutdown(&cur_con->mysql, + SHUTDOWN_DEFAULT)); + break; + case Q_KILL_SERVER: + do_kill_server(command); + break; case Q_EXEC: do_exec(command); command_executed++; diff --git a/mysql-test/include/restart_mysqld.inc b/mysql-test/include/restart_mysqld.inc index 106563d287d..be1693fd300 100644 --- a/mysql-test/include/restart_mysqld.inc +++ b/mysql-test/include/restart_mysqld.inc @@ -1,11 +1,13 @@ # Write file to make mysql-test-run.pl expect crash and restart ---exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect +--write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect +restart +EOF ---exec $MYSQLADMIN --defaults-file=$MYSQLTEST_VARDIR/my.cnf --shutdown-timeout=60 shutdown +# Send shutdown to the connected server and give +# it 10 seconds to die before zapping it +kill_server 10; -# Call script that will poll the server waiting for it to be gone ---source include/wait_until_disconnected.inc # Turn on reconnect --enable_reconnect @@ -13,3 +15,6 @@ # Call script that will poll the server waiting for it to be back online again --source include/wait_until_connected_again.inc +# Turn off reconnect again +--disable_reconnect + diff --git a/mysql-test/include/wait_until_connected_again.inc b/mysql-test/include/wait_until_connected_again.inc index 9879cd5ec9f..a9cf741fcfe 100644 --- a/mysql-test/include/wait_until_connected_again.inc +++ b/mysql-test/include/wait_until_connected_again.inc @@ -4,9 +4,13 @@ --disable_result_log --disable_query_log let $counter= 500; +let $mysql_errno= 9999; while ($mysql_errno) { - --error 0,1053,2002,2006 + # Strangely enough, the server might return "Too many connections" + # while being shutdown, thus 1040 is an "allowed" error + # See BUG#36228 + --error 0,1040,1053,2002,2006,2013 show status; dec $counter; From 206e1dc63ef2b564f7f2a4e0ab1cfcd7a58ad9fc Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 21 Apr 2008 17:39:13 +0200 Subject: [PATCH 138/705] Rename "shutdown" -> "send_shutdown" and "kill_server" to "shutdown_server" Fix warnings --- client/mysqltest.c | 54 +++++++++++++-------------- mysql-test/include/restart_mysqld.inc | 2 +- mysql-test/mysql-test-run.pl | 22 +++++++++-- 3 files changed, 47 insertions(+), 31 deletions(-) diff --git a/client/mysqltest.c b/client/mysqltest.c index c61a7591502..c0c401c8ec3 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -268,7 +268,7 @@ enum enum_commands { Q_WRITE_FILE, Q_COPY_FILE, Q_PERL, Q_DIE, Q_EXIT, Q_SKIP, Q_CHMOD_FILE, Q_APPEND_FILE, Q_CAT_FILE, Q_DIFF_FILES, Q_SEND_QUIT, Q_CHANGE_USER, Q_MKDIR, Q_RMDIR, - Q_SHUTDOWN, Q_KILL_SERVER, + Q_SEND_SHUTDOWN, Q_SHUTDOWN_SERVER, Q_UNKNOWN, /* Unknown command. */ Q_COMMENT, /* Comments, ignored. */ @@ -360,8 +360,8 @@ const char *command_names[]= "change_user", "mkdir", "rmdir", - "shutdown", - "kill_server", + "send_shutdown", + "shutdown_server", 0 }; @@ -2056,9 +2056,9 @@ void var_set_query_get_value(struct st_command *command, VAR *var) static DYNAMIC_STRING ds_col; static DYNAMIC_STRING ds_row; const struct command_arg query_get_value_args[] = { - "query", ARG_STRING, TRUE, &ds_query, "Query to run", - "column name", ARG_STRING, TRUE, &ds_col, "Name of column", - "row number", ARG_STRING, TRUE, &ds_row, "Number for row" + {"query", ARG_STRING, TRUE, &ds_query, "Query to run"}, + {"column name", ARG_STRING, TRUE, &ds_col, "Name of column"}, + {"row number", ARG_STRING, TRUE, &ds_row, "Number for row"} }; DBUG_ENTER("var_set_query_get_value"); @@ -2821,7 +2821,7 @@ void do_mkdir(struct st_command *command) int error; static DYNAMIC_STRING ds_dirname; const struct command_arg mkdir_args[] = { - "dirname", ARG_STRING, TRUE, &ds_dirname, "Directory to create" + {"dirname", ARG_STRING, TRUE, &ds_dirname, "Directory to create"} }; DBUG_ENTER("do_mkdir"); @@ -2851,7 +2851,7 @@ void do_rmdir(struct st_command *command) int error; static DYNAMIC_STRING ds_dirname; const struct command_arg rmdir_args[] = { - "dirname", ARG_STRING, TRUE, &ds_dirname, "Directory to remove" + {"dirname", ARG_STRING, TRUE, &ds_dirname, "Directory to remove"} }; DBUG_ENTER("do_rmdir"); @@ -3817,7 +3817,7 @@ void do_set_charset(struct st_command *command) int query_get_string(MYSQL* mysql, const char* query, int column, DYNAMIC_STRING* ds) { - MYSQL_RES *res; + MYSQL_RES *res= NULL; MYSQL_ROW row; if (mysql_query(mysql,query) || !(res=mysql_store_result(mysql))) @@ -3842,27 +3842,27 @@ int query_get_string(MYSQL* mysql, const char* query, NOTE! Currently only works with local server SYNOPSIS - do_kill_server() + do_shutdown_server() command called command DESCRIPTION - kill_server [] + shutdown [] */ -void do_kill_server(struct st_command *command) +void do_shutdown_server(struct st_command *command) { int timeout=60, pid; - DYNAMIC_STRING* ds_pidfile_name; + DYNAMIC_STRING ds_pidfile_name; MYSQL* mysql = &cur_con->mysql; static DYNAMIC_STRING ds_timeout; - const struct command_arg kill_args[] = { - "timeout", ARG_STRING, FALSE, &ds_timeout, "Timeout before killing server" + const struct command_arg shutdown_args[] = { + {"timeout", ARG_STRING, FALSE, &ds_timeout, "Timeout before killing server"} }; - DBUG_ENTER("do_kill_server"); + DBUG_ENTER("do_shutdown_server"); - check_command_args(command, command->first_argument, - kill_args, sizeof(kill_args)/sizeof(struct command_arg), + check_command_args(command, command->first_argument, shutdown_args, + sizeof(shutdown_args)/sizeof(struct command_arg), ' '); if (ds_timeout.length) @@ -3874,7 +3874,7 @@ void do_kill_server(struct st_command *command) /* Get the servers pid_file name and use it to read pid */ if (query_get_string(mysql, "SHOW VARIABLES LIKE 'pid_file'", 1, - ds_pidfile_name)) + &ds_pidfile_name)) die("Failed to get pid_file from server"); /* Read the pid from the file */ @@ -3882,8 +3882,8 @@ void do_kill_server(struct st_command *command) int fd; char buff[32]; - if ((fd= my_open(ds_pidfile_name->str, O_RDONLY, MYF(0))) < 0) - die("Failed to open file '%s'", ds_pidfile_name->str); + if ((fd= my_open(ds_pidfile_name.str, O_RDONLY, MYF(0))) < 0) + die("Failed to open file '%s'", ds_pidfile_name.str); if (my_read(fd, (uchar*)&buff, sizeof(buff), MYF(0)) <= 0){ my_close(fd, MYF(0)); @@ -3895,13 +3895,13 @@ void do_kill_server(struct st_command *command) my_close(fd, MYF(0)); die("pid file was empty"); } - DBUG_PRINT("info", ("Read pid %d from '%s'", pid, ds_pidfile_name->str)); + DBUG_PRINT("info", ("Read pid %d from '%s'", pid, ds_pidfile_name.str)); my_close(fd, MYF(0)); } DBUG_PRINT("info", ("Got pid %d", pid)); - /* Tell server to shutdown */ - if (mysql_shutdown(&cur_con->mysql, SHUTDOWN_DEFAULT)) + /* Tell server to shutdown if timeout > 0*/ + if (timeout && mysql_shutdown(&cur_con->mysql, SHUTDOWN_DEFAULT)) die("mysql_shutdown failed"); /* Check that server dies */ @@ -7311,13 +7311,13 @@ int main(int argc, char **argv) case Q_PING: handle_command_error(command, mysql_ping(&cur_con->mysql)); break; - case Q_SHUTDOWN: + case Q_SEND_SHUTDOWN: handle_command_error(command, mysql_shutdown(&cur_con->mysql, SHUTDOWN_DEFAULT)); break; - case Q_KILL_SERVER: - do_kill_server(command); + case Q_SHUTDOWN_SERVER: + do_shutdown_server(command); break; case Q_EXEC: do_exec(command); diff --git a/mysql-test/include/restart_mysqld.inc b/mysql-test/include/restart_mysqld.inc index be1693fd300..049827c7a81 100644 --- a/mysql-test/include/restart_mysqld.inc +++ b/mysql-test/include/restart_mysqld.inc @@ -6,7 +6,7 @@ EOF # Send shutdown to the connected server and give # it 10 seconds to die before zapping it -kill_server 10; +shutdown_server 10; # Turn on reconnect diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 86da2219807..074b585f5bc 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1303,6 +1303,18 @@ sub remove_stale_vardir () { mtr_error("No, don't remove the vardir when running with --extern") if using_extern(); + my $tmpdir= "$opt_vardir/tmp"; + if ( -l $tmpdir) + { + # var/tmp is a symlink + mtr_verbose("Removing " . readlink($tmpdir)); + rmtree(readlink($tmpdir)); + + # Remove the "tmp" symlink + mtr_verbose("unlink($tmpdir)"); + unlink($tmpdir); + } + mtr_verbose("opt_vardir: $opt_vardir"); if ( $opt_vardir eq $default_vardir ) { @@ -1422,8 +1434,12 @@ sub setup_vardir() { mkpath("$opt_vardir/log"); mkpath("$opt_vardir/run"); - mkpath("$opt_vardir/tmp"); - mkpath($opt_tmpdir) if $opt_tmpdir ne "$opt_vardir/tmp"; + + mkpath($opt_tmpdir); + if ($opt_tmpdir ne "$opt_vardir/tmp"){ + mtr_report(" - symlinking 'var/tmp' to '$opt_tmpdir'"); + symlink($opt_tmpdir, "$opt_vardir/tmp"); + } # copy all files from std_data into var/std_data # and make them writable @@ -2701,7 +2717,7 @@ sub after_test_failure ($) { } } - # Remove all files in var/tmp + # Remove all files in the tmpdir rmtree($opt_tmpdir); mkpath($opt_tmpdir); From 761b355d0e32c4b3fc87857fa8a8b936f50467cc Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 21 Apr 2008 18:32:32 +0200 Subject: [PATCH 139/705] Add check for unix socket path truncation Don't allow unix socket path to be truncated --- mysql-test/lib/My/Platform.pm | 40 ++++++++++++++++++++++++++++++++++- mysql-test/mysql-test-run.pl | 21 +++++++++--------- 2 files changed, 49 insertions(+), 12 deletions(-) diff --git a/mysql-test/lib/My/Platform.pm b/mysql-test/lib/My/Platform.pm index 27543d55adf..a70f6bb2359 100644 --- a/mysql-test/lib/My/Platform.pm +++ b/mysql-test/lib/My/Platform.pm @@ -20,7 +20,8 @@ use strict; use base qw(Exporter); our @EXPORT= qw(IS_CYGWIN IS_WINDOWS IS_WIN32PERL - native_path posix_path mixed_path); + native_path posix_path mixed_path + check_socket_path_length); BEGIN { if ($^O eq "cygwin") { @@ -50,6 +51,15 @@ BEGIN { } } +BEGIN { + if (eval "use IO::Socket::UNIX; 1") { + eval 'sub HAVE_UNIX_SOCKET { 1 }'; + } + else { + eval 'sub HAVE_UNIX_SOCKET { 0 }'; + } +} + # # native_path @@ -91,5 +101,33 @@ sub posix_path { } +sub check_socket_path_length { + my ($path)= @_; + my $truncated= 0; + + if (HAVE_UNIX_SOCKET){ + require IO::Socket::UNIX; + + my $sock = new IO::Socket::UNIX + ( + Local => $path, + Listen => 1, + ) or die $!; + if ($path ne $sock->hostpath()){ + # Path was truncated + $truncated= 1; + # Output diagnostic messages + print "path: '$path', length: ", length($path) ,"\n"; + print "hostpath: '", $sock->hostpath(), + "', length: ", length($sock->hostpath()), "\n"; + } + $sock= undef; + unlink($path); + return $truncated; + }; + # All paths OK! + return $truncated; +} + 1; diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 074b585f5bc..ad01c9bdef0 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -606,6 +606,15 @@ sub command_line_setup { $opt_tmpdir= "$opt_vardir/tmp" unless $opt_tmpdir; $opt_tmpdir =~ s,/+$,,; # Remove ending slash if any + # On some operating systems, there is a limit to the length of a + # UNIX domain socket's path far below PATH_MAX. + # Don't allow that to happen + if (check_socket_path_length("$opt_tmpdir/testsocket.sock")){ + mtr_error("Socket path '$opt_tmpdir' too long, it would be ", + "truncated and thus not possible to use for connection to ", + "MySQL Server. Set a shorter with --tmpdir= option"); + } + # -------------------------------------------------------------------------- # fast option # -------------------------------------------------------------------------- @@ -735,17 +744,6 @@ sub command_line_setup { $opt_user= "root"; # We want to do FLUSH xxx commands } - # On QNX, /tmp/dir/master.sock and /tmp/dir//master.sock seem to be - # considered different, so avoid the extra slash (/) in the socket - # paths. - my $sockdir = $opt_tmpdir; - $sockdir =~ s|/+$||; - - # On some operating systems, there is a limit to the length of a - # UNIX domain socket's path far below PATH_MAX, so try to avoid long - # socket path names. - $sockdir = tempdir(CLEANUP => 0) if ( length($sockdir) >= 70 ); - $path_testlog= "$opt_vardir/log/mysqltest.log"; $path_current_testlog= "$opt_vardir/log/current_test"; @@ -1186,6 +1184,7 @@ sub environment_setup { $ENV{'MYSQL_TEST_DIR'}= $glob_mysql_test_dir; $ENV{'MYSQLTEST_VARDIR'}= $opt_vardir; $ENV{'DEFAULT_MASTER_PORT'}= $mysqld_variables{'master-port'} || 3306; + $ENV{'MYSQL_TMP_DIR'}= $opt_tmpdir; # ---------------------------------------------------- # Setup env for NDB From 2d40d52138f8b2e2939d801f22a8cd07133ca365 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 21 Apr 2008 20:43:46 +0200 Subject: [PATCH 140/705] Fix valgrind warnings --- client/mysqltest.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/mysqltest.c b/client/mysqltest.c index c0c401c8ec3..7031145fbc1 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -3871,6 +3871,7 @@ void do_shutdown_server(struct st_command *command) if (timeout == 0) die("Illegal argument for timeout: '%s'", ds_timeout.str); } + dynstr_free(&ds_timeout); /* Get the servers pid_file name and use it to read pid */ if (query_get_string(mysql, "SHOW VARIABLES LIKE 'pid_file'", 1, @@ -3897,6 +3898,8 @@ void do_shutdown_server(struct st_command *command) } DBUG_PRINT("info", ("Read pid %d from '%s'", pid, ds_pidfile_name.str)); my_close(fd, MYF(0)); + + dynstr_free(&ds_pidfile_name); } DBUG_PRINT("info", ("Got pid %d", pid)); From 71e4de876e7fd27731aa28637683a96163fb1c76 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 21 Apr 2008 21:47:33 +0200 Subject: [PATCH 141/705] Temporarily turn on verbose --- mysql-test/mysql-test-run.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index ad01c9bdef0..41a5bda17aa 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -87,7 +87,7 @@ our $opt_vs_config = $ENV{'MTR_VS_CONFIG'}; my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb"; my $opt_suites; -our $opt_verbose= 0; # Verbose output, enable with --verbose +our $opt_verbose= 1; # Verbose output, enable with --verbose our $opt_verbose_restart= 0; # Verbose output for restarts our $exe_mysql; From 5a0ae425c672ec47aea4620e21da82fb69a120b3 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 21 Apr 2008 23:12:28 +0200 Subject: [PATCH 142/705] Move the check for socket path truncation to after the tmpdir has been created since it's used by the check --- mysql-test/mysql-test-run.pl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 41a5bda17aa..0eaafbafb1f 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -606,15 +606,6 @@ sub command_line_setup { $opt_tmpdir= "$opt_vardir/tmp" unless $opt_tmpdir; $opt_tmpdir =~ s,/+$,,; # Remove ending slash if any - # On some operating systems, there is a limit to the length of a - # UNIX domain socket's path far below PATH_MAX. - # Don't allow that to happen - if (check_socket_path_length("$opt_tmpdir/testsocket.sock")){ - mtr_error("Socket path '$opt_tmpdir' too long, it would be ", - "truncated and thus not possible to use for connection to ", - "MySQL Server. Set a shorter with --tmpdir= option"); - } - # -------------------------------------------------------------------------- # fast option # -------------------------------------------------------------------------- @@ -1440,6 +1431,15 @@ sub setup_vardir() { symlink($opt_tmpdir, "$opt_vardir/tmp"); } + # On some operating systems, there is a limit to the length of a + # UNIX domain socket's path far below PATH_MAX. + # Don't allow that to happen + if (check_socket_path_length("$opt_tmpdir/testsocket.sock")){ + mtr_error("Socket path '$opt_tmpdir' too long, it would be ", + "truncated and thus not possible to use for connection to ", + "MySQL Server. Set a shorter with --tmpdir= option"); + } + # copy all files from std_data into var/std_data # and make them writable copytree("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data"); From ceb5e439a6091a47770e1f8afcc591f02bf2f427 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 22 Apr 2008 12:40:48 +0200 Subject: [PATCH 143/705] Improve 'collect_one_suite' so it looks in storage/*/mysql-test-suites by default Also make it possible to specify a path to the suite, for example: ./mtr --suite=/some/path/to/suitedir --- mysql-test/lib/My/Find.pm | 6 ++++++ mysql-test/lib/mtr_cases.pm | 18 ++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/mysql-test/lib/My/Find.pm b/mysql-test/lib/My/Find.pm index b8906dee1ca..1b1b5645dc9 100644 --- a/mysql-test/lib/My/Find.pm +++ b/mysql-test/lib/My/Find.pm @@ -168,6 +168,12 @@ sub my_find_paths { @paths= map { "$base/$_" } @paths; #print "paths: @paths\n"; + # ------------------------------------------------------- + # Glob all paths to expand wildcards + # ------------------------------------------------------- + @paths= map { glob("$_") } @paths; + #print "paths: @paths\n"; + # ------------------------------------------------------- # Return the list of paths # ------------------------------------------------------- diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 52eb84118b7..0f8329f2f31 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -55,6 +55,7 @@ use File::Basename; use IO::File(); use My::Config; use My::Platform; +use My::Find; require "mtr_misc.pl"; @@ -248,11 +249,20 @@ sub collect_one_suite($) my $suitedir= "$::glob_mysql_test_dir"; # Default if ( $suite ne "main" ) { - $suitedir= mtr_path_exists("$suitedir/suite/$suite", - "$suitedir/$suite"); + if ( -d $suite ){ + $suitedir= $suite; + } + else + { + $suitedir= my_find_dir($::basedir, + ["mysql-test/suite", + "mysql-test", + # Look in storage engine specific suite dirs + "storage/*/mysql-test-suites" + ], + [$suite]); + } mtr_verbose("suitedir: $suitedir"); - - } my $testdir= "$suitedir/t"; From fdf1376aec4b9788a705fd3d1d1b1a7e748a00e7 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 22 Apr 2008 12:42:02 +0200 Subject: [PATCH 144/705] Add 'my_kill' - portable version of "kill" Straigthen code to be more explicit --- client/mysqltest.c | 50 +++++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 14 deletions(-) diff --git a/client/mysqltest.c b/client/mysqltest.c index 7031145fbc1..bc00d78c205 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -3820,21 +3820,46 @@ int query_get_string(MYSQL* mysql, const char* query, MYSQL_RES *res= NULL; MYSQL_ROW row; - if (mysql_query(mysql,query) || !(res=mysql_store_result(mysql))) + if (mysql_query(mysql, query)) die("'%s' failed: %d %s", query, mysql_errno(mysql), mysql_error(mysql)); - if (!(row=mysql_fetch_row(res)) || !row[column]) + if ((res= mysql_store_result(mysql)) == NULL) + die("Failed to store result: %d %s", + mysql_errno(mysql), mysql_error(mysql)); + + if ((row= mysql_fetch_row(res)) == NULL) { mysql_free_result(res); ds= 0; return 1; } - init_dynamic_string(ds, row[1], strlen(row[column]), 32); + init_dynamic_string(ds, (row[column] ? row[column] : "NULL"), ~0, 32); mysql_free_result(res); return 0; } +static int my_kill(int pid, int sig) +{ +#ifdef __WIN__ + HANDLE proc; + if ((proc= OpenProcess(PROCESS_TERMINATE, FALSE, pid)) == NULL) + return -1; + if (sig == 0) + { + CloseHandle(proc); + return 0; + } + (void)TerminateProcess(proc, 201); + CloseHandle(proc); + return 1; +#else + return kill(pid, sig); +#endif +} + + + /* Shutdown the server of current connection and make sure it goes away within seconds @@ -3885,31 +3910,28 @@ void do_shutdown_server(struct st_command *command) if ((fd= my_open(ds_pidfile_name.str, O_RDONLY, MYF(0))) < 0) die("Failed to open file '%s'", ds_pidfile_name.str); + dynstr_free(&ds_pidfile_name); + if (my_read(fd, (uchar*)&buff, sizeof(buff), MYF(0)) <= 0){ my_close(fd, MYF(0)); die("pid file was empty"); } - - pid= atoi(buff); - if (pid == 0){ - my_close(fd, MYF(0)); - die("pid file was empty"); - } - DBUG_PRINT("info", ("Read pid %d from '%s'", pid, ds_pidfile_name.str)); my_close(fd, MYF(0)); - dynstr_free(&ds_pidfile_name); + pid= atoi(buff); + if (pid == 0) + die("Pidfile didn't contain a valid number"); } DBUG_PRINT("info", ("Got pid %d", pid)); /* Tell server to shutdown if timeout > 0*/ - if (timeout && mysql_shutdown(&cur_con->mysql, SHUTDOWN_DEFAULT)) + if (timeout && mysql_shutdown(mysql, SHUTDOWN_DEFAULT)) die("mysql_shutdown failed"); /* Check that server dies */ while(timeout--){ - if (kill(0, pid) < 0){ + if (my_kill(0, pid) < 0){ DBUG_PRINT("info", ("Sleeping, timeout: %d", timeout)); break; } @@ -3919,7 +3941,7 @@ void do_shutdown_server(struct st_command *command) /* Kill the server */ DBUG_PRINT("info", ("Killing server, pid: %d", pid)); - (void)kill(9, pid); + (void)my_kill(9, pid); DBUG_VOID_RETURN; From 23f462137eb84de6335c0cbd6caccbfcb82a0520 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 22 Apr 2008 12:43:38 +0200 Subject: [PATCH 145/705] Since IO::Socket::UNIX is part of core perl, it's not enough to "eval use" it. Instead trap the error that occurs when creating the socket on platforms that does not support it. --- mysql-test/lib/My/Platform.pm | 49 ++++++++++++++--------------------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/mysql-test/lib/My/Platform.pm b/mysql-test/lib/My/Platform.pm index a70f6bb2359..bcd2401423d 100644 --- a/mysql-test/lib/My/Platform.pm +++ b/mysql-test/lib/My/Platform.pm @@ -51,15 +51,6 @@ BEGIN { } } -BEGIN { - if (eval "use IO::Socket::UNIX; 1") { - eval 'sub HAVE_UNIX_SOCKET { 1 }'; - } - else { - eval 'sub HAVE_UNIX_SOCKET { 0 }'; - } -} - # # native_path @@ -105,27 +96,27 @@ sub check_socket_path_length { my ($path)= @_; my $truncated= 0; - if (HAVE_UNIX_SOCKET){ - require IO::Socket::UNIX; + require IO::Socket::UNIX; - my $sock = new IO::Socket::UNIX - ( - Local => $path, - Listen => 1, - ) or die $!; - if ($path ne $sock->hostpath()){ - # Path was truncated - $truncated= 1; - # Output diagnostic messages - print "path: '$path', length: ", length($path) ,"\n"; - print "hostpath: '", $sock->hostpath(), - "', length: ", length($sock->hostpath()), "\n"; - } - $sock= undef; - unlink($path); - return $truncated; - }; - # All paths OK! + my $sock = new IO::Socket::UNIX + ( + Local => $path, + Listen => 1, + ); + if (!defined $sock){ + # Could not create a UNIX domain socket + return 0; # Ok, will not be used by mysqld either + } + if ($path ne $sock->hostpath()){ + # Path was truncated + $truncated= 1; + # Output diagnostic messages + print "path: '$path', length: ", length($path) ,"\n"; + print "hostpath: '", $sock->hostpath(), + "', length: ", length($sock->hostpath()), "\n"; + } + $sock= undef; # Close socket + unlink($path); # Remove the physical file return $truncated; } From d90d89dc67361c397e42cddc6c59fb19c873bebf Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 22 Apr 2008 12:54:51 +0200 Subject: [PATCH 146/705] Fix warnings for 64 bit windows --- mysys/my_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysys/my_init.c b/mysys/my_init.c index b5308387d03..9965f1a13a5 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -371,8 +371,8 @@ static void my_win_init(void) DWORD index= 0; DWORD type; char key_name[256], key_data[1024]; - size_t key_name_len= sizeof(key_name) - 1; - size_t key_data_len= sizeof(key_data) - 1; + DWORD key_name_len= sizeof(key_name) - 1; + DWORD key_data_len= sizeof(key_data) - 1; while ((ret= RegEnumValue(key_handle, index++, key_name, &key_name_len, From 113dd00d4271bb2b141ce5c1feae41b0f12383a2 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 22 Apr 2008 21:55:09 +0200 Subject: [PATCH 147/705] Always return 0 inidcating that socket path would not be truncated when running on windows. Apparently Cygwin tries to emulate UNIX Socket and thus fails to create one. --- mysql-test/lib/My/Platform.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql-test/lib/My/Platform.pm b/mysql-test/lib/My/Platform.pm index bcd2401423d..b934b08f522 100644 --- a/mysql-test/lib/My/Platform.pm +++ b/mysql-test/lib/My/Platform.pm @@ -96,6 +96,8 @@ sub check_socket_path_length { my ($path)= @_; my $truncated= 0; + return 0 if IS_WINDOWS; + require IO::Socket::UNIX; my $sock = new IO::Socket::UNIX From ea839ba05425f169b751b10037369ec8424d4488 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Tue, 22 Apr 2008 22:01:37 +0200 Subject: [PATCH 148/705] Set verbose back to 0 by default --- mysql-test/mysql-test-run.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 0eaafbafb1f..cf23d63ee13 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -87,7 +87,7 @@ our $opt_vs_config = $ENV{'MTR_VS_CONFIG'}; my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb"; my $opt_suites; -our $opt_verbose= 1; # Verbose output, enable with --verbose +our $opt_verbose= 0; # Verbose output, enable with --verbose our $opt_verbose_restart= 0; # Verbose output for restarts our $exe_mysql; From 3f9adfb812293f26f49f3e5881231295d7051ce4 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 23 Apr 2008 12:59:37 +0200 Subject: [PATCH 149/705] Don't symlink var/tmp to $opt_tmpdir Just treat var/tmp and $opt_tmndir that might be different or same. --- mysql-test/mysql-test-run.pl | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index cf23d63ee13..ba776a781b4 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1293,18 +1293,6 @@ sub remove_stale_vardir () { mtr_error("No, don't remove the vardir when running with --extern") if using_extern(); - my $tmpdir= "$opt_vardir/tmp"; - if ( -l $tmpdir) - { - # var/tmp is a symlink - mtr_verbose("Removing " . readlink($tmpdir)); - rmtree(readlink($tmpdir)); - - # Remove the "tmp" symlink - mtr_verbose("unlink($tmpdir)"); - unlink($tmpdir); - } - mtr_verbose("opt_vardir: $opt_vardir"); if ( $opt_vardir eq $default_vardir ) { @@ -1425,11 +1413,9 @@ sub setup_vardir() { mkpath("$opt_vardir/log"); mkpath("$opt_vardir/run"); - mkpath($opt_tmpdir); - if ($opt_tmpdir ne "$opt_vardir/tmp"){ - mtr_report(" - symlinking 'var/tmp' to '$opt_tmpdir'"); - symlink($opt_tmpdir, "$opt_vardir/tmp"); - } + # Create var/tmp and tmp - they might be different + mkpath("$opt_vardir/tmp"); + mkpath($opt_tmpdir) if ($opt_tmpdir ne "$opt_vardir/tmp"); # On some operating systems, there is a limit to the length of a # UNIX domain socket's path far below PATH_MAX. @@ -2716,10 +2702,13 @@ sub after_test_failure ($) { } } - # Remove all files in the tmpdir - rmtree($opt_tmpdir); - mkpath($opt_tmpdir); - + # Remove all files in tmp and var/tmp + rmtree("$opt_vardir/tmp"); + mkpath("$opt_vardir/tmp"); + if ($opt_tmpdir ne "$opt_vardir/tmp"){ + rmtree($opt_tmpdir); + mkpath($opt_tmpdir); + } } From ba900fe30252bd7568a589036205581c0a2b5a91 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 24 Apr 2008 13:02:53 +0200 Subject: [PATCH 150/705] Add support for running in parallel --- mysql-test/lib/My/Options.pm | 3 + mysql-test/lib/My/SafeProcess.pm | 6 +- mysql-test/lib/My/Test.pm | 122 +++++++ mysql-test/lib/mtr_cases.pm | 103 ++---- mysql-test/lib/mtr_report.pm | 126 ++++++- mysql-test/mysql-test-run.pl | 576 ++++++++++++++++++++++--------- 6 files changed, 678 insertions(+), 258 deletions(-) create mode 100644 mysql-test/lib/My/Test.pm diff --git a/mysql-test/lib/My/Options.pm b/mysql-test/lib/My/Options.pm index f0fc4ba75b5..40f05c41d1c 100644 --- a/mysql-test/lib/My/Options.pm +++ b/mysql-test/lib/My/Options.pm @@ -61,6 +61,9 @@ sub _split_option { elsif ($option=~ /^--(.*)$/){ return ($1, undef) } + elsif ($option=~ /^\$(.*)$/){ # $VAR + return ($1, undef) + } elsif ($option=~ /^(.*)=(.*)$/){ return ($1, $2) } diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index 4d703d73b9a..eccc0fcdeed 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -65,7 +65,7 @@ END { # Kill any children still running for my $proc (values %running){ if ( $proc->is_child($$) ){ - print "Killing: $proc\n"; + #print "Killing: $proc\n"; $proc->kill(); } } @@ -461,8 +461,8 @@ sub wait_one { return 1; } - warn "wait_one: expected pid $pid but got $retpid" - unless( $retpid == $pid ); + #warn "wait_one: expected pid $pid but got $retpid" + # unless( $retpid == $pid ); $self->_collect(); return 0; diff --git a/mysql-test/lib/My/Test.pm b/mysql-test/lib/My/Test.pm new file mode 100644 index 00000000000..890ae76b282 --- /dev/null +++ b/mysql-test/lib/My/Test.pm @@ -0,0 +1,122 @@ +# -*- cperl -*- + + +# +# One test +# +package My::Test; + +use strict; +use warnings; +use Carp; + + +sub new { + my $class= shift; + my $self= bless { + @_, + }, $class; + return $self; +} + + +# +# Return a unique key that can be used to +# identify this test in a hash +# +sub key { + my ($self)= @_; + my $key= $self->{name}; + $key.= "+".$self->{combination} if $self->{combination}; + return $key; +} + + +sub _encode { + my ($value)= @_; + $value =~ s/([|\\\x{0a}\x{0d}])/sprintf('\%02X', ord($1))/eg; + return $value; +} + +sub _decode { + my ($value)= @_; + $value =~ s/\\([0-9a-fA-F]{2})/chr(hex($1))/ge; + return $value; +} + +sub is_failed { + my ($self)= @_; + my $result= $self->{result}; + croak "'is_failed' can't be called until test has been run!" + unless defined $result; + + return ($result eq 'MTR_RES_FAILED'); +} + + +sub write_test { + my ($test, $sock, $header)= @_; + + print $sock $header, "\n"; + while ((my ($key, $value)) = each(%$test)) { + print $sock $key, "= "; + if (ref $value eq "ARRAY") { + print $sock "[", _encode(join(", ", @$value)), "]"; + } else { + print $sock _encode($value); + } + print $sock "\n"; + } + print $sock "\n"; +} + + +sub read_test { + my ($sock)= @_; + my $test= My::Test->new(); + # Read the : separated key value pairs until a + # single newline on it's own line + my $line; + while (defined($line= <$sock>)) { + # List is terminated by newline on it's own + if ($line eq "\n") { + # Correctly terminated reply + # print "Got newline\n"; + last; + } + chomp($line); + + # Split key/value on the first "=" + my ($key, $value)= split("= ", $line, 2); + + if ($value =~ /^\[(.*)\]/){ + my @values= split(", ", _decode($1)); + push(@{$test->{$key}}, @values); + } + else + { + $test->{$key}= _decode($value); + } + } + return $test; +} + + +sub print_test { + my ($self)= @_; + + print "[", $self->{name}, "]", "\n"; + while ((my ($key, $value)) = each(%$self)) { + print " ", $key, "= "; + if (ref $value eq "ARRAY") { + print "[", join(", ", @$value), "]"; + } else { + print $value; + } + print "\n"; + } + print "\n"; +} + + +1; diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 0f8329f2f31..4e10066c176 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -40,7 +40,7 @@ our $default_storage_engine; our $opt_with_ndbcluster_only; our $defaults_file; our $defaults_extra_file; -our $reorder; +our $reorder= 1; sub collect_option { my ($opt, $value)= @_; @@ -55,6 +55,7 @@ use File::Basename; use IO::File(); use My::Config; use My::Platform; +use My::Test; use My::Find; require "mtr_misc.pl"; @@ -135,52 +136,16 @@ sub collect_test_cases ($$) { { my @criteria = (); - # Look for tests that must be run in a defined order - that is - # defined by test having the same name except for the ending digit + # + # Append the criteria for sorting, in order of importance. + # + push(@criteria, "ndb=" . ($tinfo->{'ndb_test'} ? "A" : "B")); + # Group test with equal options together. + # Ending with "~" makes empty sort later than filled + my $opts= $tinfo->{'master_opt'} ? $tinfo->{'master_opt'} : []; + push(@criteria, join("!", sort @{$opts}) . "~"); - # Put variables into hash - my $test_name= $tinfo->{'name'}; - my $depend_on_test_name; - if ( $test_name =~ /^([\D]+)([0-9]{1})$/ ) - { - my $base_name= $1; - my $idx= $2; - mtr_verbose("$test_name => $base_name idx=$idx"); - if ( $idx > 1 ) - { - $idx-= 1; - $base_name= "$base_name$idx"; - mtr_verbose("New basename $base_name"); - } - - foreach my $tinfo2 (@$cases) - { - if ( $tinfo2->{'name'} eq $base_name ) - { - mtr_verbose("found dependent test $tinfo2->{'name'}"); - $depend_on_test_name=$base_name; - } - } - } - - if ( defined $depend_on_test_name ) - { - mtr_verbose("Giving $test_name same critera as $depend_on_test_name"); - $sort_criteria{$test_name} = $sort_criteria{$depend_on_test_name}; - } - else - { - # - # Append the criteria for sorting, in order of importance. - # - push(@criteria, "ndb=" . ($tinfo->{'ndb_test'} ? "1" : "0")); - # Group test with equal options together. - # Ending with "~" makes empty sort later than filled - my $opts= $tinfo->{'master_opt'} ? $tinfo->{'master_opt'} : []; - push(@criteria, join("!", sort @{$opts}) . "~"); - - $sort_criteria{$test_name} = join(" ", @criteria); - } + $sort_criteria{$tinfo->{name}} = join(" ", @criteria); } @$cases = sort { @@ -454,7 +419,7 @@ sub collect_one_suite($) } # Copy test options - my $new_test= {}; + my $new_test= My::Test->new(); while (my ($key, $value) = each(%$test)) { if (ref $value eq "ARRAY") { push(@{$new_test->{$key}}, @$value); @@ -682,13 +647,16 @@ sub collect_one_test_case { # ---------------------------------------------------------------------- # Set defaults # ---------------------------------------------------------------------- - my $tinfo= {}; - $tinfo->{'name'}= $suitename . ".$tname"; - $tinfo->{'path'}= "$testdir/$filename"; + my $tinfo= My::Test->new + ( + name => "$suitename.$tname", + path => "$testdir/$filename", - # TODO allow nonexistsing result file - # in that case .test must issue "exit" otherwise test should fail by default - $tinfo->{'result_file'}= "$resdir/$tname.result"; + # TODO allow nonexistsing result file + # in that case .test must issue "exit" otherwise test + # should fail by default + result_file => "$resdir/$tname.result", + ); # ---------------------------------------------------------------------- # Skip some tests but include in list, just mark them as skipped @@ -1034,19 +1002,6 @@ sub unspace { } - -sub envsubst { - my $string= shift; - - if ( ! defined $ENV{$string} ) - { - mtr_error(".opt file references '$string' which is not set"); - } - - return $ENV{$string}; -} - - sub opts_from_file ($) { my $file= shift; @@ -1083,10 +1038,6 @@ sub opts_from_file ($) { or $arg =~ s/^([^\'\"]*)\"(.*)\"([^\'\"]*)$/$1$2$3/; $arg =~ s/\\\\/\\/g; - # Expand environment variables - $arg =~ s/\$\{(\w+)\}/envsubst($1)/ge; - $arg =~ s/\$(\w+)/envsubst($1)/ge; - # Do not pass empty string since my_getopt is not capable to handle it. if (length($arg)) { push(@args, $arg); @@ -1102,17 +1053,7 @@ sub print_testcases { print "=" x 60, "\n"; foreach my $test (@cases){ - print "[", $test->{name}, "]", "\n"; - while ((my ($key, $value)) = each(%$test)) { - print " ", $key, "= "; - if (ref $value eq "ARRAY") { - print "[", join(", ", @$value), "]"; - } else { - print $value; - } - print "\n"; - } - print "\n"; + $test->print_test(); } print "=" x 60, "\n"; } diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index a3c0f26c8fd..f749168c64a 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -27,7 +27,7 @@ our @EXPORT= qw(report_option mtr_print_line mtr_print_thick_line mtr_warning mtr_error mtr_debug mtr_verbose mtr_verbose_restart mtr_report_test_passed mtr_report_test_failed mtr_report_test_skipped - mtr_report_stats); + mtr_report_stats mtr_report_test); use mtr_match; require "mtr_io.pl"; @@ -35,6 +35,10 @@ require "mtr_io.pl"; my $tot_real_time= 0; our $timestamp= 0; +our $name; +our $verbose; +our $verbose_restart= 0; + sub report_option { my ($opt, $value)= @_; @@ -43,6 +47,8 @@ sub report_option { $opt =~ s/-/_/; no strict 'refs'; ${$opt}= $value; + + #print $name, " setting $opt to ", (defined $value? $value : "undef") ,"\n"; } sub SHOW_SUITE_NAME() { return 1; }; @@ -51,6 +57,8 @@ sub _mtr_report_test_name ($) { my $tinfo= shift; my $tname= $tinfo->{name}; + return unless defined $verbose; + # Remove suite part of name $tname =~ s/.*\.// unless SHOW_SUITE_NAME; @@ -58,7 +66,7 @@ sub _mtr_report_test_name ($) { $tname.= " '$tinfo->{combination}'" if defined $tinfo->{combination}; - print _timestamp(); + print $name, _timestamp(); printf "%-30s ", $tname; } @@ -100,12 +108,19 @@ sub mtr_report_test_passed ($$) { $timer= mtr_fromfile("$::opt_vardir/log/timer"); $tot_real_time += ($timer/1000); $timer= sprintf "%12s", $timer; + $tinfo->{timer}= $timer; } # Set as passed unless already set if ( not defined $tinfo->{'result'} ){ $tinfo->{'result'}= 'MTR_RES_PASSED'; } mtr_report("[ pass ] $timer"); + + # Show any problems check-testcase found + if ( defined $tinfo->{'check'} ) + { + mtr_report($tinfo->{'check'}); + } } @@ -143,9 +158,7 @@ sub mtr_report_test_failed ($$) { { # Test failure was detected by test tool and its report # about what failed has been saved to file. Display the report. - print "\n"; - mtr_printfile($logfile); - print "\n"; + $tinfo->{logfile}= mtr_fromfile($logfile); } else { @@ -156,6 +169,83 @@ sub mtr_report_test_failed ($$) { } +sub mtr_report_test ($) { + my ($tinfo)= @_; + _mtr_report_test_name($tinfo); + + if ($tinfo->{'result'} eq 'MTR_RES_FAILED'){ + + #my $test_failures= $tinfo->{'failures'} || 0; + #$tinfo->{'failures'}= $test_failures + 1; + if ( defined $tinfo->{'warnings'} ) + { + mtr_report("[ fail ] Found warnings in server log file!"); + mtr_report($tinfo->{'warnings'}); + return; + } + if ( defined $tinfo->{'timeout'} ) + { + mtr_report("[ fail ] timeout"); + return; + } + else + { + mtr_report("[ fail ]"); + } + + if ( $tinfo->{'comment'} ) + { + # The test failure has been detected by mysql-test-run.pl + # when starting the servers or due to other error, the reason for + # failing the test is saved in "comment" + mtr_report("\nERROR: $tinfo->{'comment'}"); + } + elsif ( $tinfo->{logfile} ) + { + # Test failure was detected by test tool and its report + # about what failed has been saved to file. Display the report. + mtr_report("\n"); + mtr_report($tinfo->{logfile}, "\n"); + + } + else + { + # Neither this script or the test tool has recorded info + # about why the test has failed. Should be debugged. + mtr_report("\nUnexpected termination, probably when starting mysqld");; + } + } + elsif ($tinfo->{'result'} eq 'MTR_RES_SKIPPED') + { + if ( $tinfo->{'disable'} ) + { + mtr_report("[ disabled ] $tinfo->{'comment'}"); + } + elsif ( $tinfo->{'comment'} ) + { + if ( $tinfo->{skip_detected_by_test} ) + { + mtr_report("[ skip ]. $tinfo->{'comment'}"); + } + else + { + mtr_report("[ skip ] $tinfo->{'comment'}"); + } + } + else + { + mtr_report("[ skip ]"); + } + } + elsif ($tinfo->{'result'} eq 'MTR_RES_PASSED') + { + my $timer= $tinfo->{timer} || ""; + mtr_report("[ pass ] $timer"); + } + +} + + sub mtr_report_stats ($) { my $tests= shift; @@ -342,35 +432,42 @@ sub _timestamp { # Print message to screen sub mtr_report (@) { - print join(" ", @_), "\n"; + if (defined $verbose) + { + print join(" ", @_), "\n"; + } } # Print warning to screen sub mtr_warning (@) { - print STDERR _timestamp(), "mysql-test-run: WARNING: ", join(" ", @_), "\n"; + print STDERR $name, _timestamp(), + "mysql-test-run: WARNING: ", join(" ", @_), "\n"; } # Print error to screen and then exit sub mtr_error (@) { - print STDERR _timestamp(), "mysql-test-run: *** ERROR: ", join(" ", @_), "\n"; + print STDERR $name, _timestamp(), + "mysql-test-run: *** ERROR: ", join(" ", @_), "\n"; exit(1); } sub mtr_debug (@) { - if ( $::opt_verbose > 1 ) + if ( $verbose > 2 ) { - print STDERR _timestamp(), "####: ", join(" ", @_), "\n"; + print STDERR $name, + _timestamp(), "####: ", join(" ", @_), "\n"; } } sub mtr_verbose (@) { - if ( $::opt_verbose ) + if ( $verbose ) { - print STDERR _timestamp(), "> ",join(" ", @_),"\n"; + print STDERR $name, _timestamp(), + "> ",join(" ", @_),"\n"; } } @@ -378,9 +475,10 @@ sub mtr_verbose (@) { sub mtr_verbose_restart (@) { my ($server, @args)= @_; my $proc= $server->{proc}; - if ( $::opt_verbose_restart ) + if ( $verbose_restart ) { - print STDERR _timestamp(), "> Restart $proc - ",join(" ", @args),"\n"; + print STDERR $name,_timestamp(), + "> Restart $proc - ",join(" ", @args),"\n"; } } diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index cf23d63ee13..3b252b9dde3 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -51,6 +51,8 @@ use My::Find; use mtr_cases; use mtr_report; use mtr_match; +use IO::Socket::INET; +use IO::Select; require "lib/mtr_process.pl"; require "lib/mtr_io.pl"; @@ -88,7 +90,6 @@ my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb"; my $opt_suites; our $opt_verbose= 0; # Verbose output, enable with --verbose -our $opt_verbose_restart= 0; # Verbose output for restarts our $exe_mysql; our $exe_mysqladmin; @@ -141,7 +142,7 @@ my $config; # The currently running config my $current_config_name; # The currently running config file template my $opt_baseport; -my $opt_mtr_build_thread= $ENV{'MTR_BUILD_THREAD'} || "auto"; +my $opt_build_thread= $ENV{'MTR_BUILD_THREAD'} || "auto"; my $opt_record; my $opt_report_features; @@ -161,6 +162,8 @@ my $opt_repeat= 1; my $opt_retry= 3; my $opt_retry_failure= 2; +my $opt_parallel= 1; + my $opt_strace_client; our $opt_timer= 1; @@ -203,25 +206,46 @@ main(); sub main { - command_line_setup(); + # This is needed for test log evaluation in "gen-build-status-page" + # in all cases where the calling tool does not log the commands + # directly before it executes them, like "make test-force-pl" in RPM builds. + mtr_report("Logging: $0 ", join(" ", @ARGV)); - mtr_report("Checking supported features..."); + Getopt::Long::Configure("pass_through"); + GetOptions('parallel=i' => \$opt_parallel) or usage("Can't read options"); - check_ndbcluster_support(\%mysqld_variables); - check_ssl_support(\%mysqld_variables); - check_debug_support(\%mysqld_variables); + # Create server socket on any free port + my $server = new IO::Socket::INET + ( + LocalAddr => 'localhost', + Proto => 'tcp', + Listen => $opt_parallel, + ); + mtr_error("Could not create testcase server port: $!") unless $server; + my $server_port = $server->sockport(); + mtr_report("Using server port $server_port"); - executable_setup(); + # Create child processes + my %children; + for my $child_num (1..$opt_parallel){ + my $child_pid= My::SafeProcess::Base::_safe_fork(); + if ($child_pid == 0){ + $server= undef; # Close the server port in child + run_worker($server_port, $child_num); + exit(1); + } - environment_setup(); + mtr_report("Started worker, pid: $child_pid"); + $children{$child_pid}= 1; + } - if ( $opt_gcov ) - { + command_line_setup(0); + + if ( $opt_gcov ) { gcov_prepare(); } - if (!$opt_suites) - { + if (!$opt_suites) { $opt_suites= $DEFAULT_SUITES; # Check for any extra suites to enable based on the path name @@ -235,10 +259,9 @@ sub main { "mysql-6.0-ndb" => "ndb_team", ); - foreach my $dir ( reverse splitdir($basedir) ) - { + foreach my $dir ( reverse splitdir($basedir) ) { my $extra_suite= $extra_suites{$dir}; - if (defined $extra_suite){ + if (defined $extra_suite) { mtr_report("Found extra suite: $extra_suite"); $opt_suites= "$extra_suite,$opt_suites"; last; @@ -249,26 +272,289 @@ sub main { mtr_report("Collecting tests..."); my $tests= collect_test_cases($opt_suites, \@opt_cases); - initialize_servers(); - if ( $opt_report_features ) { # Put "report features" as the first test to run - my $tinfo = {}; - $tinfo->{'name'} = 'report_features'; - $tinfo->{'result_file'} = undef; # Prints result - $tinfo->{'path'} = 'include/report-features.test'; - $tinfo->{'master_opt'} = []; - $tinfo->{'slave_opt'} = []; + my $tinfo = My::Test->new + ( + name => 'report_features', + result_file => undef, # Prints result + path => 'include/report-features.test'. + master_opt => [], + slave_opt => [], + ); unshift(@$tests, $tinfo); } + initialize_servers(); + + mtr_report(); + mtr_print_thick_line(); + mtr_print_header(); + + my $completed= run_test_server($server, $tests, $opt_parallel); + + # Send Ctrl-C to any children still running + kill("INT", keys(%children)); + + # Wait for childs to exit + foreach my $pid (keys %children) + { + my $ret_pid= waitpid($pid, 0); + if ($ret_pid != $pid){ + mtr_report("Unknown process $ret_pid exited"); + } + else { + delete $children{$ret_pid}; + } + } + + mtr_verbose("Server exit\n"); + + mtr_print_line(); + + mtr_report_stats($completed); + + exit(0); +} + + +sub run_test_server { + my ($server, $tests, $childs) = @_; + + # Scheduler variables + my $max_ndb= $opt_parallel / 2; + $max_ndb = 4 if $max_ndb > 4; + $max_ndb = 1 if $max_ndb < 1; + my $num_ndb_tests= 0; + + my $completed= []; + my %running; + my $result; + + my $s= IO::Select->new(); + $s->add($server); + while (1) { + my @ready = $s->can_read(1); # Wake up once every second + foreach my $sock (@ready) { + if ($sock == $server) { + # New client connected + my $child= $sock->accept(); + mtr_verbose("Client connected"); + $s->add($child); + print $child "HELLO\n"; + } + else { + my $line= <$sock>; + if (!defined $line) { + # Client disconnected + mtr_verbose("Child closed socket"); + $s->remove($sock); + if (--$childs == 0){ + return $completed; + } + next; + } + chomp($line); + + if ($line eq 'TESTRESULT'){ + $result= My::Test::read_test($sock); + # $result->print_test(); + + # Report test status + mtr_report_test($result); + + if ($result->is_failed() and !$opt_force){ + # Test has failed, force is off + push(@$completed, $result); + return $completed; + } + + # Retry test run after test failure + my $retries= $result->{retries} || 1; + my $test_has_failed= $result->{failures} || 0; + if ($test_has_failed and $retries < $opt_retry){ + # Test should be run one more time unless it has failed + # too many times already + my $failures= $result->{failures}; + if ($opt_retry > 1 and $failures >= $opt_retry_failure){ + mtr_report("Test has failed $failures times,", + "no more retries!\n"); + } + else { + mtr_report("\nRetrying test, attempt($retries/$opt_retry)...\n"); + $result->{retries}= $retries+1; + $result->write_test($sock, 'TESTCASE'); + next; + } + } + + # Repeat test $opt_repeat number of times + my $repeat= $result->{repeat} || 1; + if ($repeat < $opt_repeat) + { + $result->{retries}= 0; + $result->{failures}= 0; + + $result->{repeat}= $repeat+1; + $result->write_test($sock, 'TESTCASE'); + next; + } + + # Remove from list of running + mtr_error("'", $result->{name},"' is not known to be running") + unless delete $running{$result->key()}; + + # Update scheduler variables + $num_ndb_tests-- if ($result->{ndb_test}); + + # Save result in completed list + push(@$completed, $result); + + } + elsif ($line eq 'START'){ + ; # Send first test + } + else { + mtr_error("Unknown response: '$line' from client"); + } + + # Find next test to schedule + # - Try to use same configuration as worker used last time + # - Limit number of parallel ndb tests + + my $next; + my $second_best; + for(my $i= 0; $i <= $#$tests; $i++) + { + my $t= $tests->[$i]; + + if (run_testcase_check_skip_test($t)){ + # Move the test to completed list + #mtr_report("skip - Moving test $i to completed"); + push(@$completed, splice(@$tests, $i, 1)); + redo; # Start over again + } + + # Limit number of parallell NDB tests + if ($t->{ndb_test} and $num_ndb_tests >= $max_ndb){ + #mtr_report("Skipping, num ndb is already at max, $num_ndb_tests"); + next; + } + + # Prefer same configuration + if (defined $result and + $result->{template_path} eq $t->{template_path}) + { + #mtr_report("Test uses same config => good match"); + # Test uses same config => good match + $next= splice(@$tests, $i, 1); + last; + } + + # Second best choice is the first that does not fulfill + # any of the above conditions + if (!defined $second_best){ + #mtr_report("Setting second_best to $i"); + $second_best= $i; + } + } + + # Use second best choice if no other test has been found + if (!$next and defined $second_best){ + #mtr_report("Take second best choice $second_best"); + mtr_error("Internal error, second best too large") + if $second_best > $#$tests; + $next= splice(@$tests, $second_best, 1); + } + + if ($next) { + #$next->print_test(); + $next->write_test($sock, 'TESTCASE'); + $running{$next->key()}= $next; + $num_ndb_tests++ if ($next->{ndb_test}); + } + else { + # No more test, tell child to exit + #mtr_report("Saying BYE to child"); + print $sock "BYE\n"; + } + } + } + } +} + + +sub run_worker ($) { + my ($server_port, $thread_num)= @_; + + $SIG{INT}= sub { exit(1); }; + + report_option('name',"worker[$thread_num]"); + + # Connect to server + my $server = new IO::Socket::INET + ( + PeerAddr => 'localhost', + PeerPort => $server_port, + Proto => 'tcp' + ); + mtr_error("Could not connect to server at port $server_port: $!") + unless $server; + + # Read hello from server which it will send when shared + # resources have been setup + my $hello= <$server>; + + command_line_setup($thread_num); + + if ( $opt_gcov ) + { + gcov_prepare(); + } + + setup_vardir(); + mysql_install_db($thread_num); + if ( using_extern() ) { create_config_file_for_extern(%opts_extern); } - run_tests($tests); + # Ask server for first test + print $server "START\n"; - exit(0); + while(my $line= <$server>){ + chomp($line); + if ($line eq 'TESTCASE'){ + my $test= My::Test::read_test($server); + #$test->print_test(); + run_testcase($test); + #$test->{result}= 'MTR_RES_PASSED'; + # Send it back, now with results set + #$test->print_test(); + $test->write_test($server, 'TESTRESULT'); + } + elsif ($line eq 'BYE'){ + mtr_report("Server said BYE"); + exit(0); + } + else { + mtr_error("Could not understand server, '$line'"); + } + } + + stop_all_servers(); + + if ( $opt_gcov ) + { + gcov_collect(); # collect coverage information + } + + if ( $opt_gcov ) + { + gcov_collect(); # collect coverage information + } + + exit(1); } @@ -278,14 +564,11 @@ sub ignore_option { } sub command_line_setup { + my ($thread_num)= @_; + my $opt_comment; my $opt_usage; - # This is needed for test log evaluation in "gen-build-status-page" - # in all cases where the calling tool does not log the commands - # directly before it executes them, like "make test-force-pl" in RPM builds. - mtr_report("Logging: $0 ", join(" ", @ARGV)); - # Read the command line options # Note: Keep list, and the order, in sync with usage at end of this file Getopt::Long::Configure("pass_through"); @@ -325,7 +608,7 @@ sub command_line_setup { 'skip-im' => \&ignore_option, # Specify ports - 'build-thread|mtr-build-thread=i' => \$opt_mtr_build_thread, + 'build-thread|mtr-build-thread=i' => \$opt_build_thread, # Test case authoring 'record' => \$opt_record, @@ -383,10 +666,10 @@ sub command_line_setup { 'report-features' => \$opt_report_features, 'comment=s' => \$opt_comment, 'fast' => \$opt_fast, - 'reorder' => \&collect_option, + 'reorder!' => \&collect_option, 'enable-disabled' => \&collect_option, 'verbose+' => \$opt_verbose, - 'verbose-restart' => \$opt_verbose_restart, + 'verbose-restart' => \&report_option, 'sleep=i' => \$opt_sleep, 'start-dirty' => \$opt_start_dirty, 'start' => \$opt_start, @@ -408,9 +691,21 @@ sub command_line_setup { usage("") if $opt_usage; # -------------------------------------------------------------------------- - # Check mtr_build_thread and calculate baseport + # Setup verbosity # -------------------------------------------------------------------------- - set_mtr_build_thread_ports($opt_mtr_build_thread); + if ($thread_num == 0){ + # The server should by default have verbose on + report_option('verbose', $opt_verbose ? $opt_verbose : 0); + } else { + # Worker should by default have verbose off + report_option('verbose', $opt_verbose ? $opt_verbose : undef); + } + + # -------------------------------------------------------------------------- + # Check build_thread and calculate baseport + # Use auto build thread in all but first worker + # -------------------------------------------------------------------------- + set_build_thread_ports($thread_num > 1 ? 'auto' : $opt_build_thread); if ( -d "../sql" ) { @@ -537,8 +832,9 @@ sub command_line_setup { # -------------------------------------------------------------------------- # Check if we should speed up tests by trying to run on tmpfs + # - Dont check in workers # -------------------------------------------------------------------------- - if ( defined $opt_mem ) + if ( defined $opt_mem and $thread_num == 0) { mtr_error("Can't use --mem and --vardir at the same time ") if $opt_vardir; @@ -554,7 +850,7 @@ sub command_line_setup { { if ( -d $fs ) { - my $template= "var_${opt_mtr_build_thread}_XXXX"; + my $template= "var_${opt_build_thread}_XXXX"; $opt_mem= tempdir( $template, DIR => $fs, CLEANUP => 0); last; } @@ -569,21 +865,11 @@ sub command_line_setup { { $opt_vardir= $default_vardir; } - elsif ( $mysql_version_id < 50000 and - $opt_vardir ne $default_vardir) - { - # Version 4.1 and --vardir was specified - # Only supported as a symlink from var/ - # by setting up $opt_mem that symlink will be created - if ( ! IS_WINDOWS ) - { - # Only platforms that have native symlinks can use the vardir trick - $opt_mem= $opt_vardir; - mtr_report("Using 4.1 vardir trick"); - } - $opt_vardir= $default_vardir; - } + # If more than one parallel run, use a subdir of the selected var + if ($thread_num && $opt_parallel > 1) { + $opt_vardir.= "/".$thread_num; + } $path_vardir_trace= $opt_vardir; # Chop off any "c:", DBUG likes a unix path ex: c:/src/... => /src/... @@ -738,6 +1024,16 @@ sub command_line_setup { $path_testlog= "$opt_vardir/log/mysqltest.log"; $path_current_testlog= "$opt_vardir/log/current_test"; + mtr_report("Checking supported features..."); + + check_ndbcluster_support(\%mysqld_variables); + check_ssl_support(\%mysqld_variables); + check_debug_support(\%mysqld_variables); + + executable_setup(); + + environment_setup(); + } @@ -756,19 +1052,20 @@ sub command_line_setup { # http://www.ncftp.com/ncftpd/doc/misc/ephemeral_ports.html # But a fairly safe range seems to be 5001 - 32767 # -sub set_mtr_build_thread_ports($) { - my $mtr_build_thread= shift || 0; +sub set_build_thread_ports($) { + my $build_thread= shift || 0; - if ( lc($mtr_build_thread) eq 'auto' ) { - print "Requesting build thread... "; - $mtr_build_thread= + if ( lc($build_thread) eq 'auto' ) { + mtr_report("Requesting build thread... "); + $build_thread= mtr_require_unique_id_and_wait("/tmp/mysql-test-ports", 200, 299); - print "got ".$mtr_build_thread."\n"; + mtr_report(" - got $build_thread"); } - $ENV{MTR_BUILD_THREAD}= $mtr_build_thread; + $ENV{MTR_BUILD_THREAD}= $build_thread; + $opt_build_thread= $build_thread; # Calculate baseport - $opt_baseport= $mtr_build_thread * 10 + 10000; + $opt_baseport= $build_thread * 10 + 10000; if ( $opt_baseport < 5001 or $opt_baseport + 9 >= 32767 ) { mtr_error("MTR_BUILD_THREAD number results in a port", @@ -776,7 +1073,7 @@ sub set_mtr_build_thread_ports($) { "($opt_baseport - $opt_baseport + 9)"); } - mtr_report("Using MR_BUILD_THREAD $mtr_build_thread,", + mtr_report("Using MTR_BUILD_THREAD $build_thread,", "with reserved ports $opt_baseport..".($opt_baseport+9)); } @@ -1383,7 +1680,7 @@ sub remove_stale_vardir () { # Create var and the directories needed in var # sub setup_vardir() { - mtr_report("Creating var directory..."); + mtr_report("Creating var directory '$opt_vardir'..."); if ( $opt_vardir eq $default_vardir ) { @@ -1773,76 +2070,6 @@ sub ndbcluster_start ($) { } -# -# Run the collected tests -# -my $suite_timeout_proc; -sub run_tests { - my ($tests)= @_; - - mtr_report(); - mtr_print_thick_line(); - mtr_print_header(); - - $suite_timeout_proc= My::SafeProcess->timer($opt_suite_timeout* 60); - foreach my $tinfo ( @$tests ) - { - if (run_testcase_check_skip_test($tinfo)) - { - next; - } - - for my $repeat (1..$opt_repeat){ - - if (run_testcase($tinfo)) - { - # Testcase failed, enter retry mode - my $retries= 1; - while ($retries < $opt_retry){ - mtr_report("\nRetrying, attempt($retries/$opt_retry)...\n"); - - if (run_testcase($tinfo) <= 0) - { - # Testcase suceeded - - my $test_has_failed= $tinfo->{failures} || 0; - if (!$test_has_failed){ - last; - } - } - else - { - # Testcase failed - - # Limit number of test failures - my $failures= $tinfo->{failures}; - if ($opt_retry > 1 and $failures >= $opt_retry_failure){ - mtr_report("Test has failed $failures times, no more retries!\n"); - last; - } - } - $retries++; - } - } - } - } - # Kill the test suite timer - $suite_timeout_proc->kill(); - - mtr_print_line(); - - stop_all_servers(); - - if ( $opt_gcov ) - { - gcov_collect(); # collect coverage information - } - - mtr_report_stats($tests); - -} - - sub create_config_file_for_extern { my %opts= ( @@ -1990,7 +2217,7 @@ sub initialize_servers { remove_stale_vardir(); setup_vardir(); - mysql_install_db(); + mysql_install_db(0); } } check_running_as_root(); @@ -2044,6 +2271,7 @@ sub sql_to_bootstrap { sub mysql_install_db { + my ($thread_num)= @_; my $data_dir= "$opt_vardir/install.db"; mtr_report("Installing system database..."); @@ -2080,6 +2308,8 @@ sub mysql_install_db { # ---------------------------------------------------------------------- $ENV{'MYSQLD_BOOTSTRAP_CMD'}= "$exe_mysqld_bootstrap " . join(" ", @$args); + return if $thread_num > 0; # Only generate MYSQLD_BOOTSTRAP_CMD in workers + # ---------------------------------------------------------------------- # Create the bootstrap.sql file # ---------------------------------------------------------------------- @@ -2387,7 +2617,7 @@ sub run_testcase ($) { # ---------------------------------------------------------------------- if ( $opt_start or $opt_start_dirty ) { - $suite_timeout_proc->kill(); +# MASV $suite_timeout_proc->kill(); mtr_report("\nStarted", started(all_servers())); mtr_report("Waiting for server(s) to exit..."); my $proc= My::SafeProcess->wait_any(); @@ -2538,11 +2768,12 @@ sub run_testcase ($) { # ---------------------------------------------------- # Check if test suite timer expired # ---------------------------------------------------- - if ( $proc eq $suite_timeout_proc ) - { - mtr_report("Test suite timeout! Terminating..."); - exit(1); - } +# MASV +# if ( $proc eq $suite_timeout_proc ) +# { +# mtr_report("Test suite timeout! Terminating..."); +# exit(1); +# } mtr_error("Unhandled process $proc exited"); } @@ -2617,7 +2848,7 @@ sub check_warnings ($) { my $res= 0; # Clear previous warnings - $tinfo->{warnings}= undef; + delete($tinfo->{warnings}); # Parallell( mysqlds(), run_check_warning, check_warning_failed); foreach my $mysqld ( mysqlds() ) @@ -2727,18 +2958,14 @@ sub report_failure_and_restart ($) { my $tinfo= shift; mtr_report_test_failed($tinfo, $path_current_testlog); - print "\n"; - if ( $opt_force ) - { - # Stop all servers that are known to be running - stop_all_servers(); - after_test_failure($tinfo->{'name'}); - mtr_report("Resuming tests...\n"); - return; - } - mtr_error("Test '$tinfo->{'name'}' failed.", - "To continue, re-run with '--force'"); + # Stop all servers that are known to be running + stop_all_servers(); + + # Collect and clean files + after_test_failure($tinfo->{'name'}); + + mtr_report("Resuming tests...\n"); } @@ -3118,12 +3345,32 @@ sub started { return grep(defined $_, map($_->{proc}, @_)); } sub stopped { return grep(!defined $_, map($_->{proc}, @_)); } +sub envsubst { + my $string= shift; + + if ( ! defined $ENV{$string} ) + { + mtr_error(".opt file references '$string' which is not set"); + } + + return $ENV{$string}; +} + + sub get_extra_opts { my ($mysqld, $tinfo)= @_; - return + my $opts= $mysqld->option("#!use-slave-opt") ? $tinfo->{slave_opt} : $tinfo->{master_opt}; + + # Expand environment variables + foreach my $opt ( @$opts ) + { + $opt =~ s/\$\{(\w+)\}/envsubst($1)/ge; + $opt =~ s/\$(\w+)/envsubst($1)/ge; + } + return $opts; } @@ -3227,7 +3474,12 @@ sub start_servers($) { } # Copy datadir from installed system db - copytree("$opt_vardir/install.db", $datadir) + for my $path ( "$opt_vardir", "$opt_vardir/..") { + my $install_db= "$path/install.db"; + copytree($install_db, $datadir) + if -d $install_db; + } + mtr_error("Failed to copy system db to '$datadir'") unless -d $datadir; # Write start of testcase to log file @@ -3332,16 +3584,20 @@ sub run_check_testcase ($$$) { if ( $mode eq "after" and $res == 1 ) { - mtr_report("\nThe check of testcase '$tname' failed, this is the\n", - "diff between before and after:\n"); - # Test failed, display the report mysqltest has created - mtr_printfile($errfile); + # Test failed, grab the report mysqltest has created + my $report= mtr_grab_file($errfile); + $tinfo->{check}.= + "\nThe check of testcase '$tname' failed, this is the\n". + "diff between before and after:\n"; + $tinfo->{check}.= $report; + } elsif ( $res ) { - mtr_report("\nCould not execute 'check-testcase' $mode testcase '$tname':"); - mtr_printfile($errfile); - mtr_report(); + my $report= mtr_grab_file($errfile); + $tinfo->{'check'}.= + "\nCould not execute 'check-testcase' $mode testcase '$tname':\n"; + $tinfo->{check}.= $report; } return $res; } From 0c3165feb34665abe09aaa30a39fcc50b52ae630 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 24 Apr 2008 13:26:28 +0200 Subject: [PATCH 151/705] Add warning supressions for bug#31590 and bug#26402 that gort lost when moving the supressions from perl to SQL --- mysql-test/include/mtr_warnings.sql | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index e344b44b8f2..76c68cb68d0 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -201,6 +201,15 @@ INSERT INTO global_supressions VALUES ("Slave: Can't DROP 'c7'.* 1091"), ("Slave: Key column 'c6'.* 1072"), + /* Test case for Bug#31590 in order_by.test produces the following error */ + ("Out of sort memory; increase server sort buffer size"), + + /* Special case for Bug #26402 in show_check.test + - Question marks are not valid file name parts on Windows. Ignore + this error message. + */ + ("Can't find file: '.\\\\test\\\\\\?{8}.frm'"), + ("THE_LAST_SUPPRESSION")|| From 471a98001e9f7ab1b18ea90bab728ad501a5ab4e Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 24 Apr 2008 14:14:11 +0200 Subject: [PATCH 152/705] Add support for bootstrapping from init_db.sql, which is used in early versions of 5.1 and 5.0 Fix usage instruction of defaults_extra_file --- mysql-test/mysql-test-run.pl | 51 +++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index ba776a781b4..f4f45c5a61a 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2020,6 +2020,9 @@ sub sql_to_bootstrap { next; } + # Replace @HOSTNAME with localhost + $line=~ s/\'\@HOSTNAME\@\'/localhost/; + # Default, just add the line without newline # but with a space as separator $result.= "$line "; @@ -2071,24 +2074,40 @@ sub mysql_install_db { # ---------------------------------------------------------------------- my $bootstrap_sql_file= "$opt_vardir/tmp/bootstrap.sql"; - # Use the mysql database for system tables - mtr_tofile($bootstrap_sql_file, "use mysql\n"); + if (-f "$path_sql_dir/mysql_system_tables.sql") + { + # Use the mysql database for system tables + mtr_tofile($bootstrap_sql_file, "use mysql\n"); - # Add the offical mysql system tables - # for a production system - mtr_appendfile_to_file("$path_sql_dir/mysql_system_tables.sql", - $bootstrap_sql_file); + # Add the offical mysql system tables + # for a production system + mtr_appendfile_to_file("$path_sql_dir/mysql_system_tables.sql", + $bootstrap_sql_file); - # Add the mysql system tables initial data - # for a production system - mtr_appendfile_to_file("$path_sql_dir/mysql_system_tables_data.sql", - $bootstrap_sql_file); + # Add the mysql system tables initial data + # for a production system + mtr_appendfile_to_file("$path_sql_dir/mysql_system_tables_data.sql", + $bootstrap_sql_file); - # Add test data for timezone - this is just a subset, on a real - # system these tables will be populated either by mysql_tzinfo_to_sql - # or by downloading the timezone table package from our website - mtr_appendfile_to_file("$path_sql_dir/mysql_test_data_timezone.sql", - $bootstrap_sql_file); + # Add test data for timezone - this is just a subset, on a real + # system these tables will be populated either by mysql_tzinfo_to_sql + # or by downloading the timezone table package from our website + mtr_appendfile_to_file("$path_sql_dir/mysql_test_data_timezone.sql", + $bootstrap_sql_file); + + } + else + { + # Install db from init_db.sql that exist in early 5.1 and 5.0 + # versions of MySQL + my $init_file= "$basedir/mysql-test/lib/init_db.sql"; + mtr_report(" - from '$init_file'"); + my $text= mtr_grab_file($init_file) or + mtr_error("Can't open '$init_file': $!"); + + mtr_tofile($bootstrap_sql_file, + sql_to_bootstrap($text)); + } # Fill help tables, just an empty file when running from bk repo # but will be replaced by a real fill_help_tables.sql when @@ -3741,7 +3760,7 @@ Options to control what engine/variation to run config|defaults-file= Use fixed config template for all tests - extra_defaults_file= Extra config template to add to + defaults_extra_file= Extra config template to add to all generated configs Options to control directories to use From 7e8898aaca0a75e6a8aa2f1ee80cc33157dbade8 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 24 Apr 2008 14:15:15 +0200 Subject: [PATCH 153/705] Replace all - with - in $opt name --- mysql-test/lib/mtr_cases.pm | 2 +- mysql-test/lib/mtr_report.pm | 34 +++++++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 0f8329f2f31..f46c0165e27 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -46,7 +46,7 @@ sub collect_option { my ($opt, $value)= @_; # Convert - to _ in option name - $opt =~ s/-/_/; + $opt =~ s/-/_/g; no strict 'refs'; ${$opt}= $value; } diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index a3c0f26c8fd..84c3c0dc226 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -26,8 +26,7 @@ our @EXPORT= qw(report_option mtr_print_line mtr_print_thick_line mtr_print_header mtr_report mtr_report_stats mtr_warning mtr_error mtr_debug mtr_verbose mtr_verbose_restart mtr_report_test_passed - mtr_report_test_failed mtr_report_test_skipped - mtr_report_stats); + mtr_report_test_failed mtr_report_test_skipped); use mtr_match; require "mtr_io.pl"; @@ -35,12 +34,13 @@ require "mtr_io.pl"; my $tot_real_time= 0; our $timestamp= 0; +our $timediff= 1; sub report_option { my ($opt, $value)= @_; # Convert - to _ in option name - $opt =~ s/-/_/; + $opt =~ s/-/_/g; no strict 'refs'; ${$opt}= $value; } @@ -228,20 +228,20 @@ sub mtr_report_stats ($) { # Print a list of check_testcases that failed(if any) if ( $::opt_check_testcases ) { - my @check_testcases= (); + my %check_testcases; foreach my $tinfo (@$tests) { if ( defined $tinfo->{'check_testcase_failed'} ) { - push(@check_testcases, $tinfo->{'name'}); + $check_testcases{$tinfo->{'name'}}= 1; } } - if ( @check_testcases ) + if ( keys %check_testcases ) { print "Check of testcase failed for: "; - print join(" ", @check_testcases); + print join(" ", keys %check_testcases); print "\n\n"; } } @@ -330,13 +330,29 @@ sub mtr_print_header () { use Time::localtime; +use Time::HiRes qw(gettimeofday); + +my $t0= gettimeofday(); + sub _timestamp { return "" unless $timestamp; + my $diff; + if ($timediff){ + my $t1= gettimeofday(); + my $elapsed= $t1 - $t0; + + $diff= sprintf(" +%02.3f", $elapsed); + + # Save current time for next lap + $t0= $t1; + + } + my $tm= localtime(); - return sprintf("%02d%02d%02d %2d:%02d:%02d ", + return sprintf("%02d%02d%02d %2d:%02d:%02d%s ", $tm->year % 100, $tm->mon+1, $tm->mday, - $tm->hour, $tm->min, $tm->sec); + $tm->hour, $tm->min, $tm->sec, $diff); } From c6aca99321ae5a20cd5003e0fdab769ec604c1b4 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 24 Apr 2008 14:16:32 +0200 Subject: [PATCH 154/705] Allow 2002 as a valid error for connect fails. It's common on windows where we don't use Unix domin sockets for connection to server --- mysql-test/include/wait_until_connected_again.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/include/wait_until_connected_again.inc b/mysql-test/include/wait_until_connected_again.inc index a9cf741fcfe..c7bb774929a 100644 --- a/mysql-test/include/wait_until_connected_again.inc +++ b/mysql-test/include/wait_until_connected_again.inc @@ -10,7 +10,7 @@ while ($mysql_errno) # Strangely enough, the server might return "Too many connections" # while being shutdown, thus 1040 is an "allowed" error # See BUG#36228 - --error 0,1040,1053,2002,2006,2013 + --error 0,1040,1053,2002,2003,2006,2013 show status; dec $counter; From 5681c996457d1cd8df58f5d5321a3c393ce3a567 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 24 Apr 2008 20:24:24 +0200 Subject: [PATCH 155/705] Print name(of thread) also in mtr_report, testserver does not set name so it will still look the same, but makes debugging much easier --- mysql-test/lib/mtr_report.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index f749168c64a..2dcf483dce0 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -434,7 +434,7 @@ sub _timestamp { sub mtr_report (@) { if (defined $verbose) { - print join(" ", @_), "\n"; + print $name, join(" ", @_), "\n"; } } From 13461e33d590fefa3bb3cb911a225276e1cb37cf Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 24 Apr 2008 20:25:00 +0200 Subject: [PATCH 156/705] If more than one parallel run, use a subdir of the selected tmpdir --- mysql-test/mysql-test-run.pl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index cb9b7970c9f..16335153140 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -892,6 +892,11 @@ sub command_line_setup { $opt_tmpdir= "$opt_vardir/tmp" unless $opt_tmpdir; $opt_tmpdir =~ s,/+$,,; # Remove ending slash if any + # If more than one parallel run, use a subdir of the selected tmpdir + if ($thread_num && $opt_parallel > 1) { + $opt_tmpdir.= "/".$thread_num; + } + # -------------------------------------------------------------------------- # fast option # -------------------------------------------------------------------------- From 001d68a2e00f1916b1bdd3c15ae7a7c054b07ac0 Mon Sep 17 00:00:00 2001 From: "skozlov/ksm@mysql.com/virtop.(none)" <> Date: Fri, 25 Apr 2008 00:41:04 +0400 Subject: [PATCH 157/705] WL#3754, testing circular replication --- .../include/circular_rpl_for_4_hosts_init.inc | 130 +++++++ .../include/circular_rpl_for_4_hosts_sync.inc | 23 ++ mysql-test/include/ndb_master-slave_2ch.inc | 136 ++++++++ .../rpl/r/rpl_circular_for_4_hosts.result | 298 ++++++++++++++++ .../rpl/t/rpl_circular_for_4_hosts-master.opt | 1 + .../rpl/t/rpl_circular_for_4_hosts-slave.opt | 1 + .../suite/rpl/t/rpl_circular_for_4_hosts.test | 328 ++++++++++++++++++ .../rpl_ndb/r/rpl_ndb_circular_2ch.result | 101 ++++++ .../rpl_ndb/t/rpl_ndb_circular_2ch-master.opt | 1 + .../rpl_ndb/t/rpl_ndb_circular_2ch-slave.opt | 1 + .../suite/rpl_ndb/t/rpl_ndb_circular_2ch.test | 179 ++++++++++ 11 files changed, 1199 insertions(+) create mode 100644 mysql-test/include/circular_rpl_for_4_hosts_init.inc create mode 100644 mysql-test/include/circular_rpl_for_4_hosts_sync.inc create mode 100644 mysql-test/include/ndb_master-slave_2ch.inc create mode 100644 mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result create mode 100644 mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-master.opt create mode 100644 mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-slave.opt create mode 100644 mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test create mode 100644 mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result create mode 100644 mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-master.opt create mode 100644 mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-slave.opt create mode 100644 mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test diff --git a/mysql-test/include/circular_rpl_for_4_hosts_init.inc b/mysql-test/include/circular_rpl_for_4_hosts_init.inc new file mode 100644 index 00000000000..8be6ef10b3e --- /dev/null +++ b/mysql-test/include/circular_rpl_for_4_hosts_init.inc @@ -0,0 +1,130 @@ +############################################################# +# +# Author: Serge Kozlov +# Date: 03/11/2008 +# Purpose: Set up circular replication based on schema +# A->B->C->D->A +# +# Notes: +# 1. --slave-num=3 must be added to *-master.opt file +# 2. Even the test uses new names for servers but file names +# of log files are still old: +# master_a -> master.[log|err] +# master_b -> slave.[log|err] +# master_c -> slave1.[log|err] +# master_d -> slave2.[log|err] +# +############################################################# +--source include/master-slave.inc + +# +# Set up circular ring by schema A->B->C-D->A +# + +--connection slave +STOP SLAVE; +RESET SLAVE; + +# master a +--connection master +--disconnect master +connect (master_a,127.0.0.1,root,,test,$MASTER_MYPORT,); +RESET MASTER; +--disable_warnings +STOP SLAVE; +--enable_warnings +RESET SLAVE; +SET auto_increment_increment = 4; +SET auto_increment_offset = 1; +let $_binlog_file= query_get_value(SHOW MASTER STATUS, File, 1); + +# master b +--connection slave +--disconnect slave +connect (master_b,127.0.0.1,root,,test,$SLAVE_MYPORT,); +RESET MASTER; +RESET SLAVE; +--replace_result $MASTER_MYPORT MASTER_A_PORT $_binlog_file MASTER_A_LOG_FILE +--eval CHANGE MASTER TO master_host='127.0.0.1',master_port=$MASTER_MYPORT,master_user='root',MASTER_LOG_FILE='$_binlog_file' +SET auto_increment_increment = 4; +SET auto_increment_offset = 2; +let $_binlog_file= query_get_value(SHOW MASTER STATUS, File, 1); + +# master c +--connection slave1 +--disconnect slave1 +connect (master_c,127.0.0.1,root,,test,$SLAVE_MYPORT1,); +RESET MASTER; +--disable_warnings +STOP SLAVE; +--enable_warnings +RESET SLAVE; +--replace_result $SLAVE_MYPORT MASTER_B_PORT $_binlog_file MASTER_B_LOG_FILE +--eval CHANGE MASTER TO master_host='127.0.0.1',master_port=$SLAVE_MYPORT,master_user='root',MASTER_LOG_FILE='$_binlog_file' +SET auto_increment_increment = 4; +SET auto_increment_offset = 3; +let $_binlog_file= query_get_value(SHOW MASTER STATUS, File, 1); + +# master d +connect (master_d,127.0.0.1,root,,test,$SLAVE_MYPORT2,); +RESET MASTER; +--disable_warnings +STOP SLAVE; +--enable_warnings +RESET SLAVE; +--replace_result $SLAVE_MYPORT1 MASTER_C_PORT $_binlog_file MASTER_C_LOG_FILE +--eval CHANGE MASTER TO master_host='127.0.0.1',master_port=$SLAVE_MYPORT1,master_user='root',MASTER_LOG_FILE='$_binlog_file' +SET auto_increment_increment = 4; +SET auto_increment_offset = 4; +let $_binlog_file= query_get_value(SHOW MASTER STATUS, File, 1); + +# master a +--connection master_a +--replace_result $SLAVE_MYPORT2 MASTER_D_PORT $_binlog_file MASTER_D_LOG_FILE +--eval CHANGE MASTER TO master_host='127.0.0.1',master_port=$SLAVE_MYPORT2,master_user='root',MASTER_LOG_FILE='$_binlog_file' + + + +# Check server_ids: they should be different +--connection master_a +let $_id_a= query_get_value(SHOW VARIABLES LIKE 'server_id', Value, 1); +SHOW VARIABLES LIKE 'auto_increment_%'; +--connection master_b +let $_id_b= query_get_value(SHOW VARIABLES LIKE 'server_id', Value, 1); +SHOW VARIABLES LIKE 'auto_increment_%'; +--connection master_c +let $_id_c= query_get_value(SHOW VARIABLES LIKE 'server_id', Value, 1); +SHOW VARIABLES LIKE 'auto_increment_%'; +--connection master_d +let $_id_d= query_get_value(SHOW VARIABLES LIKE 'server_id', Value, 1); +SHOW VARIABLES LIKE 'auto_increment_%'; +--connection master_a +let $_compared_ids= (($_id_a <> $_id_b) AND ($_id_a <> $_id_c) AND ($_id_a <> $_id_d) AND ($_id_b <> $_id_c) AND ($_id_b <> $_id_d) AND ($_id_c <> $_id_d)) AS a; +let $_compared_ids_result= query_get_value(SELECT $_compared_ids, a, 1); +--echo $_compared_ids_result + +# Start ring +--connection master_a +connect(slave,127.0.0.1,root,,test,$MASTER_MYPORT); +START SLAVE; +--source include/wait_for_slave_to_start.inc +--disconnect slave + +--connection master_b +connect(slave,127.0.0.1,root,,test,$SLAVE_MYPORT1); +START SLAVE; +--source include/wait_for_slave_to_start.inc +--disconnect slave + +--connection master_c +connect(slave,127.0.0.1,root,,test,$SLAVE_MYPORT); +START SLAVE; +--source include/wait_for_slave_to_start.inc +--disconnect slave + +--connection master_d +connect(slave,127.0.0.1,root,,test,$SLAVE_MYPORT2); +START SLAVE; +--source include/wait_for_slave_to_start.inc +--disconnect slave + diff --git a/mysql-test/include/circular_rpl_for_4_hosts_sync.inc b/mysql-test/include/circular_rpl_for_4_hosts_sync.inc new file mode 100644 index 00000000000..68aede76913 --- /dev/null +++ b/mysql-test/include/circular_rpl_for_4_hosts_sync.inc @@ -0,0 +1,23 @@ +############################################################# +# +# Author: Serge Kozlov +# Date: 03/11/2008 +# Purpose: Sync all hosts for circular replication based on +# schema A->B->C->D->A +# +# Notes: see include/circular_rpl_for_4_hosts_init.inc +# +############################################################# + +# Make the full loop of sync +--connection master_a +--disable_query_log +--sync_slave_with_master master_b +--sync_slave_with_master master_c +--sync_slave_with_master master_d +--sync_slave_with_master master_a +--sync_slave_with_master master_b +--sync_slave_with_master master_c +--save_master_pos +--connection master_a +--enable_query_log diff --git a/mysql-test/include/ndb_master-slave_2ch.inc b/mysql-test/include/ndb_master-slave_2ch.inc new file mode 100644 index 00000000000..52a06c01d86 --- /dev/null +++ b/mysql-test/include/ndb_master-slave_2ch.inc @@ -0,0 +1,136 @@ +############################################################# +# Author: Serge Kozlov +# Date: 03/17/2008 +# Purpose: Set up circular cluster replication where each +# cluster has two mysqlds and replication directions are +# following: +# master ---> slave +# / \ +# cluster A cluster B +# \ / +# master1 <--- slave1 +############################################################# + +--source include/have_log_bin.inc + +# Make connections to mysqlds + +connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,); +connect (master1,127.0.0.1,root,,test,$MASTER_MYPORT1,); +connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,); +connect (slave1,127.0.0.1,root,,test,$SLAVE_MYPORT1,); + +# Check that all mysqld compiled with ndb support + +--connection master +--disable_query_log +--require r/true.require +SELECT (support = 'YES' or support = 'DEFAULT') AS `TRUE` FROM information_schema.engines WHERE engine = 'ndbcluster'; +--source include/ndb_not_readonly.inc +--enable_query_log + +--connection master1 +--disable_query_log +--require r/true.require +SELECT (support = 'YES' or support = 'DEFAULT') AS `TRUE` FROM information_schema.engines WHERE engine = 'ndbcluster'; +--source include/ndb_not_readonly.inc +--enable_query_log + +--connection slave +--disable_query_log +--require r/true.require +SELECT (support = 'YES' or support = 'DEFAULT') AS `TRUE` FROM information_schema.engines WHERE engine = 'ndbcluster'; +--source include/ndb_not_readonly.inc +--enable_query_log + +--connection slave1 +--disable_query_log +--require r/true.require +SELECT (support = 'YES' or support = 'DEFAULT') AS `TRUE` FROM information_schema.engines WHERE engine = 'ndbcluster'; +--source include/ndb_not_readonly.inc +--enable_query_log + +# Stop slaves + +--connection master +--disable_warnings +STOP SLAVE; +--wait_for_slave_to_stop +--enable_warnings + +--connection master1 +--disable_warnings +STOP SLAVE; +--wait_for_slave_to_stop +--enable_warnings + +--connection slave +--disable_warnings +STOP SLAVE; +--wait_for_slave_to_stop +--enable_warnings + +--connection slave1 +--disable_warnings +STOP SLAVE; +--wait_for_slave_to_stop +--enable_warnings + +# Reset masters + +--connection master +--disable_warnings +--disable_query_log +USE test; +--enable_query_log +DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8,t9; +--enable_warnings +RESET MASTER; + +--connection master1 +--disable_warnings +--disable_query_log +USE test; +--enable_query_log +DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8,t9; +--enable_warnings +RESET MASTER; + +--connection slave +--disable_warnings +--disable_query_log +USE test; +--enable_query_log +DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8,t9; +--enable_warnings +RESET MASTER; + +--connection slave1 +--disable_warnings +--disable_query_log +USE test; +--enable_query_log +DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8,t9; +--enable_warnings +RESET MASTER; + +# Start slaves + +--connection slave +RESET SLAVE; +--replace_result $MASTER_MYPORT MASTER_MYPORT +--eval CHANGE MASTER TO master_host='127.0.0.1',master_port=$MASTER_MYPORT,master_user='root' +START SLAVE; +--source include/wait_for_slave_to_start.inc + +--connection master1 +RESET SLAVE; +--replace_result $SLAVE_MYPORT1 SLAVE_MYPORT1 +--eval CHANGE MASTER TO master_host='127.0.0.1',master_port=$SLAVE_MYPORT1,master_user='root' +START SLAVE; +--source include/wait_for_slave_to_start.inc + + +# Set the default connection to 'master' (cluster A) +connection master; + diff --git a/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result b/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result new file mode 100644 index 00000000000..5b775a066c4 --- /dev/null +++ b/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result @@ -0,0 +1,298 @@ +*** Set up circular ring by schema A->B->C-D->A *** +stop slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +start slave; +STOP SLAVE; +RESET SLAVE; +RESET MASTER; +STOP SLAVE; +RESET SLAVE; +SET auto_increment_increment = 4; +SET auto_increment_offset = 1; +RESET MASTER; +RESET SLAVE; +CHANGE MASTER TO master_host='127.0.0.1',master_port=MASTER_A_PORT,master_user='root',MASTER_LOG_FILE='MASTER_A_LOG_FILE'; +SET auto_increment_increment = 4; +SET auto_increment_offset = 2; +RESET MASTER; +STOP SLAVE; +RESET SLAVE; +CHANGE MASTER TO master_host='127.0.0.1',master_port=MASTER_B_PORT,master_user='root',MASTER_LOG_FILE='MASTER_B_LOG_FILE'; +SET auto_increment_increment = 4; +SET auto_increment_offset = 3; +RESET MASTER; +STOP SLAVE; +RESET SLAVE; +CHANGE MASTER TO master_host='127.0.0.1',master_port=MASTER_C_PORT,master_user='root',MASTER_LOG_FILE='MASTER_C_LOG_FILE'; +SET auto_increment_increment = 4; +SET auto_increment_offset = 4; +CHANGE MASTER TO master_host='127.0.0.1',master_port=MASTER_D_PORT,master_user='root',MASTER_LOG_FILE='MASTER_D_LOG_FILE'; +SHOW VARIABLES LIKE 'auto_increment_%'; +Variable_name Value +auto_increment_increment 4 +auto_increment_offset 1 +SHOW VARIABLES LIKE 'auto_increment_%'; +Variable_name Value +auto_increment_increment 4 +auto_increment_offset 2 +SHOW VARIABLES LIKE 'auto_increment_%'; +Variable_name Value +auto_increment_increment 4 +auto_increment_offset 3 +SHOW VARIABLES LIKE 'auto_increment_%'; +Variable_name Value +auto_increment_increment 4 +auto_increment_offset 4 +1 +START SLAVE; +START SLAVE; +START SLAVE; +START SLAVE; + +*** Preparing data *** +CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT, b VARCHAR(100), c INT NOT NULL, PRIMARY KEY(a)) ENGINE=MyISAM; +CREATE TABLE t2 (a INT NOT NULL AUTO_INCREMENT, b VARCHAR(100), c INT NOT NULL, PRIMARY KEY(a)) ENGINE=InnoDB; + +*** Testing schema A->B->C->D->A *** + +INSERT INTO t1(b,c) VALUES('A',1); +INSERT INTO t1(b,c) VALUES('B',1); +INSERT INTO t1(b,c) VALUES('C',1); +INSERT INTO t1(b,c) VALUES('D',1); +SELECT 'Master A',a,b FROM t1 WHERE c = 1 ORDER BY a,b; +Master A a b +Master A 1 A +Master A 2 B +Master A 3 C +Master A 4 D +SELECT 'Master B',a,b FROM t1 WHERE c = 1 ORDER BY a,b; +Master B a b +Master B 1 A +Master B 2 B +Master B 3 C +Master B 4 D +SELECT 'Master C',a,b FROM t1 WHERE c = 1 ORDER BY a,b; +Master C a b +Master C 1 A +Master C 2 B +Master C 3 C +Master C 4 D +SELECT 'Master D',a,b FROM t1 WHERE c = 1 ORDER BY a,b; +Master D a b +Master D 1 A +Master D 2 B +Master D 3 C +Master D 4 D + +*** Testing schema A->B->D->A if C has failure *** + +* Do failure for C and then make new connection B->D * +STOP SLAVE; +SET GLOBAL SQL_SLAVE_SKIP_COUNTER = 1; +START SLAVE; +INSERT INTO t1 VALUES(6,'C',2); +INSERT INTO t1(b,c) VALUES('B',2); +INSERT INTO t1(b,c) VALUES('A',2); +INSERT INTO t1(b,c) VALUES('D',2); + +* Data on servers (C failed) * +SELECT 'Master A',a,b FROM t1 WHERE c = 2 ORDER BY a,b; +Master A a b +Master A 5 A +Master A 8 D +SELECT 'Master B',a,b FROM t1 WHERE c = 2 ORDER BY a,b; +Master B a b +Master B 5 A +Master B 6 B +Master B 8 D +SELECT 'Master C',a,b FROM t1 WHERE c = 2 ORDER BY a,b; +Master C a b +Master C 6 C +SELECT 'Master D',a,b FROM t1 WHERE c = 2 ORDER BY a,b; +Master D a b +Master D 8 D + +* Reconfigure replication to schema A->B->C->A * +STOP SLAVE; +STOP SLAVE; +CHANGE MASTER TO master_host='127.0.0.1',master_port=MASTER_B_PORT,master_user='root',master_log_file='LOG_FILE',master_log_pos=LOG_POS; +START SLAVE; + +* Check data inserted before failure * +SELECT 'Master A',a,b FROM t1 WHERE c = 2 ORDER BY a,b; +Master A a b +Master A 5 A +Master A 6 B +Master A 8 D +SELECT 'Master B',a,b FROM t1 WHERE c = 2 ORDER BY a,b; +Master B a b +Master B 5 A +Master B 6 B +Master B 8 D +SELECT 'Master C',a,b FROM t1 WHERE c = 2 ORDER BY a,b; +Master C a b +Master C 6 C +SELECT 'Master D',a,b FROM t1 WHERE c = 2 ORDER BY a,b; +Master D a b +Master D 5 A +Master D 6 B +Master D 8 D + +* Check data inserted after failure * +INSERT INTO t1(b,c) VALUES('A',3); +INSERT INTO t1(b,c) VALUES('B',3); +INSERT INTO t1(b,c) VALUES('D',3); +SELECT 'Master A',a,b FROM t1 WHERE c = 3 ORDER BY a,b; +Master A a b +Master A 9 A +Master A 10 B +Master A 12 D +SELECT 'Master B',a,b FROM t1 WHERE c = 3 ORDER BY a,b; +Master B a b +Master B 9 A +Master B 10 B +Master B 12 D +SELECT 'Master C',a,b FROM t1 WHERE c = 3 ORDER BY a,b; +Master C a b +SELECT 'Master D',a,b FROM t1 WHERE c = 3 ORDER BY a,b; +Master D a b +Master D 9 A +Master D 10 B +Master D 12 D + +*** Testing restoring scheme A->B->C->D->A after failure *** + +* Remove wrong event from C and restore B->C->D * +STOP SLAVE; +DELETE FROM t1 WHERE a = 6; +START SLAVE; +RESET MASTER; +RESET SLAVE; +CHANGE MASTER TO master_host='127.0.0.1',master_port=MASTER_C_PORT,master_user='root',master_log_file='LOG_FILE',master_log_pos=LOG_POS; +START SLAVE; + +* Check data inserted before restoring schema A->B->C->D->A * +SELECT 'Master A',a,b FROM t1 WHERE c IN (2,3) ORDER BY a,b; +Master A a b +Master A 5 A +Master A 6 B +Master A 8 D +Master A 9 A +Master A 10 B +Master A 12 D +SELECT 'Master B',a,b FROM t1 WHERE c IN (2,3) ORDER BY a,b; +Master B a b +Master B 5 A +Master B 6 B +Master B 8 D +Master B 9 A +Master B 10 B +Master B 12 D +SELECT 'Master C',a,b FROM t1 WHERE c IN (2,3) ORDER BY a,b; +Master C a b +Master C 5 A +Master C 6 B +Master C 8 D +Master C 9 A +Master C 10 B +Master C 12 D +SELECT 'Master D',a,b FROM t1 WHERE c IN (2,3) ORDER BY a,b; +Master D a b +Master D 5 A +Master D 6 B +Master D 8 D +Master D 9 A +Master D 10 B +Master D 12 D + +* Check data inserted after restoring schema A->B->C->D->A * +INSERT INTO t1(b,c) VALUES('A',4); +INSERT INTO t1(b,c) VALUES('B',4); +INSERT INTO t1(b,c) VALUES('C',4); +INSERT INTO t1(b,c) VALUES('D',4); +SELECT 'Master A',a,b FROM t1 WHERE c = 4 ORDER BY a,b; +Master A a b +Master A 13 A +Master A 14 B +Master A 15 C +Master A 16 D +SELECT 'Master B',a,b FROM t1 WHERE c = 4 ORDER BY a,b; +Master B a b +Master B 13 A +Master B 14 B +Master B 15 C +Master B 16 D +SELECT 'Master C',a,b FROM t1 WHERE c = 4 ORDER BY a,b; +Master C a b +Master C 13 A +Master C 14 B +Master C 15 C +Master C 16 D +SELECT 'Master D',a,b FROM t1 WHERE c = 4 ORDER BY a,b; +Master D a b +Master D 13 A +Master D 14 B +Master D 15 C +Master D 16 D + +* Transactions with commits * +BEGIN; +BEGIN; +SELECT 'Master A',b,COUNT(*) FROM t2 WHERE c = 1 GROUP BY b ORDER BY b; +Master A b COUNT(*) +Master A A 100 +Master A B 100 +Master A C 100 +Master A D 100 +SELECT 'Master B',b,COUNT(*) FROM t2 WHERE c = 1 GROUP BY b ORDER BY b; +Master B b COUNT(*) +Master B A 100 +Master B B 100 +Master B C 100 +Master B D 100 +SELECT 'Master C',b,COUNT(*) FROM t2 WHERE c = 1 GROUP BY b ORDER BY b; +Master C b COUNT(*) +Master C A 100 +Master C B 100 +Master C C 100 +Master C D 100 +SELECT 'Master D',b,COUNT(*) FROM t2 WHERE c = 1 GROUP BY b ORDER BY b; +Master D b COUNT(*) +Master D A 100 +Master D B 100 +Master D C 100 +Master D D 100 + +* Transactions with rollbacks * +BEGIN; +BEGIN; +SELECT 'Master A',b,COUNT(*) FROM t2 WHERE c = 2 GROUP BY b ORDER BY b; +Master A b COUNT(*) +Master A B 100 +Master A D 100 +SELECT 'Master B',b,COUNT(*) FROM t2 WHERE c = 2 GROUP BY b ORDER BY b; +Master B b COUNT(*) +Master B B 100 +Master B D 100 +SELECT 'Master C',b,COUNT(*) FROM t2 WHERE c = 2 GROUP BY b ORDER BY b; +Master C b COUNT(*) +Master C B 100 +Master C D 100 +SELECT 'Master D',b,COUNT(*) FROM t2 WHERE c = 2 GROUP BY b ORDER BY b; +Master D b COUNT(*) +Master D B 100 +Master D D 100 + +*** Clean up *** +DROP TABLE t1,t2; +STOP SLAVE; +RESET SLAVE; +STOP SLAVE; +RESET SLAVE; +STOP SLAVE; +RESET SLAVE; +STOP SLAVE; +RESET SLAVE; diff --git a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-master.opt b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-master.opt new file mode 100644 index 00000000000..d540d4a6880 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-master.opt @@ -0,0 +1 @@ +--slave-num=3 --log-slave-updates --innodb diff --git a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-slave.opt b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-slave.opt new file mode 100644 index 00000000000..f5df45c8ecd --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-slave.opt @@ -0,0 +1 @@ +--log-slave-updates --innodb diff --git a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test new file mode 100644 index 00000000000..bca20ef79c4 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test @@ -0,0 +1,328 @@ +############################################################# +# Author: Serge Kozlov +# Date: 03/12/2008 +# Purpose: Testing circular replication based on schema +# A->B->C->D->A with using AUTO_INCREMENT_INCREMENT, +# AUTO_INCREMENT_OFFSET variables and failover +############################################################# +--source include/have_innodb.inc + +# Set up circular ring and new names for servers +--echo *** Set up circular ring by schema A->B->C->D->A *** +--source include/circular_rpl_for_4_hosts_init.inc +--echo + +# Preparing data. +--echo *** Preparing data *** +--connection master_a +CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT, b VARCHAR(100), c INT NOT NULL, PRIMARY KEY(a)) ENGINE=MyISAM; +CREATE TABLE t2 (a INT NOT NULL AUTO_INCREMENT, b VARCHAR(100), c INT NOT NULL, PRIMARY KEY(a)) ENGINE=InnoDB; +--source include/circular_rpl_for_4_hosts_sync.inc +--connection master_d +--echo + +# +# Testing +# + +--echo *** Testing schema A->B->C->D->A *** +--echo +# insert data via all hosts +--connection master_a +INSERT INTO t1(b,c) VALUES('A',1); +--sync_slave_with_master master_b +INSERT INTO t1(b,c) VALUES('B',1); +--sync_slave_with_master master_c +INSERT INTO t1(b,c) VALUES('C',1); +--sync_slave_with_master master_d +INSERT INTO t1(b,c) VALUES('D',1); + +--source include/circular_rpl_for_4_hosts_sync.inc + +--connection master_a +SELECT 'Master A',a,b FROM t1 WHERE c = 1 ORDER BY a,b; +--connection master_b +SELECT 'Master B',a,b FROM t1 WHERE c = 1 ORDER BY a,b; +--connection master_c +SELECT 'Master C',a,b FROM t1 WHERE c = 1 ORDER BY a,b; +--connection master_d +SELECT 'Master D',a,b FROM t1 WHERE c = 1 ORDER BY a,b; +--echo + +--echo *** Testing schema A->B->D->A if C has failure *** +--echo +--echo * Do failure for C and then make new connection B->D * +# Do not replicate next event from C +--connection master_d +connect(slave,127.0.0.1,root,,test,$SLAVE_MYPORT2); +STOP SLAVE; +SET GLOBAL SQL_SLAVE_SKIP_COUNTER = 1; +START SLAVE; +--source include/wait_for_slave_to_start.inc +disconnect slave; +--connection master_c +INSERT INTO t1 VALUES(6,'C',2); +--save_master_pos +--connection master_b +INSERT INTO t1(b,c) VALUES('B',2); +# Wait while C will stop. +--connection master_c +--let $slave_param= Slave_SQL_Running +--let $slave_param_value= No +--source include/wait_for_slave_param.inc +--connection master_a +INSERT INTO t1(b,c) VALUES('A',2); +--connection master_d +INSERT INTO t1(b,c) VALUES('D',2); + + +# Sync all servers except C +--connection master_b +let $wait_condition= SELECT COUNT(*)=3 FROM t1 WHERE a > 4; +--source include/wait_condition.inc + +--echo +--echo * Data on servers (C failed) * +# Masters C,D shouldn't have correct data +--connection master_a +SELECT 'Master A',a,b FROM t1 WHERE c = 2 ORDER BY a,b; +--connection master_b +SELECT 'Master B',a,b FROM t1 WHERE c = 2 ORDER BY a,b; +--connection master_c +SELECT 'Master C',a,b FROM t1 WHERE c = 2 ORDER BY a,b; +--connection master_d +SELECT 'Master D',a,b FROM t1 WHERE c = 2 ORDER BY a,b; +--echo + +--echo * Reconfigure replication to schema A->B->C->A * +# Exclude Master C +--connection master_c +STOP SLAVE; +--let $pos_c= query_get_value(SHOW SLAVE STATUS, Exec_Master_Log_Pos, 1) +--let $file_c= query_get_value(SHOW SLAVE STATUS, Master_Log_File, 1) +--connection master_d +STOP SLAVE; +--replace_result $SLAVE_MYPORT MASTER_B_PORT $file_c LOG_FILE $pos_c LOG_POS +--eval CHANGE MASTER TO master_host='127.0.0.1',master_port=$SLAVE_MYPORT,master_user='root',master_log_file='$file_c',master_log_pos=$pos_c +connect(slave,127.0.0.1,root,,test,$SLAVE_MYPORT2); +START SLAVE; +--source include/wait_for_slave_to_start.inc +disconnect slave; +--connection master_b +--sync_slave_with_master master_d +--echo + +--echo * Check data inserted before failure * +--connection master_a +SELECT 'Master A',a,b FROM t1 WHERE c = 2 ORDER BY a,b; +--connection master_b +SELECT 'Master B',a,b FROM t1 WHERE c = 2 ORDER BY a,b; +--connection master_c +SELECT 'Master C',a,b FROM t1 WHERE c = 2 ORDER BY a,b; +--connection master_d +SELECT 'Master D',a,b FROM t1 WHERE c = 2 ORDER BY a,b; +--echo + +--echo * Check data inserted after failure * +--connection master_a +INSERT INTO t1(b,c) VALUES('A',3); +--connection master_b +INSERT INTO t1(b,c) VALUES('B',3); +--connection master_d +INSERT INTO t1(b,c) VALUES('D',3); +--connection master_a + +--sync_slave_with_master master_b +--sync_slave_with_master master_d +--sync_slave_with_master master_a +--sync_slave_with_master master_b + +--connection master_a +SELECT 'Master A',a,b FROM t1 WHERE c = 3 ORDER BY a,b; +--connection master_b +SELECT 'Master B',a,b FROM t1 WHERE c = 3 ORDER BY a,b; +--connection master_c +SELECT 'Master C',a,b FROM t1 WHERE c = 3 ORDER BY a,b; +--connection master_d +SELECT 'Master D',a,b FROM t1 WHERE c = 3 ORDER BY a,b; +--connection master_a +--echo + +--echo *** Testing restoring scheme A->B->C->D->A after failure *** +--echo +# Master D will ignore a next event from C so that event will not be +# distributed to other servers +--echo * Remove wrong event from C and restore B->C->D * +--connection master_d +STOP SLAVE; +--wait_for_slave_to_stop +--connection master_c +DELETE FROM t1 WHERE a = 6; +START SLAVE; +--connection master_b +--sync_slave_with_master master_c +RESET MASTER; +--let $file_d= query_get_value(SHOW MASTER STATUS, File, 1) +--let $pos_d= query_get_value(SHOW MASTER STATUS, Position, 1) +--connection master_d +RESET SLAVE; +--replace_result $SLAVE_MYPORT1 MASTER_C_PORT $file_d LOG_FILE $pos_d LOG_POS +--eval CHANGE MASTER TO master_host='127.0.0.1',master_port=$SLAVE_MYPORT1,master_user='root',master_log_file='$file_d',master_log_pos=$pos_d +START SLAVE; +--connection master_c +--sync_slave_with_master master_d +--source include/circular_rpl_for_4_hosts_sync.inc + +--echo +--echo * Check data inserted before restoring schema A->B->C->D->A * +--connection master_a +SELECT 'Master A',a,b FROM t1 WHERE c IN (2,3) ORDER BY a,b; +--sync_slave_with_master master_b +SELECT 'Master B',a,b FROM t1 WHERE c IN (2,3) ORDER BY a,b; +--sync_slave_with_master master_c +SELECT 'Master C',a,b FROM t1 WHERE c IN (2,3) ORDER BY a,b; +--sync_slave_with_master master_d +SELECT 'Master D',a,b FROM t1 WHERE c IN (2,3) ORDER BY a,b; +--sync_slave_with_master master_a +--echo + +--echo * Check data inserted after restoring schema A->B->C->D->A * +--connection master_a +INSERT INTO t1(b,c) VALUES('A',4); +--connection master_b +INSERT INTO t1(b,c) VALUES('B',4); +--connection master_c +INSERT INTO t1(b,c) VALUES('C',4); +--connection master_d +INSERT INTO t1(b,c) VALUES('D',4); +--connection master_a + +--source include/circular_rpl_for_4_hosts_sync.inc + +--connection master_a +SELECT 'Master A',a,b FROM t1 WHERE c = 4 ORDER BY a,b; +--connection master_b +SELECT 'Master B',a,b FROM t1 WHERE c = 4 ORDER BY a,b; +--connection master_c +SELECT 'Master C',a,b FROM t1 WHERE c = 4 ORDER BY a,b; +--connection master_d +SELECT 'Master D',a,b FROM t1 WHERE c = 4 ORDER BY a,b; +--connection master_a +--echo + +--echo * Transactions with commits * +# Testing mixing of transactions and regular inserts +--connection master_a +BEGIN; +--connection master_c +BEGIN; +let $counter= 100; +--connection master_a +--disable_query_log +while ($counter) { + --connection master_a + INSERT INTO t2(b,c) VALUES('A',1); + --connection master_b + INSERT INTO t2(b,c) VALUES('B',1); + --connection master_c + INSERT INTO t2(b,c) VALUES('C',1); + --connection master_d + INSERT INTO t2(b,c) VALUES('D',1); + dec $counter; +} +--connection master_a +COMMIT; +--connection master_c +COMMIT; +--connection master_a +--enable_query_log + + +--let $wait_condition= SELECT COUNT(*)=400 FROM t2 WHERE c = 1 +--connection master_a +--source include/wait_condition.inc +--connection master_b +--source include/wait_condition.inc +--connection master_c +--source include/wait_condition.inc +--connection master_d +--source include/wait_condition.inc + +--connection master_a +SELECT 'Master A',b,COUNT(*) FROM t2 WHERE c = 1 GROUP BY b ORDER BY b; +--connection master_b +SELECT 'Master B',b,COUNT(*) FROM t2 WHERE c = 1 GROUP BY b ORDER BY b; +--connection master_c +SELECT 'Master C',b,COUNT(*) FROM t2 WHERE c = 1 GROUP BY b ORDER BY b; +--connection master_d +SELECT 'Master D',b,COUNT(*) FROM t2 WHERE c = 1 GROUP BY b ORDER BY b; +--connection master_a +--echo + +--echo * Transactions with rollbacks * +# Testing mixing of transactions with rollback and regular inserts +--connection master_a +BEGIN; +--connection master_c +BEGIN; +let $counter= 100; +--connection master_a +--disable_query_log +while ($counter) { + --connection master_a + INSERT INTO t2(b,c) VALUES('A',2); + --connection master_b + INSERT INTO t2(b,c) VALUES('B',2); + --connection master_c + INSERT INTO t2(b,c) VALUES('C',2); + --connection master_d + INSERT INTO t2(b,c) VALUES('D',2); + dec $counter; +} +--connection master_a +ROLLBACK; +--connection master_c +ROLLBACK; +--connection master_a +--enable_query_log + +--let $wait_condition= SELECT COUNT(*)=200 FROM t2 WHERE c = 2 +--connection master_a +--source include/wait_condition.inc +--connection master_b +--source include/wait_condition.inc +--connection master_c +--source include/wait_condition.inc +--connection master_d +--source include/wait_condition.inc + +--connection master_a +SELECT 'Master A',b,COUNT(*) FROM t2 WHERE c = 2 GROUP BY b ORDER BY b; +--connection master_b +SELECT 'Master B',b,COUNT(*) FROM t2 WHERE c = 2 GROUP BY b ORDER BY b; +--connection master_c +SELECT 'Master C',b,COUNT(*) FROM t2 WHERE c = 2 GROUP BY b ORDER BY b; +--connection master_d +SELECT 'Master D',b,COUNT(*) FROM t2 WHERE c = 2 GROUP BY b ORDER BY b; +--connection master_a + +--echo + +# Clean up +--echo *** Clean up *** +--connection master_a +DROP TABLE t1,t2; +--source include/circular_rpl_for_4_hosts_sync.inc + +--connection master_a +STOP SLAVE; +RESET SLAVE; +--connection master_b +STOP SLAVE; +RESET SLAVE; +--connection master_c +STOP SLAVE; +RESET SLAVE; +--connection master_d +STOP SLAVE; +RESET SLAVE; diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result new file mode 100644 index 00000000000..5ad36e6f251 --- /dev/null +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result @@ -0,0 +1,101 @@ +STOP SLAVE; +STOP SLAVE; +STOP SLAVE; +STOP SLAVE; +DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8,t9; +RESET MASTER; +DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8,t9; +RESET MASTER; +DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8,t9; +RESET MASTER; +DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8,t9; +RESET MASTER; +RESET SLAVE; +CHANGE MASTER TO master_host='127.0.0.1',master_port=MASTER_MYPORT,master_user='root'; +START SLAVE; +RESET SLAVE; +CHANGE MASTER TO master_host='127.0.0.1',master_port=SLAVE_MYPORT1,master_user='root'; +START SLAVE; + +*** Check server_id of mysqld servers *** +SHOW VARIABLES LIKE "server_id"; +Variable_name Value +server_id 1 +SET auto_increment_offset = 1; +SET auto_increment_increment = 2; +SHOW VARIABLES LIKE "server_id"; +Variable_name Value +server_id 1 +SET auto_increment_offset = 1; +SET auto_increment_increment = 2; +SHOW VARIABLES LIKE "server_id"; +Variable_name Value +server_id 2 +SET auto_increment_offset = 2; +SET auto_increment_increment = 2; +SHOW VARIABLES LIKE "server_id"; +Variable_name Value +server_id 2 +SET auto_increment_offset = 2; +SET auto_increment_increment = 2; + +*** Preparing data *** +CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT, b VARCHAR(100), c INT NOT NULL, PRIMARY KEY(a)) ENGINE=ndb; + +*** Basic testing *** +Insert rows via all hosts +Check data on both clusters +* Cluster A * +SELECT COUNT(*), SUM(a), b FROM t1 WHERE c = 1 GROUP BY b ORDER BY b; +COUNT(*) SUM(a) b +10 190 master +10 210 master1 +10 200 slave +10 220 slave1 +* Cluster B * +SELECT COUNT(*), SUM(a), b FROM t1 WHERE c = 1 GROUP BY b ORDER BY b; +COUNT(*) SUM(a) b +10 190 master +10 210 master1 +10 200 slave +10 220 slave1 + +*** Transaction testing *** +BEGIN; +BEGIN; +COMMIT; +COMMIT; +Check data on both clusters +* Cluster A * +SELECT COUNT(*), SUM(a), b FROM t1 WHERE c = 2 GROUP BY b ORDER BY b; +COUNT(*) SUM(a) b +100 23900 master +100 24100 master1 +100 24000 slave +100 24200 slave1 +* Cluster B * +SELECT COUNT(*), SUM(a), b FROM t1 WHERE c = 2 GROUP BY b ORDER BY b; +COUNT(*) SUM(a) b +100 23900 master +100 24100 master1 +100 24000 slave +100 24200 slave1 + +BEGIN; +BEGIN; +ROLLBACK; +ROLLBACK; +Check data on both clusters +* Cluster A * +SELECT COUNT(*), SUM(a), b FROM t1 WHERE c = 3 GROUP BY b ORDER BY b; +COUNT(*) SUM(a) b +100 64100 master1 +100 64000 slave +* Cluster B * +SELECT COUNT(*), SUM(a), b FROM t1 WHERE c = 3 GROUP BY b ORDER BY b; +COUNT(*) SUM(a) b +100 64100 master1 +100 64000 slave + +DELETE FROM t1; + diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-master.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-master.opt new file mode 100644 index 00000000000..3462bbc05d7 --- /dev/null +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-master.opt @@ -0,0 +1 @@ +--slave-num=2 --server-id=1 --log-bin -log-slave-updates diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-slave.opt new file mode 100644 index 00000000000..6507907b1ed --- /dev/null +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-slave.opt @@ -0,0 +1 @@ +--server-id=2 --log-bin --log-slave-updates --skip-slave-start diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test new file mode 100644 index 00000000000..beaa2739b23 --- /dev/null +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test @@ -0,0 +1,179 @@ +############################################################# +# Author: Serge Kozlov +# Date: 03/17/2008 +# Purpose: Testing cluster circular replication based on two +# independent channels between two clusters +############################################################# +--source include/have_ndb.inc +--source include/ndb_master-slave_2ch.inc +--echo + +# Check server_id and set auto_increment_* variables +--echo *** Check server_id of mysqld servers *** +--connection master +SHOW VARIABLES LIKE "server_id"; +SET auto_increment_offset = 1; +SET auto_increment_increment = 2; +--connection master1 +SHOW VARIABLES LIKE "server_id"; +SET auto_increment_offset = 1; +SET auto_increment_increment = 2; +--connection slave +SHOW VARIABLES LIKE "server_id"; +SET auto_increment_offset = 2; +SET auto_increment_increment = 2; +--connection slave1 +SHOW VARIABLES LIKE "server_id"; +SET auto_increment_offset = 2; +SET auto_increment_increment = 2; +--echo + +# Preparing data. +--echo *** Preparing data *** +--connection master +CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT, b VARCHAR(100), c INT NOT NULL, PRIMARY KEY(a)) ENGINE=ndb; + +let $wait_binlog_event= CREATE TABLE t1; +--source include/wait_for_binlog_event.inc +--connection master1 +--source include/wait_for_binlog_event.inc +--connection slave +--source include/wait_for_binlog_event.inc +--connection slave1 +--source include/wait_for_binlog_event.inc +--echo + +# +# Testing +# + +--echo *** Basic testing *** +# insert data via all hosts +--echo Insert rows via all hosts +--disable_query_log +let $counter= 10; +while ($counter) { + --connection master + INSERT INTO t1(b,c) VALUES('master',1); + --connection master1 + INSERT INTO t1(b,c) VALUES('master1',1); + --connection slave + INSERT INTO t1(b,c) VALUES('slave',1); + --connection slave1 + INSERT INTO t1(b,c) VALUES('slave1',1); + dec $counter; +} +--connection master +--enable_query_log + +# Wait replication between clusters +let $wait_condition= SELECT COUNT(*)=40 FROM t1 WHERE c = 1; +--source include/wait_condition.inc +--connection slave +--source include/wait_condition.inc + +# Check data +--echo Check data on both clusters +--connection master +--echo * Cluster A * +SELECT COUNT(*), SUM(a), b FROM t1 WHERE c = 1 GROUP BY b ORDER BY b; +--connection slave +--echo * Cluster B * +SELECT COUNT(*), SUM(a), b FROM t1 WHERE c = 1 GROUP BY b ORDER BY b; +--echo + +--echo *** Transaction testing *** +# Start transaction for one mysqld and do mass of inserts for other. +# Do it for for both clusters + +--connection master +BEGIN; +--connection slave1 +BEGIN; +let $counter= 100; +--connection master +--disable_query_log +while ($counter) { + --connection master + INSERT INTO t1(b,c) VALUES('master',2); + --connection master1 + INSERT INTO t1(b,c) VALUES('master1',2); + --connection slave + INSERT INTO t1(b,c) VALUES('slave',2); + --connection slave1 + INSERT INTO t1(b,c) VALUES('slave1',2); + dec $counter; +} +--connection master +--enable_query_log +COMMIT; +--connection slave1 +COMMIT; + +# Wait replication between clusters +--connection master +let $wait_condition= SELECT COUNT(*)=400 FROM t1 WHERE c = 2; +--source include/wait_condition.inc +--connection slave +--source include/wait_condition.inc + +--echo Check data on both clusters +--connection master +--echo * Cluster A * +SELECT COUNT(*), SUM(a), b FROM t1 WHERE c = 2 GROUP BY b ORDER BY b; +--connection slave +--echo * Cluster B * +SELECT COUNT(*), SUM(a), b FROM t1 WHERE c = 2 GROUP BY b ORDER BY b; +--echo + +# Start transaction and then roll back + +--connection master +BEGIN; +--connection slave1 +BEGIN; +let $counter= 100; +--connection master +--disable_query_log +while ($counter) { + --connection master + INSERT INTO t1(b,c) VALUES('master',3); + --connection master1 + INSERT INTO t1(b,c) VALUES('master1',3); + --connection slave + INSERT INTO t1(b,c) VALUES('slave',3); + --connection slave1 + INSERT INTO t1(b,c) VALUES('slave1',3); + dec $counter; +} +--connection master +--enable_query_log +ROLLBACK; +--connection slave1 +ROLLBACK; + +# Wait replication between clusters +--connection master +let $wait_condition= SELECT COUNT(*)=200 FROM t1 WHERE c = 3; +--source include/wait_condition.inc +--connection slave +--source include/wait_condition.inc + +--echo Check data on both clusters +--connection master +--echo * Cluster A * +SELECT COUNT(*), SUM(a), b FROM t1 WHERE c = 3 GROUP BY b ORDER BY b; +--connection slave +--echo * Cluster B * +SELECT COUNT(*), SUM(a), b FROM t1 WHERE c = 3 GROUP BY b ORDER BY b; +--echo + +# Clean up +--connection master +DELETE FROM t1; +--connection slave +let $wait_condition= SELECT COUNT(*)=0 FROM t1; +--source include/wait_condition.inc +--echo + +# End of test 5.1 From ffe4385b2ad49839441493440fe8ff961ea4b47b Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 25 Apr 2008 08:21:26 +0200 Subject: [PATCH 158/705] Add missing "include/have_ndb.inc" --- mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test index 1657a6902ba..e954c72fd1d 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test @@ -5,6 +5,7 @@ # to other engines (innodb, myisam), see also rpl_ndb_2other.test ############################################################## --source include/have_binlog_format_mixed_or_row.inc +--source include/have_ndb.inc --source include/ndb_master-slave.inc # On master use NDB as storage engine. From b1d7f68443629e4b8585d947770048447f51cc18 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 25 Apr 2008 10:31:13 +0200 Subject: [PATCH 159/705] Don't print stats when test run is abort because of test failure --- mysql-test/mysql-test-run.pl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index c2e9bd7cf65..c1fca25c477 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -291,6 +291,7 @@ sub main { mtr_print_thick_line(); mtr_print_header(); + my $num_tests= @$tests; my $completed= run_test_server($server, $tests, $opt_parallel); # Send Ctrl-C to any children still running @@ -308,6 +309,12 @@ sub main { } } + if ( @$completed != $num_tests){ + # Not all tests completed, failure + mtr_error("Test failed.", + "To continue, re-run with '--force'"); + } + mtr_verbose("Server exit\n"); mtr_print_line(); From bd21ce694217226c22752dd0c3f80197cef1c9cb Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 25 Apr 2008 10:51:11 +0200 Subject: [PATCH 160/705] Only allow "suitename" to be used as a aptch if it has at least one directory part --- mysql-test/lib/mtr_cases.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index f46c0165e27..f84129cf1ee 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -52,6 +52,7 @@ sub collect_option { } use File::Basename; +use File::Spec::Functions qw / splitdir /; use IO::File(); use My::Config; use My::Platform; @@ -249,8 +250,12 @@ sub collect_one_suite($) my $suitedir= "$::glob_mysql_test_dir"; # Default if ( $suite ne "main" ) { - if ( -d $suite ){ + # Allow suite to be path to "some dir" if $suite has at least + # one directory part + if ( -d $suite and splitdir($suite) > 1 ){ $suitedir= $suite; + mtr_report(" - from '$suitedir'"); + } else { From 99a5c22d1193ae2c69ba2f0388a225825cfeae75 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 25 Apr 2008 11:22:15 +0200 Subject: [PATCH 161/705] Be more prcise in which cluster_config sections should be expanded. Ie don't treat cluster_config.mysqld.1.1 as a section specifying a cluster --- mysql-test/lib/My/ConfigFactory.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index 29988d0013b..05b90e24c49 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -416,7 +416,7 @@ sub post_fix_mysql_cluster_section { # Add a [mysl_cluster.] section for each # defined [cluster_config.] section - foreach my $group ( $config->like('cluster_config.') ) + foreach my $group ( $config->like('cluster_config.[0-9]') ) { my @urls; # Generate ndb_connectstring for this cluster @@ -497,7 +497,7 @@ sub run_generate_sections_from_cluster_config { my @options= ('ndb_mgmd', 'ndbd', 'mysqld', 'ndbapi'); - foreach my $group ( $config->like('cluster_config.') ) { + foreach my $group ( $config->like('cluster_config.[0-9]') ) { # Keep track of current index per process type my %idxes; @@ -580,7 +580,7 @@ sub new_config { $self->run_section_rules($config, - 'cluster_config.', + 'cluster_config.[0-9]', @cluster_config_rules); $self->run_generate_sections_from_cluster_config($config); From 452c661487a2d10704993e9630a7935c652b5b19 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 25 Apr 2008 12:40:38 +0200 Subject: [PATCH 162/705] Temporarily disable "rpl_circular_for_4_hosts" and "rpl_ndb.rpl_ndb_circular_2ch" --- mysql-test/suite/rpl/t/disabled.def | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def index 4375a2a8aa5..e6c8e701c0f 100644 --- a/mysql-test/suite/rpl/t/disabled.def +++ b/mysql-test/suite/rpl/t/disabled.def @@ -15,3 +15,6 @@ rpl_innodb_bug28430 : Bug #32247 2007-11-27 mats Test reports wrong value o rpl_view : Bug#32654: rpl_view.test fails randomly rpl_ndb_multi : Bug#30751: rpl_ndb_multi missing row in output rpl_log_pos : Bug#8693 Test 'rpl_log_pos' fails sometimes +rpl_circular_for_4_hosts : Needs updated config +rpl_ndb_circular_2ch : Needs updated config + From 4a490373a2ebca46b58d16f7c72a024cb4132d09 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 25 Apr 2008 14:07:17 +0200 Subject: [PATCH 163/705] Make it possible to specify test specifi config file as .cnf --- mysql-test/lib/mtr_cases.pm | 9 +++++++++ mysql-test/suite/rpl/t/rpl_000015-master.opt | 2 -- mysql-test/suite/rpl/t/rpl_000015.cnf | 2 ++ mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt | 3 --- mysql-test/suite/rpl/t/rpl_rotate_logs.cnf | 6 ++++++ 5 files changed, 17 insertions(+), 5 deletions(-) delete mode 100644 mysql-test/suite/rpl/t/rpl_000015-master.opt create mode 100644 mysql-test/suite/rpl/t/rpl_000015.cnf delete mode 100644 mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt create mode 100644 mysql-test/suite/rpl/t/rpl_rotate_logs.cnf diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index f84129cf1ee..4f1f83c0951 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -754,6 +754,15 @@ sub collect_one_test_case { # ---------------------------------------------------------------------- process_opts_file($tinfo, "$testdir/$tname-slave.opt", 'slave_opt'); + # ---------------------------------------------------------------------- + # Check for test specific config file + # ---------------------------------------------------------------------- + my $test_cnf_file= "$testdir/$tname.cnf"; + if ( -f $test_cnf_file ) { + # Specifies the configuration file to use for this test + $tinfo->{'template_path'}= $test_cnf_file; + } + # ---------------------------------------------------------------------- # master sh # ---------------------------------------------------------------------- diff --git a/mysql-test/suite/rpl/t/rpl_000015-master.opt b/mysql-test/suite/rpl/t/rpl_000015-master.opt deleted file mode 100644 index 59a8261ba69..00000000000 --- a/mysql-test/suite/rpl/t/rpl_000015-master.opt +++ /dev/null @@ -1,2 +0,0 @@ ---config-file-template=../rpl_1slave_base.cnf - diff --git a/mysql-test/suite/rpl/t/rpl_000015.cnf b/mysql-test/suite/rpl/t/rpl_000015.cnf new file mode 100644 index 00000000000..46f8af242c2 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_000015.cnf @@ -0,0 +1,2 @@ +!include ../rpl_1slave_base.cnf + diff --git a/mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt b/mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt deleted file mode 100644 index 550212a5297..00000000000 --- a/mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt +++ /dev/null @@ -1,3 +0,0 @@ --O max_binlog_size=4096 ---config-file-template=../rpl_1slave_base.cnf - diff --git a/mysql-test/suite/rpl/t/rpl_rotate_logs.cnf b/mysql-test/suite/rpl/t/rpl_rotate_logs.cnf new file mode 100644 index 00000000000..7e676dc2da8 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_rotate_logs.cnf @@ -0,0 +1,6 @@ +!include ../rpl_1slave_base.cnf + +[mysqld.1] +max_binlog_size=4096 + + From 63389b150c4ada7cb151aad30098599711ea02bb Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 25 Apr 2008 14:34:15 +0200 Subject: [PATCH 164/705] Allow aplhanumericals in cluster_confgi.xxx sectio --- mysql-test/lib/My/ConfigFactory.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index 05b90e24c49..3558bd0c4db 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -416,7 +416,7 @@ sub post_fix_mysql_cluster_section { # Add a [mysl_cluster.] section for each # defined [cluster_config.] section - foreach my $group ( $config->like('cluster_config.[0-9]') ) + foreach my $group ( $config->like('cluster_config\.\w*') ) { my @urls; # Generate ndb_connectstring for this cluster @@ -497,7 +497,7 @@ sub run_generate_sections_from_cluster_config { my @options= ('ndb_mgmd', 'ndbd', 'mysqld', 'ndbapi'); - foreach my $group ( $config->like('cluster_config.[0-9]') ) { + foreach my $group ( $config->like('cluster_config\.\w*') ) { # Keep track of current index per process type my %idxes; @@ -580,7 +580,7 @@ sub new_config { $self->run_section_rules($config, - 'cluster_config.[0-9]', + 'cluster_config\.\w*', @cluster_config_rules); $self->run_generate_sections_from_cluster_config($config); From 425ceb2a65b99f080e8795867a260cbea63b5c2e Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 25 Apr 2008 14:38:46 +0200 Subject: [PATCH 165/705] Add lib/my/Test.pm --- mysql-test/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 31804714900..02dea1a4466 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -38,6 +38,7 @@ nobase_test_DATA = lib/mtr_cases.pm \ lib/My/Config.pm \ lib/My/Find.pm \ lib/My/Options.pm \ + lib/My/Test.pm \ lib/My/Platform.pm \ lib/My/SafeProcess.pm \ lib/My/File/Path.pm \ From 5f69fe5b89cac59d23fe2b956de4dab5fbc17aed Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 25 Apr 2008 15:07:50 +0200 Subject: [PATCH 166/705] Move rpl_ndb_circular_2ch to disabled.def in rpl_ndb --- mysql-test/suite/rpl/t/disabled.def | 1 - mysql-test/suite/rpl_ndb/t/disabled.def | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def index e6c8e701c0f..538719aaf65 100644 --- a/mysql-test/suite/rpl/t/disabled.def +++ b/mysql-test/suite/rpl/t/disabled.def @@ -16,5 +16,4 @@ rpl_view : Bug#32654: rpl_view.test fails randomly rpl_ndb_multi : Bug#30751: rpl_ndb_multi missing row in output rpl_log_pos : Bug#8693 Test 'rpl_log_pos' fails sometimes rpl_circular_for_4_hosts : Needs updated config -rpl_ndb_circular_2ch : Needs updated config diff --git a/mysql-test/suite/rpl_ndb/t/disabled.def b/mysql-test/suite/rpl_ndb/t/disabled.def index ebc99feeac6..a37bd1ee6bb 100644 --- a/mysql-test/suite/rpl_ndb/t/disabled.def +++ b/mysql-test/suite/rpl_ndb/t/disabled.def @@ -14,3 +14,4 @@ rpl_ndb_circular : Bug#33849 COMMIT event missing in cluster circular re rpl_ndb_circular_simplex : Bug#33849 COMMIT event missing in cluster circular replication. # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open +rpl_ndb_circular_2ch : Needs updated config From d8b5c50e6b49803ed9ec595fb1669650d0586125 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 25 Apr 2008 16:09:25 +0200 Subject: [PATCH 167/705] Add "match end of string" marker so that only "cluster_config.xxx" are found --- mysql-test/lib/My/ConfigFactory.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index 3558bd0c4db..69bb969d7b8 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -416,7 +416,7 @@ sub post_fix_mysql_cluster_section { # Add a [mysl_cluster.] section for each # defined [cluster_config.] section - foreach my $group ( $config->like('cluster_config\.\w*') ) + foreach my $group ( $config->like('cluster_config\.\w*$') ) { my @urls; # Generate ndb_connectstring for this cluster @@ -497,7 +497,7 @@ sub run_generate_sections_from_cluster_config { my @options= ('ndb_mgmd', 'ndbd', 'mysqld', 'ndbapi'); - foreach my $group ( $config->like('cluster_config\.\w*') ) { + foreach my $group ( $config->like('cluster_config\.\w*$') ) { # Keep track of current index per process type my %idxes; @@ -580,7 +580,7 @@ sub new_config { $self->run_section_rules($config, - 'cluster_config\.\w*', + 'cluster_config\.\w*$', @cluster_config_rules); $self->run_generate_sections_from_cluster_config($config); From 9ac996e16ecde97590f449bc472b4feaf2d6a454 Mon Sep 17 00:00:00 2001 From: "skozlov/ksm@mysql.com/virtop.(none)" <> Date: Fri, 25 Apr 2008 20:54:42 +0400 Subject: [PATCH 168/705] WL#3754, circular replication tests --- .../include/circular_rpl_for_4_hosts_init.inc | 2 +- .../rpl/r/rpl_circular_for_4_hosts.result | 2 +- .../rpl/t/rpl_circular_for_4_hosts-master.opt | 1 - .../rpl/t/rpl_circular_for_4_hosts-slave.opt | 1 - .../suite/rpl/t/rpl_circular_for_4_hosts.cnf | 27 ++++++++++++++ .../rpl_ndb/t/rpl_ndb_circular_2ch-master.opt | 1 - .../rpl_ndb/t/rpl_ndb_circular_2ch-slave.opt | 1 - .../suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf | 35 +++++++++++++++++++ .../suite/rpl_ndb/t/rpl_ndb_circular_2ch.test | 5 ++- 9 files changed, 66 insertions(+), 9 deletions(-) delete mode 100644 mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-master.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-slave.opt create mode 100644 mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.cnf delete mode 100644 mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-master.opt delete mode 100644 mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-slave.opt create mode 100644 mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf diff --git a/mysql-test/include/circular_rpl_for_4_hosts_init.inc b/mysql-test/include/circular_rpl_for_4_hosts_init.inc index 8be6ef10b3e..ac6654777db 100644 --- a/mysql-test/include/circular_rpl_for_4_hosts_init.inc +++ b/mysql-test/include/circular_rpl_for_4_hosts_init.inc @@ -18,7 +18,7 @@ --source include/master-slave.inc # -# Set up circular ring by schema A->B->C-D->A +# Set up circular ring by schema A->B->C->D->A # --connection slave diff --git a/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result b/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result index 5b775a066c4..4f0f20d88d9 100644 --- a/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result +++ b/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result @@ -1,4 +1,4 @@ -*** Set up circular ring by schema A->B->C-D->A *** +*** Set up circular ring by schema A->B->C->D->A *** stop slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; reset master; diff --git a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-master.opt b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-master.opt deleted file mode 100644 index d540d4a6880..00000000000 --- a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-master.opt +++ /dev/null @@ -1 +0,0 @@ ---slave-num=3 --log-slave-updates --innodb diff --git a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-slave.opt b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-slave.opt deleted file mode 100644 index f5df45c8ecd..00000000000 --- a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---log-slave-updates --innodb diff --git a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.cnf b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.cnf new file mode 100644 index 00000000000..141aaa7788d --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.cnf @@ -0,0 +1,27 @@ +!include ../my.cnf + +[mysqld.1] +log-slave-updates +innodb + +[mysqld.2] +log-slave-updates +innodb + +[mysqld.3] +log-slave-updates +innodb + +[mysqld.4] +log-slave-updates +innodb + +[ENV] +SLAVE_MYPORT1= @mysqld.3.port +SLAVE_MYSOCK1= @mysqld.3.socket + +SLAVE_MYPORT2= @mysqld.4.port +SLAVE_MYSOCK2= @mysqld.4.socket + + + diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-master.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-master.opt deleted file mode 100644 index 3462bbc05d7..00000000000 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-master.opt +++ /dev/null @@ -1 +0,0 @@ ---slave-num=2 --server-id=1 --log-bin -log-slave-updates diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-slave.opt deleted file mode 100644 index 6507907b1ed..00000000000 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---server-id=2 --log-bin --log-slave-updates --skip-slave-start diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf new file mode 100644 index 00000000000..27da0af1847 --- /dev/null +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf @@ -0,0 +1,35 @@ +!include ../my.cnf + +[mysqld.1.1] +server-id= 1 +log-bin +log-slave-updates + +[mysqld.2.1] +server-id= 1 +log-bin +log-slave-updates + +[mysqld.1.slave] +server-id= 2 +log-bin +log-slave-updates +skip-slave-start + +[mysqld.2.slave] +server-id= 2 +master-host= 127.0.0.1 +master-port= @mysqld.2.1.port +master-password= @mysqld.2.1.#password +master-user= @mysqld.2.1.#user +master-connect-retry= 1 +init-rpl-role= slave +log-bin +log-slave-updates +skip-slave-start +ndb_connectstring= @mysql_cluster.slave.ndb_connectstring + +[ENV] + +SLAVE_MYPORT1= @mysqld.2.slave.port +SLAVE_MYSOCK1= @mysqld.2.slave.socket diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test index beaa2739b23..fad94539b1c 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test @@ -170,10 +170,9 @@ SELECT COUNT(*), SUM(a), b FROM t1 WHERE c = 3 GROUP BY b ORDER BY b; # Clean up --connection master -DELETE FROM t1; +DROP TABLE t1; --connection slave -let $wait_condition= SELECT COUNT(*)=0 FROM t1; ---source include/wait_condition.inc +DROP TABLE t1; --echo # End of test 5.1 From 59c15c6730e90816a740a7518142879cd9305abc Mon Sep 17 00:00:00 2001 From: "skozlov/ksm@mysql.com/virtop.(none)" <> Date: Fri, 25 Apr 2008 22:54:20 +0400 Subject: [PATCH 169/705] WL#3754 Fix for mtr, added support personal configuration for test cases --- mysql-test/lib/mtr_cases.pm | 10 ++++++++++ mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index f46c0165e27..3ac286811a2 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -748,6 +748,16 @@ sub collect_one_test_case { # Add slave opts, list of extra option only for slave # ---------------------------------------------------------------------- process_opts_file($tinfo, "$testdir/$tname-slave.opt", 'slave_opt'); + + + #----------------------------------------------------------------------- + # Check for test specific config file + #----------------------------------------------------------------------- + my $test_cnf_file= "$testdir/$tname.cnf"; + if ( -f $test_cnf_file) { + # Specifies the configuration file to use for this test + $tinfo->{'template_path'}= $test_cnf_file; + } # ---------------------------------------------------------------------- # master sh diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result index 5ad36e6f251..53130343aa0 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result @@ -97,5 +97,6 @@ COUNT(*) SUM(a) b 100 64100 master1 100 64000 slave -DELETE FROM t1; +DROP TABLE t1; +DROP TABLE t1; From fd5313887248ef2d5f68d951ae5ae81f528d2d8d Mon Sep 17 00:00:00 2001 From: "skozlov/ksm@mysql.com/virtop.(none)" <> Date: Sat, 26 Apr 2008 02:17:34 +0400 Subject: [PATCH 170/705] WL#3754, rpl_ndb_circular_2ch test disabled --- mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result | 2 +- mysql-test/suite/rpl_ndb/t/disabled.def | 2 +- mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result index 53130343aa0..bb662542a56 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result @@ -98,5 +98,5 @@ COUNT(*) SUM(a) b 100 64000 slave DROP TABLE t1; -DROP TABLE t1; +DROP TABLE IF EXISTS t1; diff --git a/mysql-test/suite/rpl_ndb/t/disabled.def b/mysql-test/suite/rpl_ndb/t/disabled.def index ebc99feeac6..8177095f5a8 100644 --- a/mysql-test/suite/rpl_ndb/t/disabled.def +++ b/mysql-test/suite/rpl_ndb/t/disabled.def @@ -12,5 +12,5 @@ rpl_ndb_circular : Bug#33849 COMMIT event missing in cluster circular replication. rpl_ndb_circular_simplex : Bug#33849 COMMIT event missing in cluster circular replication. - +rpl_ndb_circular_2ch : Bug#33849 COMMIT event missing in cluster circular replication. # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test index fad94539b1c..abd2144b80c 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test @@ -172,7 +172,9 @@ SELECT COUNT(*), SUM(a), b FROM t1 WHERE c = 3 GROUP BY b ORDER BY b; --connection master DROP TABLE t1; --connection slave -DROP TABLE t1; +--disable_warings +DROP TABLE IF EXISTS t1; +--enable_warnings --echo # End of test 5.1 From fa5d32de711b003c3b11a62179eea95f24305854 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Sat, 26 Apr 2008 09:35:04 +0200 Subject: [PATCH 171/705] Don't use empty string instead of --plugin-dir when plugins are not found --- mysql-test/mysql-test-run.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index c1fca25c477..b033166513a 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1404,8 +1404,8 @@ sub environment_setup { $ENV{'UDF_EXAMPLE_LIB'}= ($lib_udf_example ? basename($lib_udf_example) : ""); - $ENV{'UDF_EXAMPLE_LIB_OPT'}= - ($lib_udf_example ? "--plugin_dir=" . dirname($lib_udf_example) : ""); + $ENV{'UDF_EXAMPLE_LIB_OPT'}= "--plugin-dir=". + ($lib_udf_example ? dirname($lib_udf_example) : ""); # -------------------------------------------------------------------------- # Add the path where mysqld will find ha_example.so @@ -1416,9 +1416,9 @@ sub environment_setup { "$basedir/storage/example/.libs/ha_example.so",); $ENV{'EXAMPLE_PLUGIN'}= ($lib_example_plugin ? basename($lib_example_plugin) : ""); - $ENV{'EXAMPLE_PLUGIN_OPT'}= - ($lib_example_plugin ? - "--plugin_dir=" . dirname($lib_example_plugin) : ""); + $ENV{'EXAMPLE_PLUGIN_OPT'}= "--plugin-dir=". + ($lib_example_plugin ? dirname($lib_example_plugin) : ""); + } # -------------------------------------------------------------------------- From 4a8347cbc4a4b5d6cf774776291a9f16eef5fae2 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Sat, 26 Apr 2008 10:09:42 +0200 Subject: [PATCH 172/705] Remove temporary disablings --- mysql-test/suite/rpl/t/disabled.def | 1 - mysql-test/suite/rpl_ndb/t/disabled.def | 1 - 2 files changed, 2 deletions(-) diff --git a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def index 538719aaf65..599a2b197ae 100644 --- a/mysql-test/suite/rpl/t/disabled.def +++ b/mysql-test/suite/rpl/t/disabled.def @@ -15,5 +15,4 @@ rpl_innodb_bug28430 : Bug #32247 2007-11-27 mats Test reports wrong value o rpl_view : Bug#32654: rpl_view.test fails randomly rpl_ndb_multi : Bug#30751: rpl_ndb_multi missing row in output rpl_log_pos : Bug#8693 Test 'rpl_log_pos' fails sometimes -rpl_circular_for_4_hosts : Needs updated config diff --git a/mysql-test/suite/rpl_ndb/t/disabled.def b/mysql-test/suite/rpl_ndb/t/disabled.def index 4bcc9f95d05..8177095f5a8 100644 --- a/mysql-test/suite/rpl_ndb/t/disabled.def +++ b/mysql-test/suite/rpl_ndb/t/disabled.def @@ -14,4 +14,3 @@ rpl_ndb_circular : Bug#33849 COMMIT event missing in cluster circular re rpl_ndb_circular_simplex : Bug#33849 COMMIT event missing in cluster circular replication. rpl_ndb_circular_2ch : Bug#33849 COMMIT event missing in cluster circular replication. # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open -rpl_ndb_circular_2ch : Needs updated config From d0d79913adf741865891279e69c039591399bf74 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Sat, 26 Apr 2008 22:16:20 +0200 Subject: [PATCH 173/705] Use parallel=4 as default --- mysql-test/mysql-test-run.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index b033166513a..b7fd4974754 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -162,7 +162,7 @@ my $opt_repeat= 1; my $opt_retry= 3; my $opt_retry_failure= 2; -my $opt_parallel= 1; +my $opt_parallel= 4; my $opt_strace_client; From 3f48a30625b4f3bf7e2a21b78dc2c0f0ef1c1fb8 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Sun, 27 Apr 2008 15:32:12 +0200 Subject: [PATCH 174/705] Save datadir in case of test failure, but limit the number of times datadir can be saved in case of constantly failing servers Remove datadirs each time all servers have been stopped thus limiting the size of vardir. The datadirs of failed tests have been saved and that should be enough to diagnose any failures --- mysql-test/mysql-test-run.pl | 176 +++++++++++++++++++++++------------ 1 file changed, 119 insertions(+), 57 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index f4f45c5a61a..28e9501dec7 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -193,9 +193,12 @@ our %mysqld_variables; my $source_dist= 0; -our $opt_max_save_core= 5; +my $opt_max_save_core= $ENV{MTR_MAX_SAVE_CORE} || 5; my $num_saved_cores= 0; # Number of core files saved in vardir/log/ so far. +my $opt_max_save_datadir= $ENV{MTR_MAX_SAVE_DATADIR} || 20; +my $num_saved_datadir= 0; # Number of datadirs saved in vardir/log/ so far. + select(STDOUT); $| = 1; # Automatically flush STDOUT @@ -351,6 +354,7 @@ sub command_line_setup { 'client-debugger=s' => \$opt_client_debugger, 'strace-client:s' => \$opt_strace_client, 'max-save-core=i' => \$opt_max_save_core, + 'max-save-datadir=i' => \$opt_max_save_datadir, # Coverage, profiling etc 'gcov' => \$opt_gcov, @@ -2325,6 +2329,10 @@ sub run_testcase ($) { if ( started(all_servers()) == 0 ) { + + # Remove old datadirs + clean_datadir(); + # Restore old ENV while (my ($option, $value)= each( %old_env )) { if (defined $value){ @@ -2448,15 +2456,12 @@ sub run_testcase ($) { mtr_report_test_passed($tinfo, $opt_timer); } - if ( $opt_check_testcases ) + if ( $opt_check_testcases and check_testcase($tinfo, "after")) { - if (check_testcase($tinfo, "after")) - { - # Stop all servers that are known to be running - stop_all_servers(); - after_test_failure($tinfo->{'name'}); - mtr_report("Resuming tests...\n"); - } + # Stop all servers that are known to be running + stop_all_servers(); + clean_datadir(); + mtr_report("Resuming tests...\n"); } } elsif ( $res == 62 ) @@ -2523,7 +2528,7 @@ sub run_testcase ($) { { # Server failed, probably crashed $tinfo->{comment}= - "Server failed during test run"; + "Server $proc failed during test run"; report_failure_and_restart($tinfo); return 1; @@ -2667,57 +2672,24 @@ sub check_expected_crash_and_restart { } -# -# Save any interesting files in the data_dir -# before the data dir is removed. -# -sub save_files_after_test_failure($$) { - my $test_name= shift; - my $data_dir= shift; - my $save_name= "$opt_vardir/log/$test_name"; +sub clean_datadir { - # Look for core files - foreach my $core_file ( glob("$data_dir/core*") ) + mtr_verbose("Cleaning datadirs..."); + + foreach my $cluster ( clusters() ) { - last if $opt_max_save_core > 0 && $num_saved_cores >= $opt_max_save_core; - my $core_name= basename($core_file); - mtr_report(" - saving '$core_name'"); - mkpath($save_name) if ! -d $save_name; - rename("$core_file", "$save_name/$core_name"); - ++$num_saved_cores; + my $cluster_dir= "$opt_vardir/".$cluster->{name}; + mtr_verbose(" - removing '$cluster_dir'"); + rmtree($cluster_dir); + } -} - - -sub after_test_failure ($) { - my $test_name= shift; - - mtr_report("Cleaning datadirs..."); foreach my $mysqld ( mysqlds() ) { - my $data_dir= $mysqld->value('datadir'); - my $name= basename($data_dir); - save_files_after_test_failure($test_name, $data_dir); - mtr_debug("Removing '$data_dir'"); - rmtree($data_dir); - } - - # Remove the ndb_*_fs dirs for all ndbd nodes - # forcing a clean start of ndb next time - foreach my $cluster ( clusters() ) - { - foreach my $ndbd ( ndbds($cluster) ) - { - my $data_dir= $ndbd->value('DataDir'); - foreach my $fs_dir ( glob("$data_dir/ndb_*_fs") ) { - rmtree($fs_dir); - mtr_debug("Removing '$fs_dir'"); - } - - my $backup_dir= $ndbd->value('BackupDataDir'); - rmtree("$backup_dir/BACKUP"); - mtr_debug("Removing '$backup_dir'"); + my $mysqld_dir= dirname($mysqld->value('datadir')); + if (-d $mysqld_dir ) { + mtr_verbose(" - removing '$mysqld_dir'"); + rmtree($mysqld_dir); } } @@ -2731,6 +2703,91 @@ sub after_test_failure ($) { } +# +# Limit number of core files saved +# +sub limit_cores_after_failure ($) { + my ($datadir)= @_; + + # Look for core files + foreach my $core_file ( glob("$datadir/core*") ) + { + my $core_name= basename($core_file); + if ($opt_max_save_core > 0 && $num_saved_cores >= $opt_max_save_core) { + # Delete file to avoid saving it when the datadir is later saved + mtr_report(" - deleting '$core_name'", + "($num_saved_cores/$opt_max_save_core)"); + unlink("$core_file"); + } + else { + mtr_report(" - found '$core_name'", + "($num_saved_cores/$opt_max_save_core)"); + } + ++$num_saved_cores; + } +} + +# +# Save datadir before it's removed +# +sub save_datadir_after_failure($$) { + my ($dir, $savedir)= @_; + + if ($opt_max_save_datadir > 0 && + $num_saved_datadir >= $opt_max_save_datadir) + { + mtr_report(" - skipping '$dir'"); + } + else { + mtr_report(" - saving '$dir'"); + my $dir_name= basename($dir); + rename("$dir", "$savedir/$dir_name"); + } +} + + +sub after_failure ($) { + my ($tinfo)= @_; + + mtr_report("Saving datadirs..."); + + my $save_dir= "$opt_vardir/log/"; + $save_dir.= $tinfo->{name}; + # Add combination name if any + $save_dir.= "_$tinfo->{combination}" + if defined $tinfo->{combination}; + + mkpath($save_dir) if ! -d $save_dir; + + # Save the used my.cnf file + copy($path_config_file, $save_dir); + + if ( clusters() ) { + foreach my $cluster ( clusters() ) { + + foreach my $server ( ndbds($cluster), ndb_mgmds($cluster) ) { + my $data_dir= $server->value('DataDir'); + limit_cores_after_failure($data_dir); + } + + my $cluster_dir= "$opt_vardir/".$cluster->{name}; + save_datadir_after_failure($cluster_dir, $save_dir); + } + } + else { + foreach my $mysqld ( mysqlds() ) { + my $data_dir= $mysqld->value('datadir'); + limit_cores_after_failure($data_dir); + save_datadir_after_failure(dirname($data_dir), $save_dir); + } + } + + $num_saved_datadir++; + + clean_datadir(); +} + + sub report_failure_and_restart ($) { my $tinfo= shift; @@ -2741,7 +2798,7 @@ sub report_failure_and_restart ($) { # Stop all servers that are known to be running stop_all_servers(); - after_test_failure($tinfo->{'name'}); + after_failure($tinfo); mtr_report("Resuming tests...\n"); return; } @@ -3849,7 +3906,12 @@ Options for debugging the product Example: $0 --strace-client=ktrace max-save-core Limit the number of core files saved (to avoid filling up disks for heavily crashing server). Defaults to - $opt_max_save_core, set to 0 for no limit. + $opt_max_save_core, set to 0 for no limit. Set + it's default with MTR_MAX_SAVE_CORE + max-save-datadir Limit the number of datadir saved (to avoid filling + up disks for heavily crashing server). Defaults to + $opt_max_save_datadir, set to 0 for no limit. Set + it's default with MTR_MAX_SAVE_DATDIR Options for valgrind From 6f2e5dbf5adbae3f2c8b90873205ba4aa90bed83 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Sun, 27 Apr 2008 16:13:08 +0200 Subject: [PATCH 175/705] Add supression for expected warning(s) in slaves error log --- mysql-test/suite/rpl/r/rpl_temporary.result | 1 + mysql-test/suite/rpl/t/rpl_temporary.test | 4 ++++ storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/rpl/r/rpl_temporary.result b/mysql-test/suite/rpl/r/rpl_temporary.result index 7e7d0cebe1d..cc65cfe679d 100644 --- a/mysql-test/suite/rpl/r/rpl_temporary.result +++ b/mysql-test/suite/rpl/r/rpl_temporary.result @@ -4,6 +4,7 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; +call mtr.add_supression("Slave: Can\'t find record in \'user\' Error_code: 1032"); reset master; SET @save_select_limit=@@session.sql_select_limit; SET @@session.sql_select_limit=10, @@session.pseudo_thread_id=100; diff --git a/mysql-test/suite/rpl/t/rpl_temporary.test b/mysql-test/suite/rpl/t/rpl_temporary.test index 44f901bdae7..f8e0ba50a86 100644 --- a/mysql-test/suite/rpl/t/rpl_temporary.test +++ b/mysql-test/suite/rpl/t/rpl_temporary.test @@ -16,6 +16,10 @@ source include/add_anonymous_users.inc; # (otherwise RESET MASTER may come too early). save_master_pos; connection slave; + +# Add supression for expected warning(s) in slaves error log +call mtr.add_supression("Slave: Can\'t find record in \'user\' Error_code: 1032"); + sync_with_master; reset master; connection master; diff --git a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp index 043df5d5038..5d803e7c9f3 100644 --- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp +++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp @@ -551,7 +551,7 @@ Dbtc::execDROP_TAB_REQ(Signal* signal) Uint32 senderRef = req->senderRef; Uint32 senderData = req->senderData; DropTabReq::RequestType rt = (DropTabReq::RequestType)req->requestType; - + abort(); if(!tabPtr.p->get_enabled() && rt == DropTabReq::OnlineDropTab){ jam(); DropTabRef* ref = (DropTabRef*)signal->getDataPtrSend(); From 17158847523f8c2d11a0387c47ff9e1138a72c2c Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Sun, 27 Apr 2008 16:16:50 +0200 Subject: [PATCH 176/705] Increase start timeout when running parallell Fix comments --- mysql-test/mysql-test-run.pl | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 3de7f730af3..d2b5422e068 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -151,10 +151,10 @@ my $opt_mark_progress; my $opt_sleep; -my $opt_testcase_timeout= 15; # 15 minutes -my $opt_suite_timeout = 180; # 3 hours -my $opt_shutdown_timeout= 10; # 10 seconds -my $opt_start_timeout = 30; # 30 seconds +my $opt_testcase_timeout= 15; # minutes +my $opt_suite_timeout = 180; # minutes +my $opt_shutdown_timeout= 10; # seconds +my $opt_start_timeout = 30; # seconds my $opt_start; my $opt_start_dirty; @@ -162,7 +162,7 @@ my $opt_repeat= 1; my $opt_retry= 3; my $opt_retry_failure= 2; -my $opt_parallel= 4; +my $opt_parallel; my $opt_strace_client; @@ -217,6 +217,10 @@ sub main { Getopt::Long::Configure("pass_through"); GetOptions('parallel=i' => \$opt_parallel) or usage("Can't read options"); + if ( not defined $opt_parallel ){ + $opt_parallel= 4; # Default + } + # Create server socket on any free port my $server = new IO::Socket::INET ( @@ -985,6 +989,11 @@ sub command_line_setup { } # -------------------------------------------------------------------------- + # Set timeout values + # -------------------------------------------------------------------------- + $opt_start_timeout*= $opt_parallel; + + # # Check valgrind arguments # -------------------------------------------------------------------------- if ( $opt_valgrind or $opt_valgrind_path or @valgrind_args) From faba19abd37c63fe7d4506078ecbb81e880f2268 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Sun, 27 Apr 2008 19:02:43 +0200 Subject: [PATCH 177/705] Use - instead of _ as separator --- mysql-test/mysql-test-run.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 28e9501dec7..0988905b44f 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2754,7 +2754,7 @@ sub after_failure ($) { my $save_dir= "$opt_vardir/log/"; $save_dir.= $tinfo->{name}; # Add combination name if any - $save_dir.= "_$tinfo->{combination}" + $save_dir.= "-$tinfo->{combination}" if defined $tinfo->{combination}; mkpath($save_dir) if ! -d $save_dir; From 83283d8371494296dfb79e169f89eaca9956732a Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Sun, 27 Apr 2008 19:06:27 +0200 Subject: [PATCH 178/705] Revert faulty commit --- storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp index 5d803e7c9f3..7bd61dfe8b3 100644 --- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp +++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp @@ -551,7 +551,7 @@ Dbtc::execDROP_TAB_REQ(Signal* signal) Uint32 senderRef = req->senderRef; Uint32 senderData = req->senderData; DropTabReq::RequestType rt = (DropTabReq::RequestType)req->requestType; - abort(); + if(!tabPtr.p->get_enabled() && rt == DropTabReq::OnlineDropTab){ jam(); DropTabRef* ref = (DropTabRef*)signal->getDataPtrSend(); From b18a64979a64664b912076bb9b43b28510348831 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Sun, 27 Apr 2008 21:31:32 +0200 Subject: [PATCH 179/705] Run all check-warning and check-testcase in parallel, this also give the oportunity to check if any other process fails during this. Add possiblitiy to store "user_data" in a Safeprocess Add function to get pid from a SafeProcess --- mysql-test/lib/My/SafeProcess.pm | 14 ++ mysql-test/lib/mtr_report.pm | 6 + mysql-test/mysql-test-run.pl | 244 ++++++++++++++++++++++--------- 3 files changed, 196 insertions(+), 68 deletions(-) diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index eccc0fcdeed..7762441496c 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -128,6 +128,7 @@ sub new { my $verbose = delete($opts{'verbose'}); my $host = delete($opts{'host'}); my $shutdown = delete($opts{'shutdown'}); + my $user_data= delete($opts{'user_data'}); # if (defined $host) { # $safe_script= "lib/My/SafeProcess/safe_process_cpcd.pl"; @@ -173,6 +174,7 @@ sub new { SAFE_NAME => $name, SAFE_SHUTDOWN => $shutdown, PARENT => $$, + SAFE_USER_DATA => $user_data, }, $class); # Put the new process in list of running @@ -546,4 +548,16 @@ sub _verbose { print STDERR " ## ", @_, "\n"; } + +sub pid { + my ($self)= @_; + return $self->{SAFE_PID}; +} + +sub user_data { + my ($self)= @_; + return $self->{SAFE_USER_DATA}; +} + + 1; diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index fcb4c614653..18c752d018d 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -242,6 +242,12 @@ sub mtr_report_test ($) { { my $timer= $tinfo->{timer} || ""; mtr_report("[ pass ] $timer"); + + # Show any problems check-testcase found + if ( defined $tinfo->{'check'} ) + { + mtr_report($tinfo->{'check'}); + } } } diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 9742be9a00f..5ef452318c5 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2482,25 +2482,90 @@ sub do_before_run_mysqltest($) } +# +# Check all server for sideffects +# +# RETURN VALUE +# 0 ok +# 1 Check failed +# >1 Fatal errro + sub check_testcase($$) { my ($tinfo, $mode)= @_; - my $result; + my $tname= $tinfo->{name}; - # Parallell( mysqlds(), run_check_testcase, check_testcase_failed ); + # Start the mysqltest processes in parallel to save time + # also makes it possible to wait for any process to exit during the check + my %started; foreach my $mysqld ( mysqlds() ) { if ( defined $mysqld->{'proc'} ) { - if (run_check_testcase($tinfo, $mode, $mysqld)) - { - # Check failed, mark the test case with that info - $tinfo->{'check_testcase_failed'}= 1; - $result= 1; - } + my $proc= start_check_testcase($tinfo, $mode, $mysqld); + $started{$proc->pid()}= $proc; } } - return $result; + + while (1){ + my $result; + my $proc= My::SafeProcess->wait_any(); + mtr_report("Got $proc"); + + if ( delete $started{$proc->pid()} ) { + # One check testcase process returned + my $res= $proc->exit_status(); + + if ( $res == 0){ + # Check completed without problem + + if ( keys(%started) == 0){ + # All checks completed + return 0; + } + # Wait for next process to exit + next; + } + else + { + if ( $mode eq "after" and $res == 1 ) + { + # Test failed, grab the report mysqltest has created + my $report= mtr_grab_file($proc->user_data()); + $tinfo->{check}.= + "\nThe check of testcase '$tname' failed, this is the\n". + "diff between before and after:\n"; + $tinfo->{check}.= $report; + + # Check failed, mark the test case with that info + $tinfo->{'check_testcase_failed'}= 1; + $result= 1; + } + elsif ( $res ) + { + my $report= mtr_grab_file($proc->user_data()); + $tinfo->{comment}.= + "Could not execute 'check-testcase' $mode testcase '$tname':\n"; + $tinfo->{comment}.= $report; + + $result= 2; + } + + } + } + else { + # Unknown process returned, most likley a crash, abort everything + $tinfo->{comment}= + "Unexpected process $proc returned during ". + "check testcase $mode test"; + $result= 3; + } + + # Kill any check processes still running + map($_->kill(), values(%started)); + + return $result; + } } @@ -2668,9 +2733,10 @@ sub run_testcase ($) { do_before_run_mysqltest($tinfo); - if ( $opt_check_testcases ) - { - check_testcase($tinfo, "before") + if ( $opt_check_testcases and check_testcase($tinfo, "before") ){ + # Failed to record state of server or server crashed + report_failure_and_restart($tinfo); + return 1; } my $test= start_mysqltest($tinfo); @@ -2707,12 +2773,21 @@ sub run_testcase ($) { mtr_report_test_passed($tinfo, $opt_timer); } - if ( $opt_check_testcases and check_testcase($tinfo, "after")) + my $check_res; + if ( $opt_check_testcases and + $check_res= check_testcase($tinfo, "after")) { - # Stop all servers that are known to be running - stop_all_servers(); - clean_datadir(); - mtr_report("Resuming tests...\n"); + if ($check_res == 1) { + # Test case had sideeffects, not fatal error, just continue + stop_all_servers(); + clean_datadir(); + mtr_report("Resuming tests...\n"); + } + else { + # Test case check failed fatally, probably a server crashed + report_failure_and_restart($tinfo); + return 1; + } } } elsif ( $res == 62 ) @@ -2818,7 +2893,7 @@ sub run_testcase ($) { # 0 OK # 1 Check failed # -sub run_check_warnings ($$) { +sub start_check_warnings ($$) { my $tinfo= shift; my $mysqld= shift; @@ -2836,37 +2911,17 @@ sub run_check_warnings ($$) { mtr_add_arg($args, "--test-file=%s", "include/check-warnings.test"); my $errfile= "$opt_vardir/tmp/$name.err"; - my $res= My::SafeProcess->run + my $proc= My::SafeProcess->new ( name => $name, path => $exe_mysqltest, error => $errfile, output => $errfile, args => \$args, + user_data => $errfile, ); - - if ( $res == 0 ) - { - my $report= mtr_grab_file($errfile); - # Log to var/log/warnings file - mtr_tofile("$opt_vardir/log/warnings", - $tname."\n", - $report); - - $res= 1; - $tinfo->{'warnings'}.= $report; - } - elsif ( $res == 62 ) { - # Test case was ok and called "skip" - $res= 0; - } - elsif ( $res ) - { - mtr_report("\nCould not execute 'check-warnings' for testcase '$tname':"); - mtr_printfile($errfile); - $res= 0; # Ignore error - } - return $res; + mtr_verbose("Started $proc"); + return $proc; } @@ -2878,17 +2933,86 @@ sub check_warnings ($) { my ($tinfo)= @_; my $res= 0; + my $tname= $tinfo->{name}; + # Clear previous warnings delete($tinfo->{warnings}); - # Parallell( mysqlds(), run_check_warning, check_warning_failed); + # Start the mysqltest processes in parallel to save time + # also makes it possible to wait for any process to exit during the check + my %started; foreach my $mysqld ( mysqlds() ) { - if (run_check_warnings($tinfo, $mysqld)){ - $res= 1; - mtr_report(); + if ( defined $mysqld->{'proc'} ) + { + my $proc= start_check_warnings($tinfo, $mysqld); + $started{$proc->pid()}= $proc; } } + + while (1){ + my $result= 0; + my $proc= My::SafeProcess->wait_any(); + mtr_report("Got $proc"); + + if ( delete $started{$proc->pid()} ) { + # One check warning process returned + my $res= $proc->exit_status(); + + if ( $res == 0 or $res == 62 ){ + + if ( $res == 0 ) { + # Check completed with problem + my $report= mtr_grab_file($proc->user_data()); + # Log to var/log/warnings file + mtr_tofile("$opt_vardir/log/warnings", + $tname."\n".$report); + + $tinfo->{'warnings'}.= $report; + $result= 1; + } + + if ( $res == 62 ) { + # Test case was ok and called "skip" + ; + } + + if ( keys(%started) == 0){ + # All checks completed + return $result; + } + # Wait for next process to exit + next; + } + else + { + my $report= mtr_grab_file($proc->user_data()); + $tinfo->{comment}.= + "Could not execute 'check-warnings' for testcase '$tname':"; + $tinfo->{comment}.= $report; + + $result= 2; + } + } + else { + # Unknown process returned, most likley a crash, abort everything + $tinfo->{comment}= + "Unexpected process $proc returned during ". + "check warnings"; + $result= 3; + } + + # Kill any check processes still running + map($_->kill(), values(%started)); + + return $result; + } + + + + + return $res; + return $res; } @@ -3632,10 +3756,9 @@ sub start_servers($) { # After testcase, run and compare with the recorded file, they should be equal! # # RETURN VALUE -# 0 OK -# 1 Check failed +# The newly started process # -sub run_check_testcase ($$$) { +sub start_check_testcase ($$$) { my $tinfo= shift; my $mode= shift; my $mysqld= shift; @@ -3660,32 +3783,17 @@ sub run_check_testcase ($$$) { mtr_add_arg($args, "--record"); } my $errfile= "$opt_vardir/tmp/$name.err"; - my $res= My::SafeProcess->run + my $proc= My::SafeProcess->new ( name => $name, path => $exe_mysqltest, error => $errfile, args => \$args, + user_data => $errfile, ); - if ( $mode eq "after" and $res == 1 ) - { - # Test failed, grab the report mysqltest has created - my $report= mtr_grab_file($errfile); - $tinfo->{check}.= - "\nThe check of testcase '$tname' failed, this is the\n". - "diff between before and after:\n"; - $tinfo->{check}.= $report; - - } - elsif ( $res ) - { - my $report= mtr_grab_file($errfile); - $tinfo->{'check'}.= - "\nCould not execute 'check-testcase' $mode testcase '$tname':\n"; - $tinfo->{check}.= $report; - } - return $res; + mtr_report("Started $proc"); + return $proc; } From 4f9409c8353aec715ec9ebd51951207c5d55cc4d Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Sun, 27 Apr 2008 23:35:38 +0200 Subject: [PATCH 180/705] Move code that saves datadirs to test server Remove mtr_report_test_failed --- mysql-test/lib/mtr_report.pm | 47 +----------- mysql-test/mysql-test-run.pl | 139 +++++++++++++++++++++-------------- 2 files changed, 83 insertions(+), 103 deletions(-) diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index 18c752d018d..9e8e26459fe 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -26,7 +26,7 @@ our @EXPORT= qw(report_option mtr_print_line mtr_print_thick_line mtr_print_header mtr_report mtr_report_stats mtr_warning mtr_error mtr_debug mtr_verbose mtr_verbose_restart mtr_report_test_passed - mtr_report_test_failed mtr_report_test_skipped + mtr_report_test_skipped mtr_report_test); use mtr_match; @@ -125,51 +125,6 @@ sub mtr_report_test_passed ($$) { } -sub mtr_report_test_failed ($$) { - my ($tinfo, $logfile)= @_; - _mtr_report_test_name($tinfo); - - $tinfo->{'result'}= 'MTR_RES_FAILED'; - my $test_failures= $tinfo->{'failures'} || 0; - $tinfo->{'failures'}= $test_failures + 1; - if ( defined $tinfo->{'warnings'} ) - { - mtr_report("[ fail ] Found warnings in server log file!"); - mtr_report($tinfo->{'warnings'}); - return; - } - elsif ( defined $tinfo->{'timeout'} ) - { - mtr_report("[ fail ] timeout"); - return; - } - else - { - mtr_report("[ fail ]"); - } - - if ( $tinfo->{'comment'} ) - { - # The test failure has been detected by mysql-test-run.pl - # when starting the servers or due to other error, the reason for - # failing the test is saved in "comment" - mtr_report("\nERROR: $tinfo->{'comment'}"); - } - elsif ( defined $logfile and -f $logfile ) - { - # Test failure was detected by test tool and its report - # about what failed has been saved to file. Display the report. - $tinfo->{logfile}= mtr_fromfile($logfile); - } - else - { - # Neither this script or the test tool has recorded info - # about why the test has failed. Should be debugged. - mtr_report("\nUnexpected termination, probably when starting mysqld");; - } -} - - sub mtr_report_test ($) { my ($tinfo)= @_; _mtr_report_test_name($tinfo); diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 5ef452318c5..9dac8b6c488 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -41,6 +41,7 @@ use Getopt::Long; use My::File::Path; # Patched version of File::Path use File::Basename; use File::Copy; +use File::Find; use File::Temp qw / tempdir /; use File::Spec::Functions qw / splitdir /; use My::Platform; @@ -197,10 +198,7 @@ our %mysqld_variables; my $source_dist= 0; my $opt_max_save_core= $ENV{MTR_MAX_SAVE_CORE} || 5; -my $num_saved_cores= 0; # Number of core files saved in vardir/log/ so far. - my $opt_max_save_datadir= $ENV{MTR_MAX_SAVE_DATADIR} || 20; -my $num_saved_datadir= 0; # Number of datadirs saved in vardir/log/ so far. select(STDOUT); $| = 1; # Automatically flush STDOUT @@ -335,6 +333,9 @@ sub main { sub run_test_server { my ($server, $tests, $childs) = @_; + my $num_saved_cores= 0; # Number of core files saved in vardir/log/ so far. + my $num_saved_datadir= 0; # Number of datadirs saved in vardir/log/ so far. + # Scheduler variables my $max_ndb= $opt_parallel / 2; $max_ndb = 4 if $max_ndb > 4; @@ -377,10 +378,54 @@ sub run_test_server { # Report test status mtr_report_test($result); - if ($result->is_failed() and !$opt_force){ - # Test has failed, force is off - push(@$completed, $result); - return $completed; + if ( $result->is_failed() ) { + + # Save the workers "savedir" in var/log + my $worker_savedir= $result->{savedir}; + my $worker_savename= basename($worker_savedir); + my $savedir= "$opt_vardir/log/$worker_savename"; + + if ($opt_max_save_datadir > 0 && + $num_saved_datadir >= $opt_max_save_datadir) + { + mtr_report(" - skipping '$worker_savedir/'"); + rmtree($worker_savedir); + } + else { + mtr_report(" - saving '$worker_savedir/' to '$savedir/'"); + rename($worker_savedir, $savedir); + } + $num_saved_datadir++; + + if ($opt_max_save_core > 0) { + # Limit number of core files saved + find({ no_chdir => 1, + wanted => sub { + my $core_file= $File::Find::name; + my $core_name= basename($core_file); + + if ($core_name =~ "core*"){ + if ($num_saved_cores >= $opt_max_save_core) { + mtr_report(" - deleting '$core_name'", + "($num_saved_cores/$opt_max_save_core)"); + unlink("$core_file"); + } + else { + mtr_report(" - found '$core_name'", + "($num_saved_cores/$opt_max_save_core)"); + } + ++$num_saved_cores; + } + } + }, + $savedir); + } + + if ( !$opt_force ) { + # Test has failed, force is off + push(@$completed, $result); + return $completed; + } } # Retry test run after test failure @@ -3079,46 +3124,15 @@ sub clean_datadir { } -# -# Limit number of core files saved -# -sub limit_cores_after_failure ($) { - my ($datadir)= @_; - - # Look for core files - foreach my $core_file ( glob("$datadir/core*") ) - { - my $core_name= basename($core_file); - if ($opt_max_save_core > 0 && $num_saved_cores >= $opt_max_save_core) { - # Delete file to avoid saving it when the datadir is later saved - mtr_report(" - deleting '$core_name'", - "($num_saved_cores/$opt_max_save_core)"); - unlink("$core_file"); - } - else { - mtr_report(" - found '$core_name'", - "($num_saved_cores/$opt_max_save_core)"); - } - ++$num_saved_cores; - } -} - # # Save datadir before it's removed # sub save_datadir_after_failure($$) { my ($dir, $savedir)= @_; - if ($opt_max_save_datadir > 0 && - $num_saved_datadir >= $opt_max_save_datadir) - { - mtr_report(" - skipping '$dir'"); - } - else { - mtr_report(" - saving '$dir'"); - my $dir_name= basename($dir); - rename("$dir", "$savedir/$dir_name"); - } + mtr_report(" - saving '$dir'"); + my $dir_name= basename($dir); + rename("$dir", "$savedir/$dir_name"); } @@ -3133,6 +3147,9 @@ sub after_failure ($) { $save_dir.= "-$tinfo->{combination}" if defined $tinfo->{combination}; + # Save savedir path for server + $tinfo->{savedir}= $save_dir; + mkpath($save_dir) if ! -d $save_dir; # Save the used my.cnf file @@ -3140,12 +3157,6 @@ sub after_failure ($) { if ( clusters() ) { foreach my $cluster ( clusters() ) { - - foreach my $server ( ndbds($cluster), ndb_mgmds($cluster) ) { - my $data_dir= $server->value('DataDir'); - limit_cores_after_failure($data_dir); - } - my $cluster_dir= "$opt_vardir/".$cluster->{name}; save_datadir_after_failure($cluster_dir, $save_dir); } @@ -3153,29 +3164,43 @@ sub after_failure ($) { else { foreach my $mysqld ( mysqlds() ) { my $data_dir= $mysqld->value('datadir'); - limit_cores_after_failure($data_dir); save_datadir_after_failure(dirname($data_dir), $save_dir); } } - - $num_saved_datadir++; - - clean_datadir(); } sub report_failure_and_restart ($) { my $tinfo= shift; - mtr_report_test_failed($tinfo, $path_current_testlog); - - # Stop all servers that are known to be running stop_all_servers(); - # Collect and clean files + $tinfo->{'result'}= 'MTR_RES_FAILED'; + + my $test_failures= $tinfo->{'failures'} || 0; + $tinfo->{'failures'}= $test_failures + 1; + + + my $logfile= $path_current_testlog; + if ( $tinfo->{comment} ) + { + # The test failure has been detected by mysql-test-run.pl + # when starting the servers or due to other error, the reason for + # failing the test is saved in "comment" + ; + } + elsif ( defined $logfile and -f $logfile ) + { + # Test failure was detected by test tool and its report + # about what failed has been saved to file. Save the report + # in tinfo + $tinfo->{logfile}= mtr_fromfile($logfile); + } + after_failure($tinfo); - mtr_report("Resuming tests...\n"); + mtr_report_test($tinfo); + } From 6400538a901625873bd08aef168268fba89b35ce Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 28 Apr 2008 08:17:23 +0200 Subject: [PATCH 181/705] Stop the test case time if "check_testcase" before test fails --- mysql-test/mysql-test-run.pl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 9dac8b6c488..44dc51b5e95 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2781,6 +2781,10 @@ sub run_testcase ($) { if ( $opt_check_testcases and check_testcase($tinfo, "before") ){ # Failed to record state of server or server crashed report_failure_and_restart($tinfo); + + # Stop the test case timer + $test_timeout_proc->kill(); + return 1; } From 9da80dac200a90add678952eb5ef8c3a46afc6af Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 28 Apr 2008 08:23:00 +0200 Subject: [PATCH 182/705] Print number of test completed at failure --- mysql-test/mysql-test-run.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 44dc51b5e95..881e540b2da 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -316,6 +316,8 @@ sub main { if ( @$completed != $num_tests){ # Not all tests completed, failure + mtr_report(); + mtr_report("After @$completed of $num_tests."); mtr_error("Test failed.", "To continue, re-run with '--force'"); } From 9e3c23c089bd817733d5b6ccf793e8d57f643dfe Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 28 Apr 2008 08:26:04 +0200 Subject: [PATCH 183/705] Add printout of all tests in case number of completed differs number of test and force is on --- mysql-test/mysql-test-run.pl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 881e540b2da..8271eacb636 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -315,6 +315,14 @@ sub main { } if ( @$completed != $num_tests){ + + if ($opt_force){ + # All test should have been run, print the completed list + foreach my $test ( @completed ){ + $test->print_test(); + } + } + # Not all tests completed, failure mtr_report(); mtr_report("After @$completed of $num_tests."); From f201478cb7f10973acc193a0833a78c720ef1e18 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 28 Apr 2008 08:28:06 +0200 Subject: [PATCH 184/705] Only run the "saved core limit" if the datadir was saved --- mysql-test/mysql-test-run.pl | 48 ++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 8271eacb636..543789a3f5b 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -404,33 +404,33 @@ sub run_test_server { else { mtr_report(" - saving '$worker_savedir/' to '$savedir/'"); rename($worker_savedir, $savedir); + + if ($opt_max_save_core > 0) { + # Limit number of core files saved + find({ no_chdir => 1, + wanted => sub { + my $core_file= $File::Find::name; + my $core_name= basename($core_file); + + if ($core_name =~ "core*"){ + if ($num_saved_cores >= $opt_max_save_core) { + mtr_report(" - deleting '$core_name'", + "($num_saved_cores/$opt_max_save_core)"); + unlink("$core_file"); + } + else { + mtr_report(" - found '$core_name'", + "($num_saved_cores/$opt_max_save_core)"); + } + ++$num_saved_cores; + } + } + }, + $savedir); + } } $num_saved_datadir++; - if ($opt_max_save_core > 0) { - # Limit number of core files saved - find({ no_chdir => 1, - wanted => sub { - my $core_file= $File::Find::name; - my $core_name= basename($core_file); - - if ($core_name =~ "core*"){ - if ($num_saved_cores >= $opt_max_save_core) { - mtr_report(" - deleting '$core_name'", - "($num_saved_cores/$opt_max_save_core)"); - unlink("$core_file"); - } - else { - mtr_report(" - found '$core_name'", - "($num_saved_cores/$opt_max_save_core)"); - } - ++$num_saved_cores; - } - } - }, - $savedir); - } - if ( !$opt_force ) { # Test has failed, force is off push(@$completed, $result); From aa635c20efb65b41dac406404ad36a355fcb47b1 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 28 Apr 2008 08:38:07 +0200 Subject: [PATCH 185/705] Reenable suite timeout detection --- mysql-test/mysql-test-run.pl | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 543789a3f5b..be14b235249 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -314,11 +314,15 @@ sub main { } } + if ( not defined @$completed ) { + mtr_error("Test suite aborted"); + } + if ( @$completed != $num_tests){ if ($opt_force){ # All test should have been run, print the completed list - foreach my $test ( @completed ){ + foreach my $test ( @$completed ){ $test->print_test(); } } @@ -330,8 +334,6 @@ sub main { "To continue, re-run with '--force'"); } - mtr_verbose("Server exit\n"); - mtr_print_line(); mtr_report_stats($completed); @@ -356,6 +358,8 @@ sub run_test_server { my %running; my $result; + my $suite_timeout_proc= My::SafeProcess->timer($opt_suite_timeout * 60); + my $s= IO::Select->new(); $s->add($server); while (1) { @@ -375,6 +379,7 @@ sub run_test_server { mtr_verbose("Child closed socket"); $s->remove($sock); if (--$childs == 0){ + $suite_timeout_proc->kill(); return $completed; } next; @@ -433,6 +438,7 @@ sub run_test_server { if ( !$opt_force ) { # Test has failed, force is off + $suite_timeout_proc->kill(); push(@$completed, $result); return $completed; } @@ -549,6 +555,15 @@ sub run_test_server { } } } + + # ---------------------------------------------------- + # Check if test suite timer expired + # ---------------------------------------------------- + if ( ! $suite_timeout_proc->wait_one(0) ) + { + mtr_report("Test suite timeout! Terminating..."); + return undef; + } } } @@ -2771,7 +2786,6 @@ sub run_testcase ($) { # ---------------------------------------------------------------------- if ( $opt_start or $opt_start_dirty ) { -# MASV $suite_timeout_proc->kill(); mtr_report("\nStarted", started(all_servers())); mtr_report("Waiting for server(s) to exit..."); my $proc= My::SafeProcess->wait_any(); @@ -2930,16 +2944,6 @@ sub run_testcase ($) { return 1; } - # ---------------------------------------------------- - # Check if test suite timer expired - # ---------------------------------------------------- -# MASV -# if ( $proc eq $suite_timeout_proc ) -# { -# mtr_report("Test suite timeout! Terminating..."); -# exit(1); -# } - mtr_error("Unhandled process $proc exited"); } mtr_error("Should never come here"); From 2aae18545dd792b7bf01fe4a40a02c96f2bb4f0b Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 28 Apr 2008 09:24:30 +0200 Subject: [PATCH 186/705] Limit number of test failures before aborting --- mysql-test/mysql-test-run.pl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index be14b235249..ed2d3f6625b 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -199,6 +199,7 @@ my $source_dist= 0; my $opt_max_save_core= $ENV{MTR_MAX_SAVE_CORE} || 5; my $opt_max_save_datadir= $ENV{MTR_MAX_SAVE_DATADIR} || 20; +my $opt_max_test_fail= $ENV{MTR_MAX_TEST_FAIL} || 10; select(STDOUT); $| = 1; # Automatically flush STDOUT @@ -347,6 +348,7 @@ sub run_test_server { my $num_saved_cores= 0; # Number of core files saved in vardir/log/ so far. my $num_saved_datadir= 0; # Number of datadirs saved in vardir/log/ so far. + my $num_failed_test= 0; # Number of tests failed so far # Scheduler variables my $max_ndb= $opt_parallel / 2; @@ -442,6 +444,14 @@ sub run_test_server { push(@$completed, $result); return $completed; } + elsif ($num_failed_test > 0 and + $num_failed_test >= $opt_max_test_fail) { + $suite_timeout_proc->kill(); + mtr_report("Too many tests($num_failed_test) failed!", + "Terminating..."); + return undef; + } + $num_failed_test++; } # Retry test run after test failure @@ -719,6 +729,7 @@ sub command_line_setup { 'strace-client:s' => \$opt_strace_client, 'max-save-core=i' => \$opt_max_save_core, 'max-save-datadir=i' => \$opt_max_save_datadir, + 'max-test-fail=i' => \$opt_max_test_fail, # Coverage, profiling etc 'gcov' => \$opt_gcov, @@ -4340,6 +4351,10 @@ Options for debugging the product up disks for heavily crashing server). Defaults to $opt_max_save_datadir, set to 0 for no limit. Set it's default with MTR_MAX_SAVE_DATDIR + max-test-fail Limit the number of test failurs before aborting + the current test run. Defaults to + $opt_max_test_fail, set to 0 for no limit. Set + it's default with MTR_MAX_TEST_FAIL Options for valgrind From 91cc80ad57fad65c3588c5a3d153a338ed41ea70 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 28 Apr 2008 12:20:42 +0200 Subject: [PATCH 187/705] Return immediately from 'check-testcase' and 'check_warnings' if no check processes has been started --- mysql-test/mysql-test-run.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index ed2d3f6625b..e5199614d86 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2588,6 +2588,9 @@ sub check_testcase($$) } } + # Return immediately if no check proceess was started + return 0 unless ( keys %started ); + while (1){ my $result; my $proc= My::SafeProcess->wait_any(); @@ -3024,6 +3027,9 @@ sub check_warnings ($) { } } + # Return immediately if no check proceess was started + return 0 unless ( keys %started ); + while (1){ my $result= 0; my $proc= My::SafeProcess->wait_any(); From 5d3d99c365d526b0d5c4b9e894818cda9579e78b Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 28 Apr 2008 14:37:40 +0200 Subject: [PATCH 188/705] Save files in var/tmp/ after failure --- mysql-test/mysql-test-run.pl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index e5199614d86..64738492258 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3190,6 +3190,9 @@ sub after_failure ($) { # Save the used my.cnf file copy($path_config_file, $save_dir); + # Copy the tmp dir + copytree("$opt_vardir/tmp/", "$save_dir/tmp/"); + if ( clusters() ) { foreach my $cluster ( clusters() ) { my $cluster_dir= "$opt_vardir/".$cluster->{name}; From a0f393d66024335e50507ff39a7883d541e92086 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 28 Apr 2008 15:03:30 +0200 Subject: [PATCH 189/705] Don't append thread num to $opt_tmpdir is var/tmp Remove .err and .result files produced by check-testcase and check-warnings --- mysql-test/mysql-test-run.pl | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 64738492258..50348053bdf 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -989,7 +989,7 @@ sub command_line_setup { $opt_tmpdir =~ s,/+$,,; # Remove ending slash if any # If more than one parallel run, use a subdir of the selected tmpdir - if ($thread_num && $opt_parallel > 1) { + if ($thread_num && $opt_parallel > 1 and $opt_tmpdir ne "$opt_vardir/tmp") { $opt_tmpdir.= "/".$thread_num; } @@ -2597,12 +2597,20 @@ sub check_testcase($$) mtr_report("Got $proc"); if ( delete $started{$proc->pid()} ) { + + my $err_file= $proc->user_data(); + my $base_file= mtr_match_extension($err_file, "err"); # Trim extension + unlink("$base_file.result"); + # One check testcase process returned my $res= $proc->exit_status(); if ( $res == 0){ # Check completed without problem + # Remove the .err file the check generated + unlink($err_file); + if ( keys(%started) == 0){ # All checks completed return 0; @@ -2615,7 +2623,7 @@ sub check_testcase($$) if ( $mode eq "after" and $res == 1 ) { # Test failed, grab the report mysqltest has created - my $report= mtr_grab_file($proc->user_data()); + my $report= mtr_grab_file($err_file); $tinfo->{check}.= "\nThe check of testcase '$tname' failed, this is the\n". "diff between before and after:\n"; @@ -2627,7 +2635,7 @@ sub check_testcase($$) } elsif ( $res ) { - my $report= mtr_grab_file($proc->user_data()); + my $report= mtr_grab_file($err_file); $tinfo->{comment}.= "Could not execute 'check-testcase' $mode testcase '$tname':\n"; $tinfo->{comment}.= $report; @@ -2635,6 +2643,9 @@ sub check_testcase($$) $result= 2; } + # Remove the .err file the check generated + unlink($err_file); + } } else { @@ -3038,12 +3049,13 @@ sub check_warnings ($) { if ( delete $started{$proc->pid()} ) { # One check warning process returned my $res= $proc->exit_status(); + my $err_file= $proc->user_data(); if ( $res == 0 or $res == 62 ){ if ( $res == 0 ) { # Check completed with problem - my $report= mtr_grab_file($proc->user_data()); + my $report= mtr_grab_file($err_file); # Log to var/log/warnings file mtr_tofile("$opt_vardir/log/warnings", $tname."\n".$report); @@ -3056,6 +3068,8 @@ sub check_warnings ($) { # Test case was ok and called "skip" ; } + # Remove the .err file the check generated + unlink($err_file); if ( keys(%started) == 0){ # All checks completed @@ -3066,13 +3080,15 @@ sub check_warnings ($) { } else { - my $report= mtr_grab_file($proc->user_data()); + my $report= mtr_grab_file($err_file); $tinfo->{comment}.= "Could not execute 'check-warnings' for testcase '$tname':"; $tinfo->{comment}.= $report; $result= 2; } + # Remove the .err file the check generated + unlink($err_file); } else { # Unknown process returned, most likley a crash, abort everything From df7b349f328bbf43258d28defb7fa05a602d7932 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Wed, 30 Apr 2008 15:52:50 +0200 Subject: [PATCH 190/705] Remove hack for mtr.pl in MySQL 4.1 --- mysql-test/mysql-test-run.pl | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 0988905b44f..07362c65921 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -573,21 +573,6 @@ sub command_line_setup { { $opt_vardir= $default_vardir; } - elsif ( $mysql_version_id < 50000 and - $opt_vardir ne $default_vardir) - { - # Version 4.1 and --vardir was specified - # Only supported as a symlink from var/ - # by setting up $opt_mem that symlink will be created - if ( ! IS_WINDOWS ) - { - # Only platforms that have native symlinks can use the vardir trick - $opt_mem= $opt_vardir; - mtr_report("Using 4.1 vardir trick"); - } - - $opt_vardir= $default_vardir; - } $path_vardir_trace= $opt_vardir; # Chop off any "c:", DBUG likes a unix path ex: c:/src/... => /src/... From 3e18c89fdb4c2d51eaf245c4569ede1debe842de Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Thu, 1 May 2008 09:34:25 +0200 Subject: [PATCH 191/705] Use the deignated tmpdir if it exists --- mysql-test/mysql-test-run.pl | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 07362c65921..6d1e9a82926 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -773,7 +773,13 @@ sub set_mtr_build_thread_ports($) { sub collect_mysqld_features { my $found_variable_list_start= 0; - my $tmpdir= tempdir(CLEANUP => 0); # Directory removed by this function + my $use_tmpdir; + if ( defined $opt_tmpdir and -d $opt_tmpdir){ + # Create the tempdir in $opt_tmpdir + $use_tmpdir= $opt_tmpdir; + } + my $tmpdir= tempdir(CLEANUP => 0, # Directory removed by this function + DIR => $use_tmpdir); # # Execute "mysqld --no-defaults --help --verbose" to get a @@ -3566,7 +3572,7 @@ sub gdb_arguments { # Write $args to gdb init file my $str= join(" ", @$$args); - my $gdb_init_file= "$opt_tmpdir/gdbinit.$type"; + my $gdb_init_file= "$opt_vardir/tmp/gdbinit.$type"; # Remove the old gdbinit file unlink($gdb_init_file); @@ -3630,7 +3636,7 @@ sub ddd_arguments { # Write $args to ddd init file my $str= join(" ", @$$args); - my $gdb_init_file= "$opt_tmpdir/gdbinit.$type"; + my $gdb_init_file= "$opt_vardir/tmp/gdbinit.$type"; # Remove the old gdbinit file unlink($gdb_init_file); From 8c97dc80ca0f1060dba183c95e29ed326ee7407b Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 2 May 2008 12:11:04 +0200 Subject: [PATCH 192/705] Print tests that has been run but shouldn't and vice versa Use opt_start_timeout also for ndb Remove the .result files generated by 'check_testcase' --- mysql-test/lib/mtr_report.pm | 12 +++++++++--- mysql-test/mysql-test-run.pl | 36 +++++++++++++++++++++++++++++------- 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index 9e8e26459fe..cf884b41d55 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -131,8 +131,6 @@ sub mtr_report_test ($) { if ($tinfo->{'result'} eq 'MTR_RES_FAILED'){ - #my $test_failures= $tinfo->{'failures'} || 0; - #$tinfo->{'failures'}= $test_failures + 1; if ( defined $tinfo->{'warnings'} ) { mtr_report("[ fail ] Found warnings in server log file!"); @@ -233,7 +231,7 @@ sub mtr_report_stats ($) { $tot_tests++; $tot_passed++; } - elsif ( $tinfo->{'result'} eq 'MTR_RES_FAILED' ) + elsif ( $tinfo->{failures} ) { $tot_tests++; $tot_failed++; @@ -301,6 +299,14 @@ sub mtr_report_stats ($) { # Print a list of testcases that failed if ( $tot_failed != 0 ) { + + # Print each failed test, again + #foreach my $test ( @$tests ){ + # if ( $test->{result} eq 'MTR_RES_FAILED' ) { + # mtr_report_test($test); + # } + #} + my $ratio= $tot_passed * 100 / $tot_tests; print "Failed $tot_failed/$tot_tests tests, "; printf("%.2f", $ratio); diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 50348053bdf..4838ddefe54 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -322,15 +322,29 @@ sub main { if ( @$completed != $num_tests){ if ($opt_force){ - # All test should have been run, print the completed list - foreach my $test ( @$completed ){ - $test->print_test(); + # All test should have been run, print the ones that differs + my %tests= (); + foreach my $t (@$tests) { $tests{$t->key()}= 1; }; + foreach my $done ( @$completed ){ + if ($tests{$done->key()}) { + mtr_report("Found one extra completed"); + $done->print_test(); + } } + %tests= (); + foreach my $t (@$completed) { $tests{$t->key()}= 1; }; + foreach my $done ( @$tests ){ + if ($tests{$done->key()}) { + mtr_report("Found one test not run"); + $done->print_test(); + } + } + } # Not all tests completed, failure mtr_report(); - mtr_report("After @$completed of $num_tests."); + mtr_report(@$completed, " of $num_tests completed."); mtr_error("Test failed.", "To continue, re-run with '--force'"); } @@ -467,6 +481,7 @@ sub run_test_server { } else { mtr_report("\nRetrying test, attempt($retries/$opt_retry)...\n"); + delete($result->{result}); $result->{retries}= $retries+1; $result->write_test($sock, 'TESTCASE'); next; @@ -479,7 +494,7 @@ sub run_test_server { { $result->{retries}= 0; $result->{failures}= 0; - + delete($result->{result}); $result->{repeat}= $repeat+1; $result->write_test($sock, 'TESTCASE'); next; @@ -1983,7 +1998,7 @@ sub ndbcluster_wait_started($$){ mtr_init_args(\$args); mtr_add_arg($args, "--defaults-file=%s", $path_config_file); mtr_add_arg($args, "--defaults-group-suffix=%s", $cluster->suffix()); - mtr_add_arg($args, "--timeout=60"); + mtr_add_arg($args, "--timeout=%d", $opt_start_timeout); if ($ndb_waiter_extra_opt) { @@ -2600,7 +2615,6 @@ sub check_testcase($$) my $err_file= $proc->user_data(); my $base_file= mtr_match_extension($err_file, "err"); # Trim extension - unlink("$base_file.result"); # One check testcase process returned my $res= $proc->exit_status(); @@ -2611,6 +2625,11 @@ sub check_testcase($$) # Remove the .err file the check generated unlink($err_file); + # Remove the .result file the check generated + if ( $mode eq 'after' ){ + unlink("$base_file.result"); + } + if ( keys(%started) == 0){ # All checks completed return 0; @@ -2646,6 +2665,9 @@ sub check_testcase($$) # Remove the .err file the check generated unlink($err_file); + # Remove the .result file the check generated + unlink("$base_file.result"); + } } else { From c9a37bec4be5f966418212705d5e0d72d6c9aaec Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Fri, 2 May 2008 13:00:04 +0200 Subject: [PATCH 193/705] Change the "diff tool" detection algoritm to use "diff -u", "diff -c" and then just "diff" --- client/mysqltest.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/client/mysqltest.c b/client/mysqltest.c index bc00d78c205..0bca63b6e81 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1345,23 +1345,21 @@ void show_diff(DYNAMIC_STRING* ds, if (init_dynamic_string(&ds_tmp, "", 256, 256)) die("Out of memory"); - /* First try with diff --help to see if the command exists at all */ + /* First try with unified diff */ if (run_tool("diff", &ds_tmp, /* Get output from diff in ds_tmp */ - "--help", + "-u", + filename1, + filename2, "2>&1", - NULL) != 0) /* Most "diff --help" tools return 0 */ - { - diff_failed= "You don't appear to have diff installed"; - } - else + NULL) > 1) /* Most "diff" tools return >1 if error */ { dynstr_set(&ds_tmp, ""); - /* First try with unified diff */ + /* Fallback to context diff with "diff -c" */ if (run_tool("diff", &ds_tmp, /* Get output from diff in ds_tmp */ - "-u", + "-c", filename1, filename2, "2>&1", @@ -1369,17 +1367,17 @@ void show_diff(DYNAMIC_STRING* ds, { dynstr_set(&ds_tmp, ""); - /* Fallback to context diff with "diff -c" */ + /* Fallback to plain "diff" */ if (run_tool("diff", &ds_tmp, /* Get output from diff in ds_tmp */ - "-c", filename1, filename2, "2>&1", NULL) > 1) /* Most "diff" tools return >1 if error */ { dynstr_set(&ds_tmp, ""); - diff_failed= "Could not execute 'diff -u' or 'diff -c'"; + + diff_failed= "Could not execute 'diff -u', 'diff -c' or 'diff'"; } } } From 8ece58b87e94a63402164e5fdae3057561229ff3 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Sat, 3 May 2008 16:10:23 +0200 Subject: [PATCH 194/705] mysql-test-run.pl: Print the scalar value of $completed, not the array values --- mysql-test/mysql-test-run.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 4838ddefe54..eb251a93049 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -344,7 +344,7 @@ sub main { # Not all tests completed, failure mtr_report(); - mtr_report(@$completed, " of $num_tests completed."); + mtr_report(int(@$completed), " of $num_tests completed."); mtr_error("Test failed.", "To continue, re-run with '--force'"); } From e088f111e931eb084f123b65ccc314cd593b1309 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Sun, 4 May 2008 13:31:40 +0200 Subject: [PATCH 195/705] Use SysInfo.pm to find a suitable value for number of workers when --parallel hasn't been specified Add lib/My/SysInfo.pm --- mysql-test/Makefile.am | 1 + mysql-test/lib/My/SysInfo.pm | 181 +++++++++++++++++++++++++++++++++++ mysql-test/mysql-test-run.pl | 17 +++- 3 files changed, 196 insertions(+), 3 deletions(-) create mode 100644 mysql-test/lib/My/SysInfo.pm diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 02dea1a4466..c37e808faf2 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -42,6 +42,7 @@ nobase_test_DATA = lib/mtr_cases.pm \ lib/My/Platform.pm \ lib/My/SafeProcess.pm \ lib/My/File/Path.pm \ + lib/My/SysInfo.pm \ lib/My/SafeProcess/Base.pm \ lib/My/SafeProcess/safe_process.pl diff --git a/mysql-test/lib/My/SysInfo.pm b/mysql-test/lib/My/SysInfo.pm new file mode 100644 index 00000000000..b764b4548f7 --- /dev/null +++ b/mysql-test/lib/My/SysInfo.pm @@ -0,0 +1,181 @@ +# -*- cperl -*- +# Copyright (C) 2004-2006 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +package My::SysInfo; + +use strict; +use Carp; +use My::Platform; + + + +sub _cpuinfo { + my ($self)= @_; + print "_cpuinfo\n"; + + my $info_file= "/proc/cpuinfo"; + if ( !( -e $info_file and -f $info_file) ) { + return undef; + } + + my $F= IO::File->new($info_file) or return undef; + + # Set input separator to blank line + local $/ = ''; + + while ( my $cpu_chunk= <$F>) { + chomp($cpu_chunk); + + my $cpuinfo = {}; + + foreach my $cpuline ( split(/\n/, $cpu_chunk) ) { + my ( $attribute, $value ) = split(/\s*:\s*/, $cpuline); + + $attribute =~ s/\s+/_/; + $attribute = lc($attribute); + + if ( $value =~ /^(no|not available|yes)$/ ) { + $value = $value eq 'yes' ? 1 : 0; + } + + if ( $attribute eq 'flags' ) { + @{ $cpuinfo->{flags} } = split / /, $value; + } else { + $cpuinfo->{$attribute} = $value; + } + } + + push(@{$self->{cpus}}, $cpuinfo); + } + $F= undef; # Close file + return $self; +} + + +sub _kstat { + my ($self)= @_; + while (1){ + my $instance_num= $self->{cpus} ? @{$self->{cpus}} : 0; + my $list= `kstat -p -m cpu_info -i $instance_num`; + my @lines= split('\n', $list) or return undef; + + my $cpuinfo= {}; + foreach my $line (@lines) + { + my ($module, $instance, $name, $statistic, $value)= + $line=~ /(\w*):(\w*):(\w*):(\w*)\t(.*)/; + + $cpuinfo->{$statistic}= $value; + } + + # Default value, the actual cpu values can be used to decrease it + # on slower cpus + $cpuinfo->{bogomips}= 2000; + + push(@{$self->{cpus}}, $cpuinfo); + } + + return $self; +} + + +sub _unamex { + my ($self)= @_; + # TODO + return undef; +} + + +sub new { + my ($class)= @_; + + + my $self= bless { + cpus => (), + }, $class; + + my @info_methods = + ( + \&_cpuinfo, + \&_kstat, + \&_unamex, + ); + + foreach my $method (@info_methods){ + if ($method->($self)){ + return $self; + } + } + + # Push a dummy cpu + push(@{$self->{cpus}}, {bogomips => 2000, model_name => "unknown"}); + + return $self; +} + + +# Return the list of cpus found +sub cpus { + my ($self)= @_; + return @{$self->{cpus}} or + confess "INTERNAL ERROR: No cpus in list"; +} + + +# Return the number of cpus found +sub num_cpus { + my ($self)= @_; + return int(@{$self->{cpus}}) or + confess "INTERNAL ERROR: No cpus in list"; +} + + +# Return the smallest bogomips value amongst the processors +sub min_bogomips { + my ($self)= @_; + + my $bogomips; + + foreach my $cpu (@{$self->{cpus}}) { + if (!defined $bogomips or $bogomips > $cpu->{bogomips}) { + $bogomips= $cpu->{bogomips}; + } + } + + return $bogomips; +} + + +# Prit the cpuinfo +sub print_info { + my ($self)= @_; + + foreach my $cpu (@{$self->{cpus}}) { + while ((my ($key, $value)) = each(%$cpu)) { + print " ", $key, "= "; + if (ref $value eq "ARRAY") { + print "[", join(", ", @$value), "]"; + } else { + print $value; + } + print "\n"; + } + print "\n"; + } +} + +1; diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index eb251a93049..40fec215b34 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -49,6 +49,7 @@ use My::SafeProcess; use My::ConfigFactory; use My::Options; use My::Find; +use My::SysInfo; use mtr_cases; use mtr_report; use mtr_match; @@ -206,7 +207,9 @@ $| = 1; # Automatically flush STDOUT main(); + sub main { + report_option('verbose', 0); # This is needed for test log evaluation in "gen-build-status-page" # in all cases where the calling tool does not log the commands @@ -216,8 +219,17 @@ sub main { Getopt::Long::Configure("pass_through"); GetOptions('parallel=i' => \$opt_parallel) or usage("Can't read options"); - if ( not defined $opt_parallel ){ - $opt_parallel= 4; # Default + if ( not defined $opt_parallel ) { + # Try to find a suitable value for number of workers + my $sys_info= My::SysInfo->new(); + $sys_info->print_info(); + + $opt_parallel= $sys_info->num_cpus(); + for my $limit (2000, 1500, 1000, 500){ + $opt_parallel-- if ($sys_info->min_bogomips() < $limit); + } + $opt_parallel= 1 if ($opt_parallel < 1); + mtr_report("Using parallel: $opt_parallel"); } # Create server socket on any free port @@ -241,7 +253,6 @@ sub main { exit(1); } - mtr_report("Started worker, pid: $child_pid"); $children{$child_pid}= 1; } From 6cef6279c25ea6bfd4ed937d65daf1da6c107fb8 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Sun, 4 May 2008 16:35:16 +0200 Subject: [PATCH 196/705] Always set bogomips unless already set Return undef only in case kstat works Cpus reported once, but with 'cpu_count' set to the actual number --- mysql-test/lib/My/SysInfo.pm | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/mysql-test/lib/My/SysInfo.pm b/mysql-test/lib/My/SysInfo.pm index b764b4548f7..87f768f4866 100644 --- a/mysql-test/lib/My/SysInfo.pm +++ b/mysql-test/lib/My/SysInfo.pm @@ -21,7 +21,7 @@ use strict; use Carp; use My::Platform; - +use constant DEFAULT_BOGO_MIPS => 2000; sub _cpuinfo { my ($self)= @_; @@ -59,7 +59,14 @@ sub _cpuinfo { } } - push(@{$self->{cpus}}, $cpuinfo); + # Make sure bogomips is set to some value + $cpuinfo->{bogomips} |= DEFAULT_BOGO_MIPS; + + # Cpus reported once, but with 'cpu_count' set to the actual number + my $cpu_count= $cpuinfo->{cpu_count} || 1; + for(1..$cpu_count){ + push(@{$self->{cpus}}, $cpuinfo); + } } $F= undef; # Close file return $self; @@ -71,7 +78,7 @@ sub _kstat { while (1){ my $instance_num= $self->{cpus} ? @{$self->{cpus}} : 0; my $list= `kstat -p -m cpu_info -i $instance_num`; - my @lines= split('\n', $list) or return undef; + my @lines= split('\n', $list) or last; # Break loop my $cpuinfo= {}; foreach my $line (@lines) @@ -82,14 +89,19 @@ sub _kstat { $cpuinfo->{$statistic}= $value; } - # Default value, the actual cpu values can be used to decrease it + # Default value, the actual cpu values can be used to decrease this # on slower cpus - $cpuinfo->{bogomips}= 2000; + $cpuinfo->{bogomips}= DEFAULT_BOGO_MIPS; push(@{$self->{cpus}}, $cpuinfo); } - return $self; + # At least one cpu should have been found + # if this method worked + if ( $self->{cpus} ) { + return $self; + } + return undef; } @@ -122,7 +134,11 @@ sub new { } # Push a dummy cpu - push(@{$self->{cpus}}, {bogomips => 2000, model_name => "unknown"}); + push(@{$self->{cpus}}, + { + bogomips => DEFAULT_BOGO_MIPS, + model_name => "unknown", + }); return $self; } From b4b0fcee26dc9a9ae30a98c37e999d0beb9d1275 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Sun, 4 May 2008 20:59:51 +0200 Subject: [PATCH 197/705] Debug printouts for not all tests completed --- mysql-test/mysql-test-run.pl | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 40fec215b34..74b895a5c40 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -333,31 +333,16 @@ sub main { if ( @$completed != $num_tests){ if ($opt_force){ - # All test should have been run, print the ones that differs - my %tests= (); - foreach my $t (@$tests) { $tests{$t->key()}= 1; }; - foreach my $done ( @$completed ){ - if ($tests{$done->key()}) { - mtr_report("Found one extra completed"); - $done->print_test(); - } + # All test should have been run, print any that are still in $tests + foreach my $test ( @$tests ){ + $test->print_test(); } - %tests= (); - foreach my $t (@$completed) { $tests{$t->key()}= 1; }; - foreach my $done ( @$tests ){ - if ($tests{$done->key()}) { - mtr_report("Found one test not run"); - $done->print_test(); - } - } - } # Not all tests completed, failure mtr_report(); - mtr_report(int(@$completed), " of $num_tests completed."); - mtr_error("Test failed.", - "To continue, re-run with '--force'"); + mtr_report("Only ", int(@$completed), " of $num_tests completed."); + mtr_error("Not all tests completed"); } mtr_print_line(); From 86ac70f774dc554768bf819f75bb1c4dc05a9e2e Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Sun, 4 May 2008 21:20:25 +0200 Subject: [PATCH 198/705] Improve retry logic --- mysql-test/mysql-test-run.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 74b895a5c40..e4e51a5bcf0 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -465,14 +465,14 @@ sub run_test_server { } # Retry test run after test failure - my $retries= $result->{retries} || 1; + my $retries= $result->{retries} || 2; my $test_has_failed= $result->{failures} || 0; - if ($test_has_failed and $retries < $opt_retry){ + if ($test_has_failed and $retries <= $opt_retry){ # Test should be run one more time unless it has failed # too many times already my $failures= $result->{failures}; if ($opt_retry > 1 and $failures >= $opt_retry_failure){ - mtr_report("Test has failed $failures times,", + mtr_report("\nTest has failed $failures times,", "no more retries!\n"); } else { From b9a810dd25550aa79978fcbfbbc5596b7366bb6c Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Sun, 4 May 2008 21:21:11 +0200 Subject: [PATCH 199/705] Correctly calculate failed tests --- mysql-test/lib/mtr_report.pm | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index cf884b41d55..026d5e9776e 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -222,22 +222,27 @@ sub mtr_report_stats ($) { foreach my $tinfo (@$tests) { - if ( $tinfo->{'result'} eq 'MTR_RES_SKIPPED' ) + if ( $tinfo->{failures} ) { + # Test has failed at least one time + $tot_tests++; + $tot_failed++; + } + elsif ( $tinfo->{'result'} eq 'MTR_RES_SKIPPED' ) + { + # Test was skipped $tot_skiped++; } elsif ( $tinfo->{'result'} eq 'MTR_RES_PASSED' ) { + # Test passed $tot_tests++; $tot_passed++; } - elsif ( $tinfo->{failures} ) - { - $tot_tests++; - $tot_failed++; - } + if ( $tinfo->{'restarted'} ) { + # Servers was restarted $tot_restarts++; } @@ -302,7 +307,7 @@ sub mtr_report_stats ($) { # Print each failed test, again #foreach my $test ( @$tests ){ - # if ( $test->{result} eq 'MTR_RES_FAILED' ) { + # if ( $test->{failures} ) { # mtr_report_test($test); # } #} @@ -320,7 +325,7 @@ sub mtr_report_stats ($) { foreach my $tinfo (@$tests) { my $tname= $tinfo->{'name'}; - if ( $tinfo->{'result'} eq 'MTR_RES_FAILED' and ! $seen{$tname}) + if ( $tinfo->{failures} and ! $seen{$tname}) { print " $tname"; $seen{$tname}= 1; From ec03ad0591a5849279ac020574ccdac6cbb00e86 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Sun, 4 May 2008 21:40:40 +0200 Subject: [PATCH 200/705] Move opt_timer to mtr_report.pm --- mysql-test/lib/mtr_report.pm | 28 ++++++++++++++-------------- mysql-test/mysql-test-run.pl | 11 +++-------- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index 026d5e9776e..aa7d763629e 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -39,7 +39,7 @@ our $timediff= 1; our $name; our $verbose; our $verbose_restart= 0; - +our $timer= 1; sub report_option { my ($opt, $value)= @_; @@ -99,23 +99,22 @@ sub mtr_report_test_skipped ($) { } -sub mtr_report_test_passed ($$) { - my ($tinfo, $use_timer)= @_; +sub mtr_report_test_passed ($) { + my ($tinfo)= @_; _mtr_report_test_name($tinfo); - my $timer= ""; - if ( $use_timer and -f "$::opt_vardir/log/timer" ) + my $timer_str= ""; + if ( $timer and -f "$::opt_vardir/log/timer" ) { - $timer= mtr_fromfile("$::opt_vardir/log/timer"); - $tot_real_time += ($timer/1000); - $timer= sprintf "%12s", $timer; - $tinfo->{timer}= $timer; + $timer_str= mtr_fromfile("$::opt_vardir/log/timer"); + $tinfo->{timer}= $timer_str; } # Set as passed unless already set if ( not defined $tinfo->{'result'} ){ $tinfo->{'result'}= 'MTR_RES_PASSED'; } - mtr_report("[ pass ] $timer"); + + mtr_report("[ pass ] ", sprintf("%12s", $timer_str)); # Show any problems check-testcase found if ( defined $tinfo->{'check'} ) @@ -193,8 +192,9 @@ sub mtr_report_test ($) { } elsif ($tinfo->{'result'} eq 'MTR_RES_PASSED') { - my $timer= $tinfo->{timer} || ""; - mtr_report("[ pass ] $timer"); + my $timer_str= $tinfo->{timer} || ""; + $tot_real_time += ($timer_str/1000); + mtr_report("[ pass ] ", sprintf("%12s", $timer_str)); # Show any problems check-testcase found if ( defined $tinfo->{'check'} ) @@ -262,7 +262,7 @@ sub mtr_report_stats ($) { # ---------------------------------------------------------------------- print "The servers were restarted $tot_restarts times\n"; - if ( $::opt_timer ) + if ( $timer ) { use English; @@ -343,7 +343,7 @@ sub mtr_report_stats ($) { } else { - print "All $tot_tests tests were successful.\n"; + print "All $tot_tests tests were successful.\n\n"; } if ( $tot_failed != 0 || $found_problems) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index e4e51a5bcf0..0fc5ed6aeee 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -168,8 +168,6 @@ my $opt_parallel; my $opt_strace_client; -our $opt_timer= 1; - our $opt_user; my $opt_valgrind= 0; @@ -784,7 +782,7 @@ sub command_line_setup { 'repeat=i' => \$opt_repeat, 'retry=i' => \$opt_retry, 'retry-failure=i' => \$opt_retry_failure, - 'timer!' => \$opt_timer, + 'timer!' => \&report_option, 'user=s' => \$opt_user, 'testcase-timeout=i' => \$opt_testcase_timeout, 'suite-timeout=i' => \$opt_suite_timeout, @@ -2886,7 +2884,7 @@ sub run_testcase ($) { } else { - mtr_report_test_passed($tinfo, $opt_timer); + mtr_report_test_passed($tinfo); } my $check_res; @@ -3948,10 +3946,7 @@ sub start_mysqltest ($) { mtr_add_arg($args, "$exe_mysqltest"); } - if ( $opt_timer ) - { - mtr_add_arg($args, "--timer-file=%s/log/timer", $opt_vardir); - } + mtr_add_arg($args, "--timer-file=%s/log/timer", $opt_vardir); if ( $opt_compress ) { From fb88bd04a6b6900cf4fc974c9734d2b1eb0ac07e Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Sun, 4 May 2008 21:43:49 +0200 Subject: [PATCH 201/705] Set "timediff" to off by default --- mysql-test/lib/mtr_report.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index aa7d763629e..349a1205d44 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -35,7 +35,7 @@ require "mtr_io.pl"; my $tot_real_time= 0; our $timestamp= 0; -our $timediff= 1; +our $timediff= 0; our $name; our $verbose; our $verbose_restart= 0; From 63a0cdb59d90d3f34a830c9d2bdc58641ed953da Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Sun, 4 May 2008 21:45:38 +0200 Subject: [PATCH 202/705] Make timediff an option --- mysql-test/mysql-test-run.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 0fc5ed6aeee..a50bd6be8d0 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -789,6 +789,7 @@ sub command_line_setup { 'shutdown-timeout=i' => \$opt_shutdown_timeout, 'warnings!' => \$opt_warnings, 'timestamp' => \&report_option, + 'timediff' => \&report_option, 'help|h' => \$opt_usage, ) or usage("Can't read options"); From 9d6d039cf1d452062137b0b7b87911e0a0f2f448 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Sun, 4 May 2008 23:22:41 +0200 Subject: [PATCH 203/705] Tune reporting --- mysql-test/lib/mtr_report.pm | 60 +++++++++--------------------------- 1 file changed, 14 insertions(+), 46 deletions(-) diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index 349a1205d44..4a321e5d847 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -52,7 +52,6 @@ sub report_option { #print $name, " setting $opt to ", (defined $value? $value : "undef") ,"\n"; } -sub SHOW_SUITE_NAME() { return 1; }; sub _mtr_report_test_name ($) { my $tinfo= shift; @@ -60,67 +59,40 @@ sub _mtr_report_test_name ($) { return unless defined $verbose; - # Remove suite part of name - $tname =~ s/.*\.// unless SHOW_SUITE_NAME; - # Add combination name if any $tname.= " '$tinfo->{combination}'" if defined $tinfo->{combination}; print $name, _timestamp(); - printf "%-30s ", $tname; + printf "%-40s ", $tname; } sub mtr_report_test_skipped ($) { - my $tinfo= shift; - _mtr_report_test_name($tinfo); - + my ($tinfo)= @_; $tinfo->{'result'}= 'MTR_RES_SKIPPED'; - if ( $tinfo->{'disable'} ) - { - mtr_report("[ disabled ] $tinfo->{'comment'}"); - } - elsif ( $tinfo->{'comment'} ) - { - if ( $tinfo->{skip_detected_by_test} ) - { - mtr_report("[ skip ]. $tinfo->{'comment'}"); - } - else - { - mtr_report("[ skip ] $tinfo->{'comment'}"); - } - } - else - { - mtr_report("[ skip ]"); - } + + mtr_report_test($tinfo); } sub mtr_report_test_passed ($) { my ($tinfo)= @_; - _mtr_report_test_name($tinfo); + # Save the timer value my $timer_str= ""; if ( $timer and -f "$::opt_vardir/log/timer" ) { $timer_str= mtr_fromfile("$::opt_vardir/log/timer"); $tinfo->{timer}= $timer_str; } + # Set as passed unless already set if ( not defined $tinfo->{'result'} ){ $tinfo->{'result'}= 'MTR_RES_PASSED'; } - mtr_report("[ pass ] ", sprintf("%12s", $timer_str)); - - # Show any problems check-testcase found - if ( defined $tinfo->{'check'} ) - { - mtr_report($tinfo->{'check'}); - } + mtr_report_test($tinfo); } @@ -178,7 +150,7 @@ sub mtr_report_test ($) { { if ( $tinfo->{skip_detected_by_test} ) { - mtr_report("[ skip ]. $tinfo->{'comment'}"); + mtr_report("[ skip ]. $tinfo->{'comment'}"); } else { @@ -194,7 +166,7 @@ sub mtr_report_test ($) { { my $timer_str= $tinfo->{timer} || ""; $tot_real_time += ($timer_str/1000); - mtr_report("[ pass ] ", sprintf("%12s", $timer_str)); + mtr_report("[ pass ] ", sprintf("%5s", $timer_str)); # Show any problems check-testcase found if ( defined $tinfo->{'check'} ) @@ -202,7 +174,6 @@ sub mtr_report_test ($) { mtr_report($tinfo->{'check'}); } } - } @@ -372,14 +343,11 @@ sub mtr_print_thick_line { sub mtr_print_header () { print "\n"; - if ( $::opt_timer ) - { - print "TEST RESULT TIME (ms)\n"; - } - else - { - print "TEST RESULT\n"; - } + printf "TEST"; + print " " x 38; + print "RESULT "; + print "TIME (ms)" if $timer; + print "\n"; mtr_print_line(); print "\n"; } From be295c87cc347fc467ea5956dbf83e075b47423e Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 5 May 2008 00:21:12 +0200 Subject: [PATCH 204/705] Change rmtree+mkpath to use clean_dir --- mysql-test/mysql-test-run.pl | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index a50bd6be8d0..7b1573366c0 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3161,6 +3161,30 @@ sub check_expected_crash_and_restart { } +# Remove all files and subdirectories of a directory +sub clean_dir { + my ($dir)= @_; + finddepth( + { no_chdir => 1, + wanted => sub { + if (-d $_){ + # A dir + if ($_ eq $dir){ + # The dir to clean + return; + } else { + rmdir($_) or mtr_warning("rmdir failed: $!"); + } + } else { + # Hopefully a file + unlink($_) or mtr_warning("unlink failed: $!"); + } + } + }, + $dir); +} + + sub clean_datadir { mtr_verbose("Cleaning datadirs..."); @@ -3183,11 +3207,9 @@ sub clean_datadir { } # Remove all files in tmp and var/tmp - rmtree("$opt_vardir/tmp"); - mkpath("$opt_vardir/tmp"); + clean_dir("$opt_vardir/tmp"); if ($opt_tmpdir ne "$opt_vardir/tmp"){ - rmtree($opt_tmpdir); - mkpath($opt_tmpdir); + clean_dir($opt_tmpdir); } } From 76905924dbd4a6dc9730a061cf9668ce00e8d751 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 5 May 2008 13:47:43 +0200 Subject: [PATCH 205/705] Add temporary printouts --- mysql-test/mysql-test-run.pl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 7b1573366c0..2227a8c77f6 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3164,6 +3164,7 @@ sub check_expected_crash_and_restart { # Remove all files and subdirectories of a directory sub clean_dir { my ($dir)= @_; + print "clean_dir: $dir\n"; finddepth( { no_chdir => 1, wanted => sub { @@ -3173,11 +3174,13 @@ sub clean_dir { # The dir to clean return; } else { - rmdir($_) or mtr_warning("rmdir failed: $!"); + print "rmdir: '$_'\n"; + rmdir($_) or mtr_warning("rmdir($_) failed: $!"); } } else { # Hopefully a file - unlink($_) or mtr_warning("unlink failed: $!"); + print "unlink: '$_'\n"; + unlink($_) or mtr_warning("unlink($_) failed: $!"); } } }, From 39e11a1ddb4f02a4b55971d1800cdc006fb2ec41 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.mysql.com" <> Date: Mon, 5 May 2008 22:55:47 +0200 Subject: [PATCH 206/705] Add printouts --- mysql-test/lib/mtr_report.pm | 9 +++++++-- mysql-test/mysql-test-run.pl | 17 ++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index 4a321e5d847..1a8a5e3e0ec 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -26,7 +26,7 @@ our @EXPORT= qw(report_option mtr_print_line mtr_print_thick_line mtr_print_header mtr_report mtr_report_stats mtr_warning mtr_error mtr_debug mtr_verbose mtr_verbose_restart mtr_report_test_passed - mtr_report_test_skipped + mtr_report_test_skipped mtr_print mtr_report_test); use mtr_match; @@ -386,8 +386,13 @@ sub _timestamp { $tm->hour, $tm->min, $tm->sec, $diff); } +# Always print message to screen +sub mtr_print (@) { + print $name, join(" ", @_), "\n"; +} -# Print message to screen + +# Print message to screen if verbose is defined sub mtr_report (@) { if (defined $verbose) { diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 2227a8c77f6..d3febb6a5c1 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2895,7 +2895,6 @@ sub run_testcase ($) { if ($check_res == 1) { # Test case had sideeffects, not fatal error, just continue stop_all_servers(); - clean_datadir(); mtr_report("Resuming tests...\n"); } else { @@ -3164,7 +3163,7 @@ sub check_expected_crash_and_restart { # Remove all files and subdirectories of a directory sub clean_dir { my ($dir)= @_; - print "clean_dir: $dir\n"; + mtr_print("clean_dir: $dir"); finddepth( { no_chdir => 1, wanted => sub { @@ -3174,12 +3173,12 @@ sub clean_dir { # The dir to clean return; } else { - print "rmdir: '$_'\n"; + mtr_print("rmdir: '$_'"); rmdir($_) or mtr_warning("rmdir($_) failed: $!"); } } else { # Hopefully a file - print "unlink: '$_'\n"; + mtr_print("unlink: '$_'"); unlink($_) or mtr_warning("unlink($_) failed: $!"); } } @@ -3192,10 +3191,14 @@ sub clean_datadir { mtr_verbose("Cleaning datadirs..."); + if (started(all_servers()) != 0){ + mtr_error("Trying to clean datadir before all servers stopped"); + } + foreach my $cluster ( clusters() ) { my $cluster_dir= "$opt_vardir/".$cluster->{name}; - mtr_verbose(" - removing '$cluster_dir'"); + mtr_print(" - removing '$cluster_dir'"); rmtree($cluster_dir); } @@ -3204,7 +3207,7 @@ sub clean_datadir { { my $mysqld_dir= dirname($mysqld->value('datadir')); if (-d $mysqld_dir ) { - mtr_verbose(" - removing '$mysqld_dir'"); + mtr_print(" - removing '$mysqld_dir'"); rmtree($mysqld_dir); } } @@ -3509,7 +3512,7 @@ sub mysqld_start ($$) { sub stop_all_servers () { - mtr_report("Stopping all servers..."); + mtr_print("Stopping all servers..."); # Kill all started servers My::SafeProcess::shutdown(0, # shutdown timeout 0 => kill From c45e9ff746701fac7f7de5dbc8b1eff3c2961367 Mon Sep 17 00:00:00 2001 From: "msvensson@shellback.(none)" <> Date: Tue, 6 May 2008 17:11:09 +0200 Subject: [PATCH 207/705] Generate a unique tmpdir for each server to avoid that they delete each others temporary files at start up - see 'mysql_rm_tmp_tables' --- mysql-test/lib/My/ConfigFactory.pm | 10 ++++++++-- mysql-test/mysql-test-run.pl | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index 69bb969d7b8..824267c8cc0 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -104,10 +104,16 @@ sub fix_server_id { sub fix_socket { my ($self, $config, $group_name, $group)= @_; # Put socket file in tmpdir - my $dir= $group->value('tmpdir'); + my $dir= $self->{ARGS}->{tmpdir}; return "$dir/$group_name.sock"; } +sub fix_tmpdir { + my ($self, $config, $group_name, $group)= @_; + my $dir= $self->{ARGS}->{tmpdir}; + return "$dir/$group_name"; +} + sub fix_log_error { my ($self, $config, $group_name, $group)= @_; my $dir= dirname($group->value('datadir')); @@ -182,7 +188,7 @@ sub fix_ssl_client_key { my @mysqld_rules= ( { 'basedir' => sub { return shift->{ARGS}->{basedir}; } }, - { 'tmpdir' => sub { return shift->{ARGS}->{tmpdir}; } }, + { 'tmpdir' => \&fix_tmpdir }, { 'character-sets-dir' => \&fix_charset_dir }, { 'language' => \&fix_language }, { 'datadir' => \&fix_datadir }, diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index d3febb6a5c1..3e186b5ec46 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3816,6 +3816,10 @@ sub start_servers($) { mtr_error("Failed to copy system db to '$datadir'") unless -d $datadir; + # Create the servers tmpdir + my $tmpdir= $mysqld->value('tmpdir'); + mkpath($tmpdir) unless -d $tmpdir; + # Write start of testcase to log file mark_log($mysqld->value('log-error'), $tinfo); From 447916b9e6e29cb2c97be4280c98e12b242d0136 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Fri, 9 May 2008 11:50:36 +0200 Subject: [PATCH 208/705] Make printout of $name nicer Remove debug printouts --- mysql-test/lib/mtr_report.pm | 19 +++++++++++-------- mysql-test/mysql-test-run.pl | 21 ++++++++++----------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index 1a8a5e3e0ec..b5c868cb20a 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -52,6 +52,9 @@ sub report_option { #print $name, " setting $opt to ", (defined $value? $value : "undef") ,"\n"; } +sub _name { + return $name ? $name." " : undef; +} sub _mtr_report_test_name ($) { my $tinfo= shift; @@ -63,7 +66,7 @@ sub _mtr_report_test_name ($) { $tname.= " '$tinfo->{combination}'" if defined $tinfo->{combination}; - print $name, _timestamp(); + print _name(), _timestamp(); printf "%-40s ", $tname; } @@ -388,7 +391,7 @@ sub _timestamp { # Always print message to screen sub mtr_print (@) { - print $name, join(" ", @_), "\n"; + print _name(), join(" ", @_), "\n"; } @@ -396,21 +399,21 @@ sub mtr_print (@) { sub mtr_report (@) { if (defined $verbose) { - print $name, join(" ", @_), "\n"; + print _name(), join(" ", @_), "\n"; } } # Print warning to screen sub mtr_warning (@) { - print STDERR $name, _timestamp(), + print STDERR _name(), _timestamp(), "mysql-test-run: WARNING: ", join(" ", @_), "\n"; } # Print error to screen and then exit sub mtr_error (@) { - print STDERR $name, _timestamp(), + print STDERR _name(), _timestamp(), "mysql-test-run: *** ERROR: ", join(" ", @_), "\n"; exit(1); } @@ -419,7 +422,7 @@ sub mtr_error (@) { sub mtr_debug (@) { if ( $verbose > 2 ) { - print STDERR $name, + print STDERR _name(), _timestamp(), "####: ", join(" ", @_), "\n"; } } @@ -428,7 +431,7 @@ sub mtr_debug (@) { sub mtr_verbose (@) { if ( $verbose ) { - print STDERR $name, _timestamp(), + print STDERR _name(), _timestamp(), "> ",join(" ", @_),"\n"; } } @@ -439,7 +442,7 @@ sub mtr_verbose_restart (@) { my $proc= $server->{proc}; if ( $verbose_restart ) { - print STDERR $name,_timestamp(), + print STDERR _name(),_timestamp(), "> Restart $proc - ",join(" ", @args),"\n"; } } diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index d3febb6a5c1..adf207d6473 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -220,7 +220,6 @@ sub main { if ( not defined $opt_parallel ) { # Try to find a suitable value for number of workers my $sys_info= My::SysInfo->new(); - $sys_info->print_info(); $opt_parallel= $sys_info->num_cpus(); for my $limit (2000, 1500, 1000, 500){ @@ -2828,15 +2827,15 @@ sub run_testcase ($) { # ---------------------------------------------------------------------- if ( $opt_start or $opt_start_dirty ) { - mtr_report("\nStarted", started(all_servers())); - mtr_report("Waiting for server(s) to exit..."); + mtr_print("\nStarted", started(all_servers())); + mtr_print("Waiting for server(s) to exit..."); my $proc= My::SafeProcess->wait_any(); if ( grep($proc eq $_, started(all_servers())) ) { - mtr_report("Server $proc died"); + mtr_print("Server $proc died"); exit(1); } - mtr_report("Unknown process $proc died"); + mtr_print("Unknown process $proc died"); exit(1); } @@ -3163,7 +3162,7 @@ sub check_expected_crash_and_restart { # Remove all files and subdirectories of a directory sub clean_dir { my ($dir)= @_; - mtr_print("clean_dir: $dir"); + mtr_verbose("clean_dir: $dir"); finddepth( { no_chdir => 1, wanted => sub { @@ -3173,12 +3172,12 @@ sub clean_dir { # The dir to clean return; } else { - mtr_print("rmdir: '$_'"); + mtr_verbose("rmdir: '$_'"); rmdir($_) or mtr_warning("rmdir($_) failed: $!"); } } else { # Hopefully a file - mtr_print("unlink: '$_'"); + mtr_verbose("unlink: '$_'"); unlink($_) or mtr_warning("unlink($_) failed: $!"); } } @@ -3198,7 +3197,7 @@ sub clean_datadir { foreach my $cluster ( clusters() ) { my $cluster_dir= "$opt_vardir/".$cluster->{name}; - mtr_print(" - removing '$cluster_dir'"); + mtr_verbose(" - removing '$cluster_dir'"); rmtree($cluster_dir); } @@ -3207,7 +3206,7 @@ sub clean_datadir { { my $mysqld_dir= dirname($mysqld->value('datadir')); if (-d $mysqld_dir ) { - mtr_print(" - removing '$mysqld_dir'"); + mtr_verbose(" - removing '$mysqld_dir'"); rmtree($mysqld_dir); } } @@ -3512,7 +3511,7 @@ sub mysqld_start ($$) { sub stop_all_servers () { - mtr_print("Stopping all servers..."); + mtr_verbose("Stopping all servers..."); # Kill all started servers My::SafeProcess::shutdown(0, # shutdown timeout 0 => kill From 10348f0f3882e936ed497196f1bfcd9cb7acbfba Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Tue, 20 May 2008 11:48:52 +0200 Subject: [PATCH 209/705] (temporarily)Turn on timestamp by default --- mysql-test/lib/mtr_report.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index b5c868cb20a..786e73f0680 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -34,7 +34,7 @@ require "mtr_io.pl"; my $tot_real_time= 0; -our $timestamp= 0; +our $timestamp= 1; our $timediff= 0; our $name; our $verbose; From 2bbcd7301ad458afa17dbd64515950f5b6f75bf0 Mon Sep 17 00:00:00 2001 From: Alexey Botchkov Date: Sun, 15 Jun 2008 18:01:07 +0500 Subject: [PATCH 210/705] Bug #35934 mysql_upgrade calls mysqlcheck with insufficient parameters. Parameters added to the mysqlcheck call to fix table/database names. --- client/mysql_upgrade.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 6c5ca039a41..088115ec3ac 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -652,6 +652,8 @@ static int run_mysqlcheck_upgrade(void) "--check-upgrade", "--all-databases", "--auto-repair", + "--fix-db-names", + "--fix-table-names", NULL); } From b15f4190dda1431db956d5920af08bfae946a02c Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 16 Jun 2008 11:21:30 +0200 Subject: [PATCH 211/705] WL#4189 - Fix make_binary_distribution.sh after removing mysql-test/ndb dir --- mysql-test/Makefile.am | 2 +- scripts/make_binary_distribution.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 31804714900..6e706ba022e 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -60,7 +60,7 @@ TEST_DIRS = t r include std_data std_data/parts \ suite/binlog suite/binlog/t suite/binlog/r suite/binlog/std_data \ suite/bugs/data suite/bugs/t suite/bugs/r \ suite/federated \ - suite/funcs_1 suite/funcs_1/bitdata suite/funcs_1/data \ + suite/funcs_1 suite/funcs_1/bitdata \ suite/funcs_1/include suite/funcs_1/lib suite/funcs_1/r \ suite/funcs_1/t suite/funcs_1/views suite/funcs_1/cursors \ suite/funcs_1/datadict suite/funcs_1/storedproc suite/funcs_1/triggers \ diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 50cff8578c9..89ce40a891c 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -369,13 +369,12 @@ fi # NDB Cluster if [ x$NDBCLUSTER = x1 ]; then ( cd ndb ; @MAKE@ DESTDIR=$BASE/ndb-stage install ) - ( cd mysql-test/ndb ; @MAKE@ DESTDIR=$BASE/ndb-stage install ) $CP $BASE/ndb-stage@bindir@/* $BASE/bin/. $CP $BASE/ndb-stage@libexecdir@/* $BASE/bin/. $CP $BASE/ndb-stage@pkglibdir@/* $BASE/lib/. $CP $BASE/ndb-stage@pkgdatadir@/* $BASE/share/mysql/. $CP -r $BASE/ndb-stage@pkgincludedir@/ndb $BASE/include - $CP -r $BASE/ndb-stage@prefix@/mysql-test/ndb $BASE/mysql-test/. || exit 1 + $CP -r $BASE/ndb-stage@prefix@/mysql-test/ndb $BASE/mysql-test/. rm -rf $BASE/ndb-stage fi From 88e3cebc464a477e248028854e57e65549faa2e6 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 16 Jun 2008 11:23:00 +0200 Subject: [PATCH 212/705] WL#4189 - Increase start timeout to 180 seconds, old version had 400 that is too much --- mysql-test/mysql-test-run.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 6d1e9a82926..3a769b9f550 100644 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -153,7 +153,7 @@ my $opt_sleep; my $opt_testcase_timeout= 15; # 15 minutes my $opt_suite_timeout = 180; # 3 hours my $opt_shutdown_timeout= 10; # 10 seconds -my $opt_start_timeout = 30; # 30 seconds +my $opt_start_timeout = 180; # 180 seconds my $opt_start; my $opt_start_dirty; From 755e0157870ff5ba959ead0fbc4fee3c5f25f1e0 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Wed, 18 Jun 2008 17:49:32 +0200 Subject: [PATCH 213/705] Fix paths --- mysql-test/mysql-test-run.pl | 0 .../parts/inc/partition_layout_check2.inc | 2 +- .../r/partition_alter1_1_2_myisam.result | 496 ++++----- .../parts/r/partition_alter1_1_myisam.result | 496 ++++----- .../parts/r/partition_alter1_2_myisam.result | 992 +++++++++--------- 5 files changed, 993 insertions(+), 993 deletions(-) mode change 100644 => 100755 mysql-test/mysql-test-run.pl diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl old mode 100644 new mode 100755 diff --git a/mysql-test/suite/parts/inc/partition_layout_check2.inc b/mysql-test/suite/parts/inc/partition_layout_check2.inc index 7123f05fc33..800448c6ab3 100644 --- a/mysql-test/suite/parts/inc/partition_layout_check2.inc +++ b/mysql-test/suite/parts/inc/partition_layout_check2.inc @@ -32,7 +32,7 @@ let $MYSQLD_DATADIR= `select LEFT(@@datadir, LENGTH(@@datadir)-1)`; #echo MYSQLD_DATADIR: $MYSQLD_DATADIR; # Dump the current definition of the table t1 to tmp1 -let $show_file= $MYSQLTEST_VARDIR/master-data/test/tmp1; +let $show_file= $MYSQLD_DATADIR/test/tmp1; --exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $show_file 2>&1 || true if ($do_file_tests) diff --git a/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result b/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result index 7533b42340f..91e760c6d59 100644 --- a/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result +++ b/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result @@ -77,12 +77,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -592,18 +592,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1121,24 +1121,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1654,20 +1654,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2179,24 +2179,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2712,24 +2712,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3245,24 +3245,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3776,26 +3776,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4306,12 +4306,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4821,18 +4821,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5350,24 +5350,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5883,20 +5883,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6408,24 +6408,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6941,24 +6941,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7474,24 +7474,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8005,26 +8005,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_alter1_1_myisam.result b/mysql-test/suite/parts/r/partition_alter1_1_myisam.result index 69b8067d043..61d0e36643d 100644 --- a/mysql-test/suite/parts/r/partition_alter1_1_myisam.result +++ b/mysql-test/suite/parts/r/partition_alter1_1_myisam.result @@ -236,12 +236,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -751,18 +751,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1280,24 +1280,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1813,20 +1813,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2338,24 +2338,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2873,24 +2873,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3406,24 +3406,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3937,26 +3937,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4467,12 +4467,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4982,18 +4982,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5511,24 +5511,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6044,20 +6044,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6569,24 +6569,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7104,24 +7104,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7637,24 +7637,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8168,26 +8168,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 diff --git a/mysql-test/suite/parts/r/partition_alter1_2_myisam.result b/mysql-test/suite/parts/r/partition_alter1_2_myisam.result index 23f32a715b4..978fab67a57 100644 --- a/mysql-test/suite/parts/r/partition_alter1_2_myisam.result +++ b/mysql-test/suite/parts/r/partition_alter1_2_myisam.result @@ -74,12 +74,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -537,18 +537,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1014,24 +1014,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1495,20 +1495,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -1968,24 +1968,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2451,24 +2451,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -2932,24 +2932,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3411,26 +3411,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -3893,12 +3893,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4356,18 +4356,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -4833,24 +4833,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5314,20 +5314,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -5787,24 +5787,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6268,24 +6268,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -6749,24 +6749,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7228,26 +7228,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -7706,12 +7706,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8169,18 +8169,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -8646,24 +8646,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9127,20 +9127,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -9600,24 +9600,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -10081,24 +10081,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -10562,24 +10562,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -11041,26 +11041,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -11519,12 +11519,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -11982,18 +11982,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#p0.MYD +MYSQLD_DATADIR/test/t1#P#p0.MYI +MYSQLD_DATADIR/test/t1#P#p1.MYD +MYSQLD_DATADIR/test/t1#P#p1.MYI +MYSQLD_DATADIR/test/t1#P#p2.MYD +MYSQLD_DATADIR/test/t1#P#p2.MYI +MYSQLD_DATADIR/test/t1#P#p3.MYD +MYSQLD_DATADIR/test/t1#P#p3.MYI +MYSQLD_DATADIR/test/t1#P#p4.MYD +MYSQLD_DATADIR/test/t1#P#p4.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -12459,24 +12459,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part0.MYD +MYSQLD_DATADIR/test/t1#P#part0.MYI +MYSQLD_DATADIR/test/t1#P#part1.MYD +MYSQLD_DATADIR/test/t1#P#part1.MYI +MYSQLD_DATADIR/test/t1#P#part2.MYD +MYSQLD_DATADIR/test/t1#P#part2.MYI +MYSQLD_DATADIR/test/t1#P#part3.MYD +MYSQLD_DATADIR/test/t1#P#part3.MYI +MYSQLD_DATADIR/test/t1#P#part_1.MYD +MYSQLD_DATADIR/test/t1#P#part_1.MYI +MYSQLD_DATADIR/test/t1#P#part_2.MYD +MYSQLD_DATADIR/test/t1#P#part_2.MYI +MYSQLD_DATADIR/test/t1#P#part_3.MYD +MYSQLD_DATADIR/test/t1#P#part_3.MYI +MYSQLD_DATADIR/test/t1#P#part_N.MYD +MYSQLD_DATADIR/test/t1#P#part_N.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -12940,20 +12940,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta.MYD +MYSQLD_DATADIR/test/t1#P#parta.MYI +MYSQLD_DATADIR/test/t1#P#partb.MYD +MYSQLD_DATADIR/test/t1#P#partb.MYI +MYSQLD_DATADIR/test/t1#P#partc.MYD +MYSQLD_DATADIR/test/t1#P#partc.MYI +MYSQLD_DATADIR/test/t1#P#partd.MYD +MYSQLD_DATADIR/test/t1#P#partd.MYI +MYSQLD_DATADIR/test/t1#P#parte.MYD +MYSQLD_DATADIR/test/t1#P#parte.MYI +MYSQLD_DATADIR/test/t1#P#partf.MYD +MYSQLD_DATADIR/test/t1#P#partf.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -13413,24 +13413,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD +MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD +MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD +MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD +MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -13894,24 +13894,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -14375,24 +14375,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD +MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 @@ -14854,26 +14854,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD +MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD +MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD +MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI +MYSQLD_DATADIR/test/t1.frm +MYSQLD_DATADIR/test/t1.par # check prerequisites-1 success: 1 # check COUNT(*) success: 1 From ce4b99857bf432da85a55fb456eea1cda9cbd452 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Thu, 19 Jun 2008 10:07:55 +0200 Subject: [PATCH 214/705] Instruct mysql_upgrade what tmpdir to use --- mysql-test/lib/My/ConfigFactory.pm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index 824267c8cc0..31927f5e8d5 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -300,6 +300,16 @@ my @mysqlbinlog_rules= ); +# +# Rules to run for [mysql_upgrade] section +# - will be run in order listed here +# +my @mysql_upgrade_rules= +( + { 'tmpdir' => sub { return shift->{ARGS}->{tmpdir}; } }, +); + + # # Generate a [client.] group to be # used for connecting to [mysqld.] @@ -606,6 +616,11 @@ sub new_config { $config->insert('mysqlbinlog'), @mysqlbinlog_rules); + # [mysql_upgrade] need additional settings + $self->run_rules_for_group($config, + $config->insert('mysql_upgrade'), + @mysql_upgrade_rules); + # Additional rules required for [client] $self->run_rules_for_group($config, $config->insert('client'), From 079fa90b8dd2ff59d3a6d4e432226438cec44be7 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Thu, 19 Jun 2008 11:20:45 +0200 Subject: [PATCH 215/705] Turn off timestamping --- mysql-test/lib/mtr_report.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index 786e73f0680..b5c868cb20a 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -34,7 +34,7 @@ require "mtr_io.pl"; my $tot_real_time= 0; -our $timestamp= 1; +our $timestamp= 0; our $timediff= 0; our $name; our $verbose; From eb05cd9e4ff1e0927a148b237667923eea3a39ca Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Fri, 4 Jul 2008 11:33:34 +0200 Subject: [PATCH 216/705] BUG#37858: loaddata,rpl_slave_skip,rpl_innodb_mixed_dml fail if datafile not world-readable Problem 1: main.loaddata tried to trigger an error caused by reading files outside the vardir, by reading itself. However, if loaddata.test is not world-readable (e.g., umask=0077), then another error is triggered. Fix 1: allow the other error too. Problem 2: rpl_slave_skip and rpl_innodb_mixed_dml tried to copy a file from mysql-test/suite/rpl/data to mysql-test/var and then read it. That failed too if umask=0077, since the file would not become world-readable. Fix 2: move the files from mysql-test/suite/rpl/data to mysql-test/std_data and update tests accordingly. Remove the directory mysql-test/suite/rpl/data. --- mysql-test/r/loaddata.result | 2 +- mysql-test/{suite/rpl/data => std_data}/rpl_bug28618.dat | 0 mysql-test/{suite/rpl/data => std_data}/rpl_mixed.dat | 0 mysql-test/suite/rpl/include/rpl_mixed_dml.inc | 6 +++--- mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result | 4 ++-- mysql-test/suite/rpl/r/rpl_slave_skip.result | 2 +- mysql-test/suite/rpl/t/rpl_slave_skip.test | 5 ++--- mysql-test/t/loaddata.test | 2 +- 8 files changed, 10 insertions(+), 11 deletions(-) rename mysql-test/{suite/rpl/data => std_data}/rpl_bug28618.dat (100%) rename mysql-test/{suite/rpl/data => std_data}/rpl_mixed.dat (100%) diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result index 3aef9ef636d..967259013f6 100644 --- a/mysql-test/r/loaddata.result +++ b/mysql-test/r/loaddata.result @@ -212,7 +212,7 @@ set @@secure_file_priv= 0; ERROR HY000: Variable 'secure_file_priv' is a read only variable truncate table t1; load data infile 'MYSQL_TEST_DIR/t/loaddata.test' into table t1; -ERROR HY000: The MySQL server is running with the --secure-file-priv option so it cannot execute this statement +Got one of the listed errors select * from t1; a b c select load_file("MYSQL_TEST_DIR/t/loaddata.test"); diff --git a/mysql-test/suite/rpl/data/rpl_bug28618.dat b/mysql-test/std_data/rpl_bug28618.dat similarity index 100% rename from mysql-test/suite/rpl/data/rpl_bug28618.dat rename to mysql-test/std_data/rpl_bug28618.dat diff --git a/mysql-test/suite/rpl/data/rpl_mixed.dat b/mysql-test/std_data/rpl_mixed.dat similarity index 100% rename from mysql-test/suite/rpl/data/rpl_mixed.dat rename to mysql-test/std_data/rpl_mixed.dat diff --git a/mysql-test/suite/rpl/include/rpl_mixed_dml.inc b/mysql-test/suite/rpl/include/rpl_mixed_dml.inc index b76d45c0eb0..e9adb805c99 100644 --- a/mysql-test/suite/rpl/include/rpl_mixed_dml.inc +++ b/mysql-test/suite/rpl/include/rpl_mixed_dml.inc @@ -51,9 +51,8 @@ DELETE FROM t2 WHERE a = 2; --echo --echo ******************** LOAD DATA INFILE ******************** ---copy_file suite/rpl/data/rpl_mixed.dat $MYSQLTEST_VARDIR/tmp/rpl_mixed.dat -LOAD DATA INFILE '../../tmp/rpl_mixed.dat' INTO TABLE t1 FIELDS TERMINATED BY '|' ; ---remove_file $MYSQLTEST_VARDIR/tmp/rpl_mixed.dat +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data/rpl_mixed.dat' INTO TABLE t1 FIELDS TERMINATED BY '|' ; SELECT * FROM t1 ORDER BY a; --source suite/rpl/include/rpl_mixed_check_select.inc --source suite/rpl/include/rpl_mixed_clear_tables.inc @@ -329,6 +328,7 @@ DROP VIEW v2; --echo ******************** SHOW BINLOG EVENTS ******************** --replace_column 2 # 5 # --replace_regex /Server ver: .+/Server ver: #/ /table_id: [0-9]+/table_id: #/ /COMMIT.+xid=[0-9]+.+/#/ /file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/ +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR show binlog events from 1; sync_slave_with_master; # as we're using UUID we don't SELECT but use "diff" like in rpl_row_UUID diff --git a/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result b/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result index 9a6053ecedf..f780cb05599 100644 --- a/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result +++ b/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result @@ -103,7 +103,7 @@ DELETE FROM t1; DELETE FROM t2; ******************** LOAD DATA INFILE ******************** -LOAD DATA INFILE '../../tmp/rpl_mixed.dat' INTO TABLE t1 FIELDS TERMINATED BY '|' ; +LOAD DATA INFILE 'MYSQLTEST_VARDIR/std_data/rpl_mixed.dat' INTO TABLE t1 FIELDS TERMINATED BY '|' ; SELECT * FROM t1 ORDER BY a; a b 10 line A @@ -884,7 +884,7 @@ master-bin.000001 # Query 1 # use `test_rpl`; DELETE FROM t2 master-bin.000001 # Xid 1 # # master-bin.000001 # Query 1 # use `test_rpl`; BEGIN master-bin.000001 # Begin_load_query 1 # ;file_id=#;block_len=# -master-bin.000001 # Execute_load_query 1 # use `test_rpl`; LOAD DATA INFILE '../../tmp/rpl_mixed.dat' INTO TABLE t1 FIELDS TERMINATED BY '|' ;file_id=# +master-bin.000001 # Execute_load_query 1 # use `test_rpl`; LOAD DATA INFILE 'MYSQLTEST_VARDIR/std_data/rpl_mixed.dat' INTO TABLE t1 FIELDS TERMINATED BY '|' ;file_id=# master-bin.000001 # Xid 1 # # master-bin.000001 # Query 1 # use `test_rpl`; BEGIN master-bin.000001 # Query 1 # use `test_rpl`; DELETE FROM t1 diff --git a/mysql-test/suite/rpl/r/rpl_slave_skip.result b/mysql-test/suite/rpl/r/rpl_slave_skip.result index bb03c3b6cca..1f975b7dbcd 100644 --- a/mysql-test/suite/rpl/r/rpl_slave_skip.result +++ b/mysql-test/suite/rpl/r/rpl_slave_skip.result @@ -344,7 +344,7 @@ CREATE TABLE t10 (a INT, b VARCHAR(20)) ENGINE=myisam; STOP SLAVE; *** On Master *** SET SESSION BINLOG_FORMAT=STATEMENT; -LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/rpl_bug28618.dat' INTO TABLE t10 FIELDS TERMINATED BY '|'; +LOAD DATA INFILE 'MYSQLTEST_VARDIR/std_data/rpl_bug28618.dat' INTO TABLE t10 FIELDS TERMINATED BY '|'; SELECT * FROM t10 ORDER BY a; a b 1 master only diff --git a/mysql-test/suite/rpl/t/rpl_slave_skip.test b/mysql-test/suite/rpl/t/rpl_slave_skip.test index 8a5b1ae0ae4..ce308f975aa 100644 --- a/mysql-test/suite/rpl/t/rpl_slave_skip.test +++ b/mysql-test/suite/rpl/t/rpl_slave_skip.test @@ -286,10 +286,9 @@ source include/wait_for_slave_to_stop.inc; --echo *** On Master *** connection master; SET SESSION BINLOG_FORMAT=STATEMENT; -exec cp ./suite/rpl/data/rpl_bug28618.dat $MYSQLTEST_VARDIR/tmp/; + --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR -eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/tmp/rpl_bug28618.dat' INTO TABLE t10 FIELDS TERMINATED BY '|'; -remove_file $MYSQLTEST_VARDIR/tmp/rpl_bug28618.dat; +eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data/rpl_bug28618.dat' INTO TABLE t10 FIELDS TERMINATED BY '|'; SELECT * FROM t10 ORDER BY a; diff --git a/mysql-test/t/loaddata.test b/mysql-test/t/loaddata.test index 9d319d4820c..bc35b652f57 100644 --- a/mysql-test/t/loaddata.test +++ b/mysql-test/t/loaddata.test @@ -163,7 +163,7 @@ set @@secure_file_priv= 0; # Test "load data" truncate table t1; --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---error 1290 +--error ER_OPTION_PREVENTS_STATEMENT, ER_TEXTFILE_NOT_READABLE eval load data infile '$MYSQL_TEST_DIR/t/loaddata.test' into table t1; select * from t1; From bb63582ed9f85071a21bb37a8c4dbb146e1c65b3 Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Sun, 6 Jul 2008 12:53:25 +0200 Subject: [PATCH 217/705] BUG#37373: rpl_ndb_transaction fails sporadically in pb on sol10-amd64-a and sol10-sparc-a Problem: rpl_ndb_transaction fails because it assumes nothing is written to the binlog at a certain point. However, ndb may binlog updates in ndb system tables at a nondeterministic time point after an ndb table update has been committed. Fix: break the test into two. rpl_ndb_transaction still does the ndb updates needed by the first half of the test. The new test case rpl_bug26395 includes the part that assumes nothing more will be written to the binlog. --- .../include/sync_slave_io_with_master.inc | 25 + mysql-test/suite/rpl/r/rpl_bug26395.result | 41 ++ .../t/rpl_bug26395-master.opt} | 0 mysql-test/suite/rpl/t/rpl_bug26395-slave.opt | 1 + mysql-test/suite/rpl/t/rpl_bug26395.test | 98 ++++ .../rpl_ndb_mixed_engines_transactions.result | 457 ++++++++++++++++++ .../rpl_ndb/r/rpl_ndb_transaction.result | 110 ----- ..._ndb_mixed_engines_transactions-master.opt | 1 + ...l_ndb_mixed_engines_transactions-slave.opt | 1 + .../t/rpl_ndb_mixed_engines_transactions.test | 450 +++++++++++++++++ .../rpl_ndb/t/rpl_ndb_transaction-master.opt | 1 - .../suite/rpl_ndb/t/rpl_ndb_transaction.test | 132 ----- 12 files changed, 1074 insertions(+), 243 deletions(-) create mode 100644 mysql-test/include/sync_slave_io_with_master.inc create mode 100644 mysql-test/suite/rpl/r/rpl_bug26395.result rename mysql-test/suite/{rpl_ndb/t/rpl_ndb_transaction-slave.opt => rpl/t/rpl_bug26395-master.opt} (100%) create mode 100644 mysql-test/suite/rpl/t/rpl_bug26395-slave.opt create mode 100644 mysql-test/suite/rpl/t/rpl_bug26395.test create mode 100644 mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result delete mode 100644 mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result create mode 100644 mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions-master.opt create mode 100644 mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions-slave.opt create mode 100644 mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test delete mode 100644 mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction-master.opt delete mode 100644 mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test diff --git a/mysql-test/include/sync_slave_io_with_master.inc b/mysql-test/include/sync_slave_io_with_master.inc new file mode 100644 index 00000000000..bac6f3857c7 --- /dev/null +++ b/mysql-test/include/sync_slave_io_with_master.inc @@ -0,0 +1,25 @@ +# ==== Purpose ==== +# +# Waits until the slave IO thread has been synced, i.e., all events +# have been copied over to slave. Does not care if the SQL thread is +# in sync. +# +# +# ==== Usage ==== +# +# Syncs to the current position on master, as found by SHOW MASTER +# STATUS. +# +# Must be called on the master. + +let $_master_file= query_get_value("SHOW MASTER STATUS", File, 1); +let $_master_pos= query_get_value("SHOW MASTER STATUS", Position, 1); + +connection slave; + +let $slave_param= Master_Log_File; +let $slave_param_value= $_master_file; +source include/wait_for_slave_param.inc; +let $slave_param= Read_Master_Log_Pos; +let $slave_param_value= $_master_pos; +source include/wait_for_slave_param.inc; diff --git a/mysql-test/suite/rpl/r/rpl_bug26395.result b/mysql-test/suite/rpl/r/rpl_bug26395.result new file mode 100644 index 00000000000..1f986c40934 --- /dev/null +++ b/mysql-test/suite/rpl/r/rpl_bug26395.result @@ -0,0 +1,41 @@ +stop slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +start slave; +==== Initialize ==== +[on master] +CREATE TABLE tinnodb (a INT) ENGINE = INNODB; +SHOW CREATE TABLE tinnodb; +Table Create Table +tinnodb CREATE TABLE `tinnodb` ( + `a` int(11) DEFAULT NULL +) ENGINE=InnoDB DEFAULT CHARSET=latin1 +set @old_debug= @@debug; +set @@debug= 'd,do_not_write_xid'; +==== Test ==== +INSERT INTO tinnodb VALUES (1); +SELECT * FROM tinnodb ORDER BY a; +a +1 +[on slave] +==== Verify results on slave ==== +STOP SLAVE; +SELECT "" AS Slave_IO_State; +Slave_IO_State + +SELECT "" AS Last_SQL_Error; +Last_SQL_Error + +SELECT "" AS Last_IO_Error; +Last_IO_Error + +SELECT * FROM tinnodb ORDER BY a; +a +==== Clean up ==== +[on master] +DROP TABLE tinnodb; +set @@debug= @old_debug; +[on slave] +DROP TABLE tinnodb; diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction-slave.opt b/mysql-test/suite/rpl/t/rpl_bug26395-master.opt similarity index 100% rename from mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction-slave.opt rename to mysql-test/suite/rpl/t/rpl_bug26395-master.opt diff --git a/mysql-test/suite/rpl/t/rpl_bug26395-slave.opt b/mysql-test/suite/rpl/t/rpl_bug26395-slave.opt new file mode 100644 index 00000000000..627becdbfb5 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_bug26395-slave.opt @@ -0,0 +1 @@ +--innodb diff --git a/mysql-test/suite/rpl/t/rpl_bug26395.test b/mysql-test/suite/rpl/t/rpl_bug26395.test new file mode 100644 index 00000000000..5d5f8f7fa5e --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_bug26395.test @@ -0,0 +1,98 @@ +# ==== Purpose ==== +# +# Tests that an autocommitted XA transaction where the master crashes +# just before writing the XID log event is executed correctly. The +# master rolls back, so the slave should not execute statement. +# +# This test was previously part of rpl_ndb_transaction.test +# +# +# ==== Method ==== +# +# We want master to be alive so that it can replicate the statement to +# the slave. So in the test case, we must not crash the +# master. Instead, we fake the crash by just not writing the XID event +# to the binlog. This is done by the @@debug='d,do_not_write_xid' +# flag. This, in turn, requires us to do 'source +# include/have_debug.inc' +# +# So, unlike if the master had crashed, the master *will* execute the +# statement. But the slave should not execute it. Hence, after the +# test is executed, the expected result on master is a table with one +# row, and on slave a table with no rows. +# +# To simulate the slave correctly, we wait until everything up to but +# not including the XID is replicated. This has to be done with +# include/wait_for_slave_io_to_sync.inc, not sync_slave_with_master, +# since the latter waits until the slave *SQL* thread has caught up +# with the master's position, which it will never do. +# +# +# ==== Related bugs ==== +# +# BUG#26395: if crash during autocommit update to transactional table on master, slave fails + +source include/have_innodb.inc; +# have_debug is needed since we use the @@debug variable on master +source include/have_debug.inc; +source include/master-slave.inc; + + +--echo ==== Initialize ==== + +--echo [on master] +--connection master + +CREATE TABLE tinnodb (a INT) ENGINE = INNODB; +SHOW CREATE TABLE tinnodb; + +# do_not_write_xid stops the master from writing an XID event. +set @old_debug= @@debug; +set @@debug= 'd,do_not_write_xid'; + + +--echo ==== Test ==== + +# Save the position up to which the slave SQL thread should execute. +save_master_pos; + +# Execute query and check that the row made it to the table. +INSERT INTO tinnodb VALUES (1); +SELECT * FROM tinnodb ORDER BY a; + +# Sync slave's IO thread. +--echo [on slave] +source include/sync_slave_io_with_master.inc; + +# Sync slave's SQL thread. +sync_with_master 0; + + +--echo ==== Verify results on slave ==== + +STOP SLAVE; +source include/wait_for_slave_to_stop.inc; +let $tmp= query_get_value("SHOW SLAVE STATUS", Slave_IO_State, 1); +eval SELECT "$tmp" AS Slave_IO_State; +let $tmp= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1); +eval SELECT "$tmp" AS Last_SQL_Error; +let $tmp= query_get_value("SHOW SLAVE STATUS", Last_IO_Error, 1); +eval SELECT "$tmp" AS Last_IO_Error; +SELECT * FROM tinnodb ORDER BY a; + + +--echo ==== Clean up ==== + +# Easiest to clean up master and slave separately, without +# replication, since master and slave are out of sync. + +--echo [on master] +connection master; +DROP TABLE tinnodb; +set @@debug= @old_debug; + +--echo [on slave] +connection slave; +DROP TABLE tinnodb; + +# Warning: do not add more tests here. The binlog is in a bad state. diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result new file mode 100644 index 00000000000..da60b0bbbbf --- /dev/null +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result @@ -0,0 +1,457 @@ +stop slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +start slave; +CREATE TABLE tmyisam (a int) ENGINE = MYISAM; +CREATE TABLE tinnodb (a int) ENGINE = INNODB; +CREATE TABLE tndb (a int) ENGINE = NDB; +SHOW CREATE TABLE tmyisam; +Table Create Table +tmyisam CREATE TABLE `tmyisam` ( + `a` int(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SHOW CREATE TABLE tinnodb; +Table Create Table +tinnodb CREATE TABLE `tinnodb` ( + `a` int(11) DEFAULT NULL +) ENGINE=InnoDB DEFAULT CHARSET=latin1 +SHOW CREATE TABLE tndb; +Table Create Table +tndb CREATE TABLE `tndb` ( + `a` int(11) DEFAULT NULL +) ENGINE=ndbcluster DEFAULT CHARSET=latin1 +[on master] +==== Single-engine transactions ==== +---- autocommitted ---- +SET AUTOCOMMIT = 1; +INSERT INTO tmyisam VALUES (0); +INSERT INTO tinnodb VALUES (1); +INSERT INTO tndb VALUES (2); +---- committed with BEGIN ---- +BEGIN; +INSERT INTO tmyisam VALUES (3); +INSERT INTO tmyisam VALUES (4); +COMMIT; +BEGIN; +INSERT INTO tinnodb VALUES (5); +INSERT INTO tinnodb VALUES (6); +COMMIT; +BEGIN; +INSERT INTO tndb VALUES (7); +INSERT INTO tndb VALUES (8); +COMMIT; +---- rolled back with BEGIN ---- +BEGIN; +INSERT INTO tmyisam VALUES (9); +INSERT INTO tmyisam VALUES (10); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +BEGIN; +INSERT INTO tinnodb VALUES (11); +INSERT INTO tinnodb VALUES (12); +ROLLBACK; +BEGIN; +INSERT INTO tndb VALUES (13); +INSERT INTO tndb VALUES (14); +ROLLBACK; +---- committed with AUTOCOMMIT = 0 ---- +SET AUTOCOMMIT = 0; +INSERT INTO tmyisam VALUES (15); +INSERT INTO tmyisam VALUES (16); +COMMIT; +INSERT INTO tinnodb VALUES (17); +INSERT INTO tinnodb VALUES (18); +COMMIT; +INSERT INTO tndb VALUES (19); +INSERT INTO tndb VALUES (20); +COMMIT; +---- rolled back with AUTOCOMMIT = 0 ---- +INSERT INTO tmyisam VALUES (21); +INSERT INTO tmyisam VALUES (22); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +INSERT INTO tinnodb VALUES (23); +INSERT INTO tinnodb VALUES (24); +ROLLBACK; +INSERT INTO tndb VALUES (25); +INSERT INTO tndb VALUES (26); +ROLLBACK; +SET AUTOCOMMIT = 1; +==== MyISAM + InnoDB ==== +---- committed with BEGIN ---- +BEGIN; +INSERT INTO tmyisam VALUES (27); +INSERT INTO tinnodb VALUES (28); +COMMIT; +BEGIN; +INSERT INTO tinnodb VALUES (29); +INSERT INTO tmyisam VALUES (30); +COMMIT; +---- rolled back with BEGIN ---- +BEGIN; +INSERT INTO tmyisam VALUES (31); +INSERT INTO tinnodb VALUES (32); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +BEGIN; +INSERT INTO tinnodb VALUES (33); +INSERT INTO tmyisam VALUES (34); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +---- committed with AUTOCOMMIT = 0 ---- +SET AUTOCOMMIT = 0; +INSERT INTO tmyisam VALUES (35); +INSERT INTO tinnodb VALUES (36); +COMMIT; +INSERT INTO tinnodb VALUES (37); +INSERT INTO tmyisam VALUES (38); +COMMIT; +---- rolled back with AUTOCOMMIT = 0 ---- +INSERT INTO tmyisam VALUES (39); +INSERT INTO tinnodb VALUES (40); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +INSERT INTO tinnodb VALUES (41); +INSERT INTO tmyisam VALUES (42); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +SET AUTOCOMMIT = 1; +==== MyISAM + NDB ==== +---- committed with BEGIN---- +BEGIN; +INSERT INTO tmyisam VALUES (43); +INSERT INTO tndb VALUES (44); +COMMIT; +BEGIN; +INSERT INTO tndb VALUES (45); +INSERT INTO tmyisam VALUES (46); +COMMIT; +---- rolled back with BEGIN ---- +BEGIN; +INSERT INTO tmyisam VALUES (47); +INSERT INTO tndb VALUES (48); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +BEGIN; +INSERT INTO tndb VALUES (49); +INSERT INTO tmyisam VALUES (50); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +---- committed with AUTOCOMMIT = 0 ---- +SET AUTOCOMMIT = 0; +INSERT INTO tmyisam VALUES (51); +INSERT INTO tndb VALUES (52); +COMMIT; +INSERT INTO tndb VALUES (53); +INSERT INTO tmyisam VALUES (54); +COMMIT; +---- rolled back with AUTOCOMMIT = 0 ---- +INSERT INTO tmyisam VALUES (55); +INSERT INTO tndb VALUES (56); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +INSERT INTO tndb VALUES (57); +INSERT INTO tmyisam VALUES (58); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +SET AUTOCOMMIT = 1; +==== InnoDB + NDB ==== +---- committed with BEGIN ---- +BEGIN; +INSERT INTO tinnodb VALUES (59); +INSERT INTO tndb VALUES (60); +COMMIT; +BEGIN; +INSERT INTO tndb VALUES (61); +INSERT INTO tinnodb VALUES (62); +COMMIT; +---- rolled back with BEGIN ---- +BEGIN; +INSERT INTO tinnodb VALUES (63); +INSERT INTO tndb VALUES (64); +ROLLBACK; +BEGIN; +INSERT INTO tndb VALUES (65); +INSERT INTO tinnodb VALUES (66); +ROLLBACK; +---- committed with AUTOCOMMIT = 0 ---- +SET AUTOCOMMIT = 0; +INSERT INTO tinnodb VALUES (67); +INSERT INTO tndb VALUES (68); +COMMIT; +INSERT INTO tndb VALUES (69); +INSERT INTO tinnodb VALUES (70); +COMMIT; +---- rolled back with AUTOCOMMIT = 0 ---- +INSERT INTO tinnodb VALUES (71); +INSERT INTO tndb VALUES (72); +ROLLBACK; +INSERT INTO tndb VALUES (73); +INSERT INTO tinnodb VALUES (74); +ROLLBACK; +SET AUTOCOMMIT = 1; +==== MyISAM + InnoDB + NDB ==== +---- committed with BEGIN ---- +BEGIN; +INSERT INTO tmyisam VALUES (75); +INSERT INTO tinnodb VALUES (76); +INSERT INTO tndb VALUES (77); +COMMIT; +BEGIN; +INSERT INTO tmyisam VALUES (78); +INSERT INTO tndb VALUES (79); +INSERT INTO tinnodb VALUES (80); +COMMIT; +BEGIN; +INSERT INTO tinnodb VALUES (81); +INSERT INTO tmyisam VALUES (82); +INSERT INTO tndb VALUES (83); +COMMIT; +BEGIN; +INSERT INTO tinnodb VALUES (84); +INSERT INTO tndb VALUES (85); +INSERT INTO tmyisam VALUES (86); +COMMIT; +BEGIN; +INSERT INTO tndb VALUES (87); +INSERT INTO tmyisam VALUES (88); +INSERT INTO tinnodb VALUES (89); +COMMIT; +BEGIN; +INSERT INTO tndb VALUES (90); +INSERT INTO tinnodb VALUES (91); +INSERT INTO tmyisam VALUES (92); +COMMIT; +---- rolled back with BEGIN ---- +BEGIN; +INSERT INTO tmyisam VALUES (93); +INSERT INTO tinnodb VALUES (94); +INSERT INTO tndb VALUES (95); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +BEGIN; +INSERT INTO tmyisam VALUES (96); +INSERT INTO tndb VALUES (97); +INSERT INTO tinnodb VALUES (98); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +BEGIN; +INSERT INTO tinnodb VALUES (99); +INSERT INTO tmyisam VALUES (100); +INSERT INTO tndb VALUES (101); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +BEGIN; +INSERT INTO tinnodb VALUES (102); +INSERT INTO tndb VALUES (103); +INSERT INTO tmyisam VALUES (104); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +BEGIN; +INSERT INTO tndb VALUES (105); +INSERT INTO tmyisam VALUES (106); +INSERT INTO tinnodb VALUES (107); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +BEGIN; +INSERT INTO tndb VALUES (108); +INSERT INTO tinnodb VALUES (109); +INSERT INTO tmyisam VALUES (110); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +---- committed with AUTOCOMMIT = 0 ---- +SET AUTOCOMMIT = 0; +INSERT INTO tmyisam VALUES (111); +INSERT INTO tinnodb VALUES (112); +INSERT INTO tndb VALUES (113); +COMMIT; +INSERT INTO tmyisam VALUES (114); +INSERT INTO tndb VALUES (115); +INSERT INTO tinnodb VALUES (116); +COMMIT; +INSERT INTO tinnodb VALUES (117); +INSERT INTO tmyisam VALUES (118); +INSERT INTO tndb VALUES (119); +COMMIT; +INSERT INTO tinnodb VALUES (120); +INSERT INTO tndb VALUES (121); +INSERT INTO tmyisam VALUES (122); +COMMIT; +INSERT INTO tndb VALUES (123); +INSERT INTO tmyisam VALUES (124); +INSERT INTO tinnodb VALUES (125); +COMMIT; +INSERT INTO tndb VALUES (126); +INSERT INTO tinnodb VALUES (127); +INSERT INTO tmyisam VALUES (128); +COMMIT; +---- rolled back with AUTOCOMMIT = 0 ---- +INSERT INTO tmyisam VALUES (129); +INSERT INTO tinnodb VALUES (130); +INSERT INTO tndb VALUES (131); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +INSERT INTO tmyisam VALUES (132); +INSERT INTO tndb VALUES (133); +INSERT INTO tinnodb VALUES (134); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +INSERT INTO tinnodb VALUES (135); +INSERT INTO tmyisam VALUES (136); +INSERT INTO tndb VALUES (137); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +INSERT INTO tinnodb VALUES (138); +INSERT INTO tndb VALUES (139); +INSERT INTO tmyisam VALUES (140); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +INSERT INTO tndb VALUES (141); +INSERT INTO tmyisam VALUES (142); +INSERT INTO tinnodb VALUES (143); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +INSERT INTO tndb VALUES (144); +INSERT INTO tinnodb VALUES (145); +INSERT INTO tmyisam VALUES (146); +ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back +SET AUTOCOMMIT = 1; +==== Verify the result ==== +SELECT * FROM tmyisam ORDER BY a; +a +0 +3 +4 +9 +10 +15 +16 +21 +22 +27 +30 +31 +34 +35 +38 +39 +42 +43 +46 +47 +50 +51 +54 +55 +58 +75 +78 +82 +86 +88 +92 +93 +96 +100 +104 +106 +110 +111 +114 +118 +122 +124 +128 +129 +132 +136 +140 +142 +146 +SELECT * FROM tinnodb ORDER BY a; +a +1 +5 +6 +17 +18 +28 +29 +36 +37 +59 +62 +67 +70 +76 +80 +81 +84 +89 +91 +112 +116 +117 +120 +125 +127 +SELECT * FROM tndb ORDER BY a; +a +2 +7 +8 +19 +20 +44 +45 +52 +53 +60 +61 +68 +69 +77 +79 +83 +85 +87 +90 +113 +115 +119 +121 +123 +126 +[on slave] +Comparing tables master:test.tmyisam and slave:test.tmyisam +Comparing tables master:test.tinnodb and slave:test.tinnodb +Comparing tables master:test.tndb and slave:test.tndb +==== Clean up ==== +[on master] +DROP TABLE tmyisam, tinnodb, tndb; +[on slave] diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result deleted file mode 100644 index bbd0a873dc8..00000000000 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result +++ /dev/null @@ -1,110 +0,0 @@ -stop slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -reset master; -reset slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -start slave; -CREATE TABLE tmyisam (a int) ENGINE = MYISAM; -CREATE TABLE tinnodb (a int) ENGINE = INNODB; -CREATE TABLE tndb (a int) ENGINE = NDB; -SHOW CREATE TABLE tmyisam; -Table Create Table -tmyisam CREATE TABLE `tmyisam` ( - `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 -SHOW CREATE TABLE tinnodb; -Table Create Table -tinnodb CREATE TABLE `tinnodb` ( - `a` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 -SHOW CREATE TABLE tndb; -Table Create Table -tndb CREATE TABLE `tndb` ( - `a` int(11) DEFAULT NULL -) ENGINE=ndbcluster DEFAULT CHARSET=latin1 -==== Test 1: Non-XA Engines ==== ---- on master --- -SET AUTOCOMMIT = 1; -INSERT INTO tndb VALUES (1); -INSERT INTO tmyisam VALUES (1); -BEGIN; -INSERT INTO tndb VALUES (2); -INSERT INTO tndb VALUES (3); -COMMIT; -BEGIN; -INSERT INTO tmyisam VALUES (2); -INSERT INTO tmyisam VALUES (3); -COMMIT; -BEGIN; -INSERT INTO tndb VALUES (4); -INSERT INTO tmyisam VALUES (4); -COMMIT; -BEGIN; -INSERT INTO tndb VALUES (5); -INSERT INTO tndb VALUES (6); -ROLLBACK; -BEGIN; -INSERT INTO tmyisam VALUES (5); -INSERT INTO tmyisam VALUES (6); -ROLLBACK; -Warnings: -Warning 1196 Some non-transactional changed tables couldn't be rolled back -BEGIN; -INSERT INTO tndb VALUES (7); -INSERT INTO tmyisam VALUES (7); -ROLLBACK; -Warnings: -Warning 1196 Some non-transactional changed tables couldn't be rolled back -SELECT * FROM tndb ORDER BY a; -a -1 -2 -3 -4 -SELECT * FROM tmyisam ORDER BY a; -a -1 -2 -3 -4 -5 -6 -7 ---- on slave --- -SELECT * FROM tndb ORDER BY a; -a -1 -2 -3 -4 -SELECT * FROM tmyisam ORDER BY a; -a -1 -2 -3 -4 -5 -6 -7 -==== Test 2: Master crash before writing XID event on XA engine ==== ---- on master --- -INSERT INTO tinnodb VALUES (1); -SELECT * FROM tinnodb ORDER BY a; -a -1 ---- on slave --- -STOP SLAVE; -SELECT "" AS Slave_IO_State; -Slave_IO_State - -SELECT "" AS Last_SQL_Error; -Last_SQL_Error - -SELECT "" AS Last_IO_Error; -Last_IO_Error - -SELECT * FROM tinnodb ORDER BY a; -a ---- on master --- -DROP TABLE tmyisam, tinnodb, tndb; -DROP TABLE tmyisam, tinnodb, tndb; diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions-master.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions-master.opt new file mode 100644 index 00000000000..627becdbfb5 --- /dev/null +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions-master.opt @@ -0,0 +1 @@ +--innodb diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions-slave.opt new file mode 100644 index 00000000000..627becdbfb5 --- /dev/null +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions-slave.opt @@ -0,0 +1 @@ +--innodb diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test new file mode 100644 index 00000000000..2aee4a827c3 --- /dev/null +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test @@ -0,0 +1,450 @@ +# ==== Purpose ==== +# +# Tests that transactions containing multiple table types are +# replicated correctly to the slave. +# +# This test was previously part of rpl_ndb_transactions. +# +# +# ==== Method ==== +# +# Try all combinations of the following: +# - Committed/rollback transactions. +# - Transactions started by AUTOCOMMIT = 0 or BEGIN. +# - Transactions using myisam, innodb, or ndb tables, or combinations +# of them. For combinations, we use the engines in all possible +# orders. +# For single-engine transactions, we also try with AUTOCOMMIT = 1. +# +# +# ==== Related bugs ==== +# +# BUG#26395: if crash during autocommit update to transactional table on master, slave fails + + +source include/ndb_master-slave.inc; +source include/have_ndb.inc; +source include/have_innodb.inc; + +CREATE TABLE tmyisam (a int) ENGINE = MYISAM; +CREATE TABLE tinnodb (a int) ENGINE = INNODB; +CREATE TABLE tndb (a int) ENGINE = NDB; + +SHOW CREATE TABLE tmyisam; +SHOW CREATE TABLE tinnodb; +SHOW CREATE TABLE tndb; + + +--echo [on master] + + +--echo ==== Single-engine transactions ==== + +--echo ---- autocommitted ---- + +SET AUTOCOMMIT = 1; + +INSERT INTO tmyisam VALUES (0); +INSERT INTO tinnodb VALUES (1); +INSERT INTO tndb VALUES (2); + +--echo ---- committed with BEGIN ---- + +BEGIN; +INSERT INTO tmyisam VALUES (3); +INSERT INTO tmyisam VALUES (4); +COMMIT; + +BEGIN; +INSERT INTO tinnodb VALUES (5); +INSERT INTO tinnodb VALUES (6); +COMMIT; + +BEGIN; +INSERT INTO tndb VALUES (7); +INSERT INTO tndb VALUES (8); +COMMIT; + +--echo ---- rolled back with BEGIN ---- + +BEGIN; +INSERT INTO tmyisam VALUES (9); +INSERT INTO tmyisam VALUES (10); +ROLLBACK; + +BEGIN; +INSERT INTO tinnodb VALUES (11); +INSERT INTO tinnodb VALUES (12); +ROLLBACK; + +BEGIN; +INSERT INTO tndb VALUES (13); +INSERT INTO tndb VALUES (14); +ROLLBACK; + + +--echo ---- committed with AUTOCOMMIT = 0 ---- + +SET AUTOCOMMIT = 0; + +INSERT INTO tmyisam VALUES (15); +INSERT INTO tmyisam VALUES (16); +COMMIT; + +INSERT INTO tinnodb VALUES (17); +INSERT INTO tinnodb VALUES (18); +COMMIT; + +INSERT INTO tndb VALUES (19); +INSERT INTO tndb VALUES (20); +COMMIT; + +--echo ---- rolled back with AUTOCOMMIT = 0 ---- + +INSERT INTO tmyisam VALUES (21); +INSERT INTO tmyisam VALUES (22); +ROLLBACK; + +INSERT INTO tinnodb VALUES (23); +INSERT INTO tinnodb VALUES (24); +ROLLBACK; + +INSERT INTO tndb VALUES (25); +INSERT INTO tndb VALUES (26); +ROLLBACK; + +SET AUTOCOMMIT = 1; + + +--echo ==== MyISAM + InnoDB ==== + +--echo ---- committed with BEGIN ---- + +BEGIN; +INSERT INTO tmyisam VALUES (27); +INSERT INTO tinnodb VALUES (28); +COMMIT; + +BEGIN; +INSERT INTO tinnodb VALUES (29); +INSERT INTO tmyisam VALUES (30); +COMMIT; + +--echo ---- rolled back with BEGIN ---- + +BEGIN; +INSERT INTO tmyisam VALUES (31); +INSERT INTO tinnodb VALUES (32); +ROLLBACK; + +BEGIN; +INSERT INTO tinnodb VALUES (33); +INSERT INTO tmyisam VALUES (34); +ROLLBACK; + +--echo ---- committed with AUTOCOMMIT = 0 ---- + +SET AUTOCOMMIT = 0; + +INSERT INTO tmyisam VALUES (35); +INSERT INTO tinnodb VALUES (36); +COMMIT; + +INSERT INTO tinnodb VALUES (37); +INSERT INTO tmyisam VALUES (38); +COMMIT; + +--echo ---- rolled back with AUTOCOMMIT = 0 ---- + +INSERT INTO tmyisam VALUES (39); +INSERT INTO tinnodb VALUES (40); +ROLLBACK; + +INSERT INTO tinnodb VALUES (41); +INSERT INTO tmyisam VALUES (42); +ROLLBACK; + +SET AUTOCOMMIT = 1; + + +--echo ==== MyISAM + NDB ==== + +--echo ---- committed with BEGIN---- + +BEGIN; +INSERT INTO tmyisam VALUES (43); +INSERT INTO tndb VALUES (44); +COMMIT; + +BEGIN; +INSERT INTO tndb VALUES (45); +INSERT INTO tmyisam VALUES (46); +COMMIT; + +--echo ---- rolled back with BEGIN ---- + +BEGIN; +INSERT INTO tmyisam VALUES (47); +INSERT INTO tndb VALUES (48); +ROLLBACK; + +BEGIN; +INSERT INTO tndb VALUES (49); +INSERT INTO tmyisam VALUES (50); +ROLLBACK; + +--echo ---- committed with AUTOCOMMIT = 0 ---- + +SET AUTOCOMMIT = 0; + +INSERT INTO tmyisam VALUES (51); +INSERT INTO tndb VALUES (52); +COMMIT; + +INSERT INTO tndb VALUES (53); +INSERT INTO tmyisam VALUES (54); +COMMIT; + +--echo ---- rolled back with AUTOCOMMIT = 0 ---- + +INSERT INTO tmyisam VALUES (55); +INSERT INTO tndb VALUES (56); +ROLLBACK; + +INSERT INTO tndb VALUES (57); +INSERT INTO tmyisam VALUES (58); +ROLLBACK; + +SET AUTOCOMMIT = 1; + + +--echo ==== InnoDB + NDB ==== + +--echo ---- committed with BEGIN ---- + +BEGIN; +INSERT INTO tinnodb VALUES (59); +INSERT INTO tndb VALUES (60); +COMMIT; + +BEGIN; +INSERT INTO tndb VALUES (61); +INSERT INTO tinnodb VALUES (62); +COMMIT; + +--echo ---- rolled back with BEGIN ---- + +BEGIN; +INSERT INTO tinnodb VALUES (63); +INSERT INTO tndb VALUES (64); +ROLLBACK; + +BEGIN; +INSERT INTO tndb VALUES (65); +INSERT INTO tinnodb VALUES (66); +ROLLBACK; + +--echo ---- committed with AUTOCOMMIT = 0 ---- + +SET AUTOCOMMIT = 0; + +INSERT INTO tinnodb VALUES (67); +INSERT INTO tndb VALUES (68); +COMMIT; + +INSERT INTO tndb VALUES (69); +INSERT INTO tinnodb VALUES (70); +COMMIT; + +--echo ---- rolled back with AUTOCOMMIT = 0 ---- + +INSERT INTO tinnodb VALUES (71); +INSERT INTO tndb VALUES (72); +ROLLBACK; + +INSERT INTO tndb VALUES (73); +INSERT INTO tinnodb VALUES (74); +ROLLBACK; + +SET AUTOCOMMIT = 1; + + +--echo ==== MyISAM + InnoDB + NDB ==== + +--echo ---- committed with BEGIN ---- + +BEGIN; +INSERT INTO tmyisam VALUES (75); +INSERT INTO tinnodb VALUES (76); +INSERT INTO tndb VALUES (77); +COMMIT; + +BEGIN; +INSERT INTO tmyisam VALUES (78); +INSERT INTO tndb VALUES (79); +INSERT INTO tinnodb VALUES (80); +COMMIT; + +BEGIN; +INSERT INTO tinnodb VALUES (81); +INSERT INTO tmyisam VALUES (82); +INSERT INTO tndb VALUES (83); +COMMIT; + +BEGIN; +INSERT INTO tinnodb VALUES (84); +INSERT INTO tndb VALUES (85); +INSERT INTO tmyisam VALUES (86); +COMMIT; + +BEGIN; +INSERT INTO tndb VALUES (87); +INSERT INTO tmyisam VALUES (88); +INSERT INTO tinnodb VALUES (89); +COMMIT; + +BEGIN; +INSERT INTO tndb VALUES (90); +INSERT INTO tinnodb VALUES (91); +INSERT INTO tmyisam VALUES (92); +COMMIT; + +--echo ---- rolled back with BEGIN ---- + +BEGIN; +INSERT INTO tmyisam VALUES (93); +INSERT INTO tinnodb VALUES (94); +INSERT INTO tndb VALUES (95); +ROLLBACK; + +BEGIN; +INSERT INTO tmyisam VALUES (96); +INSERT INTO tndb VALUES (97); +INSERT INTO tinnodb VALUES (98); +ROLLBACK; + +BEGIN; +INSERT INTO tinnodb VALUES (99); +INSERT INTO tmyisam VALUES (100); +INSERT INTO tndb VALUES (101); +ROLLBACK; + +BEGIN; +INSERT INTO tinnodb VALUES (102); +INSERT INTO tndb VALUES (103); +INSERT INTO tmyisam VALUES (104); +ROLLBACK; + +BEGIN; +INSERT INTO tndb VALUES (105); +INSERT INTO tmyisam VALUES (106); +INSERT INTO tinnodb VALUES (107); +ROLLBACK; + +BEGIN; +INSERT INTO tndb VALUES (108); +INSERT INTO tinnodb VALUES (109); +INSERT INTO tmyisam VALUES (110); +ROLLBACK; + +--echo ---- committed with AUTOCOMMIT = 0 ---- + +SET AUTOCOMMIT = 0; + +INSERT INTO tmyisam VALUES (111); +INSERT INTO tinnodb VALUES (112); +INSERT INTO tndb VALUES (113); +COMMIT; + +INSERT INTO tmyisam VALUES (114); +INSERT INTO tndb VALUES (115); +INSERT INTO tinnodb VALUES (116); +COMMIT; + +INSERT INTO tinnodb VALUES (117); +INSERT INTO tmyisam VALUES (118); +INSERT INTO tndb VALUES (119); +COMMIT; + +INSERT INTO tinnodb VALUES (120); +INSERT INTO tndb VALUES (121); +INSERT INTO tmyisam VALUES (122); +COMMIT; + +INSERT INTO tndb VALUES (123); +INSERT INTO tmyisam VALUES (124); +INSERT INTO tinnodb VALUES (125); +COMMIT; + +INSERT INTO tndb VALUES (126); +INSERT INTO tinnodb VALUES (127); +INSERT INTO tmyisam VALUES (128); +COMMIT; + +--echo ---- rolled back with AUTOCOMMIT = 0 ---- + +INSERT INTO tmyisam VALUES (129); +INSERT INTO tinnodb VALUES (130); +INSERT INTO tndb VALUES (131); +ROLLBACK; + +INSERT INTO tmyisam VALUES (132); +INSERT INTO tndb VALUES (133); +INSERT INTO tinnodb VALUES (134); +ROLLBACK; + +INSERT INTO tinnodb VALUES (135); +INSERT INTO tmyisam VALUES (136); +INSERT INTO tndb VALUES (137); +ROLLBACK; + +INSERT INTO tinnodb VALUES (138); +INSERT INTO tndb VALUES (139); +INSERT INTO tmyisam VALUES (140); +ROLLBACK; + +INSERT INTO tndb VALUES (141); +INSERT INTO tmyisam VALUES (142); +INSERT INTO tinnodb VALUES (143); +ROLLBACK; + +INSERT INTO tndb VALUES (144); +INSERT INTO tinnodb VALUES (145); +INSERT INTO tmyisam VALUES (146); +ROLLBACK; + +SET AUTOCOMMIT = 1; + + +--echo ==== Verify the result ==== + +SELECT * FROM tmyisam ORDER BY a; +SELECT * FROM tinnodb ORDER BY a; +SELECT * FROM tndb ORDER BY a; + +--echo [on slave] +--sync_slave_with_master + +let $diff_table_1=master:test.tmyisam; +let $diff_table_2=slave:test.tmyisam; +source include/diff_tables.inc; + +let $diff_table_1=master:test.tinnodb; +let $diff_table_2=slave:test.tinnodb; +source include/diff_tables.inc; + +let $diff_table_1=master:test.tndb; +let $diff_table_2=slave:test.tndb; +source include/diff_tables.inc; + + +--echo ==== Clean up ==== + +--echo [on master] +connection master; +DROP TABLE tmyisam, tinnodb, tndb; + +--echo [on slave] +sync_slave_with_master; + +source include/master-slave-end.inc; diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction-master.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction-master.opt deleted file mode 100644 index 5411960b4aa..00000000000 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction-master.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb --debug=d,do_not_write_xid diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test deleted file mode 100644 index 86af3d4f60d..00000000000 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test +++ /dev/null @@ -1,132 +0,0 @@ -# Tests that transactions are replicated correctly, with various -# combinations of non-transactional and transactional non-XA tables. -# Also tests that an XA transaction where the master crashes just -# before writing the XID log event is executed correctly. See below -# for implementation details. - -source include/ndb_master-slave.inc; -source include/have_ndb.inc; -source include/have_innodb.inc; -source include/have_debug.inc; - -CREATE TABLE tmyisam (a int) ENGINE = MYISAM; -CREATE TABLE tinnodb (a int) ENGINE = INNODB; -CREATE TABLE tndb (a int) ENGINE = NDB; - -SHOW CREATE TABLE tmyisam; -SHOW CREATE TABLE tinnodb; -SHOW CREATE TABLE tndb; - - ---echo ==== Test 1: Non-XA Engines ==== -# Test that everything works fine with non-XA engines. We just try -# all ways to do transactions involving ndb and/or myisam, with -# rollback or commit. - ---echo --- on master --- - -SET AUTOCOMMIT = 1; - -INSERT INTO tndb VALUES (1); -INSERT INTO tmyisam VALUES (1); - -BEGIN; -INSERT INTO tndb VALUES (2); -INSERT INTO tndb VALUES (3); -COMMIT; - -BEGIN; -INSERT INTO tmyisam VALUES (2); -INSERT INTO tmyisam VALUES (3); -COMMIT; - -BEGIN; -INSERT INTO tndb VALUES (4); -INSERT INTO tmyisam VALUES (4); -COMMIT; - -BEGIN; -INSERT INTO tndb VALUES (5); -INSERT INTO tndb VALUES (6); -ROLLBACK; - -BEGIN; -INSERT INTO tmyisam VALUES (5); -INSERT INTO tmyisam VALUES (6); -#--warning 1196 -ROLLBACK; - -BEGIN; -INSERT INTO tndb VALUES (7); -INSERT INTO tmyisam VALUES (7); -#--warning 1196 -ROLLBACK; - -SELECT * FROM tndb ORDER BY a; -SELECT * FROM tmyisam ORDER BY a; - ---echo --- on slave --- ---sync_slave_with_master -SELECT * FROM tndb ORDER BY a; -SELECT * FROM tmyisam ORDER BY a; - - ---echo ==== Test 2: Master crash before writing XID event on XA engine ==== -# We now want to test the following scenario, to verify that BUG#26395 -# has been fixed: - -# "master and slave have a transactional table that uses XA. Master -# has AUTOCOMMIT on and executes a statement (in this case an -# INSERT). Master crashes just before writing the XID event." - -# In this scenario, master will roll back, so slave should not execute -# the statement, and slave should roll back later when master is -# restarted. - -# However, we want the master to be alive so that we are sure it -# replicates the statement to the slave. So in the test case, we must -# therefore not crash the master. Instead, we fake the crash by just -# not writing the XID event to the binlog. This is done by the -# --debug=d,do_not_write_xid flag in the .opt file. - -# So, unlike if the master had crashed, the master *will* execute the -# statement. But the slave should not execute it. Hence, after the -# first test is executed, the expected result on master is a table -# with one row, and on slave a table with no rows. - -# To simulate the slave correctly, we wait until everything up to the -# XID is replicated. We cannot sync_slave_with_master, because that -# would wait for the transaction to end. Instead, we wait for -# "sufficiently long time". Then we stop the slave. - -# Note: since this puts the master binlog in an inconsistent state, -# this should be the last test of the file. - ---echo --- on master --- ---connection master - -INSERT INTO tinnodb VALUES (1); -SELECT * FROM tinnodb ORDER BY a; - ---echo --- on slave --- ---connection slave ---sleep 3 -STOP SLAVE; -source include/wait_for_slave_to_stop.inc; -let $tmp= query_get_value("SHOW SLAVE STATUS", Slave_IO_State, 1); -eval SELECT "$tmp" AS Slave_IO_State; -let $tmp= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1); -eval SELECT "$tmp" AS Last_SQL_Error; -let $tmp= query_get_value("SHOW SLAVE STATUS", Last_IO_Error, 1); -eval SELECT "$tmp" AS Last_IO_Error; -SELECT * FROM tinnodb ORDER BY a; - -# Clean up. We cannot do it on master and replicate over, because -# master binlog is in a bad state after last test. So we do it both on -# master and on slave. ---echo --- on master --- -connection master; -DROP TABLE tmyisam, tinnodb, tndb; - -connection slave; -DROP TABLE tmyisam, tinnodb, tndb; From e467919d18c2da322c235f76e5267c3e5195a284 Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Sun, 6 Jul 2008 19:14:41 +0200 Subject: [PATCH 218/705] BUG#37906: innodb_max_dirty_pages_pct_func does not clean up after itself Made the test innodb_max_dirty_pages_pct_func clean up after itself. --- mysql-test/r/innodb_max_dirty_pages_pct_func.result | 3 +++ mysql-test/t/disabled.def | 1 - mysql-test/t/innodb_max_dirty_pages_pct_func.test | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/innodb_max_dirty_pages_pct_func.result b/mysql-test/r/innodb_max_dirty_pages_pct_func.result index 4f6d42fb716..2f1467af94e 100644 --- a/mysql-test/r/innodb_max_dirty_pages_pct_func.result +++ b/mysql-test/r/innodb_max_dirty_pages_pct_func.result @@ -1,4 +1,5 @@ '#--------------------FN_DYNVARS_044_02-------------------------#' +SET @old_innodb_max_dirty_pages_pct= @@global.innodb_max_dirty_pages_pct; SET @@global.innodb_max_dirty_pages_pct = 80; 'connect (con1,localhost,root,,,,)' 'connection con1' @@ -28,3 +29,5 @@ DROP PROCEDURE add_records; DROP PROCEDURE add_until; DROP PROCEDURE check_pct; DROP FUNCTION dirty_pct; +DROP TABLE t1; +SET @@global.innodb_max_dirty_pages_pct = @old_innodb_max_dirty_pages_pct; diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 67ec9d2fe4d..d5f90b1ffa7 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -96,4 +96,3 @@ transaction_alloc_block_size_basic_64 : Bug #36522: Some tests of system variabl transaction_prealloc_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms wait_timeout_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms wait_timeout_func : BUG#36873 2008-07-06 sven wait_timeout_func.test fails randomly -innodb_max_dirty_pages_pct_func : BUG#37906 2008-07-06 sven innodb_max_dirty_pages_pct_func does not clean up after itself diff --git a/mysql-test/t/innodb_max_dirty_pages_pct_func.test b/mysql-test/t/innodb_max_dirty_pages_pct_func.test index 5d7b9754843..4b2af554810 100644 --- a/mysql-test/t/innodb_max_dirty_pages_pct_func.test +++ b/mysql-test/t/innodb_max_dirty_pages_pct_func.test @@ -25,6 +25,8 @@ # Check if setting innodb_max_dirty_pages_pct is changed in new connection# ########################################################################### +SET @old_innodb_max_dirty_pages_pct= @@global.innodb_max_dirty_pages_pct; + SET @@global.innodb_max_dirty_pages_pct = 80; --echo 'connect (con1,localhost,root,,,,)' connect (con1,localhost,root,,,,); @@ -157,6 +159,8 @@ DROP PROCEDURE add_records; DROP PROCEDURE add_until; DROP PROCEDURE check_pct; DROP FUNCTION dirty_pct; +DROP TABLE t1; +SET @@global.innodb_max_dirty_pages_pct = @old_innodb_max_dirty_pages_pct; ################################################################## # End of functionality Testing for innodb_max_dirty_pages_pct # From dc6d984eb41ffd0ed8ba57598e6893b9863ba6c2 Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Mon, 7 Jul 2008 11:18:09 +0200 Subject: [PATCH 219/705] rpl_row_inexist_tbl gave a merge conflict because the binlog positions changed. Fixed by removing binlog positions from output, and also: - removed code not used to verify the tested property - added comments --- .../suite/rpl/r/rpl_row_inexist_tbl.result | 68 ++++--------------- .../suite/rpl/t/rpl_row_inexist_tbl-slave.opt | 1 - .../suite/rpl/t/rpl_row_inexist_tbl.test | 46 ++++++++----- 3 files changed, 43 insertions(+), 72 deletions(-) delete mode 100644 mysql-test/suite/rpl/t/rpl_row_inexist_tbl-slave.opt diff --git a/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result b/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result index 1dd97878666..b32da2715e3 100644 --- a/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result +++ b/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result @@ -4,56 +4,18 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -create table t1 (a int not null primary key); -insert into t1 values (1); -create table t2 (a int); -insert into t2 values (1); -update t1, t2 set t1.a = 0 where t1.a = t2.a; -show tables; -Tables_in_test -t1 -select * from t1; -a -0 -drop table t1; -insert into t1 values (1); -SHOW SLAVE STATUS; -Slave_IO_State # -Master_Host 127.0.0.1 -Master_User root -Master_Port MASTER_PORT -Connect_Retry 1 -Master_Log_File master-bin.000001 -Read_Master_Log_Pos 1153 -Relay_Log_File # -Relay_Log_Pos # -Relay_Master_Log_File master-bin.000001 -Slave_IO_Running Yes -Slave_SQL_Running No -Replicate_Do_DB -Replicate_Ignore_DB -Replicate_Do_Table -Replicate_Ignore_Table # -Replicate_Wild_Do_Table -Replicate_Wild_Ignore_Table -Last_Errno 1146 -Last_Error Error 'Table 'test.t1' doesn't exist' on opening tables -Skip_Counter 0 -Exec_Master_Log_Pos 941 -Relay_Log_Space # -Until_Condition None -Until_Log_File -Until_Log_Pos 0 -Master_SSL_Allowed No -Master_SSL_CA_File -Master_SSL_CA_Path -Master_SSL_Cert -Master_SSL_Cipher -Master_SSL_Key -Seconds_Behind_Master # -Master_SSL_Verify_Server_Cert No -Last_IO_Errno # -Last_IO_Error # -Last_SQL_Errno 1146 -Last_SQL_Error Error 'Table 'test.t1' doesn't exist' on opening tables -drop table t1, t2; +==== Setup table on master but not on slave ==== +[on master] +CREATE TABLE t1 (a INT); +[on slave] +DROP TABLE t1; +==== Modify table on master ==== +[on master] +INSERT INTO t1 VALUES (1); +==== Verify error on slave ==== +[on slave] +Last_SQL_Error = Error 'Table 'test.t1' doesn't exist' on opening tables +==== Clean up ==== +STOP SLAVE; +[on master] +DROP TABLE t1; diff --git a/mysql-test/suite/rpl/t/rpl_row_inexist_tbl-slave.opt b/mysql-test/suite/rpl/t/rpl_row_inexist_tbl-slave.opt deleted file mode 100644 index abd717f8222..00000000000 --- a/mysql-test/suite/rpl/t/rpl_row_inexist_tbl-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---replicate-ignore-table=test.t2 diff --git a/mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test b/mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test index 25a8c0e744e..6add7302f55 100644 --- a/mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test +++ b/mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test @@ -1,33 +1,43 @@ -# Test to see what slave says when master is updating a table it does -# not have +# ==== Purpose ==== +# +# Verify that slave gives an error message if master updates a table +# that slave does not have. +# +# ==== Method ==== +# +# Create a table on master, wait till it's on slave, remove it from +# slave. Then update the table on master. + --source include/have_binlog_format_row.inc source include/master-slave.inc; -connection master; -create table t1 (a int not null primary key); -insert into t1 values (1); -create table t2 (a int); -insert into t2 values (1); -update t1, t2 set t1.a = 0 where t1.a = t2.a; +--echo ==== Setup table on master but not on slave ==== +--echo [on master] +CREATE TABLE t1 (a INT); +--echo [on slave] sync_slave_with_master; -# t2 should not have been replicated -# t1 should have been properly updated -show tables; -select * from t1; -drop table t1; +DROP TABLE t1; +--echo ==== Modify table on master ==== +--echo [on master] connection master; -insert into t1 values (1); +INSERT INTO t1 VALUES (1); +--echo ==== Verify error on slave ==== +--echo [on slave] connection slave; # slave should have stopped because can't find table t1 --source include/wait_for_slave_sql_to_stop.inc # see if we have a good error message: ---replace_column 7 # -source include/show_slave_status.inc; +let $err= query_get_value(SHOW SLAVE STATUS, Last_SQL_Error, 1); +--echo Last_SQL_Error = $err -# cleanup +--echo ==== Clean up ==== +STOP SLAVE; +source include/wait_for_slave_to_stop.inc; + +--echo [on master] connection master; -drop table t1, t2; +DROP TABLE t1; From af7ed3f9be850475f5b1e268e3093a2c4f0ee9fe Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Mon, 7 Jul 2008 14:20:08 +0200 Subject: [PATCH 220/705] Post-merge fixes. The file tree in mtr's vardir has changed so an old hard-coded path in mysql-test/t/subselect.test didn't work. Fix: update the paths in the test. --- mysql-test/r/subselect.result | 4 ++-- mysql-test/t/subselect.test | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result index 923bc2254bd..16d7cb65059 100644 --- a/mysql-test/r/subselect.result +++ b/mysql-test/r/subselect.result @@ -1658,9 +1658,9 @@ SELECT DISTINCT (SELECT a) FROM t1 LIMIT 100; DROP TABLE t1; create table t1 (a int, b decimal(13, 3)); insert into t1 values (1, 0.123); -select a, (select max(b) from t1) into outfile "subselect.out.file.1" from t1; +select a, (select max(b) from t1) into outfile "../../tmp/subselect.out.file.1" from t1; delete from t1; -load data infile "subselect.out.file.1" into table t1; +load data infile "../../tmp/subselect.out.file.1" into table t1; select * from t1; a b 1 0.123 diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test index 85b21c83612..3104c229985 100644 --- a/mysql-test/t/subselect.test +++ b/mysql-test/t/subselect.test @@ -1041,13 +1041,14 @@ DROP TABLE t1; create table t1 (a int, b decimal(13, 3)); insert into t1 values (1, 0.123); -let $outfile = $MYSQLTEST_VARDIR/master-data/test/subselect.out.file.1; +let $outfile_abs= $MYSQLTEST_VARDIR/tmp/subselect.out.file.1; +let $outfile_rel= ../../tmp/subselect.out.file.1; --error 0,1 ---remove_file $outfile -select a, (select max(b) from t1) into outfile "subselect.out.file.1" from t1; +--remove_file $outfile_abs +eval select a, (select max(b) from t1) into outfile "$outfile_rel" from t1; delete from t1; -load data infile "subselect.out.file.1" into table t1; ---remove_file $outfile +eval load data infile "$outfile_rel" into table t1; +--remove_file $outfile_abs select * from t1; drop table t1; From f873578aab669bd1835ea8f35e876750a4fff7ed Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Mon, 7 Jul 2008 17:38:47 +0200 Subject: [PATCH 221/705] BUG#37933: Test "rpl_insert" fails - timing problem in replication test ? Problem: the test syncs slave by a 'wait_condition' waiting until table t1 has 5000 rows. However, there is no guarantee that t1 makes it to the slave before the wait_condition. Fix: sync_slave_with_master just after t1 was created. --- mysql-test/suite/rpl/t/rpl_insert.test | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mysql-test/suite/rpl/t/rpl_insert.test b/mysql-test/suite/rpl/t/rpl_insert.test index 00e814951d5..d304dfb6cc7 100644 --- a/mysql-test/suite/rpl/t/rpl_insert.test +++ b/mysql-test/suite/rpl/t/rpl_insert.test @@ -13,6 +13,9 @@ USE mysqlslap; CREATE TABLE t1 (id INT, name VARCHAR(64)); +sync_slave_with_master; +connection master; + let $query = "INSERT DELAYED INTO t1 VALUES (1, 'Dr. No'), (2, 'From Russia With Love'), (3, 'Goldfinger'), (4, 'Thunderball'), (5, 'You Only Live Twice')"; --exec $MYSQL_SLAP --silent --concurrency=5 --iterations=200 --query=$query --delimiter=";" From 6af295940074a819ab1a12c66fc794ee2efc8b71 Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Tue, 8 Jul 2008 12:56:05 +0200 Subject: [PATCH 222/705] BUG#37962: *_func tests containing sleeps/race conditions This is not a fix, it just disables the erroneous test cases. --- mysql-test/t/disabled.def | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index d5f90b1ffa7..b3b92066dda 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -96,3 +96,13 @@ transaction_alloc_block_size_basic_64 : Bug #36522: Some tests of system variabl transaction_prealloc_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms wait_timeout_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms wait_timeout_func : BUG#36873 2008-07-06 sven wait_timeout_func.test fails randomly +delayed_insert_limit_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions +event_scheduler_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions +innodb_max_dirty_pages_pct_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions +interactive_timeout_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions +query_cache_wlock_invalidate_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions +rpl_init_slave_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions +rpl_max_binlog_size_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions +slow_query_log_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions +sql_low_priority_updates_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions +timestamp_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions From f7c41e2f1dd98b08464de0d953a5b6440efb732c Mon Sep 17 00:00:00 2001 From: Mats Kindahl Date: Tue, 8 Jul 2008 18:21:02 +0200 Subject: [PATCH 223/705] Bug #37939 rpl_row_stop_middle_update fails sporadically on pushbuild Bug #37940 rpl_dual_pos_advance fails sporadically on pushbuild,fail wait_for_slave_to_stop Bug #37941 rpl_flushlog_loop fails sporadically on pushbuild Several tests fail when waiting for the slave to stop in what appears to be timeouts caused by a timeout value set to low. This causes false failures when the servers are loaded. In order to try to avoid false negatives, we increase the timeout 10 times and also print some more information in the event that the slave fails to stop when expected to. We add a printout of the current processes running to be able to see if any process have been executing for an unexpectedly long time, and also print the binlog events at the position indicated by SHOW SLAVE STATUS. --- .../include/wait_for_slave_sql_to_stop.inc | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/mysql-test/include/wait_for_slave_sql_to_stop.inc b/mysql-test/include/wait_for_slave_sql_to_stop.inc index cb5c437a586..7b6eba6cb43 100644 --- a/mysql-test/include/wait_for_slave_sql_to_stop.inc +++ b/mysql-test/include/wait_for_slave_sql_to_stop.inc @@ -8,17 +8,34 @@ # 2) loop through looking for # sql threads to stop # 3) If loops too long die. +# +# INPUT: +# $timeout_counter Number of 1/10 sec to wait +# $keep_connection Do not do any "connect" #################################################### if (!$keep_connection) { + --echo [on slave] connection slave; } let $row_number= 1; let $run= 1; -let $counter= 300; +let $counter = $timeout_counter; +if (!$counter) +{ + let $counter= 3000; +} while ($run) { + if (!$keep_connection) + { + if (!$counter) + { + let $binlog_pos = query_get_value("SHOW SLAVE STATUS", Exec_Master_Log_Pos, 1); + let $binlog_file = query_get_value("SHOW SLAVE STATUS", Master_Log_File, 1); + } + } let $sql_result= query_get_value("SHOW SLAVE STATUS", Slave_SQL_Running, $row_number); if (`SELECT '$sql_result' = 'No'`){ let $run= 0; @@ -26,6 +43,21 @@ while ($run) sleep 0.1; if (!$counter){ --echo "Failed while waiting for slave SQL thread to stop" + if (!$keep_connection) + { + --echo [on master] + connection master; + --echo **** Note that the binlog positions are not read atomically: **** + --echo **** the replication might in reality have progressed further **** + eval SHOW BINLOG EVENTS IN '$binlog_file' FROM $binlog_pos LIMIT 5; + --echo [on slave] + connection slave; + } + --echo **** Note that the process list might have changed since the **** + --echo **** failure was detected **** + SHOW PROCESSLIST; + --echo **** Note that the binlog positions are not read atomically, so **** + --echo **** there is a small risk that the binlog status is incorrect **** query_vertical SHOW SLAVE STATUS; exit; } From c416c0e14cccc5799892f67b9dc5211d52c4d4a5 Mon Sep 17 00:00:00 2001 From: Mats Kindahl Date: Tue, 8 Jul 2008 19:59:50 +0200 Subject: [PATCH 224/705] Patch to remove extreneous printout. --- mysql-test/include/wait_for_slave_sql_to_stop.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/mysql-test/include/wait_for_slave_sql_to_stop.inc b/mysql-test/include/wait_for_slave_sql_to_stop.inc index 7b6eba6cb43..872a96a639d 100644 --- a/mysql-test/include/wait_for_slave_sql_to_stop.inc +++ b/mysql-test/include/wait_for_slave_sql_to_stop.inc @@ -15,7 +15,6 @@ #################################################### if (!$keep_connection) { - --echo [on slave] connection slave; } let $row_number= 1; From 87d16037002693337ae0167ef388e3def5eed5a8 Mon Sep 17 00:00:00 2001 From: Mats Kindahl Date: Wed, 9 Jul 2008 14:34:00 +0200 Subject: [PATCH 225/705] Ensuring that master and slave both issue a RESET MASTER and RESET SLAVE when resetting replication tests. If not, circular replication setups will leave cruft in the slaves binary log. --- mysql-test/include/master-slave-reset.inc | 17 +++++++++++++++-- mysql-test/suite/rpl/t/rpl_flushlog_loop.test | 6 ++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/mysql-test/include/master-slave-reset.inc b/mysql-test/include/master-slave-reset.inc index 1363fab236a..57fcc8f00cc 100644 --- a/mysql-test/include/master-slave-reset.inc +++ b/mysql-test/include/master-slave-reset.inc @@ -1,6 +1,13 @@ +# Reset the master and the slave to start fresh. +# +# It is necessary to execute RESET MASTER and RESET SLAVE on both +# master and slave since the replication setup might be circular. +# +# Since we expect STOP SLAVE to produce a warning as the slave is +# stopped (the server was started with skip-slave-start), we disable +# warnings when doing STOP SLAVE. + connection slave; -#we expect STOP SLAVE to produce a warning as the slave is stopped -#(the server was started with skip-slave-start) --disable_warnings stop slave; source include/wait_for_slave_to_stop.inc; @@ -13,7 +20,13 @@ use test; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; --enable_warnings reset master; +--disable_query_log +reset slave; +--enable_query_log connection slave; +--disable_query_log +reset master; +--enable_query_log reset slave; # Clean up old test tables --disable_warnings diff --git a/mysql-test/suite/rpl/t/rpl_flushlog_loop.test b/mysql-test/suite/rpl/t/rpl_flushlog_loop.test index 5aed5753129..f37df68ac3b 100644 --- a/mysql-test/suite/rpl/t/rpl_flushlog_loop.test +++ b/mysql-test/suite/rpl/t/rpl_flushlog_loop.test @@ -74,3 +74,9 @@ source include/wait_for_slave_param.inc; --replace_result $SLAVE_MYPORT SLAVE_PORT $slave_param_value POSITION --replace_column 1 # 8 # 9 # 16 # 23 # 33 # 34 # 35 # --query_vertical SHOW SLAVE STATUS + +--disable_query_log +connection master; +DROP TABLE t1; +sync_slave_with_master; +--enable_query_log From 78c8bfdddf7d3b42c14bd2a8ac312610dd015b9b Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Thu, 10 Jul 2008 18:09:39 +0200 Subject: [PATCH 226/705] BUG#37975: wait_for_slave_* should increase the timeout Problem 1: tests often fail in pushbuild with a timeout when waiting for the slave to start/stop/receive error. Fix 1: Updated the wait_for_slave_* macros in the following way: - The timeout is increased by a factor ten - Refactored the macros so that wait_for_slave_param does the work for the other macros. Problem 2: Tests are often incorrectly written, lacking a source include/wait_for_slave_to_[start|stop].inc. Fix 2: Improved the chance to get it right by adding include/start_slave.inc and include/stop_slave.inc, and updated tests to use these. Problem 3: The the built-in test language command wait_for_slave_to_stop is a misnomer (does not wait for the slave io thread) and does not give as much debug info in case of failure as the otherwise equivalent macro source include/wait_for_slave_sql_to_stop.inc Fix 3: Replaced all calls to the built-in command by a call to the macro. Problem 4: Some, but not all, of the wait_for_slave_* macros had an implicit connection slave. This made some tests confusing to read, and made it more difficult to use the macro in circular replication scenarios, where the connection named master needs to wait. Fix 4: Removed the implicit connection slave from all wait_for_slave_* macros, and updated tests to use an explicit connection slave where necessary. Problem 5: The macros wait_slave_status.inc and wait_show_pattern.inc were unused. Moreover, using them is difficult and error-prone. Fix 5: remove these macros. Problem 6: log_bin_trust_function_creators_basic failed when running tests because it assumed @@global.log_bin_trust_function_creators=1, and some tests modified this variable without resetting it to its original value. Fix 6: All tests that use this variable have been updated so that they reset the value at end of test. --- .../extra/rpl_tests/rpl_extraMaster_Col.test | 10 +- .../extra/rpl_tests/rpl_extraSlave_Col.test | 3 +- mysql-test/extra/rpl_tests/rpl_log.test | 22 +-- mysql-test/include/reset_master_and_slave.inc | 6 +- .../include/sync_slave_io_with_master.inc | 13 +- .../include/wait_for_slave_io_to_stop.inc | 49 +++---- mysql-test/include/wait_for_slave_param.inc | 98 +++++++++++-- .../include/wait_for_slave_sql_error.inc | 54 +++----- .../include/wait_for_slave_sql_to_start.inc | 46 +++---- .../include/wait_for_slave_sql_to_stop.inc | 78 +++-------- .../include/wait_for_slave_to_start.inc | 51 +++---- mysql-test/include/wait_for_slave_to_stop.inc | 55 +++----- mysql-test/include/wait_show_pattern.inc | 51 ------- mysql-test/include/wait_slave_status.inc | 129 ------------------ mysql-test/r/func_time.result | 2 + mysql-test/r/grant.result | 3 +- mysql-test/r/grant2.result | 3 +- mysql-test/r/innodb_notembedded.result | 3 +- ...og_bin_trust_function_creators_func.result | 3 + mysql-test/r/query_cache.result | 3 +- mysql-test/r/query_cache_notembedded.result | 3 +- mysql-test/r/timezone2.result | 3 +- .../t/binlog_auto_increment_bug33029.test | 2 +- mysql-test/suite/rpl/r/rpl_bug26395.result | 2 +- .../rpl/r/rpl_circular_for_4_hosts.result | 6 +- .../suite/rpl/r/rpl_flushlog_loop.result | 6 +- mysql-test/suite/rpl/r/rpl_found_rows.result | 4 +- mysql-test/suite/rpl/r/rpl_init_slave.result | 6 +- mysql-test/suite/rpl/r/rpl_log_pos.result | 4 +- mysql-test/suite/rpl/r/rpl_packet.result | 8 +- .../suite/rpl/r/rpl_row_basic_2myisam.result | 4 +- .../suite/rpl/r/rpl_row_basic_3innodb.result | 4 +- .../suite/rpl/r/rpl_row_inexist_tbl.result | 2 +- mysql-test/suite/rpl/r/rpl_row_log.result | 12 +- .../suite/rpl/r/rpl_row_log_innodb.result | 12 +- .../rpl/r/rpl_row_stop_middle_update.result | 1 + mysql-test/suite/rpl/r/rpl_row_until.result | 4 +- .../suite/rpl/r/rpl_slave_grp_exec.result | 12 +- mysql-test/suite/rpl/r/rpl_slave_skip.result | 20 +-- .../suite/rpl/r/rpl_slave_status.result | 6 +- mysql-test/suite/rpl/r/rpl_sp.result | 14 +- mysql-test/suite/rpl/r/rpl_sp_effects.result | 3 +- mysql-test/suite/rpl/r/rpl_stm_log.result | 12 +- mysql-test/suite/rpl/r/rpl_stm_until.result | 4 +- mysql-test/suite/rpl/r/rpl_variables.result | 4 +- mysql-test/suite/rpl/t/rpl_bug26395.test | 5 +- .../suite/rpl/t/rpl_circular_for_4_hosts.test | 13 +- .../suite/rpl/t/rpl_dual_pos_advance.test | 2 +- mysql-test/suite/rpl/t/rpl_flushlog_loop.test | 7 +- mysql-test/suite/rpl/t/rpl_idempotency.test | 23 ++-- mysql-test/suite/rpl/t/rpl_incident.test | 2 +- mysql-test/suite/rpl/t/rpl_init_slave.test | 20 +-- mysql-test/suite/rpl/t/rpl_log_pos.test | 14 +- mysql-test/suite/rpl/t/rpl_packet.test | 12 +- .../suite/rpl/t/rpl_row_inexist_tbl.test | 3 +- .../rpl/t/rpl_row_stop_middle_update.test | 5 +- mysql-test/suite/rpl/t/rpl_row_until.test | 12 +- mysql-test/suite/rpl/t/rpl_server_id1.test | 3 +- .../suite/rpl/t/rpl_slave_grp_exec.test | 18 +-- mysql-test/suite/rpl/t/rpl_slave_skip.test | 30 ++-- mysql-test/suite/rpl/t/rpl_slave_status.test | 9 +- mysql-test/suite/rpl/t/rpl_sp.test | 12 +- mysql-test/suite/rpl/t/rpl_sp_effects.test | 6 +- mysql-test/suite/rpl/t/rpl_stm_until.test | 16 +-- .../suite/rpl_ndb/r/rpl_ndb_basic.result | 2 +- .../suite/rpl_ndb/r/rpl_row_basic_7ndb.result | 4 +- mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test | 7 +- mysql-test/t/disabled.def | 1 + mysql-test/t/func_time.test | 2 + mysql-test/t/grant.test | 3 +- mysql-test/t/grant2.test | 3 +- mysql-test/t/innodb_notembedded.test | 4 +- .../log_bin_trust_function_creators_func.test | 5 + mysql-test/t/query_cache.test | 3 +- mysql-test/t/query_cache_notembedded.test | 4 +- mysql-test/t/rpl_init_slave_func.test | 3 +- mysql-test/t/timezone2.test | 3 +- 77 files changed, 418 insertions(+), 678 deletions(-) delete mode 100644 mysql-test/include/wait_show_pattern.inc delete mode 100644 mysql-test/include/wait_slave_status.inc diff --git a/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test b/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test index 5abd04b98ef..df0d6cf5045 100644 --- a/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test +++ b/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test @@ -497,7 +497,7 @@ INSERT INTO t10 () VALUES(1,@b1,DEFAULT,'Kyle',DEFAULT), --echo ******************************************** --echo connection slave; -wait_for_slave_to_stop; +source include/wait_for_slave_sql_to_stop.inc; --replace_result $MASTER_MYPORT MASTER_PORT --replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # --query_vertical SHOW SLAVE STATUS @@ -554,7 +554,7 @@ INSERT INTO t11 () VALUES(1,@b1,'Testing is fun','Kyle',DEFAULT), --echo ******************************************** --echo connection slave; -wait_for_slave_to_stop; +source include/wait_for_slave_sql_to_stop.inc; --replace_result $MASTER_MYPORT MASTER_PORT --replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # --query_vertical SHOW SLAVE STATUS @@ -697,7 +697,7 @@ SELECT c1,c3,hex(c4),c5,c6 FROM t14 ORDER BY c1; # Remove below once fixed #*************************** connection slave; -wait_for_slave_to_stop; +source include/wait_for_slave_sql_to_stop.inc; --replace_result $MASTER_MYPORT MASTER_PORT --replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # --query_vertical SHOW SLAVE STATUS @@ -763,7 +763,7 @@ SELECT c1,hex(c4),c5,c6,c7,c2 FROM t15 ORDER BY c1; --echo ******************************************** --echo connection slave; -wait_for_slave_to_stop; +source include/wait_for_slave_sql_to_stop.inc; --replace_result $MASTER_MYPORT MASTER_PORT --replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # --query_vertical SHOW SLAVE STATUS @@ -840,7 +840,7 @@ SELECT c1,hex(c4),c5,c6,c7 FROM t16 ORDER BY c1; --echo ***************** --echo connection slave; -wait_for_slave_to_stop; +source include/wait_for_slave_sql_to_stop.inc; --replace_result $MASTER_MYPORT MASTER_PORT --replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # --query_vertical SHOW SLAVE STATUS diff --git a/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test b/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test index 7e726828a1e..6890913b7d1 100644 --- a/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test +++ b/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test @@ -94,7 +94,7 @@ SELECT * FROM t2 ORDER BY a; --echo *** Start Slave *** connection slave; START SLAVE; -wait_for_slave_to_stop; +source include/wait_for_slave_sql_to_stop.inc; --replace_result $MASTER_MYPORT MASTER_PORT --replace_column 1 # 4 # 7 # 8 # 9 # 16 # 22 # 23 # 33 # 35 # 36 # --query_vertical SHOW SLAVE STATUS @@ -429,6 +429,7 @@ set @b1 = 'b1b1b1b1'; set @b1 = concat(@b1,@b1); INSERT INTO t9 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA'); +connection slave; --source include/wait_for_slave_sql_to_stop.inc --replace_result $MASTER_MYPORT MASTER_PORT --replace_column 1 # 4 # 7 # 8 # 9 # 16 # 22 # 23 # 33 # 35 # 36 # diff --git a/mysql-test/extra/rpl_tests/rpl_log.test b/mysql-test/extra/rpl_tests/rpl_log.test index 59e09272f21..3681600a46e 100644 --- a/mysql-test/extra/rpl_tests/rpl_log.test +++ b/mysql-test/extra/rpl_tests/rpl_log.test @@ -9,10 +9,8 @@ # test the slave immediately writes DROP TEMPORARY TABLE this_old_table). # We wait for the slave to have written all he wants to the binlog # (otherwise RESET MASTER may come too early). -save_master_pos; -connection slave; -sync_with_master; -stop slave; +sync_slave_with_master; +source include/stop_slave.inc; reset master; reset slave; # We are going to read the slave's binlog which contains file_id (for some LOAD @@ -81,17 +79,14 @@ select * from t1 order by 1 asc; save_master_pos; connection slave; -# Note that the above 'slave start' will cause a 3rd rotate event (a fake one) -# to go into the relay log (the master always sends a fake one when replication -# starts). -start slave; -let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%'; ---source include/wait_slave_status.inc +source include/start_slave.inc; + sync_with_master; #check t1 on slave to ensure whether it's identical with on master select * from t1 order by 1 asc; flush logs; -stop slave; +source include/stop_slave.inc; +source include/start_slave.inc; connection master; # Create some entries for second log @@ -104,10 +99,7 @@ source include/show_binlog_events.inc; --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ show binlog events in 'master-bin.000002'; show binary logs; -save_master_pos; -connection slave; -start slave; -sync_with_master; +sync_slave_with_master; show binary logs; --replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION --replace_column 2 # 5 # diff --git a/mysql-test/include/reset_master_and_slave.inc b/mysql-test/include/reset_master_and_slave.inc index c2d4120ddc9..30ba1f07a40 100644 --- a/mysql-test/include/reset_master_and_slave.inc +++ b/mysql-test/include/reset_master_and_slave.inc @@ -1,10 +1,8 @@ --echo **** Resetting master and slave **** connection slave; -STOP SLAVE; -source include/wait_for_slave_to_stop.inc; +source include/stop_slave.inc; RESET SLAVE; connection master; RESET MASTER; connection slave; -START SLAVE; -source include/wait_for_slave_to_start.inc; +source include/start_slave.inc; diff --git a/mysql-test/include/sync_slave_io_with_master.inc b/mysql-test/include/sync_slave_io_with_master.inc index bac6f3857c7..882724bc986 100644 --- a/mysql-test/include/sync_slave_io_with_master.inc +++ b/mysql-test/include/sync_slave_io_with_master.inc @@ -7,19 +7,30 @@ # # ==== Usage ==== # +# source include/sync_slave_io_with_master.inc; +# # Syncs to the current position on master, as found by SHOW MASTER # STATUS. # -# Must be called on the master. +# Must be called on the master. Will change connection to the slave. +# +# Parameters to this macro are $slave_timeout and +# $slave_keep_connection. See wait_for_slave_param.inc for +# descriptions. let $_master_file= query_get_value("SHOW MASTER STATUS", File, 1); let $_master_pos= query_get_value("SHOW MASTER STATUS", Position, 1); connection slave; +let $slave_error_message= Failed while waiting for slave IO thread to sync; + let $slave_param= Master_Log_File; let $slave_param_value= $_master_file; source include/wait_for_slave_param.inc; + let $slave_param= Read_Master_Log_Pos; let $slave_param_value= $_master_pos; source include/wait_for_slave_param.inc; + +let $slave_error_message= ; diff --git a/mysql-test/include/wait_for_slave_io_to_stop.inc b/mysql-test/include/wait_for_slave_io_to_stop.inc index 6e66d4e7521..0111edaff58 100644 --- a/mysql-test/include/wait_for_slave_io_to_stop.inc +++ b/mysql-test/include/wait_for_slave_io_to_stop.inc @@ -1,33 +1,18 @@ -################################################### -#Author: Jeb -#Date: 2007-06-11 -#Purpose: used for io errors on the slave. If Slave gets an io -# error, the io trhead should stop -#Details: -# 1) Fill in and setup variables -# 2) loop through looking for -# sql threads to stop -# 3) If loops too long die. -#################################################### -connection slave; -let $my_show= SHOW SLAVE STATUS; -let $sql_running= Slave_IO_Running; -let $row_number= 1; -let $run= 1; -let $counter= 300; - -while ($run) -{ - let $io_result= query_get_value("SHOW SLAVE STATUS", Slave_IO_Running, $row_number); - if (`SELECT '$io_result' = 'No'`){ - let $run= 0; - } - sleep 0.1; - if (!$counter){ - --echo "Failed while waiting for slave IO thread to stop" - query_vertical SHOW SLAVE STATUS; - exit; - } - dec $counter; -} +# ==== Purpose ==== +# +# Waits until the IO thread of the current connection has stopped, or +# until a timeout is reached. +# +# ==== Usage ==== +# +# source include/wait_for_slave_io_to_stop.inc; +# +# Parameters to this macro are $slave_timeout and +# $slave_keep_connection. See wait_for_slave_param.inc for +# descriptions. +let $slave_param= Slave_IO_Running; +let $slave_param_value= No; +let $slave_error_message= Failed while waiting for slave IO thread to stop; +source include/wait_for_slave_param.inc; +let $slave_error_message= ; diff --git a/mysql-test/include/wait_for_slave_param.inc b/mysql-test/include/wait_for_slave_param.inc index fed97195aba..6d61f2f8caa 100644 --- a/mysql-test/include/wait_for_slave_param.inc +++ b/mysql-test/include/wait_for_slave_param.inc @@ -1,26 +1,94 @@ -# include/wait_for_slave_param.inc +# ==== Purpose ==== # -# SUMMARY +# Waits until SHOW SLAVE STATUS has returned a specified value, or +# until a timeout is reached. # -# Waits until SHOW SLAVE STATUS has returned a spicified value. +# ==== Usage ==== # -# USAGE +# let $slave_param= Slave_SQL_Running; +# let $slave_param_value= No; +# --source include/slave_wait_param.inc # -# let $slave_param= Slave_SQL_Running; -# let $slave_param_value= No; -# --source include/slave_wait_param.inc +# Parameters: +# +# $slave_param, $slave_param_value +# This macro will wait until the column of the output of SHOW SLAVE +# STATUS named $slave_param gets the value $slave_param_value. See +# the example above. +# +# $slave_param_comparison +# By default, this file waits until $slave_param becomes equal to +# $slave_param_value. If you want to wait until $slave_param +# becomes *unequal* to $slave_param_value, set this parameter to the +# string '!=', like this: +# let $slave_param_comparison= !=; +# +# $slave_timeout +# The default timeout is 5 minutes. You can change the timeout by +# setting $slave_timeout. The unit is tenths of seconds. +# +# $slave_keep_connection +# If the timeout is reached, debug info is given by calling SHOW +# SLAVE STATUS, SHOW PROCESSLIST, and SHOW BINLOG EVENTS. By +# default (assuming the current connection is slave), a 'connection +# master' is then issued, and the same information is printed again +# on the master host. You can avoid switching to master (and thus +# suppress debug info on master too) by setting +# $slave_keep_connection to 1. +# +# $slave_error_message +# If set, this is printed when a timeout occurs. This is primarily +# intended to be used by other wait_for_slave_* macros, to indicate +# what the purpose of the wait was. (A very similar error message is +# given by default, but the wait_for_slave_* macros use this to give +# an error message identical to that in previous versions, so that +# errors are easier searchable in the pushbuild history.) -let $slave_wait_param_counter= 300; -let $slave_value= query_get_value("SHOW SLAVE STATUS", $slave_param, 1); -while (`select "$slave_value" != "$slave_param_value"`) +let $_slave_timeout_counter= $slave_timeout; +if (!$_slave_timeout_counter) { - dec $slave_wait_param_counter; - if (!$slave_wait_param_counter) + let $_slave_timeout_counter= 3000; +} + +let $_slave_param_comparison= $slave_param_comparison; +if (`SELECT '$_slave_param_comparison' = ''`) +{ + let $_slave_param_comparison= =; +} + +let $_show_slave_status_value= query_get_value("SHOW SLAVE STATUS", $slave_param, 1); +while (`SELECT NOT('$_show_slave_status_value' $_slave_param_comparison '$slave_param_value')`) +{ + if (!$_slave_timeout_counter) { - --echo ERROR: failed while waiting for slave parameter $slave_param: $slave_param_value - query_vertical show slave status; + --echo **** ERROR: failed while waiting for slave parameter $slave_param $_slave_param_comparison $slave_param_value **** + if (`SELECT '$slave_error_message' != ''`) + { + --echo Message: $slave_error_message + } + --echo Note: the following output may have changed since the failure was detected + --echo **** Showing SLAVE STATUS, PROCESSLIST, and BINLOG EVENTS on slave **** + query_vertical SHOW SLAVE STATUS; + SHOW PROCESSLIST; + let $binlog_name= query_get_value("SHOW MASTER STATUS", File, 1); + eval SHOW BINLOG EVENTS IN '$binlog_name'; + if (!$slave_keep_connection) { + let $master_binlog_name_io= query_get_value("SHOW SLAVE STATUS", Master_Log_File, 1); + let $master_binlog_name_sql= query_get_value("SHOW SLAVE STATUS", Relay_Master_Log_File, 1); + --echo **** Showing MASTER STATUS, PROCESSLIST, and BINLOG EVENTS on master **** + --echo [on master] + connection master; + query_vertical SHOW MASTER STATUS; + SHOW PROCESSLIST; + eval SHOW BINLOG EVENTS IN '$master_binlog_name_sql'; + if (`SELECT '$master_binlog_name_io' != '$master_binlog_name_sql'`) + { + eval SHOW BINLOG EVENTS IN '$master_binlog_name_io'; + } + } exit; } + dec $_slave_timeout_counter; sleep 0.1; - let $slave_value= query_get_value("SHOW SLAVE STATUS", $slave_param, 1); + let $_show_slave_status_value= query_get_value("SHOW SLAVE STATUS", $slave_param, 1); } diff --git a/mysql-test/include/wait_for_slave_sql_error.inc b/mysql-test/include/wait_for_slave_sql_error.inc index 6780edbe2f0..c454e3eb4d7 100644 --- a/mysql-test/include/wait_for_slave_sql_error.inc +++ b/mysql-test/include/wait_for_slave_sql_error.inc @@ -1,33 +1,23 @@ -################################################### -#Author: Sven -#Date: 2007-10-09 -#Purpose: Wait until the slave has an error in the -# sql thread, as indicated by -# "SHOW SLAVE STATUS", or at most 30 -# seconds. -#Details: -# 1) Fill in and setup variables -# 2) loop, looking for sql error on slave -# 3) If it loops too long, die. -#################################################### -connection slave; -let $row_number= 1; -let $run= 1; -let $counter= 300; +# ==== Purpose ==== +# +# Waits until the SQL thread of the current connection has got an +# error, or until a timeout is reached. +# +# ==== Usage ==== +# +# source include/wait_for_slave_sql_error.inc; +# +# Parameters to this macro are $slave_timeout and +# $slave_keep_connection. See wait_for_slave_param.inc for +# descriptions. -while ($run) -{ - let $sql_result= query_get_value("SHOW SLAVE STATUS", Last_SQL_Errno, $row_number); - let $run= `SELECT '$sql_result' = '0'`; - if ($run) { - real_sleep 0.1; - if (!$counter){ - --echo "Failed while waiting for slave to produce an error in its sql thread" - --replace_result $MASTER_MYPORT MASTER_PORT - --replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # - query_vertical SHOW SLAVE STATUS; - exit; - } - dec $counter; - } -} +let $old_slave_param_comparison= $slave_param_comparison; + +let $slave_param= Last_SQL_Errno; +let $slave_param_comparison= !=; +let $slave_param_value= 0; +let $slave_error_message= Failed while waiting for slave to produce an error in its sql thread; +source include/wait_for_slave_param.inc; +let $slave_error_message= ; + +let $slave_param_comparison= $old_slave_param_comparison; diff --git a/mysql-test/include/wait_for_slave_sql_to_start.inc b/mysql-test/include/wait_for_slave_sql_to_start.inc index 14134725da4..45f32f97553 100644 --- a/mysql-test/include/wait_for_slave_sql_to_start.inc +++ b/mysql-test/include/wait_for_slave_sql_to_start.inc @@ -1,31 +1,17 @@ -################################################### -#Author: Mats (based on file written by Jeb) -#Date: 2008-05-06 -#Purpose: To wait for slave SQL thread to start -#Details: -# 1) Fill in and setup variables -# 2) loop through looking for both -# io and sql threads to start -# 3) If loops too long die. -#################################################### -connection slave; -let $row_number= 1; -let $run= 1; -let $counter= 300; - -while ($run) -{ - let $sql_result= query_get_value("SHOW SLAVE STATUS", Slave_SQL_Running, $row_number); - if (`SELECT '$sql_result' = 'Yes'`){ - let $run= 0; - } - sleep 0.1; - if (!$counter){ - --echo "Failed while waiting for slave SQL to start" - query_vertical SHOW SLAVE STATUS; - exit; - } - dec $counter; -} - +# ==== Purpose ==== +# +# Waits the SQL thread of the current connection has started, or until +# a timeout is reached. +# +# ==== Usage ==== +# +# source include/wait_for_slave_sql_to_start.inc; +# +# Parameters to this macro are $slave_timeout and +# $slave_keep_connection. See wait_for_slave_param.inc for +# descriptions. +let $slave_param= Slave_SQL_Running; +let $slave_param_value= Yes; +let $slave_error_message= Failed while waiting for slave SQL to start; +source include/wait_for_slave_param.inc; diff --git a/mysql-test/include/wait_for_slave_sql_to_stop.inc b/mysql-test/include/wait_for_slave_sql_to_stop.inc index 872a96a639d..477dfecbb30 100644 --- a/mysql-test/include/wait_for_slave_sql_to_stop.inc +++ b/mysql-test/include/wait_for_slave_sql_to_stop.inc @@ -1,64 +1,18 @@ -################################################### -#Author: Jeb -#Date: 2007-06-11 -#Purpose: used for SQL errors on the slave. If Slave gets a sql -# error, the SQL trhead should stop -#Details: -# 1) Fill in and setup variables -# 2) loop through looking for -# sql threads to stop -# 3) If loops too long die. +# ==== Purpose ==== # -# INPUT: -# $timeout_counter Number of 1/10 sec to wait -# $keep_connection Do not do any "connect" -#################################################### -if (!$keep_connection) -{ - connection slave; -} -let $row_number= 1; -let $run= 1; -let $counter = $timeout_counter; -if (!$counter) -{ - let $counter= 3000; -} +# Waits the SQL thread of the current connection has stopped, or until +# a timeout is reached. +# +# ==== Usage ==== +# +# source include/wait_for_slave_sql_to_stop.inc; +# +# Parameters to this macro are $slave_timeout and +# $slave_keep_connection. See wait_for_slave_param.inc for +# descriptions. -while ($run) -{ - if (!$keep_connection) - { - if (!$counter) - { - let $binlog_pos = query_get_value("SHOW SLAVE STATUS", Exec_Master_Log_Pos, 1); - let $binlog_file = query_get_value("SHOW SLAVE STATUS", Master_Log_File, 1); - } - } - let $sql_result= query_get_value("SHOW SLAVE STATUS", Slave_SQL_Running, $row_number); - if (`SELECT '$sql_result' = 'No'`){ - let $run= 0; - } - sleep 0.1; - if (!$counter){ - --echo "Failed while waiting for slave SQL thread to stop" - if (!$keep_connection) - { - --echo [on master] - connection master; - --echo **** Note that the binlog positions are not read atomically: **** - --echo **** the replication might in reality have progressed further **** - eval SHOW BINLOG EVENTS IN '$binlog_file' FROM $binlog_pos LIMIT 5; - --echo [on slave] - connection slave; - } - --echo **** Note that the process list might have changed since the **** - --echo **** failure was detected **** - SHOW PROCESSLIST; - --echo **** Note that the binlog positions are not read atomically, so **** - --echo **** there is a small risk that the binlog status is incorrect **** - query_vertical SHOW SLAVE STATUS; - exit; - } - dec $counter; -} +let $slave_param= Slave_SQL_Running; +let $slave_param_value= No; +let $slave_error_message= Failed while waiting for slave SQL thread to stop; +source include/wait_for_slave_param.inc; +let $slave_error_message= ; diff --git a/mysql-test/include/wait_for_slave_to_start.inc b/mysql-test/include/wait_for_slave_to_start.inc index 29d87b58a3c..3e23ceac4cc 100644 --- a/mysql-test/include/wait_for_slave_to_start.inc +++ b/mysql-test/include/wait_for_slave_to_start.inc @@ -1,35 +1,24 @@ -################################################### -#Author: Jeb -#Date: 2007-06-11 -#Purpose: To wait a brief time for slave to start -#Details: -# 1) Fill in and setup variables -# 2) loop through looking for both -# io and sql threads to start -# 3) If loops too long die. -#################################################### -connection slave; -let $row_number= 1; -let $run= 1; -let $counter= 300; +# ==== Purpose ==== +# +# Waits until both the IO and SQL threads of the current connection +# have started, or until a timeout is reached. +# +# ==== Usage ==== +# +# source include/wait_for_slave_to_start.inc; +# +# Parameters to this macro are $slave_timeout and +# $slave_keep_connection. See wait_for_slave_param.inc for +# descriptions. -while ($run) -{ - let $io_result= query_get_value("SHOW SLAVE STATUS", Slave_IO_Running, $row_number); - if (`SELECT '$io_result' = 'Yes'`){ +let $slave_error_message= Failed while waiting for slave to start; - let $sql_result= query_get_value("SHOW SLAVE STATUS", Slave_SQL_Running, $row_number); - if (`SELECT '$sql_result' = 'Yes'`){ - let $run= 0; - } - } - sleep 0.1; - if (!$counter){ - --echo "Failed while waiting for slave to start" - query_vertical SHOW SLAVE STATUS; - exit; - } - dec $counter; -} +let $slave_param= Slave_IO_Running; +let $slave_param_value= Yes; +source include/wait_for_slave_param.inc; +let $slave_param= Slave_SQL_Running; +let $slave_param_value= Yes; +source include/wait_for_slave_param.inc; +let $slave_error_message= ; diff --git a/mysql-test/include/wait_for_slave_to_stop.inc b/mysql-test/include/wait_for_slave_to_stop.inc index 5bd2d0338f8..4973a27dc53 100644 --- a/mysql-test/include/wait_for_slave_to_stop.inc +++ b/mysql-test/include/wait_for_slave_to_stop.inc @@ -1,39 +1,24 @@ -################################################### -#Author: Jeb -#Date: 2007-06-11 -#Purpose: To replace the mysqltest.c executable -# wait_for_slave_to_stop function and -# return this to the test language. -#Details: -# 1) Fill in and setup variables -# 2) loop through looking for both -# io and sql threads to stop -# 3) If loops too long die. -#################################################### -connection slave; -let $row_number= 1; -let $run= 1; -let $counter= 300; +# ==== Purpose ==== +# +# Waits until both the IO and SQL threads of the current connection +# have stopped, or until a timeout is reached. +# +# ==== Usage ==== +# +# source include/wait_for_slave_to_stop.inc; +# +# Parameters to this macro are $slave_timeout and +# $slave_keep_connection. See wait_for_slave_param.inc for +# descriptions. -while ($run) -{ - let $io_result= query_get_value("SHOW SLAVE STATUS", Slave_IO_Running, $row_number); - if (`SELECT '$io_result' = 'No'`){ +let $slave_error_message= Failed while waiting for slave to stop; - let $sql_result= query_get_value("SHOW SLAVE STATUS", Slave_SQL_Running, $row_number); - if (`SELECT '$sql_result' = 'No'`){ - let $run= 0; - } - } - sleep 0.1; - if (!$counter){ - --echo "Failed while waiting for slave to stop" - --replace_result $MASTER_MYPORT MASTER_PORT - --replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # - query_vertical SHOW SLAVE STATUS; - exit; - } - dec $counter; -} +let $slave_param= Slave_IO_Running; +let $slave_param_value= No; +source include/wait_for_slave_param.inc; +let $slave_param= Slave_SQL_Running; +let $slave_param_value= No; +source include/wait_for_slave_param.inc; +let $slave_error_message= ; diff --git a/mysql-test/include/wait_show_pattern.inc b/mysql-test/include/wait_show_pattern.inc deleted file mode 100644 index d1fbbfe8e3e..00000000000 --- a/mysql-test/include/wait_show_pattern.inc +++ /dev/null @@ -1,51 +0,0 @@ -# include/wait_show_pattern.inc -# -# SUMMARY -# -# Waits until output produced by SHOW statement which particular type is -# specified as parameter matches certain pattern or maximum time reached. -# -# NOTES -# -# Only the first row produced by the parameter statement is checked. -# -# USAGE -# -# let $show_type= ; -# let $show_pattern= 'Pattern to be used for LIKE matching'; -# --source wait_show_pattern.inc -# -# EXAMPLES -# -# alter_table-big.test, wait_slave_status.inc -# -# SEE ALSO -# -# wait_slave_status.inc, wait_condition.inc (>=5.1) -# -############################################################################### - ---disable_query_log - -# We accept to wait maximum 30 seconds (0.2 sec/loop). -let $wait_counter= 150; -while ($wait_counter) -{ - let $result= `SHOW $show_type`; - let $success= `SELECT "$result" LIKE $show_pattern`; - if ($success) - { - let $wait_counter= 0; - } - if (!$success) - { - real_sleep 0.2; - dec $wait_counter; - } -} -if (!$success) -{ - echo Timeout in wait_show_pattern.inc \$show_type= $show_type \$show_pattern= $show_pattern (\$result= '$result'); -} - ---enable_query_log diff --git a/mysql-test/include/wait_slave_status.inc b/mysql-test/include/wait_slave_status.inc deleted file mode 100644 index d8d048527cf..00000000000 --- a/mysql-test/include/wait_slave_status.inc +++ /dev/null @@ -1,129 +0,0 @@ -# include/wait_slave_status.inc -# -# Created by Matthias Leich -# -# SUMMARY -# -# Waits until slave has reached certain state or maximum time reached. -# -# (This script will not work, when the SHOW command delivers more than one -# result record, because only the first record will be caught.) -# -# USAGE -# -# Set $result_pattern in test file and source this file: -# -# let $result_pattern= -# --include wait_slave_status.inc -# -# EXAMPLE -# -# The script rpl_until.test: -# ... -# --replace_result $MASTER_MYPORT MASTER_MYPORT -# --replace_column 1 # 9 # 23 # 33 # -# --vertical_results show slave status; -# -# outputs -# show slave status; -# Slave_IO_State # -# Master_Host 127.0.0.1 -# Master_User root -# Master_Port MASTER_MYPORT -# Connect_Retry 1 -# Master_Log_File master-bin.000001 -# Read_Master_Log_Pos 776 -# Relay_Log_File slave-relay-bin.000004 -# Relay_Log_Pos # -# Relay_Master_Log_File master-bin.000001 -# Slave_IO_Running Yes -# Slave_SQL_Running No -# Replicate_Do_DB -# Replicate_Ignore_DB -# Replicate_Do_Table -# Replicate_Ignore_Table -# Replicate_Wild_Do_Table -# Replicate_Wild_Ignore_Table -# Last_Errno 0 -# Last_Error -# Skip_Counter 0 -# Exec_Master_Log_Pos 319 -# Relay_Log_Space # -# Until_Condition Master -# Until_Log_File master-bin.000001 -# Until_Log_Pos 319 -# Master_SSL_Allowed No -# Master_SSL_CA_File -# Master_SSL_CA_Path -# Master_SSL_Cert -# Master_SSL_Cipher -# Master_SSL_Key -# Seconds_Behind_Master # -# -# The main problem with the "show slave status;" in rpl_until is, that -# depending on the total test engine power and the current load caused by -# other processes, the expected slave status might be not reached though -# it will happen in maybe some seconds. -# -# The typical problem with rpl_until is that Slave_IO_Running is "No" -# instead of "Yes". -# -# The expected result follows the LIKE pattern: -# -# let $result_pattern= '%127.0.0.1%root%1%master-bin.000001%776%slave-relay-bin.000004%master-bin.000001%Yes%No%0%0%319%Master%master-bin.000001%319%No%'; -# -# The Slave_IO_Running value is the "Yes" just after the "master-bin.000001". -# -# How to get this pattern ? -# -# Any lines "--replace_result ..." and "--replace_colum ..." just before -# the SHOW TABLE STATUS and of course the expected result itself -# show us columns where the content must be unified, because it is non -# deterministic or it depends on the current test environment. -# -# Unfortunately "--replace_result ..." and "--replace_colum ..." do not -# affect the result of our assignment let $my_val= `SHOW SLAVE STATUS`; -# Therefore such content must be covered by '%'. -# -# Please be careful. A more simple pattern might be dangerous, because we -# might get "wrong" matches. Example: There might be several "Yes" and "No" -# within one result row. -# -############################################################################### - -# We do not want to print the auxiliary commands, because they are not of -# interest and their amount will vary depending how fast we get the -# desired state. ---disable_query_log - -# The protocol should show -# - the setting of $result_pattern and -# - that this file is sourced , -# because this increases the chance to use the protocol as replay script. -eval SELECT "let \$result_pattern= $result_pattern ;" AS ""; -SELECT '--source include/wait_slave_status.inc' AS ""; - -let $show_type= SLAVE STATUS; -let $show_pattern= $result_pattern; ---enable_query_log - ---source include/wait_show_pattern.inc - -if (!$success) -{ -let $message= ! Attention: Timeout in wait_slave_status.inc. - | Possible reasons with decreasing probability: - | - The LIKE pattern is wrong, because the - | testcase was altered or the layout of the - | SHOW SLAVE STATUS result set changed. - | - There is a new bug within the replication. - | - We met an extreme testing environment and timeout is - | too small.; ---source include/show_msg80.inc ---echo DEBUG INFO START (wait_slave_status.inc): ---echo $result_pattern ---vertical_results -show slave status; ---echo DEBUG INFO END -} diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index cc0fb88b791..559ed003fb2 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -1078,6 +1078,7 @@ Note 1003 select timestampdiff(WEEK,'2001-02-01','2001-05-01') AS `a1`,timestamp select time_format('100:00:00', '%H %k %h %I %l'); time_format('100:00:00', '%H %k %h %I %l') 100 100 04 04 4 +SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; SET GLOBAL log_bin_trust_function_creators = 1; create table t1 (a timestamp default '2005-05-05 01:01:01', b timestamp default '2005-05-05 01:01:01'); @@ -1121,6 +1122,7 @@ call t_sysdate(); @a != @b 1 drop procedure t_sysdate; +SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; select timestampdiff(month,'2004-09-11','2004-09-11'); timestampdiff(month,'2004-09-11','2004-09-11') 0 diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result index 16be3eb966d..397f51fbd49 100644 --- a/mysql-test/r/grant.result +++ b/mysql-test/r/grant.result @@ -1,3 +1,4 @@ +SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; SET GLOBAL log_bin_trust_function_creators = 1; drop table if exists t1; drop database if exists mysqltest; @@ -1351,4 +1352,4 @@ DROP PROCEDURE sp3; DROP USER 'userbug33464'@'localhost'; use test; DROP DATABASE dbbug33464; -End of 5.1 tests +SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; diff --git a/mysql-test/r/grant2.result b/mysql-test/r/grant2.result index b94de265d0c..098f35e3fa0 100644 --- a/mysql-test/r/grant2.result +++ b/mysql-test/r/grant2.result @@ -365,6 +365,7 @@ insert into mysql.user select * from t1; drop table t1, t2; drop database TESTDB; flush privileges; +SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; SET GLOBAL log_bin_trust_function_creators = 1; grant all privileges on test.* to `a@`@localhost; grant execute on * to `a@`@localhost; @@ -380,7 +381,7 @@ drop function f2; drop table t2; REVOKE ALL PRIVILEGES, GRANT OPTION FROM `a@`@localhost; drop user `a@`@localhost; -SET GLOBAL log_bin_trust_function_creators = 0; +SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; drop database if exists mysqltest_1; drop database if exists mysqltest_2; drop user mysqltest_u1@localhost; diff --git a/mysql-test/r/innodb_notembedded.result b/mysql-test/r/innodb_notembedded.result index 36714eb62fb..af332aba38a 100644 --- a/mysql-test/r/innodb_notembedded.result +++ b/mysql-test/r/innodb_notembedded.result @@ -1,4 +1,5 @@ drop table if exists t1; +SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; SET GLOBAL log_bin_trust_function_creators = 1; create table t1 (col1 integer primary key, col2 integer) engine=innodb; insert t1 values (1,100); @@ -19,4 +20,4 @@ rollback; rollback; drop table t1; drop function f1; -SET GLOBAL log_bin_trust_function_creators = 0; +SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; diff --git a/mysql-test/r/log_bin_trust_function_creators_func.result b/mysql-test/r/log_bin_trust_function_creators_func.result index e109b53a8e7..3611f0f08fd 100644 --- a/mysql-test/r/log_bin_trust_function_creators_func.result +++ b/mysql-test/r/log_bin_trust_function_creators_func.result @@ -3,6 +3,7 @@ drop table if exists t1; ## Creating new user tt ## CREATE user tt@localhost; ## Setting value of variable to 0 ## +SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; SET @@global.log_bin_trust_function_creators = 0; ## Creating new table t2 ## create table t2 (a INT); @@ -69,3 +70,5 @@ drop function f1; ## Dropping table t1 & t2 ## drop table t1,t2; ## Disconnecting both the connections ## +DROP USER tt@localhost; +SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result index 5d99624df30..2df70624ac2 100644 --- a/mysql-test/r/query_cache.result +++ b/mysql-test/r/query_cache.result @@ -1116,12 +1116,13 @@ create procedure `p1`() begin select a, f1() from t1; end// +SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; SET GLOBAL log_bin_trust_function_creators = 1; call p1()// a f1() 1 2 2 2 -SET GLOBAL log_bin_trust_function_creators = 0; +SET GLOBAL log_bin_trust_function_creators = @old_log_bin_trust_function_creators; drop procedure p1// drop function f1// drop table t1// diff --git a/mysql-test/r/query_cache_notembedded.result b/mysql-test/r/query_cache_notembedded.result index ec78c2267d2..64bb40f1d17 100644 --- a/mysql-test/r/query_cache_notembedded.result +++ b/mysql-test/r/query_cache_notembedded.result @@ -314,6 +314,7 @@ drop procedure f2; drop procedure f3; drop procedure f4; drop table t1; +SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; SET GLOBAL log_bin_trust_function_creators = 1; reset query cache; drop function if exists f1; @@ -346,7 +347,7 @@ id drop table t1; drop function f1; set GLOBAL query_cache_size=0; -SET GLOBAL log_bin_trust_function_creators = 0; +SET @@global.log_bin_trust_function_creators = @old_log_bin_trust_function_creators; DROP DATABASE IF EXISTS bug30269; FLUSH STATUS; CREATE DATABASE bug30269; diff --git a/mysql-test/r/timezone2.result b/mysql-test/r/timezone2.result index 32db7ea7fa9..49d7bd6542a 100644 --- a/mysql-test/r/timezone2.result +++ b/mysql-test/r/timezone2.result @@ -269,6 +269,7 @@ select * from t1; convert_tz(NULL, NULL, NULL) NULL drop table t1; +SET @old_log_bin_trust_function_creators = @@global.log_bin_trust_function_creators; SET GLOBAL log_bin_trust_function_creators = 1; create table t1 (ldt datetime, udt datetime); create function f1(i datetime) returns datetime @@ -284,7 +285,7 @@ ldt ldt2 2006-04-19 16:30:00 2006-04-19 16:30:00 drop table t1; drop function f1; -SET GLOBAL log_bin_trust_function_creators = 0; +SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; DROP TABLE IF EXISTS t1; CREATE TABLE t1 (t TIMESTAMP); INSERT INTO t1 VALUES (NULL), (NULL); diff --git a/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test b/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test index b5590329795..a74de7ad3c6 100644 --- a/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test +++ b/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test @@ -51,6 +51,6 @@ enable_warnings; remove_file $MYSQLD_DATADIR/slave-relay-bin.000001; remove_file $MYSQLD_DATADIR/slave-relay-bin.index; stop slave sql_thread; -let $keep_connection=1; +let $slave_keep_connection=1; source include/wait_for_slave_sql_to_stop.inc; diff --git a/mysql-test/suite/rpl/r/rpl_bug26395.result b/mysql-test/suite/rpl/r/rpl_bug26395.result index 1f986c40934..c6dd2d01ed3 100644 --- a/mysql-test/suite/rpl/r/rpl_bug26395.result +++ b/mysql-test/suite/rpl/r/rpl_bug26395.result @@ -21,7 +21,7 @@ a 1 [on slave] ==== Verify results on slave ==== -STOP SLAVE; +include/stop_slave.inc SELECT "" AS Slave_IO_State; Slave_IO_State diff --git a/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result b/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result index 4f0f20d88d9..ba4e22232a0 100644 --- a/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result +++ b/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result @@ -92,7 +92,7 @@ Master D 4 D * Do failure for C and then make new connection B->D * STOP SLAVE; SET GLOBAL SQL_SLAVE_SKIP_COUNTER = 1; -START SLAVE; +include/start_slave.inc INSERT INTO t1 VALUES(6,'C',2); INSERT INTO t1(b,c) VALUES('B',2); INSERT INTO t1(b,c) VALUES('A',2); @@ -119,7 +119,7 @@ Master D 8 D STOP SLAVE; STOP SLAVE; CHANGE MASTER TO master_host='127.0.0.1',master_port=MASTER_B_PORT,master_user='root',master_log_file='LOG_FILE',master_log_pos=LOG_POS; -START SLAVE; +include/start_slave.inc * Check data inserted before failure * SELECT 'Master A',a,b FROM t1 WHERE c = 2 ORDER BY a,b; @@ -166,7 +166,7 @@ Master D 12 D *** Testing restoring scheme A->B->C->D->A after failure *** * Remove wrong event from C and restore B->C->D * -STOP SLAVE; +include/stop_slave.inc DELETE FROM t1 WHERE a = 6; START SLAVE; RESET MASTER; diff --git a/mysql-test/suite/rpl/r/rpl_flushlog_loop.result b/mysql-test/suite/rpl/r/rpl_flushlog_loop.result index 23f2b845ca6..600ac44fc86 100644 --- a/mysql-test/suite/rpl/r/rpl_flushlog_loop.result +++ b/mysql-test/suite/rpl/r/rpl_flushlog_loop.result @@ -18,11 +18,7 @@ start slave; stop slave; change master to master_host='127.0.0.1',master_user='root', master_password='',master_port=SLAVE_PORT; -start slave; - -let $result_pattern= '%127.0.0.1%root%slave-bin.000001%slave-bin.000001%Yes%Yes%0%0%None%' ; - ---source include/wait_slave_status.inc +include/start_slave.inc FLUSH LOGS; SHOW SLAVE STATUS; Slave_IO_State # diff --git a/mysql-test/suite/rpl/r/rpl_found_rows.result b/mysql-test/suite/rpl/r/rpl_found_rows.result index 25be9eb63b3..45a931872cf 100644 --- a/mysql-test/suite/rpl/r/rpl_found_rows.result +++ b/mysql-test/suite/rpl/r/rpl_found_rows.result @@ -103,10 +103,10 @@ DROP PROCEDURE just_log; DROP PROCEDURE calc_and_log; DROP FUNCTION log_rows; **** Resetting master and slave **** -STOP SLAVE; +include/stop_slave.inc RESET SLAVE; RESET MASTER; -START SLAVE; +include/start_slave.inc #### 2. Using mixed mode #### ==== 2.1. Checking a procedure ==== **** On Master **** diff --git a/mysql-test/suite/rpl/r/rpl_init_slave.result b/mysql-test/suite/rpl/r/rpl_init_slave.result index 5ff72e57f0e..908abf56c1f 100644 --- a/mysql-test/suite/rpl/r/rpl_init_slave.result +++ b/mysql-test/suite/rpl/r/rpl_init_slave.result @@ -5,8 +5,8 @@ reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; set global max_connections=151; -stop slave; -start slave; +include/stop_slave.inc +include/start_slave.inc show variables like 'init_slave'; Variable_name Value init_slave set global max_connections=500 @@ -25,6 +25,6 @@ set global init_connect="set @c=1"; show variables like 'init_connect'; Variable_name Value init_connect set @c=1 -stop slave; +include/stop_slave.inc set global init_connect= @my_global_init_connect; set global max_connections= default; diff --git a/mysql-test/suite/rpl/r/rpl_log_pos.result b/mysql-test/suite/rpl/r/rpl_log_pos.result index e0c4dedde10..7b3ebf62959 100644 --- a/mysql-test/suite/rpl/r/rpl_log_pos.result +++ b/mysql-test/suite/rpl/r/rpl_log_pos.result @@ -7,7 +7,7 @@ start slave; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB master-bin.000001 # -stop slave; +include/stop_slave.inc change master to master_log_pos=75; SHOW SLAVE STATUS; Slave_IO_State # @@ -49,7 +49,7 @@ Last_IO_Error # Last_SQL_Errno 0 Last_SQL_Error start slave; -stop slave; +include/stop_slave.inc SHOW SLAVE STATUS; Slave_IO_State # Master_Host 127.0.0.1 diff --git a/mysql-test/suite/rpl/r/rpl_packet.result b/mysql-test/suite/rpl/r/rpl_packet.result index f89d6b3459a..68173b0730c 100644 --- a/mysql-test/suite/rpl/r/rpl_packet.result +++ b/mysql-test/suite/rpl/r/rpl_packet.result @@ -8,8 +8,8 @@ drop database if exists DB_NAME_OF_MAX_LENGTH_AKA_NAME_LEN_64_BYTES_____________ create database DB_NAME_OF_MAX_LENGTH_AKA_NAME_LEN_64_BYTES_____________________; SET @@global.max_allowed_packet=1024; SET @@global.net_buffer_length=1024; -STOP SLAVE; -START SLAVE; +include/stop_slave.inc +include/start_slave.inc select @@net_buffer_length, @@max_allowed_packet; @@net_buffer_length @@max_allowed_packet 1024 1024 @@ -27,8 +27,8 @@ SLAVE_RUNNING ON drop database DB_NAME_OF_MAX_LENGTH_AKA_NAME_LEN_64_BYTES_____________________; SET @@global.max_allowed_packet=4096; SET @@global.net_buffer_length=4096; -STOP SLAVE; -START SLAVE; +include/stop_slave.inc +include/start_slave.inc CREATE TABLe `t1` (`f1` LONGTEXT) ENGINE=MyISAM; INSERT INTO `t1`(`f1`) VALUES ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa2048'); show slave status; diff --git a/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result b/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result index ecd59005b59..05af65306c1 100644 --- a/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result +++ b/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result @@ -423,10 +423,10 @@ a b c **** On Master **** DELETE FROM t1; **** Resetting master and slave **** -STOP SLAVE; +include/stop_slave.inc RESET SLAVE; RESET MASTER; -START SLAVE; +include/start_slave.inc **** On Master **** INSERT INTO t1 VALUES ('K','K'), ('L','L'), ('M','M'); **** On Master **** diff --git a/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result b/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result index 4fc2bc6d714..db7105e5c09 100644 --- a/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result +++ b/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result @@ -423,10 +423,10 @@ a b c **** On Master **** DELETE FROM t1; **** Resetting master and slave **** -STOP SLAVE; +include/stop_slave.inc RESET SLAVE; RESET MASTER; -START SLAVE; +include/start_slave.inc **** On Master **** INSERT INTO t1 VALUES ('K','K'), ('L','L'), ('M','M'); **** On Master **** diff --git a/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result b/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result index b32da2715e3..562e3dc2862 100644 --- a/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result +++ b/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result @@ -16,6 +16,6 @@ INSERT INTO t1 VALUES (1); [on slave] Last_SQL_Error = Error 'Table 'test.t1' doesn't exist' on opening tables ==== Clean up ==== -STOP SLAVE; +include/stop_slave.inc [on master] DROP TABLE t1; diff --git a/mysql-test/suite/rpl/r/rpl_row_log.result b/mysql-test/suite/rpl/r/rpl_row_log.result index 67dab254ccc..1b6fce5e206 100644 --- a/mysql-test/suite/rpl/r/rpl_row_log.result +++ b/mysql-test/suite/rpl/r/rpl_row_log.result @@ -4,7 +4,7 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -stop slave; +include/stop_slave.inc reset master; reset slave; reset master; @@ -113,11 +113,7 @@ Aberdeen Abernathy aberrant aberration -start slave; - -let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ; - ---source include/wait_slave_status.inc +include/start_slave.inc select * from t1 order by 1 asc; word Aarhus @@ -190,7 +186,8 @@ Abernathy aberrant aberration flush logs; -stop slave; +include/stop_slave.inc +include/start_slave.inc create table t2 (n int)ENGINE=MyISAM; insert into t2 values (1); show binlog events from ; @@ -220,7 +217,6 @@ show binary logs; Log_name File_size master-bin.000001 1540 master-bin.000002 516 -start slave; show binary logs; Log_name File_size slave-bin.000001 1638 diff --git a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result index f526418a01a..14d4412f6de 100644 --- a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result +++ b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result @@ -4,7 +4,7 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -stop slave; +include/stop_slave.inc reset master; reset slave; reset master; @@ -113,11 +113,7 @@ Aberdeen Abernathy aberrant aberration -start slave; - -let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ; - ---source include/wait_slave_status.inc +include/start_slave.inc select * from t1 order by 1 asc; word Aarhus @@ -190,7 +186,8 @@ Abernathy aberrant aberration flush logs; -stop slave; +include/stop_slave.inc +include/start_slave.inc create table t2 (n int)ENGINE=InnoDB; insert into t2 values (1); show binlog events from ; @@ -220,7 +217,6 @@ show binary logs; Log_name File_size master-bin.000001 1456 master-bin.000002 474 -start slave; show binary logs; Log_name File_size slave-bin.000001 1536 diff --git a/mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result b/mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result index 584a3af4543..1934b01505c 100644 --- a/mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result +++ b/mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result @@ -13,4 +13,5 @@ select count(*) from t1; count(*) 70 drop table t1; +include/stop_slave.inc drop table t1; diff --git a/mysql-test/suite/rpl/r/rpl_row_until.result b/mysql-test/suite/rpl/r/rpl_row_until.result index a6d1b085b34..be1ec51f74a 100644 --- a/mysql-test/suite/rpl/r/rpl_row_until.result +++ b/mysql-test/suite/rpl/r/rpl_row_until.result @@ -4,7 +4,7 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -stop slave; +include/stop_slave.inc create table t1(n int not null auto_increment primary key); insert into t1 values (1),(2),(3),(4); drop table t1; @@ -149,7 +149,7 @@ Last_IO_Error # Last_SQL_Errno 0 Last_SQL_Error start slave; -stop slave; +include/stop_slave.inc start slave sql_thread until master_log_file='master-bin.000001', master_log_pos=740; SHOW SLAVE STATUS; Slave_IO_State # diff --git a/mysql-test/suite/rpl/r/rpl_slave_grp_exec.result b/mysql-test/suite/rpl/r/rpl_slave_grp_exec.result index cfd309e6251..eb3c4ef5978 100644 --- a/mysql-test/suite/rpl/r/rpl_slave_grp_exec.result +++ b/mysql-test/suite/rpl/r/rpl_slave_grp_exec.result @@ -44,9 +44,9 @@ a b SELECT * FROM t2 ORDER BY a; a b 1 AA_for_row_or_YY_for_stmt_mixed -STOP SLAVE; +include/stop_slave.inc RENAME TABLE t3_bak TO t3; -START SLAVE; +include/start_slave.inc TRUNCATE t1; TRUNCATE t2; TRUNCATE t3; @@ -78,9 +78,9 @@ SELECT * FROM t1 ORDER BY a; a b SELECT * FROM t2 ORDER BY a; a b -STOP SLAVE; +include/stop_slave.inc RENAME TABLE t3_bak TO t3; -START SLAVE; +include/start_slave.inc TRUNCATE t1; TRUNCATE t2; TRUNCATE t3; @@ -116,8 +116,8 @@ SELECT * FROM t1 ORDER BY a; a b SELECT * FROM t2 ORDER BY a; a b -STOP SLAVE; +include/stop_slave.inc RENAME TABLE t3_bak TO t3; -START SLAVE; +include/start_slave.inc *** Clean up *** DROP TABLE t1,t2,t3; diff --git a/mysql-test/suite/rpl/r/rpl_slave_skip.result b/mysql-test/suite/rpl/r/rpl_slave_skip.result index 1f975b7dbcd..75d1c019098 100644 --- a/mysql-test/suite/rpl/r/rpl_slave_skip.result +++ b/mysql-test/suite/rpl/r/rpl_slave_skip.result @@ -166,7 +166,7 @@ BEGIN UPDATE t3 SET a =2, b = 'master only'; END| **** On Slave **** -STOP SLAVE; +include/stop_slave.inc **** On Master **** UPDATE t1 SET a = 2, b = 'master only' WHERE a = 1; DROP TRIGGER tr1; @@ -188,7 +188,7 @@ a b 3 master/slave *** On Slave *** SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1; -START SLAVE; +include/start_slave.inc SELECT * FROM t1 ORDER BY a; a b 1 master/slave @@ -208,7 +208,7 @@ CREATE TABLE t4 (a INT, b VARCHAR(20)) ENGINE=innodb; CREATE TABLE t5 (a INT, b VARCHAR(20)) ENGINE=innodb; CREATE TABLE t6 (a INT, b VARCHAR(20)) ENGINE=innodb; **** On Slave **** -STOP SLAVE; +include/stop_slave.inc *** On Master *** BEGIN; INSERT INTO t4 VALUES (2, 'master only'); @@ -234,7 +234,7 @@ a b 3 master/slave *** On Slave *** SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1; -START SLAVE; +include/start_slave.inc SELECT * FROM t4 ORDER BY a; a b 3 master/slave @@ -245,7 +245,7 @@ SELECT * FROM t6 ORDER BY a; a b 3 master/slave **** On Slave **** -STOP SLAVE; +include/stop_slave.inc *** On Master *** BEGIN; INSERT INTO t4 VALUES (6, 'master only'); @@ -277,7 +277,7 @@ a b 7 master only *** On Slave *** SET GLOBAL SQL_SLAVE_SKIP_COUNTER=10; -START SLAVE; +include/start_slave.inc SELECT * FROM t4 ORDER BY a; a b 3 master/slave @@ -287,7 +287,7 @@ a b SELECT * FROM t6 ORDER BY a; a b 3 master/slave -STOP SLAVE; +include/stop_slave.inc SET AUTOCOMMIT=0; INSERT INTO t4 VALUES (4, 'master only'); INSERT INTO t5 VALUES (4, 'master only'); @@ -323,7 +323,7 @@ a b 7 master only *** On Slave *** SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1; -START SLAVE; +include/start_slave.inc SELECT * FROM t4 ORDER BY a; a b 3 master/slave @@ -341,7 +341,7 @@ DROP TABLE t4, t5, t6; *** On Master *** CREATE TABLE t10 (a INT, b VARCHAR(20)) ENGINE=myisam; *** On Slave *** -STOP SLAVE; +include/stop_slave.inc *** On Master *** SET SESSION BINLOG_FORMAT=STATEMENT; LOAD DATA INFILE 'MYSQLTEST_VARDIR/std_data/rpl_bug28618.dat' INTO TABLE t10 FIELDS TERMINATED BY '|'; @@ -352,7 +352,7 @@ a b 3 master only *** On Slave *** SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1; -START SLAVE; +include/start_slave.inc SELECT * FROM t10 ORDER BY a; a b DROP TABLE t10; diff --git a/mysql-test/suite/rpl/r/rpl_slave_status.result b/mysql-test/suite/rpl/r/rpl_slave_status.result index dc27c513149..a98a81dc74f 100644 --- a/mysql-test/suite/rpl/r/rpl_slave_status.result +++ b/mysql-test/suite/rpl/r/rpl_slave_status.result @@ -8,9 +8,9 @@ start slave; [on master] GRANT REPLICATION SLAVE ON *.* TO rpl@127.0.0.1 IDENTIFIED BY 'rpl'; [on slave] -STOP SLAVE; +include/stop_slave.inc CHANGE MASTER TO master_user='rpl', master_password='rpl'; -START SLAVE; +include/start_slave.inc ==== Do replication as new user ==== [on master] CREATE TABLE t1 (n INT); @@ -25,7 +25,7 @@ DROP USER rpl@127.0.0.1; FLUSH PRIVILEGES; [on slave] ==== Restart slave without privileges ===== -STOP SLAVE; +include/stop_slave.inc START SLAVE; ==== Verify that Slave_IO_Running = No ==== Slave_IO_Running = No (should be No) diff --git a/mysql-test/suite/rpl/r/rpl_sp.result b/mysql-test/suite/rpl/r/rpl_sp.result index 3822da77b75..27a956eb526 100644 --- a/mysql-test/suite/rpl/r/rpl_sp.result +++ b/mysql-test/suite/rpl/r/rpl_sp.result @@ -191,11 +191,15 @@ begin return unix_timestamp(); end| ERROR HY000: You do not have the SUPER privilege and binary logging is enabled (you *might* want to use the less safe log_bin_trust_function_creators variable) +set @old_log_bin_trust_routine_creators= @@global.log_bin_trust_routine_creators; +set @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; set global log_bin_trust_routine_creators=1; Warnings: Warning 1287 The syntax 'log_bin_trust_routine_creators' is deprecated and will be removed in MySQL 5.2. Please use 'log_bin_trust_function_creators' instead set global log_bin_trust_function_creators=0; set global log_bin_trust_function_creators=1; +set @old_log_bin_trust_routine_creators= @@global.log_bin_trust_routine_creators; +set @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; set global log_bin_trust_function_creators=1; create function fn2() returns int @@ -549,8 +553,14 @@ insert into t values (1); return 0; end master-bin.000001 # Query 1 # use `mysqltest`; SELECT `mysqltest2`.`f1`() -set global log_bin_trust_function_creators=0; -set global log_bin_trust_function_creators=0; +set @@global.log_bin_trust_routine_creators= @old_log_bin_trust_routine_creators; +Warnings: +Warning 1287 The syntax 'log_bin_trust_routine_creators' is deprecated and will be removed in MySQL 5.2. Please use 'log_bin_trust_function_creators' instead +set @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; +set @@global.log_bin_trust_routine_creators= @old_log_bin_trust_routine_creators; +Warnings: +Warning 1287 The syntax 'log_bin_trust_routine_creators' is deprecated and will be removed in MySQL 5.2. Please use 'log_bin_trust_function_creators' instead +set @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; drop database mysqltest; drop database mysqltest2; use test; diff --git a/mysql-test/suite/rpl/r/rpl_sp_effects.result b/mysql-test/suite/rpl/r/rpl_sp_effects.result index a39d189aa3a..d9cdfd81167 100644 --- a/mysql-test/suite/rpl/r/rpl_sp_effects.result +++ b/mysql-test/suite/rpl/r/rpl_sp_effects.result @@ -4,6 +4,7 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; +SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; drop procedure if exists p1; drop procedure if exists p2; drop function if exists f1; @@ -275,5 +276,5 @@ E drop table t2; drop procedure sp_bug26199; drop function sf_bug26199; -SET GLOBAL log_bin_trust_function_creators = 0; +SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; end of the tests diff --git a/mysql-test/suite/rpl/r/rpl_stm_log.result b/mysql-test/suite/rpl/r/rpl_stm_log.result index 77d3c92ab30..eefac3ca13d 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_log.result +++ b/mysql-test/suite/rpl/r/rpl_stm_log.result @@ -4,7 +4,7 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -stop slave; +include/stop_slave.inc reset master; reset slave; reset master; @@ -109,11 +109,7 @@ Aberdeen Abernathy aberrant aberration -start slave; - -let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ; - ---source include/wait_slave_status.inc +include/start_slave.inc select * from t1 order by 1 asc; word Aarhus @@ -186,7 +182,8 @@ Abernathy aberrant aberration flush logs; -stop slave; +include/stop_slave.inc +include/start_slave.inc create table t2 (n int)ENGINE=MyISAM; insert into t2 values (1); show binlog events from ; @@ -209,7 +206,6 @@ show binary logs; Log_name File_size master-bin.000001 1347 master-bin.000002 392 -start slave; show binary logs; Log_name File_size slave-bin.000001 1450 diff --git a/mysql-test/suite/rpl/r/rpl_stm_until.result b/mysql-test/suite/rpl/r/rpl_stm_until.result index 619115aa534..c488b4d7b13 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_until.result +++ b/mysql-test/suite/rpl/r/rpl_stm_until.result @@ -4,7 +4,7 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -stop slave; +include/stop_slave.inc create table t1(n int not null auto_increment primary key); insert into t1 values (1),(2),(3),(4); drop table t1; @@ -149,7 +149,7 @@ Last_IO_Error # Last_SQL_Errno 0 Last_SQL_Error start slave; -stop slave; +include/stop_slave.inc start slave until master_log_file='master-bin.000001', master_log_pos=776; SHOW SLAVE STATUS; Slave_IO_State # diff --git a/mysql-test/suite/rpl/r/rpl_variables.result b/mysql-test/suite/rpl/r/rpl_variables.result index 73354666b7a..bf6792f9f96 100644 --- a/mysql-test/suite/rpl/r/rpl_variables.result +++ b/mysql-test/suite/rpl/r/rpl_variables.result @@ -40,10 +40,10 @@ SET @user_num = 10; SET @user_text = 'Alunda'; [on master] **** Resetting master and slave **** -STOP SLAVE; +include/stop_slave.inc RESET SLAVE; RESET MASTER; -START SLAVE; +include/start_slave.inc [on slave] SET @@global.init_slave = 'ant'; [on master] diff --git a/mysql-test/suite/rpl/t/rpl_bug26395.test b/mysql-test/suite/rpl/t/rpl_bug26395.test index 5d5f8f7fa5e..97c152d52e9 100644 --- a/mysql-test/suite/rpl/t/rpl_bug26395.test +++ b/mysql-test/suite/rpl/t/rpl_bug26395.test @@ -23,7 +23,7 @@ # # To simulate the slave correctly, we wait until everything up to but # not including the XID is replicated. This has to be done with -# include/wait_for_slave_io_to_sync.inc, not sync_slave_with_master, +# include/sync_slave_io_with_master.inc, not sync_slave_with_master, # since the latter waits until the slave *SQL* thread has caught up # with the master's position, which it will never do. # @@ -70,8 +70,7 @@ sync_with_master 0; --echo ==== Verify results on slave ==== -STOP SLAVE; -source include/wait_for_slave_to_stop.inc; +source include/stop_slave.inc; let $tmp= query_get_value("SHOW SLAVE STATUS", Slave_IO_State, 1); eval SELECT "$tmp" AS Slave_IO_State; let $tmp= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1); diff --git a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test index bca20ef79c4..4628c0e97f7 100644 --- a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test +++ b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test @@ -57,8 +57,7 @@ SELECT 'Master D',a,b FROM t1 WHERE c = 1 ORDER BY a,b; connect(slave,127.0.0.1,root,,test,$SLAVE_MYPORT2); STOP SLAVE; SET GLOBAL SQL_SLAVE_SKIP_COUNTER = 1; -START SLAVE; ---source include/wait_for_slave_to_start.inc +source include/start_slave.inc; disconnect slave; --connection master_c INSERT INTO t1 VALUES(6,'C',2); @@ -67,9 +66,7 @@ INSERT INTO t1 VALUES(6,'C',2); INSERT INTO t1(b,c) VALUES('B',2); # Wait while C will stop. --connection master_c ---let $slave_param= Slave_SQL_Running ---let $slave_param_value= No ---source include/wait_for_slave_param.inc +source include/wait_for_slave_sql_to_stop.inc; --connection master_a INSERT INTO t1(b,c) VALUES('A',2); --connection master_d @@ -105,8 +102,7 @@ STOP SLAVE; --replace_result $SLAVE_MYPORT MASTER_B_PORT $file_c LOG_FILE $pos_c LOG_POS --eval CHANGE MASTER TO master_host='127.0.0.1',master_port=$SLAVE_MYPORT,master_user='root',master_log_file='$file_c',master_log_pos=$pos_c connect(slave,127.0.0.1,root,,test,$SLAVE_MYPORT2); -START SLAVE; ---source include/wait_for_slave_to_start.inc +source include/start_slave.inc; disconnect slave; --connection master_b --sync_slave_with_master master_d @@ -154,8 +150,7 @@ SELECT 'Master D',a,b FROM t1 WHERE c = 3 ORDER BY a,b; # distributed to other servers --echo * Remove wrong event from C and restore B->C->D * --connection master_d -STOP SLAVE; ---wait_for_slave_to_stop +source include/stop_slave.inc; --connection master_c DELETE FROM t1 WHERE a = 6; START SLAVE; diff --git a/mysql-test/suite/rpl/t/rpl_dual_pos_advance.test b/mysql-test/suite/rpl/t/rpl_dual_pos_advance.test index 7ab9064b7f6..11dd46727dc 100644 --- a/mysql-test/suite/rpl/t/rpl_dual_pos_advance.test +++ b/mysql-test/suite/rpl/t/rpl_dual_pos_advance.test @@ -12,7 +12,7 @@ source include/have_innodb.inc; # set up "dual head" -let $keep_connection= 1; +let $slave_keep_connection= 1; connection slave; reset master; diff --git a/mysql-test/suite/rpl/t/rpl_flushlog_loop.test b/mysql-test/suite/rpl/t/rpl_flushlog_loop.test index f37df68ac3b..a8befe612c2 100644 --- a/mysql-test/suite/rpl/t/rpl_flushlog_loop.test +++ b/mysql-test/suite/rpl/t/rpl_flushlog_loop.test @@ -25,13 +25,8 @@ stop slave; --replace_result $SLAVE_MYPORT SLAVE_PORT eval change master to master_host='127.0.0.1',master_user='root', master_password='',master_port=$SLAVE_MYPORT; -start slave; -# -# Wait for start of slave IO and SQL threads -# -let $result_pattern= '%127.0.0.1%root%slave-bin.000001%slave-bin.000001%Yes%Yes%0%0%None%'; ---source include/wait_slave_status.inc +source include/start_slave.inc; # # Flush logs of slave diff --git a/mysql-test/suite/rpl/t/rpl_idempotency.test b/mysql-test/suite/rpl/t/rpl_idempotency.test index 0dc687a8656..989066dad2e 100644 --- a/mysql-test/suite/rpl/t/rpl_idempotency.test +++ b/mysql-test/suite/rpl/t/rpl_idempotency.test @@ -207,9 +207,8 @@ select * from ti1 order by b /* must be (2),(3) */; # foreign key: row is referenced --echo *** slave must stop -source include/wait_for_slave_sql_to_stop.inc; - connection slave; +source include/wait_for_slave_sql_to_stop.inc; let $last_error = query_get_value("SHOW SLAVE STATUS", Last_SQL_Errno, 1); disable_query_log; @@ -240,11 +239,10 @@ delete from ti1 where b=3; connection master; insert into ti2 set a=3, b=3 /* offending write event */; + --echo *** slave must stop - -source include/wait_for_slave_sql_to_stop.inc; - connection slave; +source include/wait_for_slave_sql_to_stop.inc; let $last_error = query_get_value("SHOW SLAVE STATUS", Last_SQL_Errno, 1); disable_query_log; @@ -282,9 +280,8 @@ connection master; insert into ti1 set b=1 /* offending write event */; --echo *** slave must stop -source include/wait_for_slave_sql_to_stop.inc; - connection slave; +source include/wait_for_slave_sql_to_stop.inc; let $last_error = query_get_value("SHOW SLAVE STATUS", Last_SQL_Errno, 1); disable_query_log; @@ -318,9 +315,8 @@ connection master; DELETE FROM t1 WHERE a = -2; --echo *** slave must stop -source include/wait_for_slave_sql_to_stop.inc; - connection slave; +source include/wait_for_slave_sql_to_stop.inc; let $last_error = query_get_value("SHOW SLAVE STATUS", Last_SQL_Errno, 1); disable_query_log; @@ -337,9 +333,8 @@ set global slave_exec_mode='STRICT'; connection master; DELETE FROM t2 WHERE a = -2; --echo *** slave must stop -source include/wait_for_slave_sql_to_stop.inc; - connection slave; +source include/wait_for_slave_sql_to_stop.inc; let $last_error = query_get_value("SHOW SLAVE STATUS", Last_SQL_Errno, 1); disable_query_log; @@ -360,9 +355,8 @@ connection master; UPDATE t1 SET a = 1 WHERE a = -1; --echo *** slave must stop -source include/wait_for_slave_sql_to_stop.inc; - connection slave; +source include/wait_for_slave_sql_to_stop.inc; let $last_error = query_get_value("SHOW SLAVE STATUS", Last_SQL_Errno, 1); disable_query_log; @@ -381,9 +375,8 @@ connection master; UPDATE t2 SET a = 1 WHERE a = -1; --echo *** slave must stop -source include/wait_for_slave_sql_to_stop.inc; - connection slave; +source include/wait_for_slave_sql_to_stop.inc; let $last_error = query_get_value("SHOW SLAVE STATUS", Last_SQL_Errno, 1); disable_query_log; diff --git a/mysql-test/suite/rpl/t/rpl_incident.test b/mysql-test/suite/rpl/t/rpl_incident.test index 507cd0e0798..3e2eb32a4ff 100644 --- a/mysql-test/suite/rpl/t/rpl_incident.test +++ b/mysql-test/suite/rpl/t/rpl_incident.test @@ -14,7 +14,7 @@ REPLACE INTO t1 VALUES (4); SELECT * FROM t1; connection slave; ---wait_for_slave_to_stop +source include/wait_for_slave_sql_to_stop.inc; # The 4 should not be inserted into the table, since the incident log # event should have stop the slave. diff --git a/mysql-test/suite/rpl/t/rpl_init_slave.test b/mysql-test/suite/rpl/t/rpl_init_slave.test index 1511bd541ed..58d1f6bdc01 100644 --- a/mysql-test/suite/rpl/t/rpl_init_slave.test +++ b/mysql-test/suite/rpl/t/rpl_init_slave.test @@ -7,33 +7,25 @@ source include/master-slave.inc; set global max_connections=151; connection slave; -stop slave; -source include/wait_for_slave_to_stop.inc; -start slave; -source include/wait_for_slave_to_start.inc; +source include/stop_slave.inc; +source include/start_slave.inc; connection master; -save_master_pos; -connection slave; +sync_slave_with_master; show variables like 'init_slave'; show variables like 'max_connections'; -sync_with_master; reset master; connection master; show variables like 'init_slave'; show variables like 'max_connections'; -save_master_pos; -connection slave; -sync_with_master; +sync_slave_with_master; # Save variable value set @my_global_init_connect= @@global.init_connect; set global init_connect="set @c=1"; show variables like 'init_connect'; connection master; -save_master_pos; -connection slave; -sync_with_master; -stop slave; +sync_slave_with_master; +source include/stop_slave.inc; # Restore changed global variable set global init_connect= @my_global_init_connect; diff --git a/mysql-test/suite/rpl/t/rpl_log_pos.test b/mysql-test/suite/rpl/t/rpl_log_pos.test index 45a097b6f14..5e8390f97ed 100644 --- a/mysql-test/suite/rpl/t/rpl_log_pos.test +++ b/mysql-test/suite/rpl/t/rpl_log_pos.test @@ -13,20 +13,14 @@ source include/master-slave.inc; source include/show_master_status.inc; sync_slave_with_master; -stop slave; ---source include/wait_for_slave_to_stop.inc +source include/stop_slave.inc; change master to master_log_pos=75; source include/show_slave_status2.inc; start slave; -let $slave_param= Slave_SQL_Running; -let $slave_param_value= Yes; ---source include/wait_for_slave_param.inc -let $slave_param= Slave_IO_Running; -let $slave_param_value= No; ---source include/wait_for_slave_param.inc -stop slave; ---source include/wait_for_slave_to_stop.inc +source include/wait_for_slave_sql_to_start.inc; +source include/wait_for_slave_io_to_stop.inc; +source include/stop_slave.inc; source include/show_slave_status.inc; connection master; diff --git a/mysql-test/suite/rpl/t/rpl_packet.test b/mysql-test/suite/rpl/t/rpl_packet.test index 1bde61aef78..95293b1e7ac 100644 --- a/mysql-test/suite/rpl/t/rpl_packet.test +++ b/mysql-test/suite/rpl/t/rpl_packet.test @@ -18,10 +18,8 @@ SET @@global.net_buffer_length=1024; # Restart slave for setting to take effect connection slave; -STOP SLAVE; -source include/wait_for_slave_to_stop.inc; -START SLAVE; -source include/wait_for_slave_to_start.inc; +source include/stop_slave.inc; +source include/start_slave.inc; # Reconnect to master for new setting to take effect disconnect master; @@ -65,10 +63,8 @@ SET @@global.net_buffer_length=4096; # Restart slave for new setting to take effect connection slave; -STOP SLAVE; -source include/wait_for_slave_to_stop.inc; -START SLAVE; -source include/wait_for_slave_to_start.inc; +source include/stop_slave.inc; +source include/start_slave.inc; # Reconnect to master for new setting to take effect disconnect master; diff --git a/mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test b/mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test index 6add7302f55..0c038c41ebf 100644 --- a/mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test +++ b/mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test @@ -35,8 +35,7 @@ let $err= query_get_value(SHOW SLAVE STATUS, Last_SQL_Error, 1); --echo Last_SQL_Error = $err --echo ==== Clean up ==== -STOP SLAVE; -source include/wait_for_slave_to_stop.inc; +source include/stop_slave.inc; --echo [on master] connection master; diff --git a/mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test b/mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test index 82c4b1a9936..9b24c78e62d 100644 --- a/mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test +++ b/mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test @@ -15,12 +15,12 @@ save_master_pos; connection slave; -# slave will automatically tell itself to stop thanks to the .opt +# slave will automatically stop the sql thread thanks to the .opt # file; it will initiate the stop request after the first # Rows_log_event (out of 3) but should wait until the last one is # executed before stopping. -wait_for_slave_to_stop; +source include/wait_for_slave_sql_to_stop.inc; # check that we inserted all rows (waited until the last Rows event) select count(*) from t1; @@ -28,4 +28,5 @@ select count(*) from t1; connection master; drop table t1; connection slave; # slave SQL thread is stopped +source include/stop_slave.inc; drop table t1; diff --git a/mysql-test/suite/rpl/t/rpl_row_until.test b/mysql-test/suite/rpl/t/rpl_row_until.test index 4b05e86403d..d89de7d9ebd 100644 --- a/mysql-test/suite/rpl/t/rpl_row_until.test +++ b/mysql-test/suite/rpl/t/rpl_row_until.test @@ -9,12 +9,8 @@ let $VERSION=`select version()`; # stop slave before he will start replication also sync with master # for avoiding undetermenistic behaviour -save_master_pos; -connection slave; -sync_with_master; -stop slave; -# Make sure the slave sql and io thread has stopped ---source include/wait_for_slave_to_stop.inc +sync_slave_with_master; +--source include/stop_slave.inc connection master; # create some events on master @@ -53,9 +49,7 @@ connection master; save_master_pos; connection slave; sync_with_master; -stop slave; -# Make sure the slave sql and io thread has stopped ---source include/wait_for_slave_to_stop.inc +--source include/stop_slave.inc # this should stop immediately as we are already there start slave sql_thread until master_log_file='master-bin.000001', master_log_pos=740; diff --git a/mysql-test/suite/rpl/t/rpl_server_id1.test b/mysql-test/suite/rpl/t/rpl_server_id1.test index 5838fe98de4..879c9b6c585 100644 --- a/mysql-test/suite/rpl/t/rpl_server_id1.test +++ b/mysql-test/suite/rpl/t/rpl_server_id1.test @@ -9,8 +9,7 @@ connection slave; reset master; # replicate ourselves -stop slave; -source include/wait_for_slave_to_stop.inc; +source include/stop_slave.inc; --replace_result $SLAVE_MYPORT SLAVE_PORT eval change master to master_port=$SLAVE_MYPORT; start slave; diff --git a/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test b/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test index 94d8ffb4edc..1a0ff8d52f0 100644 --- a/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test +++ b/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test @@ -77,11 +77,9 @@ if (!`SELECT @@BINLOG_FORMAT = 'ROW'`) { SELECT * FROM t2 ORDER BY a; } -STOP SLAVE; ---source include/wait_for_slave_to_stop.inc +--source include/stop_slave.inc RENAME TABLE t3_bak TO t3; -START SLAVE; ---source include/wait_for_slave_to_start.inc +--source include/start_slave.inc --connection master TRUNCATE t1; @@ -121,11 +119,9 @@ SHOW TABLES LIKE 't%'; SELECT * FROM t1 ORDER BY a; SELECT * FROM t2 ORDER BY a; -STOP SLAVE; ---source include/wait_for_slave_to_stop.inc +--source include/stop_slave.inc RENAME TABLE t3_bak TO t3; -START SLAVE; ---source include/wait_for_slave_to_start.inc +--source include/start_slave.inc --connection master TRUNCATE t1; @@ -167,11 +163,9 @@ SHOW TABLES LIKE 't%'; SELECT * FROM t1 ORDER BY a; SELECT * FROM t2 ORDER BY a; -STOP SLAVE; ---source include/wait_for_slave_to_stop.inc +source include/stop_slave.inc; RENAME TABLE t3_bak TO t3; -START SLAVE; ---source include/wait_for_slave_to_start.inc +source include/start_slave.inc; # Clean up --echo *** Clean up *** diff --git a/mysql-test/suite/rpl/t/rpl_slave_skip.test b/mysql-test/suite/rpl/t/rpl_slave_skip.test index ce308f975aa..e87fa251c80 100644 --- a/mysql-test/suite/rpl/t/rpl_slave_skip.test +++ b/mysql-test/suite/rpl/t/rpl_slave_skip.test @@ -110,8 +110,7 @@ DELIMITER ;| --echo **** On Slave **** sync_slave_with_master; -STOP SLAVE; -source include/wait_for_slave_to_stop.inc; +source include/stop_slave.inc; --echo **** On Master **** connection master; @@ -131,8 +130,7 @@ save_master_pos; --echo *** On Slave *** connection slave; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1; -START SLAVE; -source include/wait_for_slave_to_start.inc; +source include/start_slave.inc; sync_with_master; SELECT * FROM t1 ORDER BY a; @@ -156,8 +154,7 @@ CREATE TABLE t6 (a INT, b VARCHAR(20)) ENGINE=innodb; --echo **** On Slave **** sync_slave_with_master; -STOP SLAVE; -source include/wait_for_slave_to_stop.inc; +source include/stop_slave.inc; --echo *** On Master *** connection master; @@ -182,8 +179,7 @@ save_master_pos; --echo *** On Slave *** connection slave; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1; -START SLAVE; -source include/wait_for_slave_to_start.inc; +source include/start_slave.inc; sync_with_master; SELECT * FROM t4 ORDER BY a; @@ -194,8 +190,7 @@ SELECT * FROM t6 ORDER BY a; --echo **** On Slave **** connection slave; -STOP SLAVE; -source include/wait_for_slave_to_stop.inc; +source include/stop_slave.inc; --echo *** On Master *** connection master; @@ -220,8 +215,7 @@ save_master_pos; --echo *** On Slave *** connection slave; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=10; -START SLAVE; -source include/wait_for_slave_to_start.inc; +source include/start_slave.inc; sync_with_master; SELECT * FROM t4 ORDER BY a; @@ -232,8 +226,7 @@ SELECT * FROM t6 ORDER BY a; # And the same, but with autocommit = 0 # connection slave; -STOP SLAVE; -source include/wait_for_slave_to_stop.inc; +source include/stop_slave.inc; connection master; SET AUTOCOMMIT=0; @@ -257,8 +250,7 @@ save_master_pos; --echo *** On Slave *** connection slave; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1; -START SLAVE; -source include/wait_for_slave_to_start.inc; +source include/start_slave.inc; sync_with_master; SELECT * FROM t4 ORDER BY a; @@ -280,8 +272,7 @@ CREATE TABLE t10 (a INT, b VARCHAR(20)) ENGINE=myisam; --echo *** On Slave *** sync_slave_with_master; -STOP SLAVE; -source include/wait_for_slave_to_stop.inc; +source include/stop_slave.inc; --echo *** On Master *** connection master; @@ -297,8 +288,7 @@ save_master_pos; --echo *** On Slave *** connection slave; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1; -START SLAVE; -source include/wait_for_slave_to_start.inc; +source include/start_slave.inc; sync_with_master; SELECT * FROM t10 ORDER BY a; diff --git a/mysql-test/suite/rpl/t/rpl_slave_status.test b/mysql-test/suite/rpl/t/rpl_slave_status.test index c34af353089..4edf1802a5d 100644 --- a/mysql-test/suite/rpl/t/rpl_slave_status.test +++ b/mysql-test/suite/rpl/t/rpl_slave_status.test @@ -27,11 +27,9 @@ GRANT REPLICATION SLAVE ON *.* TO rpl@127.0.0.1 IDENTIFIED BY 'rpl'; --echo [on slave] sync_slave_with_master; -STOP SLAVE; -source include/wait_for_slave_to_stop.inc; +source include/stop_slave.inc; CHANGE MASTER TO master_user='rpl', master_password='rpl'; -START SLAVE; -source include/wait_for_slave_to_start.inc; +source include/start_slave.inc; --echo ==== Do replication as new user ==== --echo [on master] @@ -53,8 +51,7 @@ sync_slave_with_master; --echo ==== Restart slave without privileges ===== # (slave.err will contain access denied error for this START SLAVE command) -STOP SLAVE; -source include/wait_for_slave_to_stop.inc; +source include/stop_slave.inc; START SLAVE; source include/wait_for_slave_sql_to_start.inc; diff --git a/mysql-test/suite/rpl/t/rpl_sp.test b/mysql-test/suite/rpl/t/rpl_sp.test index 0c9245a7265..ec6464fb095 100644 --- a/mysql-test/suite/rpl/t/rpl_sp.test +++ b/mysql-test/suite/rpl/t/rpl_sp.test @@ -11,6 +11,7 @@ source include/have_binlog_format_mixed.inc; source include/master-slave.inc; + # we need a db != test, where we don't have automatic grants --disable_warnings drop database if exists mysqltest1; @@ -240,6 +241,8 @@ begin end| delimiter ;| connection master; +set @old_log_bin_trust_routine_creators= @@global.log_bin_trust_routine_creators; +set @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; # test old variable name: set global log_bin_trust_routine_creators=1; # now use new name: @@ -247,6 +250,8 @@ set global log_bin_trust_function_creators=0; set global log_bin_trust_function_creators=1; # slave needs it too otherwise will not execute what master allowed: connection slave; +set @old_log_bin_trust_routine_creators= @@global.log_bin_trust_routine_creators; +set @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; set global log_bin_trust_function_creators=1; connection con1; @@ -571,9 +576,12 @@ show binlog events in 'master-bin.000001' from 106; # Restore log_bin_trust_function_creators to its original value. # This is a cleanup for all parts above where we tested stored # functions and triggers. -set global log_bin_trust_function_creators=0; +connection slave; +set @@global.log_bin_trust_routine_creators= @old_log_bin_trust_routine_creators; +set @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; connection master; -set global log_bin_trust_function_creators=0; +set @@global.log_bin_trust_routine_creators= @old_log_bin_trust_routine_creators; +set @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; # Clean up drop database mysqltest; diff --git a/mysql-test/suite/rpl/t/rpl_sp_effects.test b/mysql-test/suite/rpl/t/rpl_sp_effects.test index c1092e3260f..63ac3a8ad9c 100644 --- a/mysql-test/suite/rpl/t/rpl_sp_effects.test +++ b/mysql-test/suite/rpl/t/rpl_sp_effects.test @@ -10,6 +10,8 @@ # **************************************************************** connection master; +SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; + # cleanup --disable_warnings drop procedure if exists p1; @@ -254,8 +256,8 @@ drop table t2; drop procedure sp_bug26199; drop function sf_bug26199; +SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; + sync_slave_with_master; -SET GLOBAL log_bin_trust_function_creators = 0; - --echo end of the tests diff --git a/mysql-test/suite/rpl/t/rpl_stm_until.test b/mysql-test/suite/rpl/t/rpl_stm_until.test index 2793e8833fd..bc0b647bc73 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_until.test +++ b/mysql-test/suite/rpl/t/rpl_stm_until.test @@ -8,12 +8,8 @@ let $VERSION=`select version()`; # stop slave before he will start replication also sync with master # for avoiding undetermenistic behaviour -save_master_pos; -connection slave; -sync_with_master; -stop slave; -# Make sure the slave sql and io thread has stopped ---source include/wait_for_slave_to_stop.inc +sync_slave_with_master; +--source include/stop_slave.inc connection master; # create some events on master @@ -49,12 +45,8 @@ source include/show_slave_status2.inc; # clean up start slave; connection master; -save_master_pos; -connection slave; -sync_with_master; -stop slave; -# Make sure the slave sql and io thread has stopped ---source include/wait_for_slave_to_stop.inc +sync_slave_with_master; +--source include/stop_slave.inc # this should stop immediately as we are already there start slave until master_log_file='master-bin.000001', master_log_pos=776; diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result index b5b3dc6b66c..b16a63ec5ad 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result @@ -180,7 +180,7 @@ Last_IO_Error Last_SQL_Errno Last_SQL_Error set GLOBAL slave_transaction_retries=10; -START SLAVE; +include/start_slave.inc select * from t1 order by nid; nid nom prenom 1 LOCK ABC1 diff --git a/mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result b/mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result index b1554bec156..3a8b008951e 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result @@ -423,10 +423,10 @@ a b c **** On Master **** DELETE FROM t1; **** Resetting master and slave **** -STOP SLAVE; +include/stop_slave.inc RESET SLAVE; RESET MASTER; -START SLAVE; +include/start_slave.inc **** On Master **** INSERT INTO t1 VALUES ('K','K'), ('L','L'), ('M','M'); **** On Master **** diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test index c7d8db8ef8b..5903cd223ad 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test @@ -184,22 +184,21 @@ set GLOBAL slave_transaction_retries=1; --echo **** On Master **** UPDATE t1 SET `nom`="DEAD" WHERE `nid`=1; +--echo **** On Slave **** # Wait for deadlock to be detected. # When detected, the slave will stop, so we just wait for it to stop. +connection slave; source include/wait_for_slave_sql_to_stop.inc; # Replication should have stopped, since max retries were not enough. # verify with show slave status ---connection slave ---echo **** On Slave **** --replace_result $MASTER_MYPORT MASTER_PORT --replace_column 1 7 8 9 16 19 20 22 23 33 35 36 37 38 --query_vertical SHOW SLAVE STATUS; # now set max retries high enough to succeed, and start slave again set GLOBAL slave_transaction_retries=10; -START SLAVE; -source include/wait_for_slave_to_start.inc; +source include/start_slave.inc; # Wait for deadlock to be detected and retried. # We want to wait until at least one retry has been made, but before # the slave stops. currently, there is no safe way to do that: we diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index b3b92066dda..dad6f3c56a1 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -106,3 +106,4 @@ rpl_max_binlog_size_func : BUG#37962 2008-07-08 sven *_func tests c slow_query_log_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions sql_low_priority_updates_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions timestamp_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions +log_output_func : BUG#37766 2008-07-10 sven main.log_output_func randomly fails in pushbuild diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test index c417e9a02bf..3e5923157fe 100644 --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@ -606,6 +606,7 @@ select time_format('100:00:00', '%H %k %h %I %l'); # Bug #12562: Make SYSDATE behave like it does in Oracle: always the current # time, regardless of magic to make NOW() always the same for the # entirety of a statement. +SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; SET GLOBAL log_bin_trust_function_creators = 1; create table t1 (a timestamp default '2005-05-05 01:01:01', @@ -656,6 +657,7 @@ end; delimiter ;// call t_sysdate(); drop procedure t_sysdate; +SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; # # Bug #13534: timestampdiff() returned incorrect results across leap years diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test index 3fac767468e..853fd43028e 100644 --- a/mysql-test/t/grant.test +++ b/mysql-test/t/grant.test @@ -3,6 +3,7 @@ # Grant tests not performed with embedded server -- source include/not_embedded.inc +SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; SET GLOBAL log_bin_trust_function_creators = 1; # Cleanup @@ -1468,4 +1469,4 @@ use test; DROP DATABASE dbbug33464; ---echo End of 5.1 tests +SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; diff --git a/mysql-test/t/grant2.test b/mysql-test/t/grant2.test index 0f0c92e82eb..afdd2793207 100644 --- a/mysql-test/t/grant2.test +++ b/mysql-test/t/grant2.test @@ -488,6 +488,7 @@ flush privileges; # BUG#13310 incorrect user parsing by SP # +SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; SET GLOBAL log_bin_trust_function_creators = 1; grant all privileges on test.* to `a@`@localhost; @@ -512,7 +513,7 @@ connection default; REVOKE ALL PRIVILEGES, GRANT OPTION FROM `a@`@localhost; drop user `a@`@localhost; -SET GLOBAL log_bin_trust_function_creators = 0; +SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; # diff --git a/mysql-test/t/innodb_notembedded.test b/mysql-test/t/innodb_notembedded.test index 2731f8e33ed..564b947c75e 100644 --- a/mysql-test/t/innodb_notembedded.test +++ b/mysql-test/t/innodb_notembedded.test @@ -5,6 +5,8 @@ drop table if exists t1; --enable_warnings +SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; + connect (a,localhost,root,,); connect (b,localhost,root,,); @@ -39,4 +41,4 @@ drop table t1; drop function f1; disconnect a; disconnect b; -SET GLOBAL log_bin_trust_function_creators = 0; +SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; diff --git a/mysql-test/t/log_bin_trust_function_creators_func.test b/mysql-test/t/log_bin_trust_function_creators_func.test index db91128b225..52483ec281a 100644 --- a/mysql-test/t/log_bin_trust_function_creators_func.test +++ b/mysql-test/t/log_bin_trust_function_creators_func.test @@ -35,6 +35,7 @@ drop table if exists t1; CREATE user tt@localhost; --echo ## Setting value of variable to 0 ## +SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; SET @@global.log_bin_trust_function_creators = 0; --echo ## Creating new table t2 ## @@ -119,3 +120,7 @@ drop table t1,t2; --echo ## Disconnecting both the connections ## disconnect test_con2; +connection default; + +DROP USER tt@localhost; +SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test index 74cc97538aa..52e872c2b38 100644 --- a/mysql-test/t/query_cache.test +++ b/mysql-test/t/query_cache.test @@ -801,9 +801,10 @@ create procedure `p1`() begin select a, f1() from t1; end// +SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; SET GLOBAL log_bin_trust_function_creators = 1; call p1()// -SET GLOBAL log_bin_trust_function_creators = 0; +SET GLOBAL log_bin_trust_function_creators = @old_log_bin_trust_function_creators; drop procedure p1// drop function f1// diff --git a/mysql-test/t/query_cache_notembedded.test b/mysql-test/t/query_cache_notembedded.test index 929b93e10d5..ecb7bfc100e 100644 --- a/mysql-test/t/query_cache_notembedded.test +++ b/mysql-test/t/query_cache_notembedded.test @@ -183,6 +183,8 @@ drop table t1; # # bug#14767: INSERT in SF + concurrent SELECT with query cache # +connection default; +SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; SET GLOBAL log_bin_trust_function_creators = 1; reset query cache; @@ -224,7 +226,7 @@ disconnect con2; connection default; set GLOBAL query_cache_size=0; -SET GLOBAL log_bin_trust_function_creators = 0; +SET @@global.log_bin_trust_function_creators = @old_log_bin_trust_function_creators; # # Bug #30269 Query cache eats memory diff --git a/mysql-test/t/rpl_init_slave_func.test b/mysql-test/t/rpl_init_slave_func.test index b3d647f4394..f080a2b6814 100644 --- a/mysql-test/t/rpl_init_slave_func.test +++ b/mysql-test/t/rpl_init_slave_func.test @@ -73,8 +73,7 @@ sync_with_master; SET @@global.init_slave = "SET @a=5"; -stop slave; ---wait_for_slave_to_stop +source include/stop_slave.inc; reset slave; # Clean up old test tables --disable_warnings diff --git a/mysql-test/t/timezone2.test b/mysql-test/t/timezone2.test index 4f70539ca8d..15ddceb8d68 100644 --- a/mysql-test/t/timezone2.test +++ b/mysql-test/t/timezone2.test @@ -228,6 +228,7 @@ drop table t1; # Test for bug #11081 "Using a CONVERT_TZ function in a stored function # or trigger fails". # +SET @old_log_bin_trust_function_creators = @@global.log_bin_trust_function_creators; SET GLOBAL log_bin_trust_function_creators = 1; create table t1 (ldt datetime, udt datetime); @@ -243,7 +244,7 @@ select ldt, f1(udt) as ldt2 from t1; drop table t1; drop function f1; -SET GLOBAL log_bin_trust_function_creators = 0; +SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; # End of 5.0 tests From a49577cc2f1fd604d346f27c8897466f8b440502 Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Thu, 10 Jul 2008 19:25:04 +0200 Subject: [PATCH 227/705] test case rpl.rpl000018 does not exist but has option files. removing the option files --- mysql-test/suite/rpl/t/rpl000018-master.opt | 1 - mysql-test/suite/rpl/t/rpl000018-slave.opt | 1 - 2 files changed, 2 deletions(-) delete mode 100644 mysql-test/suite/rpl/t/rpl000018-master.opt delete mode 100644 mysql-test/suite/rpl/t/rpl000018-slave.opt diff --git a/mysql-test/suite/rpl/t/rpl000018-master.opt b/mysql-test/suite/rpl/t/rpl000018-master.opt deleted file mode 100644 index ad2c6a647b5..00000000000 --- a/mysql-test/suite/rpl/t/rpl000018-master.opt +++ /dev/null @@ -1 +0,0 @@ --O max_binlog_size=4096 diff --git a/mysql-test/suite/rpl/t/rpl000018-slave.opt b/mysql-test/suite/rpl/t/rpl000018-slave.opt deleted file mode 100644 index e854f0d0bb2..00000000000 --- a/mysql-test/suite/rpl/t/rpl000018-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---skip-slave-start --abort-slave-event-count=1 From af598eccdc8f6343a371b710aca35b0082361599 Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Mon, 14 Jul 2008 11:41:23 +0200 Subject: [PATCH 228/705] BUG#37975: wait_for_slave_* should increase the timeout Post-push fixes: I forgot to include the new files start_slave.inc and stop_slave.inc in the previuos push. --- mysql-test/include/start_slave.inc | 21 +++++++++++++++++++++ mysql-test/include/stop_slave.inc | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 mysql-test/include/start_slave.inc create mode 100644 mysql-test/include/stop_slave.inc diff --git a/mysql-test/include/start_slave.inc b/mysql-test/include/start_slave.inc new file mode 100644 index 00000000000..0a78c5d8026 --- /dev/null +++ b/mysql-test/include/start_slave.inc @@ -0,0 +1,21 @@ +# ==== Purpose ==== +# +# Issues START SLAVE on the current connection. Then waits until both +# the IO and SQL threads have started, or until a timeout is reached. +# +# Please use this instead of 'START SLAVE', to reduce the risk of test +# case bugs. +# +# ==== Usage ==== +# +# source include/wait_for_slave_to_start.inc; +# +# Parameters to this macro are $slave_timeout and +# $slave_keep_connection. See wait_for_slave_param.inc for +# descriptions. + +--disable_query_log +START SLAVE; +--enable_query_log +--echo include/start_slave.inc +source include/wait_for_slave_to_start.inc; diff --git a/mysql-test/include/stop_slave.inc b/mysql-test/include/stop_slave.inc new file mode 100644 index 00000000000..e9c56034fb3 --- /dev/null +++ b/mysql-test/include/stop_slave.inc @@ -0,0 +1,21 @@ +# ==== Purpose ==== +# +# Issues STOP SLAVE on the current connection. Then waits until both +# the IO and SQL threads have stopped, or until a timeout is reached. +# +# Please use this instead of 'STOP SLAVE', to reduce the risk of test +# case bugs. +# +# ==== Usage ==== +# +# source include/wait_for_slave_to_start.inc; +# +# Parameters to this macro are $slave_timeout and +# $slave_keep_connection. See wait_for_slave_param.inc for +# descriptions. + +--disable_query_log +STOP SLAVE; +--enable_query_log +--echo include/stop_slave.inc +source include/wait_for_slave_to_stop.inc; From 361458c6430dc5d4e59c976014b048dbad62a2fc Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Mon, 14 Jul 2008 16:06:03 +0200 Subject: [PATCH 229/705] BUG#37975: wait_for_slave_* should increase the timeout Post-push fixes: forgot to commit an updated result file. --- mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result index a840f059439..8b480df8d0c 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result @@ -4,7 +4,7 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -stop slave; +include/stop_slave.inc reset master; reset slave; reset master; @@ -117,11 +117,7 @@ Aberdeen Abernathy aberrant aberration -start slave; - -let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ; - ---source include/wait_slave_status.inc +include/start_slave.inc select * from t1 order by 1 asc; word Aarhus @@ -194,7 +190,8 @@ Abernathy aberrant aberration flush logs; -stop slave; +include/stop_slave.inc +include/start_slave.inc create table t2 (n int)ENGINE=NDB; insert into t2 values (1); show binlog events from ; @@ -230,7 +227,6 @@ show binary logs; Log_name File_size master-bin.000001 1760 master-bin.000002 623 -start slave; show binary logs; Log_name File_size slave-bin.000001 1855 From 679c7aca59265540128cdf93eac7e96acbd375cd Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Tue, 15 Jul 2008 12:01:54 +0200 Subject: [PATCH 230/705] BUG#37733: rpl.rpl_flushlog_loop 'row' fails sporadically on pushbuild Post-push fix. The previous patch did 'reset master' at the wrong place. --- mysql-test/include/master-slave-reset.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/include/master-slave-reset.inc b/mysql-test/include/master-slave-reset.inc index 57fcc8f00cc..938eb2c074a 100644 --- a/mysql-test/include/master-slave-reset.inc +++ b/mysql-test/include/master-slave-reset.inc @@ -24,13 +24,13 @@ reset master; reset slave; --enable_query_log connection slave; ---disable_query_log -reset master; ---enable_query_log reset slave; # Clean up old test tables --disable_warnings drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; --enable_warnings +--disable_query_log +reset master; +--enable_query_log start slave; source include/wait_for_slave_to_start.inc; From 17d8bd786bb6719513295720903ca8603e0aea80 Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Tue, 15 Jul 2008 18:05:39 +0200 Subject: [PATCH 231/705] BUG#38127: main.mysqlbinlog_base64 fails sporadically on pushbuild This is not a fix to the bug. I'm just pushing a change to the test case that will produce debug info when the test fails next time. --- mysql-test/t/mysqlbinlog_base64.test | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mysql-test/t/mysqlbinlog_base64.test b/mysql-test/t/mysqlbinlog_base64.test index 71def6a733a..2d8a111d2ea 100644 --- a/mysql-test/t/mysqlbinlog_base64.test +++ b/mysql-test/t/mysqlbinlog_base64.test @@ -32,6 +32,21 @@ drop table t2; select * from t1; select * from t2; +# DEBUG CODE ADDED BY SVEN. BUG#38127 +let $count_t1= `SELECT COUNT(*) FROM t1`; +let $count_t2= `SELECT COUNT(*) FROM t2`; +if (`SELECT $count_t1 != 3 OR $count_t2 != 70`) +{ + --echo Test case bug! See BUG#38127. Printing debug info. + --cat_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql + SHOW MASTER STATUS; + SHOW BINLOG EVENTS; + --exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001 + SHOW TABLES; + exit; +} +# END DEBUG CODE + # # Verify that events larger than the default IO_CACHE buffer # are handled correctly (BUG#25628). From ed8a08ba0cde153deb4626eb7ec0e9e48379abb6 Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Wed, 16 Jul 2008 11:17:10 +0200 Subject: [PATCH 232/705] BUG#37733: rpl.rpl_flushlog_loop 'row' fails sporadically on pushbuild Post-post-push fix. The result file for rpl_rbr_to_sbr needs to be updated. While I was there, made rpl_rbr_to_sbr clean up after itself by reverting @@binlog_format to the value it had before the test started. --- mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result | 3 ++- mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result b/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result index 8f145b94046..0551240eb8a 100644 --- a/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result +++ b/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result @@ -4,6 +4,7 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; +SET @old_binlog_format= @@global.binlog_format; SET BINLOG_FORMAT=MIXED; SET GLOBAL BINLOG_FORMAT=MIXED; SELECT @@GLOBAL.BINLOG_FORMAT, @@SESSION.BINLOG_FORMAT; @@ -65,7 +66,6 @@ Last_SQL_Error SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000001 # Query 2 # use `test`; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9 slave-bin.000001 # Query 1 # use `test`; CREATE TABLE t1 (a INT, b LONG) slave-bin.000001 # Query 1 # use `test`; INSERT INTO t1 VALUES (1,1), (2,2) slave-bin.000001 # Query 1 # use `test`; BEGIN @@ -73,3 +73,4 @@ slave-bin.000001 # Table_map 1 # table_id: # (test.t1) slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F slave-bin.000001 # Query 1 # use `test`; COMMIT DROP TABLE IF EXISTS t1; +SET @@global.binlog_format= @old_binlog_format; diff --git a/mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test b/mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test index 72ae6a99c44..8863c9d4ac7 100644 --- a/mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test +++ b/mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test @@ -5,6 +5,8 @@ # Test that the slave temporarily switches to ROW when seeing binrow # events when it is in STATEMENT or MIXED mode +SET @old_binlog_format= @@global.binlog_format; + SET BINLOG_FORMAT=MIXED; SET GLOBAL BINLOG_FORMAT=MIXED; SELECT @@GLOBAL.BINLOG_FORMAT, @@SESSION.BINLOG_FORMAT; @@ -33,6 +35,7 @@ SHOW BINLOG EVENTS; connection master; DROP TABLE IF EXISTS t1; +SET @@global.binlog_format= @old_binlog_format; # Let's compare. Note: If they match test will pass, if they do not match # the test will show that the diff statement failed and not reject file From e14d0f10c254012c445edd077252dd395e527f40 Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Wed, 16 Jul 2008 11:50:11 +0200 Subject: [PATCH 233/705] BUG#38127: main.mysqlbinlog_base64 fails sporadically on pushbuild Problem: mysqlbinlog_base64 fails because the binlog contains traces from previous test cases. Fix: Make have_log_bin reset the master's binlog. --- mysql-test/include/have_log_bin.inc | 10 ++++++++++ mysql-test/t/mysqlbinlog_base64.test | 15 --------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/mysql-test/include/have_log_bin.inc b/mysql-test/include/have_log_bin.inc index 11530dc953e..13d31b70674 100644 --- a/mysql-test/include/have_log_bin.inc +++ b/mysql-test/include/have_log_bin.inc @@ -1,4 +1,14 @@ +# ==== Purpose ==== +# +# Ensure that the server is running with binlogging on and reset the +# binlog. +# +# ==== Usage ==== +# +# source include/have_log_bin.inc; + -- require r/have_log_bin.require disable_query_log; show variables like "log_bin"; +RESET MASTER; enable_query_log; diff --git a/mysql-test/t/mysqlbinlog_base64.test b/mysql-test/t/mysqlbinlog_base64.test index 2d8a111d2ea..71def6a733a 100644 --- a/mysql-test/t/mysqlbinlog_base64.test +++ b/mysql-test/t/mysqlbinlog_base64.test @@ -32,21 +32,6 @@ drop table t2; select * from t1; select * from t2; -# DEBUG CODE ADDED BY SVEN. BUG#38127 -let $count_t1= `SELECT COUNT(*) FROM t1`; -let $count_t2= `SELECT COUNT(*) FROM t2`; -if (`SELECT $count_t1 != 3 OR $count_t2 != 70`) -{ - --echo Test case bug! See BUG#38127. Printing debug info. - --cat_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql - SHOW MASTER STATUS; - SHOW BINLOG EVENTS; - --exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001 - SHOW TABLES; - exit; -} -# END DEBUG CODE - # # Verify that events larger than the default IO_CACHE buffer # are handled correctly (BUG#25628). From 818802a6ea3bf390ba27c5555c820eaf59c0a5b7 Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Tue, 22 Jul 2008 20:55:20 +0200 Subject: [PATCH 234/705] BUG#37834: mtr --max-test-fail=0 does not set max number of failed tests to unlimited Problem: mtr --max-test-fail=0 should allow unlimited number of errors, but stops after the second error. Fix: It's just a typo in mysql-test-run.pl --- mysql-test/mysql-test-run.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index b10a038d15a..c83de254270 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -451,7 +451,7 @@ sub run_test_server { push(@$completed, $result); return $completed; } - elsif ($num_failed_test > 0 and + elsif ($opt_max_test_fail > 0 and $num_failed_test >= $opt_max_test_fail) { $suite_timeout_proc->kill(); mtr_report("Too many tests($num_failed_test) failed!", From b6545b30fa356c7861e87bca29f29ae7e2183cbb Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Wed, 23 Jul 2008 13:23:52 +0200 Subject: [PATCH 235/705] BUG#37717: rpl.rpl_stm_until 'stmt' fails sporadically on pushbuild Problem: After START SLAVE, the Slave_IO_Status column of SHOW SLAVE STATUS goes from No to Yes asynchronously. That caused sporadic failures on pushbuild in rpl_stm_until since the test contains SHOW SLAVE STATUS right after START SLAVE. Fix: Wait until Slave_IO_Status becomes Yes after each START SLAVE. --- .../include/wait_for_slave_io_to_start.inc | 19 ++++++++ mysql-test/suite/rpl/r/rpl_stm_until.result | 8 ++++ mysql-test/suite/rpl/t/rpl_stm_until.test | 45 +++++++++++++++---- 3 files changed, 63 insertions(+), 9 deletions(-) create mode 100644 mysql-test/include/wait_for_slave_io_to_start.inc diff --git a/mysql-test/include/wait_for_slave_io_to_start.inc b/mysql-test/include/wait_for_slave_io_to_start.inc new file mode 100644 index 00000000000..3ada2a0e927 --- /dev/null +++ b/mysql-test/include/wait_for_slave_io_to_start.inc @@ -0,0 +1,19 @@ +# ==== Purpose ==== +# +# Waits until the IO thread of the current connection has started and +# connected to the master (i.e., until SHOW SLAVE STATUS returns Yes +# in the Slave_IO_Running field), or until a timeout is reached. +# +# ==== Usage ==== +# +# source include/wait_for_slave_io_to_start.inc; +# +# Parameters to this macro are $slave_timeout and +# $slave_keep_connection. See wait_for_slave_param.inc for +# descriptions. + +let $slave_param= Slave_IO_Running; +let $slave_param_value= Yes; +let $slave_error_message= Failed while waiting for slave IO thread to start; +source include/wait_for_slave_param.inc; +let $slave_error_message= ; diff --git a/mysql-test/suite/rpl/r/rpl_stm_until.result b/mysql-test/suite/rpl/r/rpl_stm_until.result index c488b4d7b13..55074f0be0d 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_until.result +++ b/mysql-test/suite/rpl/r/rpl_stm_until.result @@ -4,7 +4,10 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; +[on slave] include/stop_slave.inc +==== Create some events on master ==== +[on master] create table t1(n int not null auto_increment primary key); insert into t1 values (1),(2),(3),(4); drop table t1; @@ -12,6 +15,8 @@ create table t2(n int not null auto_increment primary key); insert into t2 values (1),(2); insert into t2 values (3),(4); drop table t2; +==== Replicate one event at a time on slave ==== +[on slave] start slave until master_log_file='master-bin.000001', master_log_pos=323; select * from t1; n @@ -149,6 +154,8 @@ Last_IO_Error # Last_SQL_Errno 0 Last_SQL_Error start slave; +[on master] +[on slave] include/stop_slave.inc start slave until master_log_file='master-bin.000001', master_log_pos=776; SHOW SLAVE STATUS; @@ -190,6 +197,7 @@ Last_IO_Errno # Last_IO_Error # Last_SQL_Errno 0 Last_SQL_Error +==== Test various error conditions ==== start slave until master_log_file='master-bin', master_log_pos=561; ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL start slave until master_log_file='master-bin.000001', master_log_pos=561, relay_log_pos=12; diff --git a/mysql-test/suite/rpl/t/rpl_stm_until.test b/mysql-test/suite/rpl/t/rpl_stm_until.test index bc0b647bc73..07a3b27763d 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_until.test +++ b/mysql-test/suite/rpl/t/rpl_stm_until.test @@ -1,18 +1,37 @@ +# ==== Purpose ==== +# +# Verify that START SLAVE UNTIL replicates until the given binlog +# position but not longer. Verify that START SLAVE UNTIL with various +# incorrect arguments gives an error. +# +# ==== Method ==== +# +# On master, create a table and insert some rows. On slave, START +# SLAVE UNTIL so that it reads one event at a time, and check the +# table and the slave status each time. +# +# Then, on slave, run START SLAVE UNTIL with incorrect arguments and +# verify that it gives an error. +# +# ==== Related bugs ==== +# +# Bug in this test: BUG#37717: rpl.rpl_stm_until 'stmt' fails sporadically on pushbuild + -- source include/have_binlog_format_mixed_or_statement.inc -- source include/master-slave.inc # Test is dependent on binlog positions -# prepare version for substitutions -let $VERSION=`select version()`; - -# stop slave before he will start replication also sync with master -# for avoiding undetermenistic behaviour +# Stop slave before it starts replication. Also sync with master +# to avoid nondeterministic behaviour. +--echo [on slave] sync_slave_with_master; --source include/stop_slave.inc +--echo ==== Create some events on master ==== + +--echo [on master] connection master; -# create some events on master create table t1(n int not null auto_increment primary key); insert into t1 values (1),(2),(3),(4); drop table t1; @@ -21,9 +40,13 @@ insert into t2 values (1),(2); insert into t2 values (3),(4); drop table t2; +--echo ==== Replicate one event at a time on slave ==== + # try to replicate all queries until drop of t1 +--echo [on slave] connection slave; start slave until master_log_file='master-bin.000001', master_log_pos=323; +--source include/wait_for_slave_io_to_start.inc --source include/wait_for_slave_sql_to_stop.inc # here table should be still not deleted select * from t1; @@ -31,6 +54,7 @@ source include/show_slave_status2.inc; # this should fail right after start start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291; +--source include/wait_for_slave_io_to_start.inc --source include/wait_for_slave_sql_to_stop.inc # again this table should be still not deleted select * from t1; @@ -38,24 +62,28 @@ source include/show_slave_status2.inc; # try replicate all up to and not including the second insert to t2; start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=746; +--source include/wait_for_slave_io_to_start.inc --source include/wait_for_slave_sql_to_stop.inc select * from t2; source include/show_slave_status2.inc; # clean up start slave; +--echo [on master] connection master; +--echo [on slave] sync_slave_with_master; --source include/stop_slave.inc # this should stop immediately as we are already there start slave until master_log_file='master-bin.000001', master_log_pos=776; +--source include/wait_for_slave_io_to_start.inc --source include/wait_for_slave_sql_to_stop.inc -# here the sql slave thread should be stopped --replace_result bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004 source include/show_slave_status2.inc; -#testing various error conditions +--echo ==== Test various error conditions ==== + --error 1277 start slave until master_log_file='master-bin', master_log_pos=561; --error 1277 @@ -70,4 +98,3 @@ start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=561; start slave sql_thread; start slave until master_log_file='master-bin.000001', master_log_pos=776; -# End of 4.1 tests From 5c11b98b6ee105acc10bde5d69431554380ec5d4 Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Thu, 24 Jul 2008 16:44:41 +0200 Subject: [PATCH 236/705] Add doxygen files to .bzrignore --- .bzrignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.bzrignore b/.bzrignore index 350827bc864..573c803f6f8 100644 --- a/.bzrignore +++ b/.bzrignore @@ -2095,10 +2095,13 @@ sql/.libs/udf_example.lai sql/.libs/udf_example.so.0 sql/.libs/udf_example.so.0.0.0 sql/client.c +sql/Doxyfile sql/f.c sql/gen_lex_hash sql/gmon.out sql/handlerton.cc +sql/html +sql/latex sql/lex_hash.h sql/link_sources sql/max/* From ee3b5acc6200150d2da0f8ccfffcb8ea0c3f4e18 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Thu, 24 Jul 2008 22:20:35 +0200 Subject: [PATCH 237/705] Check that the default-storage-engine used by test is a supported engine --- mysql-test/lib/mtr_cases.pm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 8c061dbc691..ad0c82e8a74 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -536,6 +536,26 @@ sub optimize_cases { } } } + + + # ======================================================= + # Check that engine selected by + # --default-storage-engine= is supported + # ======================================================= + foreach my $opt ( @{$tinfo->{master_opt}} ) { + my $default_engine= + mtr_match_prefix($opt, "--default-storage-engine="); + + if (defined $default_engine){ + if ( ! exists $::mysqld_variables{$default_engine} ) + { + $tinfo->{'skip'}= 1; + $tinfo->{'comment'}= + "'$default_engine' not supported"; + + } + } + } } } From ac1aa0cd706001b3484922d89a383b55ff7fe5cb Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Thu, 24 Jul 2008 22:21:19 +0200 Subject: [PATCH 238/705] Add all server arguments to mysqltest_embedded when running check_warnings --- mysql-test/mysql-test-run.pl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index c83de254270..be68fef2b5d 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3019,6 +3019,23 @@ sub start_check_warnings ($$) { mtr_add_arg($args, "--skip-safemalloc"); mtr_add_arg($args, "--test-file=%s", "include/check-warnings.test"); + if ( $opt_embedded_server ) + { + + # Get the args needed for the embedded server + # and append them to args prefixed + # with --sever-arg= + + my $mysqld= $config->group('embedded') + or mtr_error("Could not get [embedded] section"); + + my $mysqld_args; + mtr_init_args(\$mysqld_args); + my $extra_opts= get_extra_opts($mysqld, $tinfo); + mysqld_arguments($mysqld_args, $mysqld, $extra_opts); + mtr_add_arg($args, "--server-arg=%s", $_) for @$mysqld_args; + } + my $errfile= "$opt_vardir/tmp/$name.err"; my $proc= My::SafeProcess->new ( From 05386f9033bbdca19606567ba0f0786b4e63a1c3 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Thu, 24 Jul 2008 22:22:47 +0200 Subject: [PATCH 239/705] Remove debug printout --- mysql-test/lib/My/SysInfo.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/mysql-test/lib/My/SysInfo.pm b/mysql-test/lib/My/SysInfo.pm index 87f768f4866..88a6d3dc4b9 100644 --- a/mysql-test/lib/My/SysInfo.pm +++ b/mysql-test/lib/My/SysInfo.pm @@ -25,7 +25,6 @@ use constant DEFAULT_BOGO_MIPS => 2000; sub _cpuinfo { my ($self)= @_; - print "_cpuinfo\n"; my $info_file= "/proc/cpuinfo"; if ( !( -e $info_file and -f $info_file) ) { From c1430dc8b0d312952725174a5e307d422e37c1c9 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Thu, 24 Jul 2008 22:58:18 +0200 Subject: [PATCH 240/705] BUG#37832 Parallel-running mtr --help prints usage many times --- mysql-test/mysql-test-run.pl | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index be68fef2b5d..e7589562e87 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -215,7 +215,7 @@ sub main { mtr_report("Logging: $0 ", join(" ", @ARGV)); Getopt::Long::Configure("pass_through"); - GetOptions('parallel=i' => \$opt_parallel) or usage("Can't read options"); + GetOptions('parallel=i' => \$opt_parallel) or usage(0, "Can't read options"); if ( not defined $opt_parallel ) { # Try to find a suitable value for number of workers @@ -662,7 +662,7 @@ sub run_worker ($) { sub ignore_option { my ($opt, $value)= @_; - print "Ignoring option '$opt'\n"; + mtr_report("Ignoring option '$opt'"); } sub command_line_setup { @@ -671,6 +671,9 @@ sub command_line_setup { my $opt_comment; my $opt_usage; + # Default verbosity, server ON and workers OFF + report_option('verbose', $thread_num ? undef : 0); + # Read the command line options # Note: Keep list, and the order, in sync with usage at end of this file Getopt::Long::Configure("pass_through"); @@ -791,19 +794,15 @@ sub command_line_setup { 'timediff' => \&report_option, 'help|h' => \$opt_usage, - ) or usage("Can't read options"); + ) or usage($thread_num, "Can't read options"); - usage("") if $opt_usage; + usage($thread_num, "") if $opt_usage; # -------------------------------------------------------------------------- # Setup verbosity # -------------------------------------------------------------------------- - if ($thread_num == 0){ - # The server should by default have verbose on - report_option('verbose', $opt_verbose ? $opt_verbose : 0); - } else { - # Worker should by default have verbose off - report_option('verbose', $opt_verbose ? $opt_verbose : undef); + if ($opt_verbose != 0){ + report_option('verbose', $opt_verbose); } # -------------------------------------------------------------------------- @@ -900,7 +899,7 @@ sub command_line_setup { } elsif ( $arg =~ /^-/ ) { - usage("Invalid option \"$arg\""); + usage($thread_num, "Invalid option \"$arg\""); } else { @@ -4321,7 +4320,10 @@ sub valgrind_arguments { # Usage # sub usage ($) { - my $message= shift; + my ($thread_num, $message)= @_; + + # Only main thread should print usage + return if $thread_num != 0; if ( $message ) { From f763a96d2b912fe818098ae8b1a5d6092854b82b Mon Sep 17 00:00:00 2001 From: Serge Kozlov Date: Fri, 25 Jul 2008 21:23:50 +0400 Subject: [PATCH 241/705] Bug#37732 --- mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result | 2 +- mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result b/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result index ba4e22232a0..c3ccc76d1bc 100644 --- a/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result +++ b/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result @@ -115,7 +115,7 @@ SELECT 'Master D',a,b FROM t1 WHERE c = 2 ORDER BY a,b; Master D a b Master D 8 D -* Reconfigure replication to schema A->B->C->A * +* Reconfigure replication to schema A->B->D->A * STOP SLAVE; STOP SLAVE; CHANGE MASTER TO master_host='127.0.0.1',master_port=MASTER_B_PORT,master_user='root',master_log_file='LOG_FILE',master_log_pos=LOG_POS; diff --git a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test index 4628c0e97f7..3d90a33ac8b 100644 --- a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test +++ b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test @@ -91,7 +91,7 @@ SELECT 'Master C',a,b FROM t1 WHERE c = 2 ORDER BY a,b; SELECT 'Master D',a,b FROM t1 WHERE c = 2 ORDER BY a,b; --echo ---echo * Reconfigure replication to schema A->B->C->A * +--echo * Reconfigure replication to schema A->B->D->A * # Exclude Master C --connection master_c STOP SLAVE; @@ -106,6 +106,7 @@ source include/start_slave.inc; disconnect slave; --connection master_b --sync_slave_with_master master_d +--sync_slave_with_master master_a --echo --echo * Check data inserted before failure * From b1252a7ccf6af29a26f5c341a6ad6d1baaf965a2 Mon Sep 17 00:00:00 2001 From: He Zhenxing Date: Mon, 28 Jul 2008 15:15:20 +0800 Subject: [PATCH 242/705] Rmove RESET MASTER from have_log_bin.inc because it can cause some test to stall for slave_net_timeout and cause some test case fail --- mysql-test/include/have_log_bin.inc | 4 +--- mysql-test/r/mysqlbinlog_base64.result | 1 + mysql-test/t/mysqlbinlog_base64.test | 5 +++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mysql-test/include/have_log_bin.inc b/mysql-test/include/have_log_bin.inc index 13d31b70674..1c65f9352d8 100644 --- a/mysql-test/include/have_log_bin.inc +++ b/mysql-test/include/have_log_bin.inc @@ -1,7 +1,6 @@ # ==== Purpose ==== # -# Ensure that the server is running with binlogging on and reset the -# binlog. +# Ensure that the server is running with binlogging on # # ==== Usage ==== # @@ -10,5 +9,4 @@ -- require r/have_log_bin.require disable_query_log; show variables like "log_bin"; -RESET MASTER; enable_query_log; diff --git a/mysql-test/r/mysqlbinlog_base64.result b/mysql-test/r/mysqlbinlog_base64.result index 436b165cfa3..c5e1e2f8ca1 100644 --- a/mysql-test/r/mysqlbinlog_base64.result +++ b/mysql-test/r/mysqlbinlog_base64.result @@ -1,3 +1,4 @@ +reset master; create table t1 (a int); insert into t1 values (1); insert into t1 values (2); diff --git a/mysql-test/t/mysqlbinlog_base64.test b/mysql-test/t/mysqlbinlog_base64.test index 71def6a733a..fb21e28fdcb 100644 --- a/mysql-test/t/mysqlbinlog_base64.test +++ b/mysql-test/t/mysqlbinlog_base64.test @@ -1,4 +1,9 @@ -- source include/have_binlog_format_row.inc +# +# Reset master to cleanup binlog +# +reset master; + # # Write different events to binlog # From 4e9f2d2454dbae4d1375a2e9e5a13f439aaae2fe Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Wed, 30 Jul 2008 12:16:30 +0200 Subject: [PATCH 243/705] Always print errno after failed file operation --- client/mysqltest.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/mysqltest.c b/client/mysqltest.c index 544b3a2bd6a..f700ea9479d 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -2266,7 +2266,7 @@ int open_file(const char *name) if (!(cur_file->file = my_fopen(buff, O_RDONLY | FILE_BINARY, MYF(0)))) { cur_file--; - die("Could not open '%s' for reading", buff); + die("Could not open '%s' for reading, errno: %d", buff, errno); } cur_file->file_name= my_strdup(buff, MYF(MY_FAE)); cur_file->lineno=1; @@ -5474,7 +5474,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), DBUG_ASSERT(cur_file == file_stack && cur_file->file == 0); if (!(cur_file->file= my_fopen(buff, O_RDONLY | FILE_BINARY, MYF(0)))) - die("Could not open '%s' for reading: errno = %d", buff, errno); + die("Could not open '%s' for reading, errno: %d", buff, errno); cur_file->file_name= my_strdup(buff, MYF(MY_FAE)); cur_file->lineno= 1; break; @@ -5591,11 +5591,11 @@ void str_to_file2(const char *fname, char *str, int size, my_bool append) flags|= O_TRUNC; if ((fd= my_open(buff, flags, MYF(MY_WME | MY_FFNF))) < 0) - die("Could not open '%s' for writing: errno = %d", buff, errno); + die("Could not open '%s' for writing, errno: %d", buff, errno); if (append && my_seek(fd, 0, SEEK_END, MYF(0)) == MY_FILEPOS_ERROR) - die("Could not find end of file '%s': errno = %d", buff, errno); + die("Could not find end of file '%s', errno: %d", buff, errno); if (my_write(fd, (uchar*)str, size, MYF(MY_WME|MY_FNABP))) - die("write failed"); + die("write failed, errno: %d", errno); my_close(fd, MYF(0)); } From e6ac8830a4deea28e7299b064ebe649bcdeeca1a Mon Sep 17 00:00:00 2001 From: He Zhenxing Date: Thu, 31 Jul 2008 14:24:27 +0800 Subject: [PATCH 244/705] BUG#37051 Replication rules not evaluated correctly The problem of this bug is that we need to get the list of tables to be updated for a multi-table update statement, which requires to open all the tables referenced by the statement and resolve all the fields involved in update in order to figure out the list of tables for update. However if there are replicate filter rules, some tables might not exist on slave and result in a failure before we could examine the filter rules. I think the whole problem can not be solved on slave alone, the master must record and send the information of tables involved for update to slave, so that the slave do not need to open all the tables referenced by the multi-table update statement to figure out which tables are involved for update. So a status variable is added to Query_log event to store the value of table map for update on master. And on slave, it will try to get the value of this variable and use it to examine filter rules without opening any tables on slave, if this values is not available, the old approach is used and thus the bug will still occur for when replicating from old masters. --- .../wait_for_slave_sql_error_and_skip.inc | 23 ++ .../rpl/r/rpl_filter_tables_not_exist.result | 151 +++++++++++++ .../t/rpl_filter_tables_not_exist-slave.opt | 1 + .../rpl/t/rpl_filter_tables_not_exist.test | 205 ++++++++++++++++++ sql/log_event.cc | 52 +++-- sql/log_event.h | 41 +++- sql/sql_class.cc | 2 + sql/sql_class.h | 8 +- sql/sql_parse.cc | 48 +++- sql/sql_update.cc | 2 +- 10 files changed, 503 insertions(+), 30 deletions(-) create mode 100644 mysql-test/include/wait_for_slave_sql_error_and_skip.inc create mode 100644 mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result create mode 100644 mysql-test/suite/rpl/t/rpl_filter_tables_not_exist-slave.opt create mode 100644 mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test diff --git a/mysql-test/include/wait_for_slave_sql_error_and_skip.inc b/mysql-test/include/wait_for_slave_sql_error_and_skip.inc new file mode 100644 index 00000000000..c38277b33ff --- /dev/null +++ b/mysql-test/include/wait_for_slave_sql_error_and_skip.inc @@ -0,0 +1,23 @@ +# ==== Purpose ==== +# +# Wait for slave SQL error, skip the erroneous statement and restart +# slave +# +# ==== Usage ==== +# +# let show_sql_error=0|1; +# source include/wait_for_slave_sql_error_and_skip.inc; + +echo --source include/wait_for_slave_sql_error_and_skip.inc; +connection slave; +source include/wait_for_slave_sql_error.inc; +if ($show_sql_error) +{ + let $error= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1); + echo Last_SQL_Error = $error; +} + +# skip the erroneous statement +set global sql_slave_skip_counter=1; +source include/start_slave.inc; +connection master; diff --git a/mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result b/mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result new file mode 100644 index 00000000000..7eddaabc636 --- /dev/null +++ b/mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result @@ -0,0 +1,151 @@ +stop slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +start slave; +CREATE TABLE t1 (id int, a int); +CREATE TABLE t2 (id int, b int); +CREATE TABLE t3 (id int, c int); +CREATE TABLE t4 (id int, d int); +CREATE TABLE t5 (id int, e int); +CREATE TABLE t6 (id int, f int); +CREATE TABLE t7 (id int, g int); +CREATE TABLE t8 (id int, h int); +CREATE TABLE t9 (id int, i int); +INSERT INTO t1 VALUES (1, 1), (2, 2), (3, 3); +INSERT INTO t2 VALUES (1, 1), (2, 2), (3, 3); +INSERT INTO t3 VALUES (1, 1), (2, 2), (3, 3); +INSERT INTO t4 VALUES (1, 1), (2, 2), (3, 3); +INSERT INTO t5 VALUES (1, 1), (2, 2), (3, 3); +INSERT INTO t6 VALUES (1, 1), (2, 2), (3, 3); +INSERT INTO t7 VALUES (1, 1), (2, 2), (3, 3); +INSERT INTO t8 VALUES (1, 1), (2, 2), (3, 3); +INSERT INTO t9 VALUES (1, 1), (2, 2), (3, 3); +[on slave] +SHOW TABLES LIKE 't%'; +Tables_in_test (t%) +t1 +t2 +t3 +[on master] +UPDATE t7 LEFT JOIN t4 ON (t4.id=t7.id) SET d=0, g=0 where t7.id=1; +UPDATE t7 LEFT JOIN (t4, t5, t6) ON (t7.id=t4.id and t7.id=t5.id and t7.id=t6.id) SET d=0, e=0, f=0, g=0 where t7.id=1; +UPDATE t4 LEFT JOIN (t7, t8, t9) ON (t4.id=t7.id and t4.id=t8.id and t4.id=t9.id) SET d=0, g=0, h=0, i=0 where t4.id=1; +UPDATE t7 LEFT JOIN (t8, t9) ON (t7.id=t8.id and t7.id=t9.id) SET g=0, h=0, i=0 where t7.id=1; +UPDATE t1 LEFT JOIN t4 ON (t1.id=t4.id) SET d=0 where t1.id=1; +UPDATE t1 LEFT JOIN t7 ON (t1.id=t7.id) SET g=0 where t1.id=1; +UPDATE t1 LEFT JOIN (t4, t5, t6) ON (t1.id=t4.id and t1.id=t5.id and t1.id=t6.id) SET d=0, e=0, f=0 where t1.id=1; +UPDATE t1 LEFT JOIN (t4, t5, t8) ON (t1.id=t4.id and t1.id=t5.id and t1.id=t8.id) SET d=0, e=0, h=0 where t1.id=1; +UPDATE t1 LEFT JOIN (t7, t8, t5) ON (t1.id=t7.id and t1.id=t8.id and t1.id=t5.id) SET g=0, h=0, e=0 where t1.id=1; +UPDATE t1 LEFT JOIN (t2, t3, t5) ON (t1.id=t2.id and t1.id=t3.id and t1.id=t5.id) SET e=0 where t1.id=1; +UPDATE t4 LEFT JOIN t1 ON (t1.id=t4.id) SET a=0, d=0 where t4.id=1; +UPDATE t4 LEFT JOIN (t1, t7) ON (t4.id=t1.id and t7.id=t4.id) SET a = 0, d=0, g=0 where t4.id=1; +UPDATE t4 LEFT JOIN (t1, t2, t3) ON (t1.id=t4.id and t2.id=t4.id and t3.id=t4.id) SET a=0, b=0, c=0, d=0 where t4.id=1; +UPDATE t4 LEFT JOIN (t1, t2, t5) ON (t1.id=t4.id and t2.id=t4.id and t5.id=t4.id) SET a=0, b=0, e=0, d=0 where t4.id=1; +UPDATE t4 LEFT JOIN (t1, t6, t7) ON (t4.id=t1.id and t4.id=t6.id and t4.id=t7.id) SET a=0, d=0, f=0, g=0 where t4.id=1; +UPDATE t7 LEFT JOIN (t4, t1, t2) ON (t7.id=t4.id and t7.id=t1.id and t7.id=t2.id) SET a=0, b=0, d=0, g=0 where t7.id=1; +UPDATE t7 LEFT JOIN (t8, t4, t1) ON (t7.id=t8.id and t7.id=t4.id and t7.id=t1.id) SET a=0, d=0, g=0, h=0 where t7.id=1; +UPDATE t1 LEFT JOIN t4 ON (t1.id=t4.id) SET a=0 where t1.id=1; +--source include/wait_for_slave_sql_error_and_skip.inc +Last_SQL_Error = Error 'Table 'test.t4' doesn't exist' on query. Default database: 'test'. Query: 'UPDATE t1 LEFT JOIN t4 ON (t1.id=t4.id) SET a=0 where t1.id=1' +set global sql_slave_skip_counter=1; +include/start_slave.inc +UPDATE t1 LEFT JOIN (t4, t7) ON (t1.id=t4.id and t1.id=t7.id) SET a=0 where t1.id=1; +--source include/wait_for_slave_sql_error_and_skip.inc +Last_SQL_Error = Error 'Table 'test.t4' doesn't exist' on query. Default database: 'test'. Query: 'UPDATE t1 LEFT JOIN (t4, t7) ON (t1.id=t4.id and t1.id=t7.id) SET a=0 where t1.id=1' +set global sql_slave_skip_counter=1; +include/start_slave.inc +UPDATE t1 LEFT JOIN (t2, t4, t7) ON (t1.id=t2.id and t1.id=t4.id and t1.id=t7.id) SET a=0, b=0 where t1.id=1; +--source include/wait_for_slave_sql_error_and_skip.inc +Last_SQL_Error = Error 'Table 'test.t4' doesn't exist' on query. Default database: 'test'. Query: 'UPDATE t1 LEFT JOIN (t2, t4, t7) ON (t1.id=t2.id and t1.id=t4.id and t1.id=t7.id) SET a=0, b=0 where t1.id=1' +set global sql_slave_skip_counter=1; +include/start_slave.inc +UPDATE t1 LEFT JOIN (t2, t3, t7) ON (t1.id=t2.id and t1.id=t3.id and t1.id=t7.id) SET a=0, b=0, c=0 where t1.id=1; +--source include/wait_for_slave_sql_error_and_skip.inc +Last_SQL_Error = Error 'Table 'test.t7' doesn't exist' on query. Default database: 'test'. Query: 'UPDATE t1 LEFT JOIN (t2, t3, t7) ON (t1.id=t2.id and t1.id=t3.id and t1.id=t7.id) SET a=0, b=0, c=0 where t1.id=1' +set global sql_slave_skip_counter=1; +include/start_slave.inc +UPDATE t1 LEFT JOIN t7 ON (t1.id=t7.id) SET a=0, g=0 where t1.id=1; +--source include/wait_for_slave_sql_error_and_skip.inc +Last_SQL_Error = Error 'Table 'test.t7' doesn't exist' on query. Default database: 'test'. Query: 'UPDATE t1 LEFT JOIN t7 ON (t1.id=t7.id) SET a=0, g=0 where t1.id=1' +set global sql_slave_skip_counter=1; +include/start_slave.inc +UPDATE t7 LEFT JOIN t1 ON (t1.id=t7.id) SET a=0, g=0 where t7.id=1; +--source include/wait_for_slave_sql_error_and_skip.inc +Last_SQL_Error = Error 'Table 'test.t7' doesn't exist' on query. Default database: 'test'. Query: 'UPDATE t7 LEFT JOIN t1 ON (t1.id=t7.id) SET a=0, g=0 where t7.id=1' +set global sql_slave_skip_counter=1; +include/start_slave.inc +UPDATE t1 LEFT JOIN (t4, t5, t7) ON (t1.id=t4.id and t1.id=t5.id and t1.id=t7.id) SET a=0, g=0 where t1.id=1; +--source include/wait_for_slave_sql_error_and_skip.inc +Last_SQL_Error = Error 'Table 'test.t4' doesn't exist' on query. Default database: 'test'. Query: 'UPDATE t1 LEFT JOIN (t4, t5, t7) ON (t1.id=t4.id and t1.id=t5.id and t1.id=t7.id) SET a=0, g=0 where t1.id=1' +set global sql_slave_skip_counter=1; +include/start_slave.inc +UPDATE t1 LEFT JOIN (t4, t7, t8) ON (t1.id=t4.id and t1.id=t7.id and t1.id=t8.id) SET a=0, g=0 where t1.id=1; +--source include/wait_for_slave_sql_error_and_skip.inc +Last_SQL_Error = Error 'Table 'test.t4' doesn't exist' on query. Default database: 'test'. Query: 'UPDATE t1 LEFT JOIN (t4, t7, t8) ON (t1.id=t4.id and t1.id=t7.id and t1.id=t8.id) SET a=0, g=0 where t1.id=1' +set global sql_slave_skip_counter=1; +include/start_slave.inc +UPDATE t1 LEFT JOIN (t7, t8, t9) ON (t1.id=t7.id and t1.id=t8.id and t1.id=t9.id) SET a=0, g=0, h=0, i=0 where t1.id=1; +--source include/wait_for_slave_sql_error_and_skip.inc +Last_SQL_Error = Error 'Table 'test.t7' doesn't exist' on query. Default database: 'test'. Query: 'UPDATE t1 LEFT JOIN (t7, t8, t9) ON (t1.id=t7.id and t1.id=t8.id and t1.id=t9.id) SET a=0, g=0, h=0, i=0 where t1.id=1' +set global sql_slave_skip_counter=1; +include/start_slave.inc +UPDATE t7 LEFT JOIN (t1, t2, t3) ON (t7.id=t1.id and t7.id=t2.id and t7.id=t3.id) SET g=0, a=0, b=0, c=0 where t7.id=1; +--source include/wait_for_slave_sql_error_and_skip.inc +Last_SQL_Error = Error 'Table 'test.t7' doesn't exist' on query. Default database: 'test'. Query: 'UPDATE t7 LEFT JOIN (t1, t2, t3) ON (t7.id=t1.id and t7.id=t2.id and t7.id=t3.id) SET g=0, a=0, b=0, c=0 where t7.id=1' +set global sql_slave_skip_counter=1; +include/start_slave.inc +UPDATE t7 LEFT JOIN (t4, t5, t3) ON (t7.id=t4.id and t7.id=t5.id and t7.id=t3.id) SET g=0, c=0 where t7.id=1; +--source include/wait_for_slave_sql_error_and_skip.inc +Last_SQL_Error = Error 'Table 'test.t7' doesn't exist' on query. Default database: 'test'. Query: 'UPDATE t7 LEFT JOIN (t4, t5, t3) ON (t7.id=t4.id and t7.id=t5.id and t7.id=t3.id) SET g=0, c=0 where t7.id=1' +set global sql_slave_skip_counter=1; +include/start_slave.inc +UPDATE t7 LEFT JOIN (t8, t9, t3) ON (t7.id=t8.id and t7.id=t9.id and t7.id=t3.id) SET g=0, h=0, i=0, c=0 where t7.id=1; +--source include/wait_for_slave_sql_error_and_skip.inc +Last_SQL_Error = Error 'Table 'test.t7' doesn't exist' on query. Default database: 'test'. Query: 'UPDATE t7 LEFT JOIN (t8, t9, t3) ON (t7.id=t8.id and t7.id=t9.id and t7.id=t3.id) SET g=0, h=0, i=0, c=0 where t7.id=1' +set global sql_slave_skip_counter=1; +include/start_slave.inc +UPDATE t1 LEFT JOIN t4 ON (t1.id=t4.id) SET a=0, d=0 where t1.id=1; +--source include/wait_for_slave_sql_error_and_skip.inc +Last_SQL_Error = Error 'Table 'test.t4' doesn't exist' on query. Default database: 'test'. Query: 'UPDATE t1 LEFT JOIN t4 ON (t1.id=t4.id) SET a=0, d=0 where t1.id=1' +set global sql_slave_skip_counter=1; +include/start_slave.inc +UPDATE t1 LEFT JOIN (t4, t5, t6) ON (t1.id=t4.id and t1.id=t5.id and t1.id=t6.id) SET a=0, d=0, e=0, f=0 where t1.id=1; +--source include/wait_for_slave_sql_error_and_skip.inc +Last_SQL_Error = Error 'Table 'test.t4' doesn't exist' on query. Default database: 'test'. Query: 'UPDATE t1 LEFT JOIN (t4, t5, t6) ON (t1.id=t4.id and t1.id=t5.id and t1.id=t6.id) SET a=0, d=0, e=0, f=0 where t1.id=1' +set global sql_slave_skip_counter=1; +include/start_slave.inc +UPDATE t4 LEFT JOIN (t1, t5, t6) ON (t4.id=t1.id and t4.id=t5.id and t4.id=t6.id) SET a=0, e=0, f=0 where t4.id=1; +--source include/wait_for_slave_sql_error_and_skip.inc +Last_SQL_Error = Error 'Table 'test.t4' doesn't exist' on query. Default database: 'test'. Query: 'UPDATE t4 LEFT JOIN (t1, t5, t6) ON (t4.id=t1.id and t4.id=t5.id and t4.id=t6.id) SET a=0, e=0, f=0 where t4.id=1' +set global sql_slave_skip_counter=1; +include/start_slave.inc +UPDATE t7 LEFT JOIN (t1, t4, t2) ON (t7.id=t1.id and t7.id=t4.id and t7.id=t2.id) SET a=0, b=0, d=0, g=0 where t7.id=1; +--source include/wait_for_slave_sql_error_and_skip.inc +Last_SQL_Error = Error 'Table 'test.t7' doesn't exist' on query. Default database: 'test'. Query: 'UPDATE t7 LEFT JOIN (t1, t4, t2) ON (t7.id=t1.id and t7.id=t4.id and t7.id=t2.id) SET a=0, b=0, d=0, g=0 where t7.id=1' +set global sql_slave_skip_counter=1; +include/start_slave.inc +[on slave] +show tables like 't%'; +Tables_in_test (t%) +t1 +t2 +t3 +SELECT * FROM t1; +id a +1 1 +2 2 +3 3 +SELECT * FROM t2; +id b +1 1 +2 2 +3 3 +SELECT * FROM t3; +id c +1 1 +2 2 +3 3 +[on master] +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; diff --git a/mysql-test/suite/rpl/t/rpl_filter_tables_not_exist-slave.opt b/mysql-test/suite/rpl/t/rpl_filter_tables_not_exist-slave.opt new file mode 100644 index 00000000000..42acd3ea33d --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_filter_tables_not_exist-slave.opt @@ -0,0 +1 @@ +--replicate-do-table=test.t1 --replicate-do-table=test.t2 --replicate-do-table=test.t3 --replicate-ignore-table=test.t4 --replicate-ignore-table=test.t5 --replicate-ignore-table=test.t6 diff --git a/mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test b/mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test new file mode 100644 index 00000000000..274599857be --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test @@ -0,0 +1,205 @@ +# Test evaluation of replication table filter rules +# +# ==== Purpose ==== +# +# Test if replication table filter rules are properly evaluated when +# some of the tables referenced by the multiple-table update do not +# exist on slave. +# +# ==== Method ==== +# +# Master creates tables t1, t2, t3, t4, t5, t6, t7, t8, t9 and the +# slave is started with the following replication table filter rules: +# +# --replicate-do-table=t1 +# --replicate-do-table=t2 +# --replicate-do-table=t3 +# +# and +# +# --replicate-ignore-table=t4 +# --replicate-ignore-table=t5 +# --replicate-ignore-table=t6 +# +# So the slave only replicate changes to tables t1, t2 and t3 and only +# these tables exist on slave. +# +# From now on, tables t1, t2, and t3 are referenced as do tables, +# tables t4, t5, t6 are referenced as ignore tables, and tables t7, +# t8, t9 are referenced as other tables. +# +# All multi-table update tests reference tables that are not do +# tables, which do not exist on slave. And the following situations +# of multi-table update will be tested: +# +# 1. Do tables are not referenced at all +# 2. Do tables are not referenced for update +# 3. Ignore tables are referenced for update before do tables +# 4. Only do tables are referenced for update +# 5. Do tables and other tables are referenced for update +# 6. Do tables are referenced for update before ignore tables +# +# For 1, 2 and 3, the statement should be ignored by slave, for 4, 5 +# and 6 the statement should be accepted by slave and cause an error +# because of non-exist tables. +# +# ==== Related bugs ==== +# +# BUG#37051 Replication rules not evaluated correctly + + +source include/have_binlog_format_statement.inc; +source include/master-slave.inc; + +# These tables are mentioned in do-table rules +CREATE TABLE t1 (id int, a int); +CREATE TABLE t2 (id int, b int); +CREATE TABLE t3 (id int, c int); + +# These tables are mentioned in ignore-table rules +CREATE TABLE t4 (id int, d int); +CREATE TABLE t5 (id int, e int); +CREATE TABLE t6 (id int, f int); + +# These tables are not mentioned in do-table or ignore-table rules +CREATE TABLE t7 (id int, g int); +CREATE TABLE t8 (id int, h int); +CREATE TABLE t9 (id int, i int); + +INSERT INTO t1 VALUES (1, 1), (2, 2), (3, 3); +INSERT INTO t2 VALUES (1, 1), (2, 2), (3, 3); +INSERT INTO t3 VALUES (1, 1), (2, 2), (3, 3); + +INSERT INTO t4 VALUES (1, 1), (2, 2), (3, 3); +INSERT INTO t5 VALUES (1, 1), (2, 2), (3, 3); +INSERT INTO t6 VALUES (1, 1), (2, 2), (3, 3); + +INSERT INTO t7 VALUES (1, 1), (2, 2), (3, 3); +INSERT INTO t8 VALUES (1, 1), (2, 2), (3, 3); +INSERT INTO t9 VALUES (1, 1), (2, 2), (3, 3); + +# Only t1, t2, t3 should be replicated to slave +sync_slave_with_master; +echo [on slave]; +SHOW TABLES LIKE 't%'; + +connection master; +echo [on master]; + +# +# Do tables are not referenced, these statements should be ignored by +# slave. +# +UPDATE t7 LEFT JOIN t4 ON (t4.id=t7.id) SET d=0, g=0 where t7.id=1; +UPDATE t7 LEFT JOIN (t4, t5, t6) ON (t7.id=t4.id and t7.id=t5.id and t7.id=t6.id) SET d=0, e=0, f=0, g=0 where t7.id=1; +UPDATE t4 LEFT JOIN (t7, t8, t9) ON (t4.id=t7.id and t4.id=t8.id and t4.id=t9.id) SET d=0, g=0, h=0, i=0 where t4.id=1; +UPDATE t7 LEFT JOIN (t8, t9) ON (t7.id=t8.id and t7.id=t9.id) SET g=0, h=0, i=0 where t7.id=1; + +# +# Do tables are not referenced for update, these statements should be +# ignored by slave. +# +UPDATE t1 LEFT JOIN t4 ON (t1.id=t4.id) SET d=0 where t1.id=1; +UPDATE t1 LEFT JOIN t7 ON (t1.id=t7.id) SET g=0 where t1.id=1; +UPDATE t1 LEFT JOIN (t4, t5, t6) ON (t1.id=t4.id and t1.id=t5.id and t1.id=t6.id) SET d=0, e=0, f=0 where t1.id=1; +UPDATE t1 LEFT JOIN (t4, t5, t8) ON (t1.id=t4.id and t1.id=t5.id and t1.id=t8.id) SET d=0, e=0, h=0 where t1.id=1; +UPDATE t1 LEFT JOIN (t7, t8, t5) ON (t1.id=t7.id and t1.id=t8.id and t1.id=t5.id) SET g=0, h=0, e=0 where t1.id=1; +UPDATE t1 LEFT JOIN (t2, t3, t5) ON (t1.id=t2.id and t1.id=t3.id and t1.id=t5.id) SET e=0 where t1.id=1; + +# +# Ignore tables are referenced for update before do tables, these +# statements should be ignore by slave. +# +UPDATE t4 LEFT JOIN t1 ON (t1.id=t4.id) SET a=0, d=0 where t4.id=1; +UPDATE t4 LEFT JOIN (t1, t7) ON (t4.id=t1.id and t7.id=t4.id) SET a = 0, d=0, g=0 where t4.id=1; +UPDATE t4 LEFT JOIN (t1, t2, t3) ON (t1.id=t4.id and t2.id=t4.id and t3.id=t4.id) SET a=0, b=0, c=0, d=0 where t4.id=1; +UPDATE t4 LEFT JOIN (t1, t2, t5) ON (t1.id=t4.id and t2.id=t4.id and t5.id=t4.id) SET a=0, b=0, e=0, d=0 where t4.id=1; +UPDATE t4 LEFT JOIN (t1, t6, t7) ON (t4.id=t1.id and t4.id=t6.id and t4.id=t7.id) SET a=0, d=0, f=0, g=0 where t4.id=1; +UPDATE t7 LEFT JOIN (t4, t1, t2) ON (t7.id=t4.id and t7.id=t1.id and t7.id=t2.id) SET a=0, b=0, d=0, g=0 where t7.id=1; +UPDATE t7 LEFT JOIN (t8, t4, t1) ON (t7.id=t8.id and t7.id=t4.id and t7.id=t1.id) SET a=0, d=0, g=0, h=0 where t7.id=1; + +# Sync slave to make sure all above statements are correctly ignored, +# if any of the above statement are not ignored, it would cause error +# and stop slave sql thread. +sync_slave_with_master; +connection master; + +# Parameter for include/wait_for_slave_sql_error_and_skip.inc, ask it +# to show SQL error message +let show_sql_error=1; + +# +# Only do tables are referenced for update, these statements should +# cause error on slave +# +UPDATE t1 LEFT JOIN t4 ON (t1.id=t4.id) SET a=0 where t1.id=1; +source include/wait_for_slave_sql_error_and_skip.inc; + +UPDATE t1 LEFT JOIN (t4, t7) ON (t1.id=t4.id and t1.id=t7.id) SET a=0 where t1.id=1; +source include/wait_for_slave_sql_error_and_skip.inc; + +UPDATE t1 LEFT JOIN (t2, t4, t7) ON (t1.id=t2.id and t1.id=t4.id and t1.id=t7.id) SET a=0, b=0 where t1.id=1; +source include/wait_for_slave_sql_error_and_skip.inc; + +UPDATE t1 LEFT JOIN (t2, t3, t7) ON (t1.id=t2.id and t1.id=t3.id and t1.id=t7.id) SET a=0, b=0, c=0 where t1.id=1; +source include/wait_for_slave_sql_error_and_skip.inc; + +# +# Do tables and other tables are referenced for update, these +# statements should cause error on slave +# +UPDATE t1 LEFT JOIN t7 ON (t1.id=t7.id) SET a=0, g=0 where t1.id=1; +source include/wait_for_slave_sql_error_and_skip.inc; + +UPDATE t7 LEFT JOIN t1 ON (t1.id=t7.id) SET a=0, g=0 where t7.id=1; +source include/wait_for_slave_sql_error_and_skip.inc; + +UPDATE t1 LEFT JOIN (t4, t5, t7) ON (t1.id=t4.id and t1.id=t5.id and t1.id=t7.id) SET a=0, g=0 where t1.id=1; +source include/wait_for_slave_sql_error_and_skip.inc; + +UPDATE t1 LEFT JOIN (t4, t7, t8) ON (t1.id=t4.id and t1.id=t7.id and t1.id=t8.id) SET a=0, g=0 where t1.id=1; +source include/wait_for_slave_sql_error_and_skip.inc; + +UPDATE t1 LEFT JOIN (t7, t8, t9) ON (t1.id=t7.id and t1.id=t8.id and t1.id=t9.id) SET a=0, g=0, h=0, i=0 where t1.id=1; +source include/wait_for_slave_sql_error_and_skip.inc; + +UPDATE t7 LEFT JOIN (t1, t2, t3) ON (t7.id=t1.id and t7.id=t2.id and t7.id=t3.id) SET g=0, a=0, b=0, c=0 where t7.id=1; +source include/wait_for_slave_sql_error_and_skip.inc; + +UPDATE t7 LEFT JOIN (t4, t5, t3) ON (t7.id=t4.id and t7.id=t5.id and t7.id=t3.id) SET g=0, c=0 where t7.id=1; +source include/wait_for_slave_sql_error_and_skip.inc; + +UPDATE t7 LEFT JOIN (t8, t9, t3) ON (t7.id=t8.id and t7.id=t9.id and t7.id=t3.id) SET g=0, h=0, i=0, c=0 where t7.id=1; +source include/wait_for_slave_sql_error_and_skip.inc; + +# +# Do tables are referenced for update before ignore tables +# +UPDATE t1 LEFT JOIN t4 ON (t1.id=t4.id) SET a=0, d=0 where t1.id=1; +source include/wait_for_slave_sql_error_and_skip.inc; + +UPDATE t1 LEFT JOIN (t4, t5, t6) ON (t1.id=t4.id and t1.id=t5.id and t1.id=t6.id) SET a=0, d=0, e=0, f=0 where t1.id=1; +source include/wait_for_slave_sql_error_and_skip.inc; + +UPDATE t4 LEFT JOIN (t1, t5, t6) ON (t4.id=t1.id and t4.id=t5.id and t4.id=t6.id) SET a=0, e=0, f=0 where t4.id=1; +source include/wait_for_slave_sql_error_and_skip.inc; + +UPDATE t7 LEFT JOIN (t1, t4, t2) ON (t7.id=t1.id and t7.id=t4.id and t7.id=t2.id) SET a=0, b=0, d=0, g=0 where t7.id=1; +source include/wait_for_slave_sql_error_and_skip.inc; + +sync_slave_with_master; +echo [on slave]; + +# We should only have tables t1, t2, t3 on slave +show tables like 't%'; + +# The rows in these tables should remain untouched +SELECT * FROM t1; +SELECT * FROM t2; +SELECT * FROM t3; + +# Clean up +connection master; +echo [on master]; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +source include/master-slave-end.inc; diff --git a/sql/log_event.cc b/sql/log_event.cc index 3b9c2c28df9..162c570e8e9 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1474,6 +1474,11 @@ void Query_log_event::pack_info(Protocol *protocol) static void write_str_with_code_and_len(char **dst, const char *src, int len, uint code) { + /* + only 1 byte to store the length of catalog, so it should not + surpass 255 + */ + DBUG_ASSERT(len <= 255); DBUG_ASSERT(src); *((*dst)++)= code; *((*dst)++)= (uchar) len; @@ -1493,21 +1498,8 @@ static void write_str_with_code_and_len(char **dst, const char *src, bool Query_log_event::write(IO_CACHE* file) { - /** - @todo if catalog can be of length FN_REFLEN==512, then we are not - replicating it correctly, since the length is stored in a byte - /sven - */ - uchar buf[QUERY_HEADER_LEN+ - 1+4+ // code of flags2 and flags2 - 1+8+ // code of sql_mode and sql_mode - 1+1+FN_REFLEN+ // code of catalog and catalog length and catalog - 1+4+ // code of autoinc and the 2 autoinc variables - 1+6+ // code of charset and charset - 1+1+MAX_TIME_ZONE_NAME_LENGTH+ // code of tz and tz length and tz name - 1+2+ // code of lc_time_names and lc_time_names_number - 1+2 // code of charset_database and charset_database_number - ], *start, *start_of_status; + uchar buf[QUERY_HEADER_LEN + MAX_SIZE_LOG_EVENT_STATUS]; + uchar *start, *start_of_status; ulong event_length; if (!query) @@ -1613,10 +1605,8 @@ bool Query_log_event::write(IO_CACHE* file) { /* In the TZ sys table, column Name is of length 64 so this should be ok */ DBUG_ASSERT(time_zone_len <= MAX_TIME_ZONE_NAME_LENGTH); - *start++= Q_TIME_ZONE_CODE; - *start++= time_zone_len; - memcpy(start, time_zone_str, time_zone_len); - start+= time_zone_len; + write_str_with_code_and_len((char **)(&start), + time_zone_str, time_zone_len, Q_TIME_ZONE_CODE); } if (lc_time_names_number) { @@ -1632,7 +1622,17 @@ bool Query_log_event::write(IO_CACHE* file) int2store(start, charset_database_number); start+= 2; } + if (table_map_for_update) + { + *start++= Q_TABLE_MAP_FOR_UPDATE_CODE; + int8store(start, table_map_for_update); + start+= 8; + } /* + NOTE: When adding new status vars, please don't forget to update + the MAX_SIZE_LOG_EVENT_STATUS in log_event.h and update function + code_name in this file. + Here there could be code like if (command-line-option-which-says-"log_this_variable" && inited) { @@ -1709,7 +1709,8 @@ Query_log_event::Query_log_event(THD* thd_arg, const char* query_arg, auto_increment_increment(thd_arg->variables.auto_increment_increment), auto_increment_offset(thd_arg->variables.auto_increment_offset), lc_time_names_number(thd_arg->variables.lc_time_names->number), - charset_database_number(0) + charset_database_number(0), + table_map_for_update((ulonglong)thd_arg->table_map_for_update) { time_t end_time; @@ -1838,6 +1839,7 @@ code_name(int code) case Q_CATALOG_NZ_CODE: return "Q_CATALOG_NZ_CODE"; case Q_LC_TIME_NAMES_CODE: return "Q_LC_TIME_NAMES_CODE"; case Q_CHARSET_DATABASE_CODE: return "Q_CHARSET_DATABASE_CODE"; + case Q_TABLE_MAP_FOR_UPDATE_CODE: return "Q_TABLE_MAP_FOR_UPDATE_CODE"; } sprintf(buf, "CODE#%d", code); return buf; @@ -1874,7 +1876,8 @@ Query_log_event::Query_log_event(const char* buf, uint event_len, db(NullS), catalog_len(0), status_vars_len(0), flags2_inited(0), sql_mode_inited(0), charset_inited(0), auto_increment_increment(1), auto_increment_offset(1), - time_zone_len(0), lc_time_names_number(0), charset_database_number(0) + time_zone_len(0), lc_time_names_number(0), charset_database_number(0), + table_map_for_update(0) { ulong data_len; uint32 tmp; @@ -2016,6 +2019,11 @@ Query_log_event::Query_log_event(const char* buf, uint event_len, charset_database_number= uint2korr(pos); pos+= 2; break; + case Q_TABLE_MAP_FOR_UPDATE_CODE: + CHECK_SPACE(pos, end, 8); + table_map_for_update= uint8korr(pos); + pos+= 8; + break; default: /* That's why you must write status vars in growing order of code */ DBUG_PRINT("info",("Query_log_event has unknown status vars (first has\ @@ -2425,6 +2433,8 @@ int Query_log_event::do_apply_event(Relay_log_info const *rli, else thd->variables.collation_database= thd->db_charset; + thd->table_map_for_update= (table_map)table_map_for_update; + /* Execute the query (note that we bypass dispatch_command()) */ const char* found_semicolon= NULL; mysql_parse(thd, thd->query, thd->query_length, &found_semicolon); diff --git a/sql/log_event.h b/sql/log_event.h index 76d92b23189..041c41dc71b 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -237,12 +237,15 @@ struct sql_ex_info packet (i.e. a query) sent from client to master; First, an auxiliary log_event status vars estimation: */ -#define MAX_SIZE_LOG_EVENT_STATUS (4 /* flags2 */ + \ - 8 /* sql mode */ + \ - 1 + 1 + 255 /* catalog */ + \ - 4 /* autoinc */ + \ - 6 /* charset */ + \ - MAX_TIME_ZONE_NAME_LENGTH) +#define MAX_SIZE_LOG_EVENT_STATUS (1 + 4 /* type, flags2 */ + \ + 1 + 8 /* type, sql_mode */ + \ + 1 + 1 + 255 /* type, length, catalog */ + \ + 1 + 4 /* type, auto_increment */ + \ + 1 + 6 /* type, charset */ + \ + 1 + 1 + 255 /* type, length, time_zone */ + \ + 1 + 2 /* type, lc_time_names_number */ + \ + 1 + 2 /* type, charset_database_number */ + \ + 1 + 8 /* type, table_map_for_update */) #define MAX_LOG_EVENT_HEADER ( /* in order of Query_log_event::write */ \ LOG_EVENT_HEADER_LEN + /* write_header */ \ QUERY_HEADER_LEN + /* write_data */ \ @@ -306,6 +309,8 @@ struct sql_ex_info #define Q_LC_TIME_NAMES_CODE 7 #define Q_CHARSET_DATABASE_CODE 8 + +#define Q_TABLE_MAP_FOR_UPDATE_CODE 9 /* Intvar event post-header */ #define I_TYPE_OFFSET 0 @@ -1455,6 +1460,22 @@ protected: This field is written if it is not 0. + + table_map_for_update + Q_TABLE_MAP_FOR_UPDATE_CODE == 9 + 8 byte integer + + The value of the table map that is to be updated by the + multi-table update query statement. Every bit of this variable + represents a table, and is set to 1 if the corresponding table is + to be updated by this statement. + + The value of this variable is set when executing a multi-table update + statement and used by slave to apply filter rules without opening + all the tables on slave. This is required because some tables may + not exist on slave because of the filter rules. + + @subsection Query_log_event_notes_on_previous_versions Notes on Previous Versions @@ -1471,6 +1492,9 @@ protected: * See Q_CHARSET_DATABASE_CODE in the table above. + * When adding new status vars, please don't forget to update the + MAX_SIZE_LOG_EVENT_STATUS, and update function code_name + */ class Query_log_event: public Log_event { @@ -1548,6 +1572,11 @@ public: const char *time_zone_str; uint lc_time_names_number; /* 0 means en_US */ uint charset_database_number; + /* + map for tables that will be updated for a multi-table update query + statement, for other query statements, this will be zero. + */ + ulonglong table_map_for_update; #ifndef MYSQL_CLIENT diff --git a/sql/sql_class.cc b/sql/sql_class.cc index b54aea94424..93c65d820c3 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1113,6 +1113,8 @@ void THD::cleanup_after_query() free_items(); /* Reset where. */ where= THD::DEFAULT_WHERE; + /* reset table map for multi-table update */ + table_map_for_update= 0; } diff --git a/sql/sql_class.h b/sql/sql_class.h index a86b4d36d00..cf238de776b 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -396,7 +396,6 @@ struct system_variables DATE_TIME_FORMAT *datetime_format; DATE_TIME_FORMAT *time_format; my_bool sysdate_is_now; - }; @@ -1446,6 +1445,13 @@ public: Note: in the parser, stmt_arena == thd, even for PS/SP. */ Query_arena *stmt_arena; + + /* + map for tables that will be updated for a multi-table update query + statement, for other query statements, this will be zero. + */ + table_map table_map_for_update; + /* Tells if LAST_INSERT_ID(#) was called for the current statement */ bool arg_of_last_insert_id_function; /* diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index b8f2228d6e7..dfa5e625384 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1887,6 +1887,10 @@ mysql_execute_command(THD *thd) TABLE_LIST *all_tables; /* most outer SELECT_LEX_UNIT of query */ SELECT_LEX_UNIT *unit= &lex->unit; +#ifdef HAVE_REPLICATION + /* have table map for update for multi-update statement (BUG#37051) */ + bool have_table_map_for_update= FALSE; +#endif /* Saved variable value */ DBUG_ENTER("mysql_execute_command"); #ifdef WITH_PARTITION_STORAGE_ENGINE @@ -1952,6 +1956,48 @@ mysql_execute_command(THD *thd) // force searching in slave.cc:tables_ok() all_tables->updating= 1; } + + /* + For fix of BUG#37051, the master stores the table map for update + in the Query_log_event, and the value is assigned to + thd->variables.table_map_for_update before executing the update + query. + + If thd->variables.table_map_for_update is set, then we are + replicating from a new master, we can use this value to apply + filter rules without opening all the tables. However If + thd->variables.table_map_for_update is not set, then we are + replicating from an old master, so we just skip this and + continue with the old method. And of course, the bug would still + exist for old masters. + */ + if (lex->sql_command == SQLCOM_UPDATE_MULTI && + thd->table_map_for_update) + { + have_table_map_for_update= TRUE; + table_map table_map_for_update= thd->table_map_for_update; + uint nr= 0; + TABLE_LIST *table; + for (table=all_tables; table; table=table->next_global, nr++) + { + if (table_map_for_update & ((table_map)1 << nr)) + table->updating= TRUE; + else + table->updating= FALSE; + } + + if (all_tables_not_ok(thd, all_tables)) + { + /* we warn the slave SQL thread */ + my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0)); + if (thd->one_shot_set) + reset_one_shot_variables(thd); + DBUG_RETURN(0); + } + + for (table=all_tables; table; table=table->next_global) + table->updating= TRUE; + } /* Check if statment should be skipped because of slave filtering @@ -2866,7 +2912,7 @@ end_with_restore_list: #ifdef HAVE_REPLICATION /* Check slave filtering rules */ - if (unlikely(thd->slave_thread)) + if (unlikely(thd->slave_thread && !have_table_map_for_update)) { if (all_tables_not_ok(thd, all_tables)) { diff --git a/sql/sql_update.cc b/sql/sql_update.cc index bfb71db22da..e384109bbe1 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1000,7 +1000,7 @@ reopen_tables: DBUG_RETURN(TRUE); } - tables_for_update= get_table_map(fields); + thd->table_map_for_update= tables_for_update= get_table_map(fields); /* Setup timestamp handling and locking mode From 53e17da331e47a44a8d0b7fe39f7c998c9e5ba1f Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 1 Aug 2008 16:08:51 +0200 Subject: [PATCH 245/705] Bug #33810 mysql-test-run can't find testcase if it is in a non-default testsuite --- mysql-test/lib/mtr_cases.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index ad0c82e8a74..47909b7a38f 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -120,7 +120,7 @@ sub collect_test_cases ($$) { } if ( not $found ) { - mtr_error("Could not find $tname in any suite"); + mtr_error("Could not find '$tname' in '$suites' suite(s)"); } } } From 7e5752e27b56c0be65b290f0ed3b1058f9c4667f Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 1 Aug 2008 16:13:35 +0200 Subject: [PATCH 246/705] Bug #33337 mysql-test-run.pl options --gdb and --ddd don't work with --embedded-server --- mysql-test/mysql-test-run.pl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index e7589562e87..87aeff437d6 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1044,6 +1044,13 @@ sub command_line_setup { { mtr_error("Can't use --extern with --embedded-server"); } + + if ( $opt_gdb || $opt_ddd || $opt_manual_gdb || $opt_manual_ddd || + $opt_manual_debug || $opt_debugger ) + { + mtr_error("You need to use the client debug options for the", + "embedded server. Ex: --client-gdb"); + } } # -------------------------------------------------------------------------- From 27b37e45b0f88a3948f17128805d25fd3cec98c0 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 1 Aug 2008 16:15:27 +0200 Subject: [PATCH 247/705] Bug #32406 #ifdef LATER_HAVE_NDBCLUSTER_DB in client/mysqladmin.cc --- client/mysqladmin.cc | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index b3b699f61fd..ea5b92a7c5a 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -23,10 +23,6 @@ #include #include -#ifdef LATER_HAVE_NDBCLUSTER_DB -#include "../ndb/src/mgmclient/ndb_mgmclient.h" -#endif - #define ADMIN_VERSION "8.42" #define MAX_MYSQL_VAR 256 #define SHUTDOWN_DEF_TIMEOUT 3600 /* Wait for shutdown */ @@ -46,10 +42,6 @@ static uint tcp_port = 0, option_wait = 0, option_silent=0, nr_iterations; static uint opt_count_iterations= 0, my_end_arg; static ulong opt_connect_timeout, opt_shutdown_timeout; static char * unix_port=0; -#ifdef LATER_HAVE_NDBCLUSTER_DB -static my_bool opt_ndbcluster=0; -static char *opt_ndb_connectstring=0; -#endif #ifdef HAVE_SMEM static char *shared_memory_base_name=0; @@ -105,9 +97,6 @@ enum commands { ADMIN_PING, ADMIN_EXTENDED_STATUS, ADMIN_FLUSH_STATUS, ADMIN_FLUSH_PRIVILEGES, ADMIN_START_SLAVE, ADMIN_STOP_SLAVE, ADMIN_FLUSH_THREADS, ADMIN_OLD_PASSWORD -#ifdef LATER_HAVE_NDBCLUSTER_DB - ,ADMIN_NDB_MGM -#endif }; static const char *command_names[]= { "create", "drop", "shutdown", @@ -118,9 +107,6 @@ static const char *command_names[]= { "ping", "extended-status", "flush-status", "flush-privileges", "start-slave", "stop-slave", "flush-threads","old-password", -#ifdef LATER_HAVE_NDBCLUSTER_DB - "ndb-mgm", -#endif NullS }; @@ -224,14 +210,6 @@ static struct my_option my_long_options[] = {"shutdown_timeout", OPT_SHUTDOWN_TIMEOUT, "", (uchar**) &opt_shutdown_timeout, (uchar**) &opt_shutdown_timeout, 0, GET_ULONG, REQUIRED_ARG, SHUTDOWN_DEF_TIMEOUT, 0, 3600*12, 0, 1, 0}, -#ifdef LATER_HAVE_NDBCLUSTER_DB - {"ndbcluster", OPT_NDBCLUSTER, "" - "", (uchar**) &opt_ndbcluster, - (uchar**) &opt_ndbcluster, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, - {"ndb-connectstring", OPT_NDB_CONNECTSTRING, "" - "", (uchar**) &opt_ndb_connectstring, - (uchar**) &opt_ndb_connectstring, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, -#endif { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0} }; @@ -984,24 +962,6 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) } mysql->reconnect=1; /* Automatic reconnect is default */ break; -#ifdef LATER_HAVE_NDBCLUSTER_DB - case ADMIN_NDB_MGM: - { - if (argc < 2) - { - my_printf_error(0, "Too few arguments to ndb-mgm", error_flags); - return 1; - } - { - Ndb_mgmclient_handle cmd= - ndb_mgmclient_handle_create(opt_ndb_connectstring); - ndb_mgmclient_execute(cmd, --argc, ++argv); - ndb_mgmclient_handle_destroy(cmd); - } - argc= 0; - } - break; -#endif default: my_printf_error(0, "Unknown command: '%-.60s'", error_flags, argv[0]); return 1; From 798590b79844e871c490563df8f7cd67fb2ab4ea Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 4 Aug 2008 12:38:50 +0200 Subject: [PATCH 248/705] Bug #32307 mysqltest - does not detect illegal if syntax --- client/mysqltest.c | 8 ++++++++ mysql-test/extra/rpl_tests/rpl_row_sp002.test | 2 +- mysql-test/include/not_as_root.inc | 7 +++---- mysql-test/mysql-test-run.pl | 1 - mysql-test/r/mysqltest.result | 6 ++++-- mysql-test/r/not_as_root.require | 2 -- mysql-test/t/execution_constants.test | 9 ++++++++- mysql-test/t/mysqltest.test | 20 +++++++++++++++++++ mysql-test/t/ps.test | 2 +- 9 files changed, 45 insertions(+), 12 deletions(-) delete mode 100644 mysql-test/r/not_as_root.require diff --git a/client/mysqltest.c b/client/mysqltest.c index f700ea9479d..09d6292f0a0 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -2184,8 +2184,16 @@ void eval_expr(VAR *v, const char *p, const char **p_end) if (*p == '$') { VAR *vp; + const char* expected_end= *p_end; // Remember var end if ((vp= var_get(p, p_end, 0, 0))) var_copy(v, vp); + + /* Make sure there was just a $variable and nothing else */ + const char* end= *p_end + 1; + if (end < expected_end) + die("Found junk '%.*s' after $variable in expression", + expected_end - end - 1, end); + DBUG_VOID_RETURN; } diff --git a/mysql-test/extra/rpl_tests/rpl_row_sp002.test b/mysql-test/extra/rpl_tests/rpl_row_sp002.test index 47afcce875b..5a2ab1912b8 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_sp002.test +++ b/mysql-test/extra/rpl_tests/rpl_row_sp002.test @@ -206,7 +206,7 @@ START TRANSACTION; -- disable_query_log -- disable_result_log let $n=50; -while ($n>3) +while ($n) { eval call test.p3($n); dec $n; diff --git a/mysql-test/include/not_as_root.inc b/mysql-test/include/not_as_root.inc index e0277ea593e..6c88051d632 100644 --- a/mysql-test/include/not_as_root.inc +++ b/mysql-test/include/not_as_root.inc @@ -1,4 +1,3 @@ --- require r/not_as_root.require -disable_query_log; -eval select "$MYSQL_TEST_ROOT" as running_as_root; -enable_query_log; +if ($MYSQL_TEST_ROOT){ + skip Not as root; +} diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 87aeff437d6..af62536e462 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1883,7 +1883,6 @@ sub check_running_as_root () { # the file will not return 0000 my $file_mode= (stat($test_file))[2] & 07777; - $ENV{'MYSQL_TEST_ROOT'}= "NO"; mtr_verbose("result: $result, file_mode: $file_mode"); if ($result eq "MySQL" && $file_mode == 0) { diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index adf99185d89..fc1dc5c0863 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -293,7 +293,7 @@ var5 from query that returns no row failing query in let mysqltest: At line 1: Error running query 'failing query': 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'failing query' at line 1 mysqltest: At line 1: Missing required argument 'filename' to command 'source' -mysqltest: At line 1: Could not open './non_existingFile' for reading +mysqltest: At line 1: Could not open './non_existingFile' for reading, errno: 2 mysqltest: In included file "MYSQLTEST_VARDIR/tmp/recursive.sql": At line 1: Source directives are nesting too deep mysqltest: In included file "MYSQLTEST_VARDIR/tmp/error.sql": At line 1: query 'garbage ' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 @@ -443,7 +443,7 @@ ERROR 3D000: No database selected Output from mysqltest-x.inc Output from mysqltest-x.inc Output from mysqltest-x.inc -mysqltest: Could not open './non_existing_file.inc' for reading: errno = 2 +mysqltest: Could not open './non_existing_file.inc' for reading, errno: 2 failing_statement; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'failing_statement' at line 1 failing_statement; @@ -728,4 +728,6 @@ mysqltest: At line 1: change user failed: Access denied for user 'root'@'localho SELECT 'c:\\a.txt' AS col; col z +hej +mysqltest: At line 1: Found junk ' != 143' after $variable in expression End of tests diff --git a/mysql-test/r/not_as_root.require b/mysql-test/r/not_as_root.require deleted file mode 100644 index d9ea5244efc..00000000000 --- a/mysql-test/r/not_as_root.require +++ /dev/null @@ -1,2 +0,0 @@ -running_as_root -NO diff --git a/mysql-test/t/execution_constants.test b/mysql-test/t/execution_constants.test index 4930164d3fa..e61d79f5249 100644 --- a/mysql-test/t/execution_constants.test +++ b/mysql-test/t/execution_constants.test @@ -41,12 +41,19 @@ while ($i) error 0,1436 // eval $query_head 0 $query_tail// - if ($mysql_errno != 1436) + if ($mysql_errno) { # We reached the place where we reported an error about the stack limit, # and we successfully returned the error. That means that at the stack # limit, we still have enough space reserved to report an error. let $i = 1// + + # Check that mysql_errno is 1436 + if (`select $mysql_errno != 1436`) + { + die Wrong error triggered, expected 1436 but got $mysql_errno// + } + } # Multiplying by three stack frames should be fine enough resolution. diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index b41f033d2af..1bc6a4a625a 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -2131,5 +2131,25 @@ rmdir $MYSQLTEST_VARDIR/tmp/testdir; --replace_result c:\\a.txt z SELECT 'c:\\a.txt' AS col; +# +# Bug #32307 mysqltest - does not detect illegal if syntax +# + +let $test= 1; +if ($test){ + echo hej; +} + +--write_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql +if ($mysql_errno != 1436) +{ + echo ^ Should not be allowed! +} +EOF +--error 1 +--exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/mysqltest.sql 2>&1 +remove_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql; + + --echo End of tests diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test index 3e1a41d32c8..91cb6eef8ad 100644 --- a/mysql-test/t/ps.test +++ b/mysql-test/t/ps.test @@ -1665,7 +1665,7 @@ DROP PROCEDURE IF EXISTS p1; let $iterations= 100; --disable_query_log --disable_result_log -while ($iterations > 0) +while ($iterations) { --error ER_PARSE_ERROR PREPARE stmt FROM "CREATE PROCEDURE p1()"; From 39ad2dc05ae2cf6798d60397e82cddba16ddb244 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 4 Aug 2008 21:54:44 +0200 Subject: [PATCH 249/705] Bug #38181 Please print more debug info when tests fail --- client/CMakeLists.txt | 4 +- client/Makefile.am | 4 +- client/{mysqltest.c => mysqltest.cc} | 580 ++++++++++-------- libmysqld/examples/CMakeLists.txt | 2 +- libmysqld/examples/Makefile.am | 2 +- .../include/analyze-sync_with_master.test | 6 + .../analyze_failure_sync_with_master.test | 15 - mysql-test/include/mysqltest-x.inc | 1 + mysql-test/lib/mtr_cases.pm | 12 +- mysql-test/lib/mtr_report.pm | 50 +- mysql-test/mysql-test-run.pl | 184 +++++- mysql-test/r/mysqltest.result | 14 +- mysql-test/t/fix_priv_tables.test | 3 +- mysql-test/t/mysqltest.test | 20 +- mysql-test/t/openssl_1.test | 8 +- 15 files changed, 563 insertions(+), 342 deletions(-) rename client/{mysqltest.c => mysqltest.cc} (96%) create mode 100644 mysql-test/include/analyze-sync_with_master.test delete mode 100644 mysql-test/include/analyze_failure_sync_with_master.test diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index cbd4a1f306b..e96437d40d0 100755 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -32,8 +32,8 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc ../mysys/my_conio.c) TARGET_LINK_LIBRARIES(mysql mysqlclient_notls wsock32) -ADD_EXECUTABLE(mysqltest mysqltest.c) -SET_SOURCE_FILES_PROPERTIES(mysqltest.c PROPERTIES COMPILE_FLAGS "-DTHREADS") +ADD_EXECUTABLE(mysqltest mysqltest.cc) +SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqltest mysqlclient mysys regex wsock32 dbug) ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) diff --git a/client/Makefile.am b/client/Makefile.am index 940766ac66c..94ad6c15d99 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -86,8 +86,8 @@ mysqlslap_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \ $(LIBMYSQLCLIENT_LA) \ $(top_builddir)/mysys/libmysys.a -mysqltest_SOURCES= mysqltest.c -mysqltest_CFLAGS= -DTHREAD -UUNDEF_THREADS_HACK +mysqltest_SOURCES= mysqltest.cc +mysqltest_CXXFLAGS= -DTHREAD -UUNDEF_THREADS_HACK mysqltest_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \ @CLIENT_EXTRA_LDFLAGS@ \ $(LIBMYSQLCLIENT_LA) \ diff --git a/client/mysqltest.c b/client/mysqltest.cc similarity index 96% rename from client/mysqltest.c rename to client/mysqltest.cc index f700ea9479d..b110cc88514 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.cc @@ -169,7 +169,6 @@ static ulonglong timer_start; static void timer_output(void); static ulonglong timer_now(void); -static ulonglong progress_start= 0; /* Precompiled re's */ static my_regex_t ps_re; /* the query can be run using PS protocol */ @@ -184,12 +183,12 @@ DYNAMIC_ARRAY q_lines; #include "sslopt-vars.h" -struct +struct Parser { int read_lines,current_line; } parser; -struct +struct MasterPos { char file[FN_REFLEN]; ulong pos; @@ -198,7 +197,7 @@ struct /* if set, all results are concated and compared against this file */ const char *result_file_name= 0; -typedef struct st_var +typedef struct { char *name; int name_len; @@ -420,7 +419,7 @@ struct st_command TYPELIB command_typelib= {array_elements(command_names),"", command_names, 0}; -DYNAMIC_STRING ds_res, ds_progress, ds_warning_messages; +DYNAMIC_STRING ds_res; char builtin_echo[FN_REFLEN]; @@ -430,8 +429,6 @@ void abort_not_supported_test(const char *fmt, ...) ATTRIBUTE_FORMAT(printf, 1, 2); void verbose_msg(const char *fmt, ...) ATTRIBUTE_FORMAT(printf, 1, 2); -void warning_msg(const char *fmt, ...) - ATTRIBUTE_FORMAT(printf, 1, 2); void log_msg(const char *fmt, ...) ATTRIBUTE_FORMAT(printf, 1, 2); @@ -444,9 +441,7 @@ VAR* var_get(const char *var_name, const char** var_name_end, void eval_expr(VAR* v, const char *p, const char** p_end); my_bool match_delimiter(int c, const char *delim, uint length); void dump_result_to_reject_file(char *buf, int size); -void dump_result_to_log_file(char *buf, int size); void dump_warning_messages(); -void dump_progress(); void do_eval(DYNAMIC_STRING *query_eval, const char *query, const char *query_end, my_bool pass_through_escape_chars); @@ -483,6 +478,169 @@ void free_all_replace(){ } +class LogFile { + FILE* m_file; + char m_file_name[FN_REFLEN]; + uint m_bytes_written; +public: + LogFile() : m_file(NULL), m_bytes_written(0) { + bzero(m_file_name, sizeof(m_file_name)); + } + + ~LogFile() { + close(); + } + + const char* file_name() const { return m_file_name; } + uint bytes_written() const { return m_bytes_written; } + + void open(const char* dir, const char* name, const char* ext) + { + DBUG_ENTER("LogFile::open"); + DBUG_PRINT("enter", ("dir: %s, name: %s", + name, dir)); + if (!name) + { + m_file= stdout; + DBUG_VOID_RETURN; + } + + fn_format(m_file_name, name, dir, ext, + *dir ? MY_REPLACE_DIR | MY_REPLACE_EXT : + MY_REPLACE_EXT); + + DBUG_PRINT("info", ("file_name: %s", m_file_name)); + + if ((m_file= fopen(m_file_name, "w+")) == NULL) + die("Failed to open log file %s, errno: %d", m_file_name, errno); + + DBUG_VOID_RETURN; + } + + void close() + { + if (m_file && m_file != stdout) + fclose(m_file); + m_file= NULL; + } + + void flush() + { + if (m_file && m_file != stdout) + fflush(m_file); + } + + void write(DYNAMIC_STRING* ds) + { + DBUG_ENTER("LogFile::write"); + DBUG_ASSERT(m_file); + + if (ds->length == 0) + DBUG_VOID_RETURN; + DBUG_ASSERT(ds->str); + + if (fwrite(ds->str, 1, ds->length, m_file) != ds->length) + die("Failed to write %d bytes to '%s', errno: %d", + ds->length, m_file_name, errno); + m_bytes_written+= ds->length; + DBUG_VOID_RETURN; + } + + void show_tail(uint lines) { + DBUG_ENTER("LogFile::show_tail"); + + if (!m_file || m_file == stdout) + DBUG_VOID_RETURN; + + if (lines == 0) + DBUG_VOID_RETURN; + lines++; + + int show_offset= 0; + char buf[256]; + size_t bytes; + bool found_bof= false; + + /* Search backward in file until "lines" newline has been found */ + while (lines && !found_bof) + { + show_offset-= sizeof(buf); + while(fseek(m_file, show_offset, SEEK_END) != 0 && show_offset < 0) + { + found_bof= true; + // Seeking before start of file + show_offset++; + } + + if ((bytes= fread(buf, 1, sizeof(buf), m_file)) <= 0) + { + fprintf(stderr, "Failed to read from '%s', errno: %d\n", + m_file_name, errno); + DBUG_VOID_RETURN; + } + + DBUG_PRINT("info", ("Read %d bytes from file, buf: %s", bytes, buf)); + + char* show_from= buf + bytes; + while(show_from > buf && lines > 0 ) + { + show_from--; + if (*show_from == '\n') + lines--; + } + if (show_from != buf) + { + // The last new line was found in this buf, adjust offset + show_offset+= (show_from - buf) + 1; + DBUG_PRINT("info", ("adjusted offset to %d", show_offset)); + } + DBUG_PRINT("info", ("show_offset: %d", show_offset)); + } + + fprintf(stderr, "\nThe result from queries just before the failure was:\n"); + + DBUG_PRINT("info", ("show_offset: %d", show_offset)); + if (!lines) + { + fprintf(stderr, "< snip >\n"); + + if (fseek(m_file, show_offset, SEEK_END) != 0) + { + fprintf(stderr, "Failed to seek to position %d in '%s', errno: %d", + show_offset, m_file_name, errno); + DBUG_VOID_RETURN; + } + + } + else { + DBUG_PRINT("info", ("Showing the whole file")); + if (fseek(m_file, 0L, SEEK_SET) != 0) + { + fprintf(stderr, "Failed to seek to pos 0 in '%s', errno: %d", + m_file_name, errno); + DBUG_VOID_RETURN; + } + } + + while ((bytes= fread(buf, 1, sizeof(buf), m_file)) > 0) + fwrite(buf, 1, bytes, stderr); + + if (!lines) + { + fprintf(stderr, + "\nMore results from queries before failure can be found in %s\n", + m_file_name); + } + fflush(stderr); + + DBUG_VOID_RETURN; + } +}; + +LogFile log_file; +LogFile progress_file; + + /* Disable functions that only exist in MySQL 4.0 */ #if MYSQL_VERSION_ID < 40000 void mysql_enable_rpl_parse(MYSQL* mysql __attribute__((unused))) {} @@ -627,7 +785,7 @@ void do_eval(DYNAMIC_STRING *query_eval, const char *query, /* - Run query and dump the result to stdout in vertical format + Run query and dump the result to stderr in vertical format NOTE! This function should be safe to call when an error has occured and thus any further errors will be ignored(although logged) @@ -963,8 +1121,6 @@ void free_used_memory() my_free(embedded_server_args[--embedded_server_arg_count],MYF(0)); delete_dynamic(&q_lines); dynstr_free(&ds_res); - dynstr_free(&ds_progress); - dynstr_free(&ds_warning_messages); free_all_replace(); my_free(opt_pass,MYF(MY_ALLOW_ZERO_PTR)); free_defaults(default_argv); @@ -1042,31 +1198,7 @@ void die(const char *fmt, ...) fprintf(stderr, "\n"); fflush(stderr); - /* Show results from queries just before failure */ - if (ds_res.length && opt_tail_lines) - { - int tail_lines= opt_tail_lines; - char* show_from= ds_res.str + ds_res.length - 1; - while(show_from > ds_res.str && tail_lines > 0 ) - { - show_from--; - if (*show_from == '\n') - tail_lines--; - } - fprintf(stderr, "\nThe result from queries just before the failure was:\n"); - if (show_from > ds_res.str) - fprintf(stderr, "< snip >"); - fprintf(stderr, "%s", show_from); - fflush(stderr); - } - - /* Dump the result that has been accumulated so far to .log file */ - if (result_file_name && ds_res.length) - dump_result_to_log_file(ds_res.str, ds_res.length); - - /* Dump warning messages */ - if (result_file_name && ds_warning_messages.length) - dump_warning_messages(); + log_file.show_tail(opt_tail_lines); /* Help debugging by displaying any warnings that might have @@ -1140,41 +1272,6 @@ void verbose_msg(const char *fmt, ...) } -void warning_msg(const char *fmt, ...) -{ - va_list args; - char buff[512]; - size_t len; - DBUG_ENTER("warning_msg"); - - va_start(args, fmt); - dynstr_append(&ds_warning_messages, "mysqltest: "); - if (start_lineno != 0) - { - dynstr_append(&ds_warning_messages, "Warning detected "); - if (cur_file && cur_file != file_stack) - { - len= my_snprintf(buff, sizeof(buff), "in included file %s ", - cur_file->file_name); - dynstr_append_mem(&ds_warning_messages, - buff, len); - } - len= my_snprintf(buff, sizeof(buff), "at line %d: ", - start_lineno); - dynstr_append_mem(&ds_warning_messages, - buff, len); - } - - len= my_vsnprintf(buff, sizeof(buff), fmt, args); - dynstr_append_mem(&ds_warning_messages, buff, len); - - dynstr_append(&ds_warning_messages, "\n"); - va_end(args); - - DBUG_VOID_RETURN; -} - - void log_msg(const char *fmt, ...) { va_list args; @@ -1583,18 +1680,17 @@ int dyn_string_cmp(DYNAMIC_STRING* ds, const char *fname) /* - Check the content of ds against result file + Check the content of log against result file SYNOPSIS check_result - ds - content to be checked RETURN VALUES error - the function will not return */ -void check_result(DYNAMIC_STRING* ds) +void check_result() { const char* mess= "Result content mismatch\n"; @@ -1602,10 +1698,7 @@ void check_result(DYNAMIC_STRING* ds) DBUG_ASSERT(result_file_name); DBUG_PRINT("enter", ("result_file_name: %s", result_file_name)); - if (access(result_file_name, F_OK) != 0) - die("The specified result file does not exist: '%s'", result_file_name); - - switch (dyn_string_cmp(ds, result_file_name)) { + switch (compare_files(log_file.file_name(), result_file_name)) { case RESULT_OK: break; /* ok */ case RESULT_LENGTH_MISMATCH: @@ -1633,9 +1726,10 @@ void check_result(DYNAMIC_STRING* ds) fn_format(reject_file, result_file_name, opt_logdir, ".reject", MY_REPLACE_DIR | MY_REPLACE_EXT); } - str_to_file(reject_file, ds->str, ds->length); - dynstr_set(ds, NULL); /* Don't create a .log file */ + if (my_copy(log_file.file_name(), reject_file, MYF(0)) != 0) + die("Failed to copy '%s' to '%s', errno: %d", + log_file.file_name(), reject_file, errno); show_diff(NULL, result_file_name, reject_file); die(mess); @@ -1749,7 +1843,7 @@ VAR *var_init(VAR *v, const char *name, int name_len, const char *val, tmp_var->name = (name) ? (char*) tmp_var + sizeof(*tmp_var) : 0; tmp_var->alloced = (v == 0); - if (!(tmp_var->str_val = my_malloc(val_alloc_len+1, MYF(MY_WME)))) + if (!(tmp_var->str_val = (char*)my_malloc(val_alloc_len+1, MYF(MY_WME)))) die("Out of memory"); memcpy(tmp_var->name, name, name_len); @@ -2162,8 +2256,8 @@ void var_copy(VAR *dest, VAR *src) /* Alloc/realloc data for str_val in dest */ if (dest->alloced_len < src->alloced_len && !(dest->str_val= dest->str_val - ? my_realloc(dest->str_val, src->alloced_len, MYF(MY_WME)) - : my_malloc(src->alloced_len, MYF(MY_WME)))) + ? (char*)my_realloc(dest->str_val, src->alloced_len, MYF(MY_WME)) + : (char*)my_malloc(src->alloced_len, MYF(MY_WME)))) die("Out of memory"); else dest->alloced_len= src->alloced_len; @@ -2221,9 +2315,9 @@ void eval_expr(VAR *v, const char *p, const char **p_end) v->alloced_len = (new_val_len < MIN_VAR_ALLOC - 1) ? MIN_VAR_ALLOC : new_val_len + 1; if (!(v->str_val = - v->str_val ? my_realloc(v->str_val, v->alloced_len+1, - MYF(MY_WME)) : - my_malloc(v->alloced_len+1, MYF(MY_WME)))) + v->str_val ? + (char*)my_realloc(v->str_val, v->alloced_len+1, MYF(MY_WME)) : + (char*)my_malloc(v->alloced_len+1, MYF(MY_WME)))) die("Out of memory"); } v->str_val_len = new_val_len; @@ -2559,7 +2653,7 @@ enum enum_operator SYNOPSIS do_modify_var() query called command - operator operation to perform on the var + op operation to perform on the var DESCRIPTION dec $var_name @@ -2568,7 +2662,7 @@ enum enum_operator */ int do_modify_var(struct st_command *command, - enum enum_operator operator) + enum enum_operator op) { const char *p= command->first_argument; VAR* v; @@ -2578,7 +2672,7 @@ int do_modify_var(struct st_command *command, die("The argument to %.*s must be a variable (start with $)", command->first_word_len, command->query); v= var_get(p, &p, 1, 0); - switch (operator) { + switch (op) { case DO_DEC: v->int_val--; break; @@ -3398,24 +3492,19 @@ void do_wait_for_slave_to_stop(struct st_command *c __attribute__((unused))) } -void do_sync_with_master2(long offset) +void do_sync_with_master2(struct st_command *command, long offset) { MYSQL_RES *res; MYSQL_ROW row; MYSQL *mysql= &cur_con->mysql; char query_buf[FN_REFLEN+128]; - int tries= 0; - int rpl_parse; + int timeout= 300; /* seconds */ if (!master_pos.file[0]) die("Calling 'sync_with_master' without calling 'save_master_pos'"); - rpl_parse= mysql_rpl_parse_enabled(mysql); - mysql_disable_rpl_parse(mysql); - sprintf(query_buf, "select master_pos_wait('%s', %ld)", master_pos.file, - master_pos.pos + offset); - -wait_for_position: + sprintf(query_buf, "select master_pos_wait('%s', %ld, %d)", + master_pos.file, master_pos.pos + offset, timeout); if (mysql_query(mysql, query_buf)) die("failed in '%s': %d: %s", query_buf, mysql_errno(mysql), @@ -3428,30 +3517,48 @@ wait_for_position: mysql_free_result(res); die("empty result in %s", query_buf); } - if (!row[0]) - { - /* - It may be that the slave SQL thread has not started yet, though START - SLAVE has been issued ? - */ - mysql_free_result(res); - if (tries++ == 30) - { - show_query(mysql, "SHOW MASTER STATUS"); - show_query(mysql, "SHOW SLAVE STATUS"); - die("could not sync with master ('%s' returned NULL)", query_buf); - } - sleep(1); /* So at most we will wait 30 seconds and make 31 tries */ - goto wait_for_position; - } + + int result= -99; + const char* result_str= row[0]; + if (result_str) + result= atoi(result_str); + mysql_free_result(res); - if (rpl_parse) - mysql_enable_rpl_parse(mysql); + + if (!result_str || result < 0) + { + /* master_pos_wait returned NULL or < 0 */ + show_query(mysql, "SHOW MASTER STATUS"); + show_query(mysql, "SHOW SLAVE STATUS"); + show_query(mysql, "SHOW PROCESSLIST"); + fprintf(stderr, "analyze: sync_with_master\n"); + + if (!result_str) + { + /* + master_pos_wait returned NULL. This indicates that + slave SQL thread is not started, the slave's master + information is not initialized, the arguments are + incorrect, or an error has occured + */ + die("%.*s failed: '%s' returned NULL "\ + "indicating slave SQL thread failure", + command->first_word_len, command->query, query_buf); + + } + + if (result == -1) + die("%.*s failed: '%s' returned -1 "\ + "indicating timeout after %d seconds", + command->first_word_len, command->query, query_buf, timeout); + else + die("%.*s failed: '%s' returned unknown result :%d", + command->first_word_len, command->query, query_buf, result); + } return; } - void do_sync_with_master(struct st_command *command) { long offset= 0; @@ -3466,7 +3573,7 @@ void do_sync_with_master(struct st_command *command) die("Invalid integer argument \"%s\"", offset_start); command->last_argument= p; } - do_sync_with_master2(offset); + do_sync_with_master2(command, offset); return; } @@ -3943,7 +4050,7 @@ void do_shutdown_server(struct st_command *command) break; } DBUG_PRINT("info", ("Sleeping, timeout: %d", timeout)); - my_sleep(1); + my_sleep(1000000L); } /* Kill the server */ @@ -5081,55 +5188,6 @@ void convert_to_format_v1(char* query) } -/* - Check a command that is about to be sent (or should have been - sent if parsing was enabled) to mysql server for - suspicious things and generate warnings. -*/ - -void scan_command_for_warnings(struct st_command *command) -{ - const char *ptr= command->query; - DBUG_ENTER("scan_command_for_warnings"); - DBUG_PRINT("enter", ("query: %s", command->query)); - - while(*ptr) - { - /* - Look for query's that lines that start with a -- comment - and has a mysqltest command - */ - if (ptr[0] == '\n' && - ptr[1] && ptr[1] == '-' && - ptr[2] && ptr[2] == '-' && - ptr[3]) - { - uint type; - char save; - char *end, *start= (char*)ptr+3; - /* Skip leading spaces */ - while (*start && my_isspace(charset_info, *start)) - start++; - end= start; - /* Find end of command(next space) */ - while (*end && !my_isspace(charset_info, *end)) - end++; - save= *end; - *end= 0; - DBUG_PRINT("info", ("Checking '%s'", start)); - type= find_type(start, &command_typelib, 1+2); - if (type) - warning_msg("Embedded mysqltest command '--%s' detected in " - "query '%s' was this intentional? ", - start, command->query); - *end= save; - } - - ptr++; - } - DBUG_VOID_RETURN; -} - /* Check for unexpected "junk" after the end of query This is normally caused by missing delimiters or when @@ -5187,6 +5245,19 @@ void check_eol_junk(const char *eol) } +bool is_delimiter(const char* p) +{ + uint match= 0; + char* delim= delimiter; + while (*p && *p == *delim++) + { + match++; + p++; + } + + return (match == delimiter_length); +} + /* Create a command from a set of lines @@ -5253,9 +5324,11 @@ int read_command(struct st_command** command_ptr) if (!(command->query_buf= command->query= my_strdup(p, MYF(MY_WME)))) die("Out of memory"); - /* Calculate first word length(the command), terminated by space or ( */ + /* + Calculate first word length(the command), terminated + by 'space' , '(' or 'delimiter' */ p= command->query; - while (*p && !my_isspace(charset_info, *p) && *p != '(') + while (*p && !my_isspace(charset_info, *p) && *p != '(' && !is_delimiter(p)) p++; command->first_word_len= (uint) (p - command->query); DBUG_PRINT("info", ("first_word: %.*s", @@ -5520,6 +5593,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), die("Can't use server argument"); } break; + case OPT_LOG_DIR: + /* Check that the file exists */ + if (access(opt_logdir, F_OK) != 0) + die("The specified log directory does not exist: '%s'", opt_logdir); + break; case 'F': read_embedded_server_arguments(argument); break; @@ -5561,6 +5639,14 @@ int parse_args(int argc, char **argv) if (debug_check_flag) my_end_arg= MY_CHECK_ERROR; + + if (!record) + { + /* Check that the result file exists */ + if (result_file_name && access(result_file_name, F_OK) != 0) + die("The specified result file '%s' does not exist", result_file_name); + } + return 0; } @@ -5615,37 +5701,6 @@ void str_to_file(const char *fname, char *str, int size) } -void dump_result_to_log_file(char *buf, int size) -{ - char log_file[FN_REFLEN]; - str_to_file(fn_format(log_file, result_file_name, opt_logdir, ".log", - *opt_logdir ? MY_REPLACE_DIR | MY_REPLACE_EXT : - MY_REPLACE_EXT), - buf, size); - fprintf(stderr, "\nMore results from queries before failure can be found in %s\n", - log_file); -} - -void dump_progress(void) -{ - char progress_file[FN_REFLEN]; - str_to_file(fn_format(progress_file, result_file_name, - opt_logdir, ".progress", - *opt_logdir ? MY_REPLACE_DIR | MY_REPLACE_EXT : - MY_REPLACE_EXT), - ds_progress.str, ds_progress.length); -} - -void dump_warning_messages(void) -{ - char warn_file[FN_REFLEN]; - - str_to_file(fn_format(warn_file, result_file_name, opt_logdir, ".warnings", - *opt_logdir ? MY_REPLACE_DIR | MY_REPLACE_EXT : - MY_REPLACE_EXT), - ds_warning_messages.str, ds_warning_messages.length); -} - void check_regerr(my_regex_t* r, int err) { char err_buf[1024]; @@ -5890,7 +5945,7 @@ void append_stmt_result(DYNAMIC_STRING *ds, MYSQL_STMT *stmt, { uint max_length= fields[i].max_length + 1; my_bind[i].buffer_type= MYSQL_TYPE_STRING; - my_bind[i].buffer= (char *)my_malloc(max_length, MYF(MY_WME | MY_FAE)); + my_bind[i].buffer= my_malloc(max_length, MYF(MY_WME | MY_FAE)); my_bind[i].buffer_length= max_length; my_bind[i].is_null= &is_null[i]; my_bind[i].length= &length[i]; @@ -5906,7 +5961,7 @@ void append_stmt_result(DYNAMIC_STRING *ds, MYSQL_STMT *stmt, while (mysql_stmt_fetch(stmt) == 0) { for (i= 0; i < num_fields; i++) - append_field(ds, i, &fields[i], my_bind[i].buffer, + append_field(ds, i, &fields[i], (char*)my_bind[i].buffer, *my_bind[i].length, *my_bind[i].is_null); if (!display_result_vertically) dynstr_append_mem(ds, "\n", 1); @@ -6614,9 +6669,6 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags) init_dynamic_string(&ds_warnings, NULL, 0, 256); - /* Scan for warning before sending to server */ - scan_command_for_warnings(command); - /* Evaluate query if this is an eval command */ @@ -6946,28 +6998,10 @@ void get_command_type(struct st_command* command) } else { - /* -- comment that didn't contain a mysqltest command */ - command->type= Q_COMMENT; - warning_msg("Suspicious command '--%s' detected, was this intentional? "\ - "Use # instead of -- to avoid this warning", - command->query); - - if (command->first_word_len && - strcmp(command->query + command->first_word_len - 1, delimiter) == 0) - { - /* - Detect comment with command using extra delimiter - Ex --disable_query_log; - ^ Extra delimiter causing the command - to be skipped - */ - save= command->query[command->first_word_len-1]; - command->query[command->first_word_len-1]= 0; - if (find_type(command->query, &command_typelib, 1+2) > 0) - die("Extra delimiter \";\" found"); - command->query[command->first_word_len-1]= save; - - } + /* -- "comment" that didn't contain a mysqltest command */ + die("Found line beginning with -- that didn't contain "\ + "a valid mysqltest command, check your syntax or "\ + "use # if you intended to write a comment"); } } @@ -6986,22 +7020,25 @@ void get_command_type(struct st_command* command) /* Record how many milliseconds it took to execute the test file - up until the current line and save it in the dynamic string ds_progress. - - The ds_progress will be dumped to .progress when - test run completes + up until the current line and write it to .progress file */ void mark_progress(struct st_command* command __attribute__((unused)), int line) { + static ulonglong progress_start= 0; // < Beware + DYNAMIC_STRING ds_progress; + char buf[32], *end; ulonglong timer= timer_now(); if (!progress_start) progress_start= timer; timer-= progress_start; + if (init_dynamic_string(&ds_progress, "", 256, 256)) + die("Out of memory"); + /* Milliseconds since start */ end= longlong2str(timer, buf, 10); dynstr_append_mem(&ds_progress, buf, (int)(end-buf)); @@ -7023,6 +7060,10 @@ void mark_progress(struct st_command* command __attribute__((unused)), dynstr_append_mem(&ds_progress, "\n", 1); + progress_file.write(&ds_progress); + + dynstr_free(&ds_progress); + } #ifdef HAVE_STACKTRACE @@ -7130,7 +7171,6 @@ int main(int argc, char **argv) my_bool q_send_flag= 0, abort_flag= 0; uint command_executed= 0, last_command_executed= 0; char save_file[FN_REFLEN]; - MY_STAT res_info; MY_INIT(argv[0]); save_file[0]= 0; @@ -7189,11 +7229,14 @@ int main(int argc, char **argv) init_win_path_patterns(); #endif - init_dynamic_string(&ds_res, "", 65536, 65536); - init_dynamic_string(&ds_progress, "", 0, 2048); - init_dynamic_string(&ds_warning_messages, "", 0, 2048); + init_dynamic_string(&ds_res, "", 2048, 2048); + parse_args(argc, argv); + log_file.open(opt_logdir, result_file_name, ".log"); + if (opt_mark_progress) + progress_file.open(opt_logdir, result_file_name, ".progress"); + var_set_int("$PS_PROTOCOL", ps_protocol); var_set_int("$SP_PROTOCOL", sp_protocol); var_set_int("$VIEW_PROTOCOL", view_protocol); @@ -7282,8 +7325,8 @@ int main(int argc, char **argv) command->type != Q_ENABLE_PARSING && command->type != Q_DISABLE_PARSING) { + /* Parsing is disabled, silently convert this line to a comment */ command->type= Q_COMMENT; - scan_command_for_warnings(command); } if (cur_block->ok) @@ -7447,7 +7490,7 @@ int main(int argc, char **argv) select_connection(command); else select_connection_name("slave"); - do_sync_with_master2(0); + do_sync_with_master2(command, 0); break; } case Q_COMMENT: /* Ignore row */ @@ -7572,8 +7615,14 @@ int main(int argc, char **argv) parser.current_line += current_line_inc; if ( opt_mark_progress ) mark_progress(command, parser.current_line); + + /* Write result from command to log file */ + log_file.write(&ds_res); + dynstr_set(&ds_res, 0); } + log_file.close(); + start_lineno= 0; if (parsing_disabled) @@ -7582,9 +7631,9 @@ int main(int argc, char **argv) /* The whole test has been executed _sucessfully_. Time to compare result or save it to record file. - The entire output from test is now kept in ds_res. + The entire output from test is in the log file */ - if (ds_res.length) + if (log_file.bytes_written()) { if (result_file_name) { @@ -7592,22 +7641,29 @@ int main(int argc, char **argv) if (record) { - /* Recording - dump the output from test to result file */ - str_to_file(result_file_name, ds_res.str, ds_res.length); + /* Recording */ + + /* save a copy of the log to result file */ + if (my_copy(log_file.file_name(), result_file_name, MYF(0)) != 0) + die("Failed to copy '%s' to '%s', errno: %d", + log_file.file_name(), result_file_name, errno); + } else { - /* Check that the output from test is equal to result file - - detect missing result file - - detect zero size result file - */ - check_result(&ds_res); + /* Check that the output from test is equal to result file */ + check_result(); } } else { - /* No result_file_name specified to compare with, print to stdout */ - printf("%s", ds_res.str); + /* + No result_file_name specified, the result + has been printed to stdout, exit with error + unless script has called "exit" to indicate success + */ + if (abort_flag == 0) + die("Exit with failure! Call 'exit' in script to return with sucess"); } } else @@ -7615,25 +7671,8 @@ int main(int argc, char **argv) die("The test didn't produce any output"); } - if (!command_executed && - result_file_name && my_stat(result_file_name, &res_info, 0)) - { - /* - my_stat() successful on result file. Check if we have not run a - single query, but we do have a result file that contains data. - Note that we don't care, if my_stat() fails. For example, for a - non-existing or non-readable file, we assume it's fine to have - no query output from the test file, e.g. regarded as no error. - */ + if (!command_executed && result_file_name) die("No queries executed but result file found!"); - } - - if ( opt_mark_progress && result_file_name ) - dump_progress(); - - /* Dump warning messages */ - if (result_file_name && ds_warning_messages.length) - dump_warning_messages(); timer_output(); /* Yes, if we got this far the test has suceeded! Sakila smiles */ @@ -7702,12 +7741,11 @@ void do_get_replace_column(struct st_command *command) die("Missing argument in %s", command->query); /* Allocate a buffer for results */ - start= buff= my_malloc(strlen(from)+1,MYF(MY_WME | MY_FAE)); + start= buff= (char*)my_malloc(strlen(from)+1,MYF(MY_WME | MY_FAE)); while (*from) { char *to; uint column_number; - to= get_string(&buff, &from, command); if (!(column_number= atoi(to)) || column_number > MAX_COLUMNS) die("Wrong column number to replace_column in '%s'", command->query); @@ -7785,7 +7823,7 @@ void do_get_replace(struct st_command *command) bzero((char*) &from_array,sizeof(from_array)); if (!*from) die("Missing argument in %s", command->query); - start= buff= my_malloc(strlen(from)+1,MYF(MY_WME | MY_FAE)); + start= buff= (char*)my_malloc(strlen(from)+1,MYF(MY_WME | MY_FAE)); while (*from) { char *to= buff; diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt index a07d089c757..13e5ed1eb7f 100644 --- a/libmysqld/examples/CMakeLists.txt +++ b/libmysqld/examples/CMakeLists.txt @@ -32,7 +32,7 @@ ADD_EXECUTABLE(mysql_embedded ../../client/completion_hash.cc TARGET_LINK_LIBRARIES(mysql_embedded mysys yassl taocrypt zlib debug dbug regex strings wsock32) ADD_DEPENDENCIES(mysql_embedded libmysqld) -ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.c) +ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.cc TARGET_LINK_LIBRARIES(mysqltest_embedded mysys yassl taocrypt zlib debug dbug regex strings wsock32) ADD_DEPENDENCIES(mysqltest_embedded libmysqld) diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index 3425b48645f..109d33a85ae 100644 --- a/libmysqld/examples/Makefile.am +++ b/libmysqld/examples/Makefile.am @@ -41,7 +41,7 @@ LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @LIBDL@ $(CXXLDFLAGS) \ @NDB_SCI_LIBS@ mysqltest_embedded_LINK = $(CXXLINK) -nodist_mysqltest_embedded_SOURCES = mysqltest.c +nodist_mysqltest_embedded_SOURCES = mysqltest.cc mysqltest_embedded_LDADD = $(LDADD) $(top_builddir)/regex/libregex.a nodist_mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \ diff --git a/mysql-test/include/analyze-sync_with_master.test b/mysql-test/include/analyze-sync_with_master.test new file mode 100644 index 00000000000..684c0dbbab7 --- /dev/null +++ b/mysql-test/include/analyze-sync_with_master.test @@ -0,0 +1,6 @@ +SHOW PROCESSLIST; + +let $binlog_name= query_get_value("SHOW MASTER STATUS", File, 1); +eval SHOW BINLOG EVENTS IN '$binlog_name'; + +exit; \ No newline at end of file diff --git a/mysql-test/include/analyze_failure_sync_with_master.test b/mysql-test/include/analyze_failure_sync_with_master.test deleted file mode 100644 index e6fd32d2f46..00000000000 --- a/mysql-test/include/analyze_failure_sync_with_master.test +++ /dev/null @@ -1,15 +0,0 @@ -# Connect to both master and slave -connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,); -connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,); - -vertical_results; - -echo == MASTER ===========================================================; -connection master; -show master status; -show slave status; - -echo == SLAVE ===========================================================; -connection slave; -show master status; -show slave status; diff --git a/mysql-test/include/mysqltest-x.inc b/mysql-test/include/mysqltest-x.inc index dd1468aed07..797c5c39f3f 100644 --- a/mysql-test/include/mysqltest-x.inc +++ b/mysql-test/include/mysqltest-x.inc @@ -1,2 +1,3 @@ echo Output from mysqltest-x.inc; +exit; diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index ad0c82e8a74..904276854ee 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -677,12 +677,16 @@ sub collect_one_test_case { name => "$suitename.$tname", path => "$testdir/$filename", - # TODO allow nonexistsing result file - # in that case .test must issue "exit" otherwise test - # should fail by default - result_file => "$resdir/$tname.result", ); + my $result_file= "$resdir/$tname.result"; + if (-f $result_file) { + # Allow nonexistsing result file + # in that case .test must issue "exit" otherwise test + # should fail by default + $tinfo->{result_file}= $result_file; + } + # ---------------------------------------------------------------------- # Skip some tests but include in list, just mark them as skipped # ---------------------------------------------------------------------- diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index b5c868cb20a..6a46a372c45 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -103,17 +103,24 @@ sub mtr_report_test ($) { my ($tinfo)= @_; _mtr_report_test_name($tinfo); - if ($tinfo->{'result'} eq 'MTR_RES_FAILED'){ + my $comment= $tinfo->{'comment'}; + my $logfile= $tinfo->{'logfile'}; + my $warnings= $tinfo->{'warnings'}; + my $result= $tinfo->{'result'}; - if ( defined $tinfo->{'warnings'} ) + if ($result eq 'MTR_RES_FAILED'){ + + if ( $warnings ) { mtr_report("[ fail ] Found warnings in server log file!"); - mtr_report($tinfo->{'warnings'}); + mtr_report($warnings); return; } - if ( defined $tinfo->{'timeout'} ) + my $timeout= $tinfo->{'timeout'}; + if ( $timeout ) { - mtr_report("[ fail ] timeout"); + mtr_report("[ fail ] timeout after $timeout minutes"); + mtr_report("\n$tinfo->{'comment'}"); return; } else @@ -121,43 +128,42 @@ sub mtr_report_test ($) { mtr_report("[ fail ]"); } - if ( $tinfo->{'comment'} ) + if ( $logfile ) + { + # Test failure was detected by test tool and its report + # about what failed has been saved to file. Display the report. + mtr_report("\n$logfile\n"); + } + if ( $comment ) { # The test failure has been detected by mysql-test-run.pl # when starting the servers or due to other error, the reason for # failing the test is saved in "comment" - mtr_report("\nERROR: $tinfo->{'comment'}"); + mtr_report("\n$comment\n"); } - elsif ( $tinfo->{logfile} ) - { - # Test failure was detected by test tool and its report - # about what failed has been saved to file. Display the report. - mtr_report("\n"); - mtr_report($tinfo->{logfile}, "\n"); - } - else + if ( !$logfile and !$comment ) { # Neither this script or the test tool has recorded info # about why the test has failed. Should be debugged. - mtr_report("\nUnexpected termination, probably when starting mysqld");; + mtr_report("\nUnknown result, neither 'comment' or 'logfile' set"); } } - elsif ($tinfo->{'result'} eq 'MTR_RES_SKIPPED') + elsif ($result eq 'MTR_RES_SKIPPED') { if ( $tinfo->{'disable'} ) { - mtr_report("[ disabled ] $tinfo->{'comment'}"); + mtr_report("[ disabled ] $comment"); } - elsif ( $tinfo->{'comment'} ) + elsif ( $comment ) { if ( $tinfo->{skip_detected_by_test} ) { - mtr_report("[ skip ]. $tinfo->{'comment'}"); + mtr_report("[ skip ]. $comment"); } else { - mtr_report("[ skip ] $tinfo->{'comment'}"); + mtr_report("[ skip ] $comment"); } } else @@ -165,7 +171,7 @@ sub mtr_report_test ($) { mtr_report("[ skip ]"); } } - elsif ($tinfo->{'result'} eq 'MTR_RES_PASSED') + elsif ($result eq 'MTR_RES_PASSED') { my $timer_str= $tinfo->{timer} || ""; $tot_real_time += ($timer_str/1000); diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index e7589562e87..19178bb5482 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -164,7 +164,7 @@ my $opt_repeat= 1; my $opt_retry= 3; my $opt_retry_failure= 2; -my $opt_parallel; +my $opt_parallel= $ENV{MTR_PARALLEL}; my $opt_strace_client; @@ -291,8 +291,9 @@ sub main { my $tinfo = My::Test->new ( name => 'report_features', - result_file => undef, # Prints result + # No result_file => Prints result path => 'include/report-features.test'. + template_path => "include/default_my.cnf", master_opt => [], slave_opt => [], ); @@ -615,6 +616,7 @@ sub run_worker ($) { } setup_vardir(); + check_running_as_root(); mysql_install_db($thread_num); if ( using_extern() ) { @@ -2326,7 +2328,6 @@ sub initialize_servers { mysql_install_db(0); } } - check_running_as_root(); } @@ -2685,6 +2686,120 @@ sub check_testcase($$) } +# Start run mysqltest on one server +# +# RETURN VALUE +# 0 OK +# 1 Check failed +# +sub start_run_one ($$) { + my ($mysqld, $run)= @_; + + my $name= "$run-".$mysqld->name(); + + my $args; + mtr_init_args(\$args); + + mtr_add_arg($args, "--defaults-file=%s", $path_config_file); + mtr_add_arg($args, "--defaults-group-suffix=%s", $mysqld->after('mysqld')); + + mtr_add_arg($args, "--silent"); + mtr_add_arg($args, "--skip-safemalloc"); + mtr_add_arg($args, "--test-file=%s", "include/$run.test"); + + my $errfile= "$opt_vardir/tmp/$name.err"; + my $proc= My::SafeProcess->new + ( + name => $name, + path => $exe_mysqltest, + error => $errfile, + output => $errfile, + args => \$args, + user_data => $errfile, + ); + mtr_verbose("Started $proc"); + return $proc; +} + + +# +# Run script on all servers, collect results +# +# RETURN VALUE +# 0 ok +# 1 Failure + +sub run_on_all($$) +{ + my ($tinfo, $run)= @_; + my $tname= $tinfo->{name}; + + # Start the mysqltest processes in parallel to save time + # also makes it possible to wait for any process to exit during the check + # and to have a timeout process + my %started; + foreach my $mysqld ( mysqlds() ) + { + if ( defined $mysqld->{'proc'} ) + { + my $proc= start_run_one($mysqld, $run); + $started{$proc->pid()}= $proc; + } + } + + # Return immediately if no check proceess was started + return 0 unless ( keys %started ); + + my $timeout_proc= My::SafeProcess->timer(60); # Seconds + + while (1){ + my $result; + my $proc= My::SafeProcess->wait_any(); + mtr_report("Got $proc"); + + if ( delete $started{$proc->pid()} ) { + + # One mysqltest process returned + my $err_file= $proc->user_data(); + my $res= $proc->exit_status(); + + # Append the report from .err file + $tinfo->{comment}.= " == $err_file ==\n"; + $tinfo->{comment}.= mtr_grab_file($err_file); + $tinfo->{comment}.= "\n"; + + # Remove the .err file + unlink($err_file); + + if ( keys(%started) == 0){ + # All completed + $timeout_proc->kill(); + return 0; + } + + # Wait for next process to exit + next; + } + elsif ( $proc eq $timeout_proc ) { + $tinfo->{comment}.= "Timeout $timeout_proc expired for running '$run'"; + } + else { + # Unknown process returned, most likley a crash, abort everything + $tinfo->{comment}.= + "Unexpected process $proc returned during ". + "execution of '$run'"; + } + + # Kill any check processes still running + map($_->kill(), values(%started)); + + $timeout_proc->kill(); + + return 1; + } +} + + sub mark_log { my ($log, $tinfo)= @_; my $log_msg= "CURRENT_TEST: $tinfo->{name}\n"; @@ -2722,6 +2837,26 @@ sub find_testcase_skipped_reason($) } +sub find_analyze_request +{ + # Open the test log file + my $F= IO::File->new($path_current_testlog) + or return; + my $analyze; + + while ( my $line= <$F> ) + { + # Look for "reason: " + if ( $line =~ /analyze: (.*)/ ) + { + $analyze= $1; + } + } + + return $analyze; +} + + # Return timezone value of tinfo or default value sub timezone { my ($tinfo)= @_; @@ -2925,6 +3060,13 @@ sub run_testcase ($) { } elsif ( $res == 1 ) { + # Check if the test tool requests that + # an analyze script should be run + my $analyze= find_analyze_request(); + if ($analyze){ + run_on_all($tinfo, "analyze-$analyze"); + } + # Test case failure reported by mysqltest report_failure_and_restart($tinfo); } @@ -2983,8 +3125,10 @@ sub run_testcase ($) { # ---------------------------------------------------- if ( $proc eq $test_timeout_proc ) { - mtr_report("Test case timeout!"); - $tinfo->{'timeout'}= 1; # Mark as timeout + $tinfo->{comment}= + "Test case timeout after $opt_testcase_timeout minute(s)\n\n"; + $tinfo->{'timeout'}= $opt_testcase_timeout; # Mark as timeout + run_on_all($tinfo, 'analyze-timeout'); report_failure_and_restart($tinfo); return 1; } @@ -3301,7 +3445,6 @@ sub report_failure_and_restart ($) { $tinfo->{'failures'}= $test_failures + 1; - my $logfile= $path_current_testlog; if ( $tinfo->{comment} ) { # The test failure has been detected by mysql-test-run.pl @@ -3309,12 +3452,17 @@ sub report_failure_and_restart ($) { # failing the test is saved in "comment" ; } - elsif ( defined $logfile and -f $logfile ) + + if ( !defined $tinfo->{logfile} ) { - # Test failure was detected by test tool and its report - # about what failed has been saved to file. Save the report - # in tinfo - $tinfo->{logfile}= mtr_fromfile($logfile); + my $logfile= $path_current_testlog; + if ( defined $logfile and -f $logfile ) + { + # Test failure was detected by test tool and its report + # about what failed has been saved to file. Save the report + # in tinfo + $tinfo->{logfile}= mtr_fromfile($logfile); + } } after_failure($tinfo); @@ -3892,6 +4040,16 @@ sub start_servers($) { $mysqld->{'proc'}) == 0) { $tinfo->{comment}= "Failed to start ".$mysqld->name(); + + my $logfile= $mysqld->value('log-error'); + if ( defined $logfile and -f $logfile ) + { + $tinfo->{logfile}= mtr_fromfile($logfile); + } + else + { + $tinfo->{logfile}= "Could not open server logfile: '$logfile'"; + } return 1; } } @@ -4012,8 +4170,6 @@ sub start_mysqltest ($) { mtr_add_arg($args, "--sleep=%d", $opt_sleep); } - client_debug_arg($args, "mysqltest"); - if ( $opt_ssl ) { # Turn on SSL for _all_ test cases if option --ssl was used @@ -4069,6 +4225,8 @@ sub start_mysqltest ($) { mtr_add_arg($args, "--result-file=%s", $tinfo->{'result_file'}); } + client_debug_arg($args, "mysqltest"); + if ( $opt_record ) { mtr_add_arg($args, "--record"); diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index adf99185d89..d8fd01f86ee 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -293,7 +293,7 @@ var5 from query that returns no row failing query in let mysqltest: At line 1: Error running query 'failing query': 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'failing query' at line 1 mysqltest: At line 1: Missing required argument 'filename' to command 'source' -mysqltest: At line 1: Could not open './non_existingFile' for reading +mysqltest: At line 1: Could not open './non_existingFile' for reading, errno: 2 mysqltest: In included file "MYSQLTEST_VARDIR/tmp/recursive.sql": At line 1: Source directives are nesting too deep mysqltest: In included file "MYSQLTEST_VARDIR/tmp/error.sql": At line 1: query 'garbage ' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 @@ -443,7 +443,7 @@ ERROR 3D000: No database selected Output from mysqltest-x.inc Output from mysqltest-x.inc Output from mysqltest-x.inc -mysqltest: Could not open './non_existing_file.inc' for reading: errno = 2 +mysqltest: Could not open './non_existing_file.inc' for reading, errno: 2 failing_statement; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'failing_statement' at line 1 failing_statement; @@ -486,8 +486,6 @@ mysqltest: At line 3: query 'create table t1 (a int primary key); insert into t1 values (1); select 'select-me'; insertz 'error query'' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insertz 'error query'' at line 1 - -More results from queries before failure can be found in MYSQLTEST_VARDIR/log/bug11731.log drop table t1; Multi statement using expected error create table t1 (a int primary key); @@ -728,4 +726,12 @@ mysqltest: At line 1: change user failed: Access denied for user 'root'@'localho SELECT 'c:\\a.txt' AS col; col z +select 1; +1 +1 +select 1; +1 +1 +-- a comment for the server; +mysqltest: At line 1: Found line beginning with -- that didn't contain a valid mysqltest command, check your syntax or use # if you intended to write a comment End of tests diff --git a/mysql-test/t/fix_priv_tables.test b/mysql-test/t/fix_priv_tables.test index 3051fd88076..c7cd500f8d2 100644 --- a/mysql-test/t/fix_priv_tables.test +++ b/mysql-test/t/fix_priv_tables.test @@ -51,7 +51,8 @@ echo; -- disable_query_log # Run the mysql_fix_privilege_tables.sql using "mysql --force" ---exec $MYSQL --force mysql < $MYSQL_FIX_PRIVILEGE_TABLES > $MYSQLTEST_VARDIR/log/fix_priv_tables.log 2>&1 +--exec $MYSQL --force mysql < $MYSQL_FIX_PRIVILEGE_TABLES > $MYSQLTEST_VARDIR/tmp/fix_priv_tables.log 2>&1 +--remove_file $MYSQLTEST_VARDIR/tmp/fix_priv_tables.log -- enable_query_log -- enable_result_log diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index b41f033d2af..5c5b74c968a 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -1225,7 +1225,7 @@ select "a" as col1, "c" as col2; --exec echo "replace_result a;" | $MYSQL_TEST 2>&1 --error 1 --exec echo "replace_result a ;" | $MYSQL_TEST 2>&1 ---exec echo "replace_result a b; echo OK;" | $MYSQL_TEST 2>&1 +--exec echo "replace_result a b; echo OK; exit;" | $MYSQL_TEST 2>&1 --error 1 --exec echo "--replace_result a b c" | $MYSQL_TEST 2>&1 --error 1 @@ -1289,7 +1289,7 @@ while ($i) dec $i; } EOF ---exec echo "source $MYSQLTEST_VARDIR/tmp/mysqltest.sql; echo OK;" | $MYSQL_TEST 2>&1 +--exec echo "source $MYSQLTEST_VARDIR/tmp/mysqltest.sql; echo OK; exit;" | $MYSQL_TEST 2>&1 remove_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql; # Repeat connect/disconnect @@ -1496,6 +1496,7 @@ echo Multi statement using expected error; --exec echo "select 'select-me';" >> $MYSQLTEST_VARDIR/tmp/bug11731.sql --exec echo "insertz "error query"||||" >> $MYSQLTEST_VARDIR/tmp/bug11731.sql --exec echo "delimiter ;||||" >> $MYSQLTEST_VARDIR/tmp/bug11731.sql +--exec echo "exit;" >> $MYSQLTEST_VARDIR/tmp/bug11731.sql # These two should work since the error is expected --exec $MYSQL_TEST -x $MYSQLTEST_VARDIR/tmp/bug11731.sql 2>&1 @@ -1688,6 +1689,7 @@ EOF --diff_files $MYSQLTEST_VARDIR/tmp/diff1.tmp $MYSQLTEST_VARDIR/tmp/diff4.tmp --error 1 --diff_files $MYSQLTEST_VARDIR/tmp/diff4.tmp $MYSQLTEST_VARDIR/tmp/diff1.tmp +exit; EOF # Execute the above diffs, and send their output to /dev/null - only @@ -2131,5 +2133,19 @@ rmdir $MYSQLTEST_VARDIR/tmp/testdir; --replace_result c:\\a.txt z SELECT 'c:\\a.txt' AS col; +# ---------------------------------------------------------------------------- +# Test that -- is not allowed as comment, only as mysqltest builtin command +# ---------------------------------------------------------------------------- + +# valid +select 1; +--query select 1 +--query -- a comment for the server + +# Not valid, "select" is not a mysqltest command +--error 1 +--exec echo "--select 1;" | $MYSQL_TEST 2>&1 + + --echo End of tests diff --git a/mysql-test/t/openssl_1.test b/mysql-test/t/openssl_1.test index 111c723e19c..a76f62c9611 100644 --- a/mysql-test/t/openssl_1.test +++ b/mysql-test/t/openssl_1.test @@ -101,7 +101,7 @@ drop table t1; # - Apparently selecting a cipher doesn't work at all # - Usa a cipher that both yaSSL and OpenSSL supports # ---exec echo "SHOW STATUS LIKE 'Ssl_cipher';" > $MYSQLTEST_VARDIR/tmp/test.sql +--exec echo "SHOW STATUS LIKE 'Ssl_cipher'; exit;" > $MYSQLTEST_VARDIR/tmp/test.sql --exec $MYSQL_TEST --ssl-cipher=DHE-RSA-AES256-SHA < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 # @@ -155,18 +155,18 @@ SET GLOBAL event_scheduler=0; # # Test to connect using a list of ciphers # ---exec echo "SHOW STATUS LIKE 'Ssl_cipher';" > $MYSQLTEST_VARDIR/tmp/test.sql +--exec echo "SHOW STATUS LIKE 'Ssl_cipher'; exit;" > $MYSQLTEST_VARDIR/tmp/test.sql --exec $MYSQL_TEST --ssl-cipher=UNKNOWN-CIPHER:AES128-SHA < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 # Test to connect using a specifi cipher # ---exec echo "SHOW STATUS LIKE 'Ssl_cipher';" > $MYSQLTEST_VARDIR/tmp/test.sql +--exec echo "SHOW STATUS LIKE 'Ssl_cipher'; exit;" > $MYSQLTEST_VARDIR/tmp/test.sql --exec $MYSQL_TEST --ssl-cipher=AES128-SHA < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 # Test to connect using an unknown cipher # ---exec echo "SHOW STATUS LIKE 'Ssl_cipher';" > $MYSQLTEST_VARDIR/tmp/test.sql +--exec echo "SHOW STATUS LIKE 'Ssl_cipher'; exit" > $MYSQLTEST_VARDIR/tmp/test.sql --error 1 --exec $MYSQL_TEST --ssl-cipher=UNKNOWN-CIPHER < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 From afbbe64aae7755122fb8a43c282b0aea3ee17ed4 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 4 Aug 2008 21:56:20 +0200 Subject: [PATCH 250/705] Patch for combinations file using different --default-storage-engine= directives --- mysql-test/lib/mtr_cases.pm | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 47909b7a38f..863c3c71adb 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -537,23 +537,36 @@ sub optimize_cases { } } - # ======================================================= # Check that engine selected by # --default-storage-engine= is supported # ======================================================= + my %builtin_engines = ('myisam' => 1, 'memory' => 1); + foreach my $opt ( @{$tinfo->{master_opt}} ) { my $default_engine= mtr_match_prefix($opt, "--default-storage-engine="); if (defined $default_engine){ - if ( ! exists $::mysqld_variables{$default_engine} ) - { - $tinfo->{'skip'}= 1; - $tinfo->{'comment'}= - "'$default_engine' not supported"; + #print " $tinfo->{name}\n"; + #print " - The test asked to use '$default_engine'\n"; + + #my $engine_value= $::mysqld_variables{$default_engine}; + #print " - The mysqld_variables says '$engine_value'\n"; + + if ( ! exists $::mysqld_variables{$default_engine} and + ! exists $builtin_engines{$default_engine} ) + { + $tinfo->{'skip'}= 1; + $tinfo->{'comment'}= + "'$default_engine' not supported"; } + + $tinfo->{'ndb_test'}= 1 + if ( $default_engine =~ /^ndb/i ); + $tinfo->{'innodb_test'}= 1 + if ( $default_engine =~ /^innodb/i ); } } } From 2441ec87707e32533bb3714afdff4b148f53a13f Mon Sep 17 00:00:00 2001 From: He Zhenxing Date: Wed, 6 Aug 2008 18:52:15 +0800 Subject: [PATCH 251/705] Wait for slave to stop before set skip counter --- mysql-test/include/wait_for_slave_sql_error_and_skip.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mysql-test/include/wait_for_slave_sql_error_and_skip.inc b/mysql-test/include/wait_for_slave_sql_error_and_skip.inc index c38277b33ff..9b5641bfa34 100644 --- a/mysql-test/include/wait_for_slave_sql_error_and_skip.inc +++ b/mysql-test/include/wait_for_slave_sql_error_and_skip.inc @@ -17,6 +17,9 @@ if ($show_sql_error) echo Last_SQL_Error = $error; } +# wait for SQL thread to stop after the error +source include/wait_for_slave_sql_to_stop.inc; + # skip the erroneous statement set global sql_slave_skip_counter=1; source include/start_slave.inc; From 32f4018500511fc96573529e14cadb4cadbb4af8 Mon Sep 17 00:00:00 2001 From: He Zhenxing Date: Thu, 7 Aug 2008 09:33:01 +0800 Subject: [PATCH 252/705] post push fix for BUG#37051 --- mysql-test/r/multi_update.result | 4 ++-- sql/sql_class.cc | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result index 421a63cd54c..aa88b44f5b4 100644 --- a/mysql-test/r/multi_update.result +++ b/mysql-test/r/multi_update.result @@ -627,7 +627,7 @@ a b 4 4 show master status /* there must be the UPDATE query event */; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 197 +master-bin.000001 206 delete from t1; delete from t2; insert into t1 values (1,2),(3,4),(4,4); @@ -637,7 +637,7 @@ UPDATE t2,t1 SET t2.a=t2.b where t2.a=t1.a; ERROR 23000: Duplicate entry '4' for key 'PRIMARY' show master status /* there must be the UPDATE query event */; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 212 +master-bin.000001 221 drop table t1, t2; set @@session.binlog_format= @sav_binlog_format; drop table if exists t1, t2, t3; diff --git a/sql/sql_class.cc b/sql/sql_class.cc index cab69423ee4..c83ca0d1899 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -514,6 +514,7 @@ THD::THD() lock_id(&main_lock_id), user_time(0), in_sub_stmt(0), binlog_table_maps(0), binlog_flags(0UL), + table_map_for_update(0), arg_of_last_insert_id_function(FALSE), first_successful_insert_id_in_prev_stmt(0), first_successful_insert_id_in_prev_stmt_for_binlog(0), From 36459fb6dc7e1dd0f2547d7164b4843c228bae04 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 8 Aug 2008 19:09:13 +0200 Subject: [PATCH 253/705] Make opt_big_test a global variable --- mysql-test/mysql-test-run.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 0e30d045781..badd52edd2b 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -98,7 +98,7 @@ our $exe_mysqladmin; our $exe_mysqltest; our $exe_libtool; -my $opt_big_test= 0; +our $opt_big_test= 0; our @opt_combinations; From 02e48e886fdf6c5140b404a8dd199991f2192e95 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Sat, 9 Aug 2008 10:52:50 +0200 Subject: [PATCH 254/705] Fix warnings in mysqltest --- client/mysqltest.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 7b90526271b..87557d46053 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -546,8 +546,8 @@ public: DBUG_ASSERT(ds->str); if (fwrite(ds->str, 1, ds->length, m_file) != ds->length) - die("Failed to write %d bytes to '%s', errno: %d", - ds->length, m_file_name, errno); + die("Failed to write %lu bytes to '%s', errno: %d", + (unsigned long)ds->length, m_file_name, errno); m_bytes_written+= ds->length; DBUG_VOID_RETURN; } @@ -585,7 +585,8 @@ public: DBUG_VOID_RETURN; } - DBUG_PRINT("info", ("Read %d bytes from file, buf: %s", bytes, buf)); + DBUG_PRINT("info", ("Read %lu bytes from file, buf: %s", + (unsigned long)bytes, buf)); char* show_from= buf + bytes; while(show_from > buf && lines > 0 ) @@ -2291,7 +2292,7 @@ void eval_expr(VAR *v, const char *p, const char **p_end) const char* end= *p_end + 1; if (end < expected_end) die("Found junk '%.*s' after $variable in expression", - expected_end - end - 1, end); + (int)(expected_end - end - 1), end); DBUG_VOID_RETURN; } From 66b42a13f22a9ccd86b99f4fb7900815d8710c87 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Sat, 9 Aug 2008 11:16:12 +0200 Subject: [PATCH 255/705] Make events_restart more stable by waiting for the server to be stopped before starting it again --- client/mysqltest.cc | 2 +- mysql-test/include/restart_mysqld.inc | 12 ++++++++++-- mysql-test/lib/mtr_io.pl | 14 +++++++++++++- mysql-test/mysql-test-run.pl | 27 +++++++++++++++++++++++---- 4 files changed, 47 insertions(+), 8 deletions(-) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 87557d46053..3176e764515 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -4174,7 +4174,7 @@ void do_shutdown_server(struct st_command *command) /* Check that server dies */ while(timeout--){ if (my_kill(0, pid) < 0){ - DBUG_PRINT("info", ("Sleeping, timeout: %d", timeout)); + DBUG_PRINT("info", ("Process %d does not exist anymore", pid)); break; } DBUG_PRINT("info", ("Sleeping, timeout: %d", timeout)); diff --git a/mysql-test/include/restart_mysqld.inc b/mysql-test/include/restart_mysqld.inc index 049827c7a81..30b6c7ce70f 100644 --- a/mysql-test/include/restart_mysqld.inc +++ b/mysql-test/include/restart_mysqld.inc @@ -1,13 +1,21 @@ -# Write file to make mysql-test-run.pl expect crash and restart +# Write file to make mysql-test-run.pl expect the "crash", but don't start +# it until it's told to --write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect -restart +wait EOF # Send shutdown to the connected server and give # it 10 seconds to die before zapping it shutdown_server 10; +# Check server is gone +--source include/wait_until_disconnected.inc + +# Write file to make mysql-test-run.pl start up the server again +--append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect +restart +EOF # Turn on reconnect --enable_reconnect diff --git a/mysql-test/lib/mtr_io.pl b/mysql-test/lib/mtr_io.pl index 6712c19b829..31c2e8ffb06 100644 --- a/mysql-test/lib/mtr_io.pl +++ b/mysql-test/lib/mtr_io.pl @@ -26,7 +26,7 @@ sub mtr_tonewfile($@); sub mtr_appendfile_to_file ($$); sub mtr_grab_file($); sub mtr_printfile($); - +sub mtr_lastlinefromfile ($); # Read a whole file, stripping leading and trailing whitespace. sub mtr_fromfile ($) { @@ -94,5 +94,17 @@ sub mtr_printfile($) { return; } +sub mtr_lastlinefromfile ($) { + my $file= shift; + my $text; + + open(FILE,"<",$file) or mtr_error("can't open file \"$file\": $!"); + while (my $line= ) + { + $text= $line; + } + close FILE; + return $text; +} 1; diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 4d9e44fe922..212cf07ef0e 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3320,10 +3320,29 @@ sub check_expected_crash_and_restart { my $expect_file= "$opt_vardir/tmp/".$mysqld->name().".expect"; if ( -f $expect_file ) { - mtr_report("Crash was expected, file '$expect_file' exists"); - # Start server with same settings as last time - mysqld_start($mysqld, $mysqld->{'started_opts'}); - unlink($expect_file); + mtr_verbose("Crash was expected, file '$expect_file' exists"); + + while (1){ + + # If last line in expect file starts with "wait" + # sleep a little and try again, thus allowing the + # test script to control when the server should start + # up again + my $last_line= mtr_lastlinefromfile($expect_file); + if ($last_line =~ /^wait/ ) + { + mtr_verbose("Test says wait before restart"); + mtr_milli_sleep(100); + next; + } + + unlink($expect_file); + + # Start server with same settings as last time + mysqld_start($mysqld, $mysqld->{'started_opts'}); + + last; + } } return 1; From aceba783f8a5c4cd82f820e7c7c79557212d7239 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Sat, 9 Aug 2008 11:29:35 +0200 Subject: [PATCH 256/705] Improve printout for 'found warnings' and add an exit to please mysqltest --- mysql-test/include/check-warnings.test | 3 ++- mysql-test/include/mtr_warnings.sql | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mysql-test/include/check-warnings.test b/mysql-test/include/check-warnings.test index e29f4300562..9f404201ab8 100644 --- a/mysql-test/include/check-warnings.test +++ b/mysql-test/include/check-warnings.test @@ -8,5 +8,6 @@ call mtr.check_warnings(@result); if (`select @result = 0`){ skip OK; } -echo Found warnings; --enable_query_log +echo ^ Found warnings!!; +exit; diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index 76c68cb68d0..5c359693bd7 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -278,7 +278,7 @@ BEGIN SELECT @log_error; SELECT line as log_error FROM suspect_lines WHERE supressed=0; - SELECT * FROM test_supressions; + --SELECT * FROM test_supressions; -- Return 2 -> check failed SELECT 2 INTO result; ELSE From 06a2f92bac83065c62ecd2a6f2f6cb18dca4b7df Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Sat, 9 Aug 2008 11:31:17 +0200 Subject: [PATCH 257/705] Ad missing ) to CmakeLists.txt --- libmysqld/examples/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt index 13e5ed1eb7f..fde37830ddf 100644 --- a/libmysqld/examples/CMakeLists.txt +++ b/libmysqld/examples/CMakeLists.txt @@ -32,7 +32,7 @@ ADD_EXECUTABLE(mysql_embedded ../../client/completion_hash.cc TARGET_LINK_LIBRARIES(mysql_embedded mysys yassl taocrypt zlib debug dbug regex strings wsock32) ADD_DEPENDENCIES(mysql_embedded libmysqld) -ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.cc +ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.cc) TARGET_LINK_LIBRARIES(mysqltest_embedded mysys yassl taocrypt zlib debug dbug regex strings wsock32) ADD_DEPENDENCIES(mysqltest_embedded libmysqld) From 00560ac3d48dd2fca9f341f1df2cb64befcc17f8 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Sat, 9 Aug 2008 11:33:59 +0200 Subject: [PATCH 258/705] Add analyze-timeout.test --- mysql-test/include/analyze-timeout.test | 1 + 1 file changed, 1 insertion(+) create mode 100644 mysql-test/include/analyze-timeout.test diff --git a/mysql-test/include/analyze-timeout.test b/mysql-test/include/analyze-timeout.test new file mode 100644 index 00000000000..1de0dcb483c --- /dev/null +++ b/mysql-test/include/analyze-timeout.test @@ -0,0 +1 @@ +SHOW PROCESSLIST; From 4202897da74cdf536db32541f0431de4ab1231e5 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Sat, 9 Aug 2008 14:52:39 +0200 Subject: [PATCH 259/705] Open result file in binary moe to avoid CR/LF problems --- client/mysqltest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 3176e764515..868177eefdb 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -517,7 +517,7 @@ public: DBUG_PRINT("info", ("file_name: %s", m_file_name)); - if ((m_file= fopen(m_file_name, "w+")) == NULL) + if ((m_file= fopen(m_file_name, "wb+")) == NULL) die("Failed to open log file %s, errno: %d", m_file_name, errno); DBUG_VOID_RETURN; From 552d514d0b14eb1eb43cf0d4bc9169a06eaf9bd6 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Sat, 9 Aug 2008 14:59:57 +0200 Subject: [PATCH 260/705] Fix VS8 build error --- client/mysqltest.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 868177eefdb..9b05a2c60ec 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -487,7 +487,7 @@ void free_all_replace(){ class LogFile { FILE* m_file; char m_file_name[FN_REFLEN]; - uint m_bytes_written; + size_t m_bytes_written; public: LogFile() : m_file(NULL), m_bytes_written(0) { bzero(m_file_name, sizeof(m_file_name)); @@ -498,7 +498,7 @@ public: } const char* file_name() const { return m_file_name; } - uint bytes_written() const { return m_bytes_written; } + size_t bytes_written() const { return m_bytes_written; } void open(const char* dir, const char* name, const char* ext) { @@ -5972,7 +5972,7 @@ void fix_win_paths(const char *val, int len) DBUG_PRINT("info", ("pattern: %s", *pattern)); /* Search for the path in string */ - while ((p= strstr(val, *pattern))) + while ((p= strstr((char*)val, *pattern))) { DBUG_PRINT("info", ("Found %s in val p: %s", *pattern, p)); From c431b23baeec840c16b08db38e72e89d1f0a1fba Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Sun, 10 Aug 2008 19:46:43 +0200 Subject: [PATCH 261/705] Fixup mtr_unique. Remove usage of ps and grep. Make it a module. Move _process_alive to Platform.pm. Rename opt_baseport to baseport, it's not an option --- mysql-test/lib/My/Platform.pm | 14 ++- mysql-test/lib/My/SafeProcess.pm | 11 -- mysql-test/lib/mtr_unique.pl | 178 ------------------------------ mysql-test/lib/mtr_unique.pm | 184 +++++++++++++++++++++++++++++++ mysql-test/mysql-test-run.pl | 22 ++-- 5 files changed, 209 insertions(+), 200 deletions(-) delete mode 100644 mysql-test/lib/mtr_unique.pl create mode 100644 mysql-test/lib/mtr_unique.pm diff --git a/mysql-test/lib/My/Platform.pm b/mysql-test/lib/My/Platform.pm index b934b08f522..1db6985771d 100644 --- a/mysql-test/lib/My/Platform.pm +++ b/mysql-test/lib/My/Platform.pm @@ -21,7 +21,7 @@ use strict; use base qw(Exporter); our @EXPORT= qw(IS_CYGWIN IS_WINDOWS IS_WIN32PERL native_path posix_path mixed_path - check_socket_path_length); + check_socket_path_length process_alive); BEGIN { if ($^O eq "cygwin") { @@ -123,4 +123,16 @@ sub check_socket_path_length { } +sub process_alive { + my ($pid)= @_; + die "usage: process_alive(pid)" unless $pid; + + return kill(0, $pid) unless IS_WINDOWS; + + my @list= split(/,/, `tasklist /FI "PID eq $pid" /NH /FO CSV`); + my $ret_pid= eval($list[1]); + return ($ret_pid == $pid); +} + + 1; diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index 7762441496c..83749514622 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -100,17 +100,6 @@ else } -sub _process_alive { - my ($pid)= @_; - - return kill(0, $pid) unless IS_WINDOWS; - - my @list= split(/,/, `tasklist /FI "PID eq $pid" /NH /FO CSV`); - my $ret_pid= eval($list[1]); - return ($ret_pid == $pid); -} - - sub new { my $class= shift; diff --git a/mysql-test/lib/mtr_unique.pl b/mysql-test/lib/mtr_unique.pl deleted file mode 100644 index a668fc097c7..00000000000 --- a/mysql-test/lib/mtr_unique.pl +++ /dev/null @@ -1,178 +0,0 @@ -# -*- cperl -*- -# Copyright (C) 2006 MySQL AB -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# -# This file is used from mysql-test-run.pl when choosing -# port numbers and directories to use for running mysqld. -# - -use strict; -use Fcntl ':flock'; - -# -# Requested IDs are stored in a hash and released upon END. -# -my %mtr_unique_assigned_ids = (); -my $mtr_unique_pid; -BEGIN { - $mtr_unique_pid = $$ unless defined $mtr_unique_pid; -} -END { - if($mtr_unique_pid == $$) { - while(my ($id,$file) = each(%mtr_unique_assigned_ids)) { - print "Autoreleasing $file:$id\n"; - mtr_release_unique_id($file, $id); - } - } -} - -# -# Require a unique, numerical ID, given a file name (where all -# requested IDs are stored), a minimum and a maximum value. -# -# We use flock to implement locking for the ID file and ignore -# possible problems arising from lack of support for it on -# some platforms (it should work on most, and the possible -# race condition would occur rarely). The proper solution for -# this is a daemon that manages IDs, of course. -# -# If no unique ID within the specified parameters can be -# obtained, return undef. -# -sub mtr_require_unique_id($$$) { - my $file = shift; - my $min = shift; - my $max = shift; - my $ret = undef; - my $changed = 0; - - my $can_use_ps = `ps -e | grep '^[ ]*$$ '`; - - if(eval("readlink '$file'") || eval("readlink '$file.sem'")) { - die 'lock file is a symbolic link'; - } - - chmod 0777, "$file.sem"; - open SEM, ">", "$file.sem" or die "can't write to $file.sem"; - flock SEM, LOCK_EX or die "can't lock $file.sem"; - if(! -e $file) { - open FILE, ">", $file or die "can't create $file"; - close FILE; - } - - if(eval("readlink '$file'") || eval("readlink '$file.sem'")) { - die 'lock file is a symbolic link'; - } - - chmod 0777, $file; - open FILE, "+<", $file or die "can't open $file"; - select undef,undef,undef,0.2; - seek FILE, 0, 0; - my %taken = (); - while() { - chomp; - my ($id, $pid) = split / /; - $taken{$id} = $pid; - if($can_use_ps) { - my $res = `ps -e | grep '^[ ]*$pid '`; - if(!$res) { - print "Ignoring slot $id used by missing process $pid.\n"; - delete $taken{$id}; - ++$changed; - } - } - } - for(my $i=$min; $i<=$max; ++$i) { - if(! exists $taken{$i}) { - $ret = $i; - $taken{$i} = $$; - ++$changed; - last; - } - } - if($changed) { - seek FILE, 0, 0; - truncate FILE, 0 or die "can't truncate $file"; - for my $k (keys %taken) { - print FILE $k . ' ' . $taken{$k} . "\n"; - } - } - close FILE; - flock SEM, LOCK_UN or warn "can't unlock $file.sem"; - close SEM; - $mtr_unique_assigned_ids{$ret} = $file if defined $ret; - return $ret; -} - -# -# Require a unique ID like above, but sleep if no ID can be -# obtained immediately. -# -sub mtr_require_unique_id_and_wait($$$) { - my $ret = mtr_require_unique_id($_[0],$_[1],$_[2]); - while(! defined $ret) { - sleep 30; - $ret = mtr_require_unique_id($_[0],$_[1],$_[2]); - print "Waiting for unique id to become available...\n" unless $ret; - } - return $ret; -} - -# -# Release a unique ID. -# -sub mtr_release_unique_id($$) { - my $file = shift; - my $myid = shift; - - if(eval("readlink '$file'") || eval("readlink '$file.sem'")) { - die 'lock file is a symbolic link'; - } - - open SEM, ">", "$file.sem" or die "can't write to $file.sem"; - flock SEM, LOCK_EX or die "can't lock $file.sem"; - - if(eval("readlink '$file'") || eval("readlink '$file.sem'")) { - die 'lock file is a symbolic link'; - } - - if(! -e $file) { - open FILE, ">", $file or die "can't create $file"; - close FILE; - } - open FILE, "+<", $file or die "can't open $file"; - select undef,undef,undef,0.2; - seek FILE, 0, 0; - my %taken = (); - while() { - chomp; - my ($id, $pid) = split / /; - $taken{$id} = $pid; - } - delete $taken{$myid}; - seek FILE, 0, 0; - truncate FILE, 0 or die "can't truncate $file"; - for my $k (keys %taken) { - print FILE $k . ' ' . $taken{$k} . "\n"; - } - close FILE; - flock SEM, LOCK_UN or warn "can't unlock $file.sem"; - close SEM; - delete $mtr_unique_assigned_ids{$myid}; -} - -1; - diff --git a/mysql-test/lib/mtr_unique.pm b/mysql-test/lib/mtr_unique.pm new file mode 100644 index 00000000000..22a23644540 --- /dev/null +++ b/mysql-test/lib/mtr_unique.pm @@ -0,0 +1,184 @@ +# -*- cperl -*- +# Copyright (C) 2006 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +package mtr_unique; + +use strict; +use Fcntl ':flock'; + +use base qw(Exporter); +our @EXPORT= qw(mtr_get_unique_id mtr_release_unique_id); + +use My::Platform; + +sub msg { + # print "### unique($$) - ", join(" ", @_), "\n"; +} + +my $file= "/tmp/mysql-test-ports"; + +my %mtr_unique_ids; + +END { + my $allocated_id= $mtr_unique_ids{$$}; + if (defined $allocated_id) + { + mtr_release_unique_id($allocated_id); + } + delete $mtr_unique_ids{$$}; +} + +# +# Get a unique, numerical ID, given a file name (where all +# requested IDs are stored), a minimum and a maximum value. +# +# If no unique ID within the specified parameters can be +# obtained, return undef. +# +sub mtr_get_unique_id($$) { + my ($min, $max)= @_;; + + msg("get, '$file', $min-$max"); + + die "Can only get one unique id per process!" if $mtr_unique_ids{$$}; + + my $ret = undef; + my $changed = 0; + + if(eval("readlink '$file'") || eval("readlink '$file.sem'")) { + die 'lock file is a symbolic link'; + } + + chmod 0777, "$file.sem"; + open SEM, ">", "$file.sem" or die "can't write to $file.sem"; + flock SEM, LOCK_EX or die "can't lock $file.sem"; + if(! -e $file) { + open FILE, ">", $file or die "can't create $file"; + close FILE; + } + + msg("HAVE THE LOCK"); + + if(eval("readlink '$file'") || eval("readlink '$file.sem'")) { + die 'lock file is a symbolic link'; + } + + chmod 0777, $file; + open FILE, "+<", $file or die "can't open $file"; + #select undef,undef,undef,0.2; + seek FILE, 0, 0; + my %taken = (); + while() { + chomp; + my ($id, $pid) = split / /; + $taken{$id} = $pid; + msg("taken: $id, $pid"); + # Check if process with given pid is alive + if(!process_alive($pid)) { + msg("Removing slot $id used by missing process $pid");; + delete $taken{$id}; + $changed++; + } + } + for(my $i=$min; $i<=$max; ++$i) { + if(! exists $taken{$i}) { + $ret = $i; + $taken{$i} = $$; + $changed++; + # Remember the id this process got + $mtr_unique_ids{$$}= $i; + msg(" got $i"); + last; + } + } + if($changed) { + seek FILE, 0, 0; + truncate FILE, 0 or die "can't truncate $file"; + for my $k (keys %taken) { + print FILE $k . ' ' . $taken{$k} . "\n"; + } + } + close FILE; + + msg("RELEASING THE LOCK"); + flock SEM, LOCK_UN or warn "can't unlock $file.sem"; + close SEM; + + return $ret; +} + + +# +# Release a unique ID. +# +sub mtr_release_unique_id($) { + my ($myid)= @_; + + msg("release, $myid"); + + + if(eval("readlink '$file'") || eval("readlink '$file.sem'")) { + die 'lock file is a symbolic link'; + } + + open SEM, ">", "$file.sem" or die "can't write to $file.sem"; + flock SEM, LOCK_EX or die "can't lock $file.sem"; + + msg("HAVE THE LOCK"); + + if(eval("readlink '$file'") || eval("readlink '$file.sem'")) { + die 'lock file is a symbolic link'; + } + + if(! -e $file) { + open FILE, ">", $file or die "can't create $file"; + close FILE; + } + open FILE, "+<", $file or die "can't open $file"; + #select undef,undef,undef,0.2; + seek FILE, 0, 0; + my %taken = (); + while() { + chomp; + my ($id, $pid) = split / /; + msg(" taken, $id $pid"); + $taken{$id} = $pid; + } + + if ($taken{$myid} != $$) + { + msg(" The unique id for this process does not match pid"); + } + + + msg(" removing $myid"); + delete $taken{$myid}; + seek FILE, 0, 0; + truncate FILE, 0 or die "can't truncate $file"; + for my $k (keys %taken) { + print FILE $k . ' ' . $taken{$k} . "\n"; + } + close FILE; + + msg("RELEASE THE LOCK"); + + flock SEM, LOCK_UN or warn "can't unlock $file.sem"; + close SEM; +} + + +1; + diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 212cf07ef0e..2dc3fce6ba0 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -53,6 +53,7 @@ use My::SysInfo; use mtr_cases; use mtr_report; use mtr_match; +use mtr_unique; use IO::Socket::INET; use IO::Select; @@ -60,7 +61,6 @@ require "lib/mtr_process.pl"; require "lib/mtr_io.pl"; require "lib/mtr_gcov.pl"; require "lib/mtr_misc.pl"; -require "lib/mtr_unique.pl"; $SIG{INT}= sub { mtr_error("Got ^C signal"); }; @@ -143,7 +143,7 @@ our $opt_client_debugger; my $config; # The currently running config my $current_config_name; # The currently running config file template -my $opt_baseport; +my $baseport; my $opt_build_thread= $ENV{'MTR_BUILD_THREAD'} || "auto"; my $opt_record; @@ -1181,24 +1181,26 @@ sub set_build_thread_ports($) { if ( lc($build_thread) eq 'auto' ) { mtr_report("Requesting build thread... "); - $build_thread= - mtr_require_unique_id_and_wait("/tmp/mysql-test-ports", 200, 299); + $build_thread= mtr_get_unique_id(200, 299); + if ( !defined $build_thread ) { + mtr_error("Could not get a unique build thread id"); + } mtr_report(" - got $build_thread"); } $ENV{MTR_BUILD_THREAD}= $build_thread; $opt_build_thread= $build_thread; # Calculate baseport - $opt_baseport= $build_thread * 10 + 10000; - if ( $opt_baseport < 5001 or $opt_baseport + 9 >= 32767 ) + $baseport= $build_thread * 10 + 10000; + if ( $baseport < 5001 or $baseport + 9 >= 32767 ) { mtr_error("MTR_BUILD_THREAD number results in a port", "outside 5001 - 32767", - "($opt_baseport - $opt_baseport + 9)"); + "($baseport - $baseport + 9)"); } mtr_report("Using MTR_BUILD_THREAD $build_thread,", - "with reserved ports $opt_baseport..".($opt_baseport+9)); + "with reserved ports $baseport..".($baseport+9)); } @@ -2286,7 +2288,7 @@ sub kill_leftovers ($) { sub check_ports_free { my @ports_to_check; - for ($opt_baseport..$opt_baseport+9){ + for ($baseport..$baseport+9){ push(@ports_to_check, $_); } mtr_report("Checking ports..."); @@ -2931,7 +2933,7 @@ sub run_testcase ($) { extra_template_path => $tinfo->{extra_template_path}, vardir => $opt_vardir, tmpdir => $opt_tmpdir, - baseport => $opt_baseport, + baseport => $baseport, #hosts => [ 'host1', 'host2' ], user => $opt_user, password => '', From 6244c476f5b94559d07b1f1ed9d425ca9ea2b775 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Sun, 10 Aug 2008 20:52:49 +0200 Subject: [PATCH 262/705] fix distcheck --- mysql-test/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 3348b258115..83b688ff600 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -33,7 +33,7 @@ nobase_test_DATA = lib/mtr_cases.pm \ lib/mtr_process.pl \ lib/mtr_report.pm \ lib/mtr_stress.pl \ - lib/mtr_unique.pl \ + lib/mtr_unique.pm \ lib/My/ConfigFactory.pm \ lib/My/Config.pm \ lib/My/Find.pm \ From 3a72c5bf6196acc0a110825afbaa0fc1c7acf4f1 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 11 Aug 2008 10:41:12 +0200 Subject: [PATCH 263/705] Don't use slots 200-249 since they are also used by PB --- mysql-test/mysql-test-run.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 2dc3fce6ba0..56898ca7a60 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1181,7 +1181,7 @@ sub set_build_thread_ports($) { if ( lc($build_thread) eq 'auto' ) { mtr_report("Requesting build thread... "); - $build_thread= mtr_get_unique_id(200, 299); + $build_thread= mtr_get_unique_id(250, 299); if ( !defined $build_thread ) { mtr_error("Could not get a unique build thread id"); } From 788362de81a11a541cdc0aa3d41adf0a6cd15ea2 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 11 Aug 2008 10:41:23 +0200 Subject: [PATCH 264/705] Debug printouts --- mysql-test/lib/My/Platform.pm | 4 +++- mysql-test/lib/mtr_unique.pm | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mysql-test/lib/My/Platform.pm b/mysql-test/lib/My/Platform.pm index 1db6985771d..cee0c8778fe 100644 --- a/mysql-test/lib/My/Platform.pm +++ b/mysql-test/lib/My/Platform.pm @@ -66,7 +66,9 @@ sub mixed_path { my ($path)= @_; if (IS_CYGWIN){ return unless defined $path; - $path= `cygpath -m $path`; + my $cmd= "cygpath -m $path"; + print "$cmd\n"; + $path= `$cmd`; chomp $path; } return $path; diff --git a/mysql-test/lib/mtr_unique.pm b/mysql-test/lib/mtr_unique.pm index 22a23644540..b4093ab1dce 100644 --- a/mysql-test/lib/mtr_unique.pm +++ b/mysql-test/lib/mtr_unique.pm @@ -88,7 +88,8 @@ sub mtr_get_unique_id($$) { msg("taken: $id, $pid"); # Check if process with given pid is alive if(!process_alive($pid)) { - msg("Removing slot $id used by missing process $pid");; + print "Removing slot $id used by missing process $pid\n"; + msg("Removing slot $id used by missing process $pid"); delete $taken{$id}; $changed++; } From 2923e91b5a4dd9bb7b94bc97cc49e03f40350f0b Mon Sep 17 00:00:00 2001 From: Andrei Elkin Date: Thu, 14 Aug 2008 00:18:31 +0300 Subject: [PATCH 265/705] Bug #38738 rpl_ndb_mixed_engines_transactions result content mismatch pb notices differences in results at the very beginning of the test. Absense of mysql.ndb_apply_status must be benign anyway, but the warning should not happen if have_ndb.inc is invoked ahead of ndb_master-slave. Fixed with relocation of the macros. --- .../suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test index 2aee4a827c3..14b76722fa6 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test @@ -22,8 +22,8 @@ # BUG#26395: if crash during autocommit update to transactional table on master, slave fails -source include/ndb_master-slave.inc; source include/have_ndb.inc; +source include/ndb_master-slave.inc; source include/have_innodb.inc; CREATE TABLE tmyisam (a int) ENGINE = MYISAM; From f94e914d47b6c1bc60d171a7b3a205fbb9f4468f Mon Sep 17 00:00:00 2001 From: He Zhenxing Date: Fri, 15 Aug 2008 10:31:04 +0800 Subject: [PATCH 266/705] post fixes after merge --- mysql-test/suite/binlog/r/binlog_killed_simulate.result | 2 +- mysql-test/suite/rpl/r/rpl_stm_log.result | 2 +- mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/binlog/r/binlog_killed_simulate.result b/mysql-test/suite/binlog/r/binlog_killed_simulate.result index 703833fb2a3..634d3f62814 100644 --- a/mysql-test/suite/binlog/r/binlog_killed_simulate.result +++ b/mysql-test/suite/binlog/r/binlog_killed_simulate.result @@ -19,7 +19,7 @@ ERROR 70100: Query execution was interrupted show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=# -master-bin.000001 # Execute_load_query # # use `test`; load data infile '../std_data_ln/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */ ;file_id=# +master-bin.000001 # Execute_load_query # # use `test`; load data infile '../../std_data/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */ ;file_id=# select (@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) is not null; diff --git a/mysql-test/suite/rpl/r/rpl_stm_log.result b/mysql-test/suite/rpl/r/rpl_stm_log.result index 17f607057bb..740dce4a03c 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_log.result +++ b/mysql-test/suite/rpl/r/rpl_stm_log.result @@ -194,7 +194,7 @@ master-bin.000001 # Query # # use `test`; insert into t1 values (NULL) master-bin.000001 # Query # # use `test`; drop table t1 master-bin.000001 # Query # # use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=# -master-bin.000001 # Execute_load_query # # use `test`; load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines ;file_id=# +master-bin.000001 # Execute_load_query # # use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=# master-bin.000001 # Rotate # # master-bin.000002;pos=4 show binlog events in 'master-bin.000002'; Log_name Pos Event_type Server_id End_log_pos Info diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test index abd2144b80c..f8fccd28092 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test @@ -172,7 +172,7 @@ SELECT COUNT(*), SUM(a), b FROM t1 WHERE c = 3 GROUP BY b ORDER BY b; --connection master DROP TABLE t1; --connection slave ---disable_warings +--disable_warnings DROP TABLE IF EXISTS t1; --enable_warnings --echo From f0bf4a47ca2b8965d56f21745321359b5e42c845 Mon Sep 17 00:00:00 2001 From: Mats Kindahl Date: Tue, 19 Aug 2008 13:18:59 +0200 Subject: [PATCH 267/705] Bug #34707: Row based replication: slave creates table within wrong database The failure was caused by executing a CREATE-SELECT statement that creates a table in another database than the current one. In row-based logging, the CREATE statement was written to the binary log without the database, hence creating the table in the wrong database, causing the following inserts to fail since the table didn't exist in the given database. Fixed the bug by adding a parameter to store_create_info() that will make the function print the database name before the table name and used that in the calls that write the CREATE statement to the binary log. The database name is only printed if it is different than the currently selected database. The output of SHOW CREATE TABLE has not changed and is still printed without the database name. --- .../suite/rpl/r/rpl_row_create_table.result | 21 +++++++++++++++ .../suite/rpl/t/rpl_row_create_table.test | 17 ++++++++++++ sql/handler.cc | 2 ++ sql/log.cc | 4 +-- sql/sql_class.cc | 24 ++++++++++++++++- sql/sql_class.h | 19 +++++++++++++ sql/sql_insert.cc | 3 ++- sql/sql_parse.cc | 4 +++ sql/sql_show.cc | 27 ++++++++++++++++--- sql/sql_show.h | 2 +- sql/sql_table.cc | 5 ++-- 11 files changed, 118 insertions(+), 10 deletions(-) diff --git a/mysql-test/suite/rpl/r/rpl_row_create_table.result b/mysql-test/suite/rpl/r/rpl_row_create_table.result index c4cf8353bca..ad659c37b7f 100644 --- a/mysql-test/suite/rpl/r/rpl_row_create_table.result +++ b/mysql-test/suite/rpl/r/rpl_row_create_table.result @@ -430,4 +430,25 @@ a 1 2 DROP TABLE t1; +stop slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +start slave; +CREATE DATABASE mysqltest1; +CREATE TABLE mysqltest1.without_select (f1 BIGINT); +CREATE TABLE mysqltest1.with_select AS SELECT 1 AS f1; +show binlog events from ; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Query # # CREATE DATABASE mysqltest1 +master-bin.000001 # Query # # use `test`; CREATE TABLE mysqltest1.without_select (f1 BIGINT) +master-bin.000001 # Query # # use `test`; BEGIN +master-bin.000001 # Query # # use `test`; CREATE TABLE `mysqltest1`.`with_select` ( + `f1` int(1) NOT NULL DEFAULT '0' +) +master-bin.000001 # Table_map # # table_id: # (mysqltest1.with_select) +master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F +master-bin.000001 # Query # # use `test`; COMMIT +DROP DATABASE mysqltest1; end of the tests diff --git a/mysql-test/suite/rpl/t/rpl_row_create_table.test b/mysql-test/suite/rpl/t/rpl_row_create_table.test index e5cdfa4341a..3fb5aa8e1f2 100644 --- a/mysql-test/suite/rpl/t/rpl_row_create_table.test +++ b/mysql-test/suite/rpl/t/rpl_row_create_table.test @@ -259,5 +259,22 @@ connection master; DROP TABLE t1; sync_slave_with_master; +# +# BUG#34707: Row based replication: slave creates table within wrong database +# + +source include/master-slave-reset.inc; + +connection master; +CREATE DATABASE mysqltest1; + +CREATE TABLE mysqltest1.without_select (f1 BIGINT); +CREATE TABLE mysqltest1.with_select AS SELECT 1 AS f1; +source include/show_binlog_events.inc; +sync_slave_with_master; + +connection master; +DROP DATABASE mysqltest1; +sync_slave_with_master; --echo end of the tests diff --git a/sql/handler.cc b/sql/handler.cc index fe4944ed836..9894b89f823 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -4393,6 +4393,8 @@ static int write_locked_table_maps(THD *thd) (long) thd, (long) thd->lock, (long) thd->locked_tables, (long) thd->extra_lock)); + DBUG_PRINT("debug", ("get_binlog_table_maps(): %d", thd->get_binlog_table_maps())); + if (thd->get_binlog_table_maps() == 0) { MYSQL_LOCK *locks[3]; diff --git a/sql/log.cc b/sql/log.cc index 30575b5befd..a6f3192b061 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1377,6 +1377,8 @@ binlog_end_trans(THD *thd, binlog_trx_data *trx_data, FLAGSTR(thd->options, OPTION_NOT_AUTOCOMMIT), FLAGSTR(thd->options, OPTION_BEGIN))); + thd->binlog_flush_pending_rows_event(TRUE); + /* NULL denotes ROLLBACK with nothing to replicate: i.e., rollback of only transactional tables. If the transaction contain changes to @@ -1395,8 +1397,6 @@ binlog_end_trans(THD *thd, binlog_trx_data *trx_data, were, we would have to ensure that we're not ending a statement inside a stored function. */ - thd->binlog_flush_pending_rows_event(TRUE); - error= mysql_bin_log.write(thd, &trx_data->trans_log, end_ev); trx_data->reset(); diff --git a/sql/sql_class.cc b/sql/sql_class.cc index c83ca0d1899..b6070c61974 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -3528,6 +3528,24 @@ int THD::binlog_flush_pending_rows_event(bool stmt_end) } +static const char * +show_query_type(THD::enum_binlog_query_type qtype) +{ + switch (qtype) { + case THD::ROW_QUERY_TYPE: + return "ROW"; + case THD::STMT_QUERY_TYPE: + return "STMT"; + case THD::MYSQL_QUERY_TYPE: + return "MYSQL"; + } + + static char buf[64]; + sprintf(buf, "UNKNOWN#%d", qtype); + return buf; +} + + /* Member function that will log query, either row-based or statement-based depending on the value of the 'current_stmt_binlog_row_based' @@ -3556,7 +3574,8 @@ int THD::binlog_query(THD::enum_binlog_query_type qtype, char const *query_arg, THD::killed_state killed_status_arg) { DBUG_ENTER("THD::binlog_query"); - DBUG_PRINT("enter", ("qtype: %d query: '%s'", qtype, query_arg)); + DBUG_PRINT("enter", ("qtype: %s query: '%s'", + show_query_type(qtype), query_arg)); DBUG_ASSERT(query_arg && mysql_bin_log.is_open()); /* @@ -3595,6 +3614,9 @@ int THD::binlog_query(THD::enum_binlog_query_type qtype, char const *query_arg, switch (qtype) { case THD::ROW_QUERY_TYPE: + DBUG_PRINT("debug", + ("current_stmt_binlog_row_based: %d", + current_stmt_binlog_row_based)); if (current_stmt_binlog_row_based) DBUG_RETURN(0); /* Otherwise, we fall through */ diff --git a/sql/sql_class.h b/sql/sql_class.h index 8ceb93940ab..7381930dc93 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -996,6 +996,21 @@ enum enum_thread_type SYSTEM_THREAD_EVENT_WORKER= 32 }; +inline char const * +show_system_thread(enum_thread_type thread) +{ +#define RETURN_NAME_AS_STRING(NAME) case (NAME): return #NAME + switch (thread) { + RETURN_NAME_AS_STRING(NON_SYSTEM_THREAD); + RETURN_NAME_AS_STRING(SYSTEM_THREAD_DELAYED_INSERT); + RETURN_NAME_AS_STRING(SYSTEM_THREAD_SLAVE_IO); + RETURN_NAME_AS_STRING(SYSTEM_THREAD_SLAVE_SQL); + RETURN_NAME_AS_STRING(SYSTEM_THREAD_NDBCLUSTER_BINLOG); + RETURN_NAME_AS_STRING(SYSTEM_THREAD_EVENT_SCHEDULER); + RETURN_NAME_AS_STRING(SYSTEM_THREAD_EVENT_WORKER); + } +#undef RETURN_NAME_AS_STRING +} /** This class represents the interface for internal error handlers. @@ -2084,6 +2099,10 @@ public: Don't reset binlog format for NDB binlog injector thread. */ + DBUG_PRINT("debug", + ("temporary_tables: %d, in_sub_stmt: %d, system_thread: %s", + (int) temporary_tables, in_sub_stmt, + show_system_thread(system_thread))); if ((temporary_tables == NULL) && (in_sub_stmt == 0) && (system_thread != SYSTEM_THREAD_NDBCLUSTER_BINLOG)) { diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 9e3c591ae2a..df7b76491e0 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -3616,7 +3616,8 @@ select_create::binlog_show_create_table(TABLE **tables, uint count) tmp_table_list.table = *tables; query.length(0); // Have to zero it since constructor doesn't - result= store_create_info(thd, &tmp_table_list, &query, create_info); + result= store_create_info(thd, &tmp_table_list, &query, create_info, + /* show_database */ TRUE); DBUG_ASSERT(result == 0); /* store_create_info() always return 0 */ thd->binlog_query(THD::STMT_QUERY_TYPE, diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index b1c9afa3842..349a64a2a1e 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -5467,6 +5467,10 @@ void mysql_reset_thd_for_next_command(THD *thd) */ thd->reset_current_stmt_binlog_row_based(); + DBUG_PRINT("debug", + ("current_stmt_binlog_row_based: %d", + thd->current_stmt_binlog_row_based)); + DBUG_VOID_RETURN; } diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 16a0342cb1f..698f41ac85a 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -619,7 +619,8 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list) if ((table_list->view ? view_store_create_info(thd, table_list, &buffer) : - store_create_info(thd, table_list, &buffer, NULL))) + store_create_info(thd, table_list, &buffer, NULL, + FALSE /* show_database */))) DBUG_RETURN(TRUE); List field_list; @@ -810,7 +811,8 @@ mysqld_dump_create_info(THD *thd, TABLE_LIST *table_list, int fd) DBUG_PRINT("enter",("table: %s",table_list->table->s->table_name.str)); protocol->prepare_for_resend(); - if (store_create_info(thd, table_list, packet, NULL)) + if (store_create_info(thd, table_list, packet, NULL, + FALSE /* show_database */)) DBUG_RETURN(-1); if (fd < 0) @@ -1062,7 +1064,7 @@ static bool get_field_default_value(THD *thd, TABLE *table, */ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet, - HA_CREATE_INFO *create_info_arg) + HA_CREATE_INFO *create_info_arg, bool show_database) { List field_list; char tmp[MAX_FIELD_WIDTH], *for_str, buff[128], def_value_buf[MAX_FIELD_WIDTH]; @@ -1110,6 +1112,25 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet, alias= share->table_name.str; } } + + /* + Print the database before the table name if told to do that. The + database name is only printed in the event that it is different + from the current database. The main reason for doing this is to + avoid having to update gazillions of tests and result files, but + it also saves a few bytes of the binary log. + */ + if (show_database) + { + const LEX_STRING *const db= + table_list->schema_table ? &INFORMATION_SCHEMA_NAME : &table->s->db; + if (strcmp(db->str, thd->db) != 0) + { + append_identifier(thd, packet, db->str, db->length); + packet->append(STRING_WITH_LEN(".")); + } + } + append_identifier(thd, packet, alias, strlen(alias)); packet->append(STRING_WITH_LEN(" (\n")); /* diff --git a/sql/sql_show.h b/sql/sql_show.h index d63217584b2..3baaef00a7d 100644 --- a/sql/sql_show.h +++ b/sql/sql_show.h @@ -33,7 +33,7 @@ find_files_result find_files(THD *thd, List *files, const char *db, const char *path, const char *wild, bool dir); int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet, - HA_CREATE_INFO *create_info_arg); + HA_CREATE_INFO *create_info_arg, bool show_database); int view_store_create_info(THD *thd, TABLE_LIST *table, String *buff); int copy_event_to_schema_table(THD *thd, TABLE *sch_table, TABLE *event_table); diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 2b3b5ef67d9..1de16338c40 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -4956,8 +4956,9 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, TABLE_LIST* src_table, } VOID(pthread_mutex_unlock(&LOCK_open)); - IF_DBUG(int result=) store_create_info(thd, table, &query, - create_info); + IF_DBUG(int result=) + store_create_info(thd, table, &query, + create_info, FALSE /* show_database */); DBUG_ASSERT(result == 0); // store_create_info() always return 0 write_bin_log(thd, TRUE, query.ptr(), query.length()); From 1bfa707a7ae6f86d0dd56c3d46c943602f5aad7f Mon Sep 17 00:00:00 2001 From: Mats Kindahl Date: Wed, 20 Aug 2008 10:06:50 +0200 Subject: [PATCH 268/705] Bug #38773: DROP DATABASE cause switch to stmt-mode when there are temporary tables open When executing a DROP DATABASE statement in ROW mode and having temporary tables open at the same time, the existance of temporary tables prevent the server from switching back to row mode after temporarily switching to statement mode to handle the logging of the statement. Fixed the problem by removing the code to switch to statement mode and added code to temporarily disable the binary log while dropping the objects in the database. --- mysql-test/extra/binlog_tests/database.test | 15 ++++++ .../suite/binlog/r/binlog_database.result | 53 +++++++++++++++++++ sql/sql_db.cc | 23 +++++--- 3 files changed, 83 insertions(+), 8 deletions(-) diff --git a/mysql-test/extra/binlog_tests/database.test b/mysql-test/extra/binlog_tests/database.test index 11a8f53a6d7..2e445f98adf 100644 --- a/mysql-test/extra/binlog_tests/database.test +++ b/mysql-test/extra/binlog_tests/database.test @@ -13,3 +13,18 @@ create trigger tr1 before insert on t1 for each row insert into t2 values (2*new create procedure sp1 (a int) insert into t1 values(a); drop database testing_1; source include/show_binlog_events.inc; + +# BUG#38773: DROP DATABASE cause switch to stmt-mode when there are +# temporary tables open + +use test; +reset master; +create temporary table tt1 (a int); +create table t1 (a int); +insert into t1 values (1); +disable_warnings; +drop database if exists mysqltest1; +enable_warnings; +insert into t1 values (1); +drop table tt1, t1; +source include/show_binlog_events.inc; diff --git a/mysql-test/suite/binlog/r/binlog_database.result b/mysql-test/suite/binlog/r/binlog_database.result index 7121d458077..d64d902217b 100644 --- a/mysql-test/suite/binlog/r/binlog_database.result +++ b/mysql-test/suite/binlog/r/binlog_database.result @@ -17,6 +17,22 @@ master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(a int) insert into t1 values(a) master-bin.000001 # Query # # drop database testing_1 +use test; +reset master; +create temporary table tt1 (a int); +create table t1 (a int); +insert into t1 values (1); +drop database if exists mysqltest1; +insert into t1 values (1); +drop table tt1, t1; +show binlog events from ; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Query # # use `test`; create temporary table tt1 (a int) +master-bin.000001 # Query # # use `test`; create table t1 (a int) +master-bin.000001 # Query # # use `test`; insert into t1 values (1) +master-bin.000001 # Query # # drop database if exists mysqltest1 +master-bin.000001 # Query # # use `test`; insert into t1 values (1) +master-bin.000001 # Query # # use `test`; drop table tt1, t1 set binlog_format=mixed; reset master; create database testing_1; @@ -36,6 +52,22 @@ master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(a int) insert into t1 values(a) master-bin.000001 # Query # # drop database testing_1 +use test; +reset master; +create temporary table tt1 (a int); +create table t1 (a int); +insert into t1 values (1); +drop database if exists mysqltest1; +insert into t1 values (1); +drop table tt1, t1; +show binlog events from ; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Query # # use `test`; create temporary table tt1 (a int) +master-bin.000001 # Query # # use `test`; create table t1 (a int) +master-bin.000001 # Query # # use `test`; insert into t1 values (1) +master-bin.000001 # Query # # drop database if exists mysqltest1 +master-bin.000001 # Query # # use `test`; insert into t1 values (1) +master-bin.000001 # Query # # use `test`; drop table tt1, t1 set binlog_format=row; reset master; create database testing_1; @@ -55,6 +87,27 @@ master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` master-bin.000001 # Query # # use `testing_1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(a int) insert into t1 values(a) master-bin.000001 # Query # # drop database testing_1 +use test; +reset master; +create temporary table tt1 (a int); +create table t1 (a int); +insert into t1 values (1); +drop database if exists mysqltest1; +insert into t1 values (1); +drop table tt1, t1; +show binlog events from ; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Query # # use `test`; create table t1 (a int) +master-bin.000001 # Query # # use `test`; BEGIN +master-bin.000001 # Table_map # # table_id: # (test.t1) +master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F +master-bin.000001 # Query # # use `test`; COMMIT +master-bin.000001 # Query # # drop database if exists mysqltest1 +master-bin.000001 # Query # # use `test`; BEGIN +master-bin.000001 # Table_map # # table_id: # (test.t1) +master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F +master-bin.000001 # Query # # use `test`; COMMIT +master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ show databases; Database information_schema diff --git a/sql/sql_db.cc b/sql/sql_db.cc index bb55f5f7a4f..52d9e42bc82 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -883,13 +883,6 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent) VOID(pthread_mutex_lock(&LOCK_mysql_create_db)); - /* - This statement will be replicated as a statement, even when using - row-based replication. The flag will be reset at the end of the - statement. - */ - thd->clear_current_stmt_binlog_row_based(); - length= build_table_filename(path, sizeof(path), db, "", "", 0); strmov(path+length, MY_DB_OPT_FILE); // Append db option file name del_dbopt(path); // Remove dboption hash entry @@ -914,8 +907,21 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent) remove_db_from_cache(db); pthread_mutex_unlock(&LOCK_open); - error= -1; + /* + We temporarily disable the binary log while dropping the objects + in the database. Since the DROP DATABASE statement is always + replicated as a statement, execution of it will drop all objects + in the database on the slave as well, so there is no need to + replicate the removal of the individual objects in the database + as well. + + This is more of a safety precaution, since normally no objects + should be dropped while the database is being cleaned, but in + the event that a change in the code to remove other objects is + made, these drops should still not be logged. + */ + tmp_disable_binlog(thd); if ((deleted= mysql_rm_known_files(thd, dirp, db, path, 0, &dropped_tables)) >= 0) { @@ -927,6 +933,7 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent) #endif error = 0; } + reenable_binlog(thd); } if (!silent && deleted>=0) { From 77b7ad33986c84fb7183890a3dd17d69af10b2af Mon Sep 17 00:00:00 2001 From: Mats Kindahl Date: Fri, 22 Aug 2008 12:40:21 +0200 Subject: [PATCH 269/705] Fixning compiler warnings. Fixing build failure for valgrind platform. --- include/my_global.h | 3 +++ sql/log.cc | 2 -- sql/sql_class.cc | 10 ++++++---- sql/sql_class.h | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/include/my_global.h b/include/my_global.h index 6cfc4d67305..c6ac90d4a34 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1130,6 +1130,9 @@ typedef char bool; /* Ordinary boolean values 0 1 */ #define dbug_volatile #endif +/* Some helper macros */ +#define YESNO(X) ((X) ? "yes" : "no") + /* Defines for time function */ #define SCALE_SEC 100 #define SCALE_USEC 10000 diff --git a/sql/log.cc b/sql/log.cc index a6f3192b061..49c9bce95f1 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1448,8 +1448,6 @@ static int binlog_prepare(handlerton *hton, THD *thd, bool all) return 0; } -#define YESNO(X) ((X) ? "yes" : "no") - /** This function is called once after each statement. diff --git a/sql/sql_class.cc b/sql/sql_class.cc index b6070c61974..50888c6f7af 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -3528,22 +3528,24 @@ int THD::binlog_flush_pending_rows_event(bool stmt_end) } +#ifndef DBUG_OFF static const char * show_query_type(THD::enum_binlog_query_type qtype) { switch (qtype) { + static char buf[64]; case THD::ROW_QUERY_TYPE: return "ROW"; case THD::STMT_QUERY_TYPE: return "STMT"; case THD::MYSQL_QUERY_TYPE: return "MYSQL"; + default: + sprintf(buf, "UNKNOWN#%d", qtype); + return buf; } - - static char buf[64]; - sprintf(buf, "UNKNOWN#%d", qtype); - return buf; } +#endif /* diff --git a/sql/sql_class.h b/sql/sql_class.h index 7381930dc93..0bc8d00b22c 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2100,8 +2100,8 @@ public: Don't reset binlog format for NDB binlog injector thread. */ DBUG_PRINT("debug", - ("temporary_tables: %d, in_sub_stmt: %d, system_thread: %s", - (int) temporary_tables, in_sub_stmt, + ("temporary_tables: %s, in_sub_stmt: %s, system_thread: %s", + YESNO(temporary_tables), YESNO(in_sub_stmt), show_system_thread(system_thread))); if ((temporary_tables == NULL) && (in_sub_stmt == 0) && (system_thread != SYSTEM_THREAD_NDBCLUSTER_BINLOG)) From 78791ae39fccf5b6c1174068e4e1de5e63ec0760 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 25 Aug 2008 10:27:24 +0200 Subject: [PATCH 270/705] Bug#33337, silently convert --gdb(etc.) to --client-gdb in embedded mode --- mysql-test/mysql-test-run.pl | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 56898ca7a60..08be2db958b 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1048,6 +1048,28 @@ sub command_line_setup { mtr_error("Can't use --extern with --embedded-server"); } + + if ($opt_gdb) + { + mtr_warning("Silently converting --gdb to --client-gdb in embedded mode"); + $opt_client_gdb= $opt_gdb; + $opt_gdb= undef; + } + + if ($opt_ddd) + { + mtr_warning("Silently converting --ddd to --client-ddd in embedded mode"); + $opt_client_ddd= $opt_ddd; + $opt_ddd= undef; + } + + if ($opt_debugger) + { + mtr_warning("Silently converting --debugger to --client-debugger in embedded mode"); + $opt_client_debugger= $opt_debugger; + $opt_debugger= undef; + } + if ( $opt_gdb || $opt_ddd || $opt_manual_gdb || $opt_manual_ddd || $opt_manual_debug || $opt_debugger ) { From ec6019f9b90f7f3adc7a49ac4f3a8ffb279d9362 Mon Sep 17 00:00:00 2001 From: Mats Kindahl Date: Mon, 25 Aug 2008 14:23:49 +0200 Subject: [PATCH 271/705] Eliminating some compiler warnings. --- sql/sql_class.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sql/sql_class.h b/sql/sql_class.h index 0bc8d00b22c..488a35ff070 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1001,6 +1001,7 @@ show_system_thread(enum_thread_type thread) { #define RETURN_NAME_AS_STRING(NAME) case (NAME): return #NAME switch (thread) { + static char buf[64]; RETURN_NAME_AS_STRING(NON_SYSTEM_THREAD); RETURN_NAME_AS_STRING(SYSTEM_THREAD_DELAYED_INSERT); RETURN_NAME_AS_STRING(SYSTEM_THREAD_SLAVE_IO); @@ -1008,6 +1009,9 @@ show_system_thread(enum_thread_type thread) RETURN_NAME_AS_STRING(SYSTEM_THREAD_NDBCLUSTER_BINLOG); RETURN_NAME_AS_STRING(SYSTEM_THREAD_EVENT_SCHEDULER); RETURN_NAME_AS_STRING(SYSTEM_THREAD_EVENT_WORKER); + default: + sprintf(buf, "", thread); + return buf; } #undef RETURN_NAME_AS_STRING } From 3a1c50bc539ae81bf572b6445e7b3a7c1ce420eb Mon Sep 17 00:00:00 2001 From: Andrei Elkin Date: Mon, 25 Aug 2008 15:40:44 +0300 Subject: [PATCH 272/705] Bug #36968 rpl_temporary_errors.test produces warning in pushbuild Backporting fixes to 5.1 from 6.0. --- mysql-test/include/mtr_warnings.sql | 1 - mysql-test/suite/rpl/r/rpl_temporary_errors.result | 1 + mysql-test/suite/rpl/t/rpl_temporary_errors.test | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index 5c359693bd7..8343683bf55 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -134,7 +134,6 @@ INSERT INTO global_supressions VALUES ("Slave: According to the master's version"), ("Slave: Column [0-9]* type mismatch"), ("Slave: Error .* doesn't exist"), - ("Slave: Error .*Deadlock found"), ("Slave: Error .*Unknown table"), ("Slave: Error in Write_rows event: "), ("Slave: Field .* of table .* has no default value"), diff --git a/mysql-test/suite/rpl/r/rpl_temporary_errors.result b/mysql-test/suite/rpl/r/rpl_temporary_errors.result index 430e63c5859..75fbf187fd3 100644 --- a/mysql-test/suite/rpl/r/rpl_temporary_errors.result +++ b/mysql-test/suite/rpl/r/rpl_temporary_errors.result @@ -4,6 +4,7 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; +call mtr.add_supression("Deadlock found"); **** On Master **** SET SESSION BINLOG_FORMAT=ROW; CREATE TABLE t1 (a INT PRIMARY KEY, b INT); diff --git a/mysql-test/suite/rpl/t/rpl_temporary_errors.test b/mysql-test/suite/rpl/t/rpl_temporary_errors.test index f38ed29f7d4..d557566acf9 100644 --- a/mysql-test/suite/rpl/t/rpl_temporary_errors.test +++ b/mysql-test/suite/rpl/t/rpl_temporary_errors.test @@ -1,5 +1,7 @@ source include/master-slave.inc; +call mtr.add_supression("Deadlock found"); + --echo **** On Master **** connection master; SET SESSION BINLOG_FORMAT=ROW; From 4c7ba06c9c796481e12e4afdc1783081a5a6922c Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 25 Aug 2008 17:51:24 +0200 Subject: [PATCH 273/705] Print error message in diff_files if any of the two files to diff does not exist --- client/mysqltest.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 9b05a2c60ec..c86b213c238 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -3335,6 +3335,14 @@ void do_diff_files(struct st_command *command) sizeof(diff_file_args)/sizeof(struct command_arg), ' '); + if (access(ds_filename.str, F_OK) != 0) + die("command \"diff_files\" failed, file '%s' does not exist", + ds_filename.str); + + if (access(ds_filename2.str, F_OK) != 0) + die("command \"diff_files\" failed, file '%s' does not exist", + ds_filename2.str); + if ((error= compare_files(ds_filename.str, ds_filename2.str))) { /* Compare of the two files failed, append them to output From 1e7b7c78721326f568b55c359ee7ece6bfb5edfa Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 25 Aug 2008 17:51:48 +0200 Subject: [PATCH 274/705] BUG#39011 mtr reports test failure without any message or log - part 1 --- mysql-test/mysql-test-run.pl | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 08be2db958b..dbc108d4fb2 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3508,12 +3508,21 @@ sub report_failure_and_restart ($) { if ( !defined $tinfo->{logfile} ) { my $logfile= $path_current_testlog; - if ( defined $logfile and -f $logfile ) + if ( defined $logfile ) { - # Test failure was detected by test tool and its report - # about what failed has been saved to file. Save the report - # in tinfo - $tinfo->{logfile}= mtr_fromfile($logfile); + if ( -f $logfile ) + { + # Test failure was detected by test tool and its report + # about what failed has been saved to file. Save the report + # in tinfo + $tinfo->{logfile}= mtr_fromfile($logfile); + } + else + { + # The test tool report didn't exist, display an + # error message + $tinfo->{logfile}= "Could not open test tool report '$logfile'"; + } } } From 37e6f0c6abd1fe47f589406526c727d32d667787 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 29 Aug 2008 12:25:19 +0200 Subject: [PATCH 275/705] Print error message in diff_files if any of the two files to diff does not exist --- client/mysqltest.cc | 8 ++++++++ mysql-test/mysql-test-run.pl | 19 ++++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 9b05a2c60ec..c86b213c238 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -3335,6 +3335,14 @@ void do_diff_files(struct st_command *command) sizeof(diff_file_args)/sizeof(struct command_arg), ' '); + if (access(ds_filename.str, F_OK) != 0) + die("command \"diff_files\" failed, file '%s' does not exist", + ds_filename.str); + + if (access(ds_filename2.str, F_OK) != 0) + die("command \"diff_files\" failed, file '%s' does not exist", + ds_filename2.str); + if ((error= compare_files(ds_filename.str, ds_filename2.str))) { /* Compare of the two files failed, append them to output diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 56898ca7a60..d07738fc29c 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3486,12 +3486,21 @@ sub report_failure_and_restart ($) { if ( !defined $tinfo->{logfile} ) { my $logfile= $path_current_testlog; - if ( defined $logfile and -f $logfile ) + if ( defined $logfile ) { - # Test failure was detected by test tool and its report - # about what failed has been saved to file. Save the report - # in tinfo - $tinfo->{logfile}= mtr_fromfile($logfile); + if ( -f $logfile ) + { + # Test failure was detected by test tool and its report + # about what failed has been saved to file. Save the report + # in tinfo + $tinfo->{logfile}= mtr_fromfile($logfile); + } + else + { + # The test tool report didn't exist, display an + # error message + $tinfo->{logfile}= "Could not open test tool report '$logfile'"; + } } } From a846ab811e4eb3f77f3b365f98cea50bfa79f400 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 29 Aug 2008 12:33:02 +0200 Subject: [PATCH 276/705] Bug#33337, silently convert --gdb(etc.) to --client-gdb in embedded mode --- mysql-test/mysql-test-run.pl | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index d07738fc29c..dbc108d4fb2 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1048,6 +1048,28 @@ sub command_line_setup { mtr_error("Can't use --extern with --embedded-server"); } + + if ($opt_gdb) + { + mtr_warning("Silently converting --gdb to --client-gdb in embedded mode"); + $opt_client_gdb= $opt_gdb; + $opt_gdb= undef; + } + + if ($opt_ddd) + { + mtr_warning("Silently converting --ddd to --client-ddd in embedded mode"); + $opt_client_ddd= $opt_ddd; + $opt_ddd= undef; + } + + if ($opt_debugger) + { + mtr_warning("Silently converting --debugger to --client-debugger in embedded mode"); + $opt_client_debugger= $opt_debugger; + $opt_debugger= undef; + } + if ( $opt_gdb || $opt_ddd || $opt_manual_gdb || $opt_manual_ddd || $opt_manual_debug || $opt_debugger ) { From 6a4af260cc5d41cbbca6b4744682da4ee11d03d1 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 29 Aug 2008 14:46:22 +0200 Subject: [PATCH 277/705] Bug#36616 rpl tests without 'source include/have_log_bin.inc' fail starting server --- mysql-test/mysql-test-run.pl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index dbc108d4fb2..59bf70363e8 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3623,6 +3623,11 @@ sub mysqld_arguments ($$$) { { ; # Dont add --binlog-format when running without binlog } + elsif ($arg eq "--loose-skip-log-bin" and + $mysqld->option("log-slave-updates")) + { + ; # Dont add --skip-log-bin when mysqld have --log-slave-updates in config + } else { mtr_add_arg($args, "%s", $arg); From e132e26b97ecc969c5f55384ed078a1c18ada2b8 Mon Sep 17 00:00:00 2001 From: He Zhenxing Date: Thu, 4 Sep 2008 11:26:12 +0800 Subject: [PATCH 278/705] Use MyISAM for all tables created in mtr_warnings.sql --- mysql-test/include/mtr_warnings.sql | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index 8343683bf55..cf259703a4f 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -8,7 +8,7 @@ use mtr|| -- CREATE TABLE suspicious_patterns ( pattern VARCHAR(255) -)|| +) ENGINE=MyISAM|| -- @@ -46,7 +46,7 @@ INSERT INTO suspicious_patterns VALUES -- CREATE TABLE test_supressions ( pattern VARCHAR(255) -)|| +) ENGINE=MyISAM|| -- @@ -69,7 +69,7 @@ END -- CREATE TABLE global_supressions ( pattern VARCHAR(255) -)|| +) ENGINE=MyISAM|| -- Declare a trigger that makes sure @@ -227,7 +227,7 @@ BEGIN CREATE TEMPORARY TABLE error_log ( row INT AUTO_INCREMENT PRIMARY KEY, line mediumtext NULL - ); + ) ENGINE=MyISAM; SELECT variable_value INTO @log_error FROM information_schema.global_variables @@ -255,7 +255,7 @@ BEGIN WHERE line REGEXP "^CURRENT_TEST:"; DELETE FROM error_log WHERE row < @max_row; - CREATE TEMPORARY TABLE suspect_lines AS + CREATE TEMPORARY TABLE suspect_lines ENGINE=MyISAM AS SELECT DISTINCT el.line, 0 as "supressed" FROM error_log el, suspicious_patterns ep WHERE el.line REGEXP ep.pattern; From c3e7b689954c960ca632017be6a2b04d6fc444f9 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 5 Sep 2008 11:32:33 +0200 Subject: [PATCH 279/705] Fix gcov in mtr.pl --- mysql-test/lib/mtr_gcov.pl | 36 ++++++++++++++---------------------- mysql-test/mysql-test-run.pl | 22 ++++++---------------- 2 files changed, 20 insertions(+), 38 deletions(-) diff --git a/mysql-test/lib/mtr_gcov.pl b/mysql-test/lib/mtr_gcov.pl index a2de1fcbdff..6bd6fbe0f03 100644 --- a/mysql-test/lib/mtr_gcov.pl +++ b/mysql-test/lib/mtr_gcov.pl @@ -20,25 +20,14 @@ use strict; -# These are not to be prefixed with "mtr_" +sub gcov_prepare ($) { + my ($dir)= @_; -sub gcov_prepare (); -sub gcov_collect (); - -############################################################################## -# -# -# -############################################################################## - -sub gcov_prepare () { - - `find $::glob_basedir -name \*.gcov \ + `find $dir -name \*.gcov \ -or -name \*.da | xargs rm`; } -# Used by gcov -our @mysqld_src_dirs= +my @mysqld_src_dirs= ( "strings", "mysys", @@ -53,21 +42,24 @@ our @mysqld_src_dirs= "sql", ); -sub gcov_collect () { +sub gcov_collect ($$$) { + my ($dir, $gcov, $gcov_msg, $err)= @_; + + my $start_dir= cwd(); print "Collecting source coverage info...\n"; - -f $::opt_gcov_msg and unlink($::opt_gcov_msg); - -f $::opt_gcov_err and unlink($::opt_gcov_err); + -f $gcov_msg and unlink($gcov_msg); + -f $gcov_err and unlink($gcov_err); foreach my $d ( @mysqld_src_dirs ) { - chdir("$::glob_basedir/$d"); + chdir("$dir/$d"); foreach my $f ( (glob("*.h"), glob("*.cc"), glob("*.c")) ) { - `$::opt_gcov $f 2>>$::opt_gcov_err >>$::opt_gcov_msg`; + `$gcov $f 2>>$gcov_err >>$gcov_msg`; } - chdir($::glob_mysql_test_dir); + chdir($start_dir); } - print "gcov info in $::opt_gcov_msg, errors in $::opt_gcov_err\n"; + print "gcov info in $gcov_msg, errors in $gcov_err\n"; } diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 59bf70363e8..de0c73847cf 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -257,7 +257,7 @@ sub main { command_line_setup(0); if ( $opt_gcov ) { - gcov_prepare(); + gcov_prepare($basedir); } if (!$opt_suites) { @@ -346,6 +346,11 @@ sub main { mtr_print_line(); + if ( $opt_gcov ) { + gcov_collect($basedir, $opt_gcov, + $opt_gcov_msg, $opt_gcov_err); + } + mtr_report_stats($completed); exit(0); @@ -611,11 +616,6 @@ sub run_worker ($) { command_line_setup($thread_num); - if ( $opt_gcov ) - { - gcov_prepare(); - } - setup_vardir(); check_running_as_root(); mysql_install_db($thread_num); @@ -649,16 +649,6 @@ sub run_worker ($) { stop_all_servers(); - if ( $opt_gcov ) - { - gcov_collect(); # collect coverage information - } - - if ( $opt_gcov ) - { - gcov_collect(); # collect coverage information - } - exit(1); } From 7f954bd287e3a1507ebae212fae719874a8f7435 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 5 Sep 2008 14:06:22 +0200 Subject: [PATCH 280/705] Fix misspelled variable in mtr.pl --- mysql-test/lib/mtr_gcov.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/lib/mtr_gcov.pl b/mysql-test/lib/mtr_gcov.pl index 6bd6fbe0f03..5049fdd6063 100644 --- a/mysql-test/lib/mtr_gcov.pl +++ b/mysql-test/lib/mtr_gcov.pl @@ -43,7 +43,7 @@ my @mysqld_src_dirs= ); sub gcov_collect ($$$) { - my ($dir, $gcov, $gcov_msg, $err)= @_; + my ($dir, $gcov, $gcov_msg, $gcov_err)= @_; my $start_dir= cwd(); From 913ec830b334349ebf23d0231616dbafe5d2a155 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 5 Sep 2008 14:09:39 +0200 Subject: [PATCH 281/705] WL#4350 - Rearrange spawn worker code --- mysql-test/mysql-test-run.pl | 207 ++++++++++++++++++----------------- 1 file changed, 106 insertions(+), 101 deletions(-) mode change 100755 => 100644 mysql-test/mysql-test-run.pl diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl old mode 100755 new mode 100644 index de0c73847cf..c6005d889e5 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -165,8 +165,6 @@ my $opt_repeat= 1; my $opt_retry= 3; my $opt_retry_failure= 2; -my $opt_parallel= $ENV{MTR_PARALLEL}; - my $opt_strace_client; our $opt_user; @@ -208,6 +206,7 @@ main(); sub main { + # Default, verbosity on report_option('verbose', 0); # This is needed for test log evaluation in "gen-build-status-page" @@ -215,46 +214,11 @@ sub main { # directly before it executes them, like "make test-force-pl" in RPM builds. mtr_report("Logging: $0 ", join(" ", @ARGV)); + my $opt_parallel= $ENV{MTR_PARALLEL}; Getopt::Long::Configure("pass_through"); GetOptions('parallel=i' => \$opt_parallel) or usage(0, "Can't read options"); - if ( not defined $opt_parallel ) { - # Try to find a suitable value for number of workers - my $sys_info= My::SysInfo->new(); - - $opt_parallel= $sys_info->num_cpus(); - for my $limit (2000, 1500, 1000, 500){ - $opt_parallel-- if ($sys_info->min_bogomips() < $limit); - } - $opt_parallel= 1 if ($opt_parallel < 1); - mtr_report("Using parallel: $opt_parallel"); - } - - # Create server socket on any free port - my $server = new IO::Socket::INET - ( - LocalAddr => 'localhost', - Proto => 'tcp', - Listen => $opt_parallel, - ); - mtr_error("Could not create testcase server port: $!") unless $server; - my $server_port = $server->sockport(); - mtr_report("Using server port $server_port"); - - # Create child processes - my %children; - for my $child_num (1..$opt_parallel){ - my $child_pid= My::SafeProcess::Base::_safe_fork(); - if ($child_pid == 0){ - $server= undef; # Close the server port in child - run_worker($server_port, $child_num); - exit(1); - } - - $children{$child_pid}= 1; - } - - command_line_setup(0); + command_line_setup(); if ( $opt_gcov ) { gcov_prepare($basedir); @@ -301,13 +265,61 @@ sub main { unshift(@$tests, $tinfo); } + print "vardir: $opt_vardir\n"; initialize_servers(); + ####################################################################### + my $num_tests= @$tests; + if ( not defined $opt_parallel ) { + # Try to find a suitable value for number of workers + my $sys_info= My::SysInfo->new(); + + $opt_parallel= $sys_info->num_cpus(); + for my $limit (2000, 1500, 1000, 500){ + $opt_parallel-- if ($sys_info->min_bogomips() < $limit); + } + $opt_parallel= $num_tests if ($opt_parallel > $num_tests); + $opt_parallel= 1 if ($opt_parallel < 1); + mtr_report("Using parallel: $opt_parallel"); + } + + # Create server socket on any free port + my $server = new IO::Socket::INET + ( + LocalAddr => 'localhost', + Proto => 'tcp', + Listen => $opt_parallel, + ); + mtr_error("Could not create testcase server port: $!") unless $server; + my $server_port = $server->sockport(); + mtr_report("Using server port $server_port"); + + # Create child processes + my %children; + for my $child_num (1..$opt_parallel){ + my $child_pid= My::SafeProcess::Base::_safe_fork(); + if ($child_pid == 0){ + $server= undef; # Close the server port in child + $tests= {}; # Don't need the tests list in child + + # Use subdir of var and tmp unless only one worker + if ($opt_parallel > 1) { + set_vardir("$opt_vardir/$child_num"); + $opt_tmpdir= "$opt_tmpdir/$child_num"; + } + + run_worker($server_port, $child_num); + exit(1); + } + + $children{$child_pid}= 1; + } + ####################################################################### + mtr_report(); mtr_print_thick_line(); mtr_print_header(); - my $num_tests= @$tests; my $completed= run_test_server($server, $tests, $opt_parallel); # Send Ctrl-C to any children still running @@ -357,7 +369,7 @@ sub main { } -sub run_test_server { +sub run_test_server ($$$) { my ($server, $tests, $childs) = @_; my $num_saved_cores= 0; # Number of core files saved in vardir/log/ so far. @@ -365,7 +377,7 @@ sub run_test_server { my $num_failed_test= 0; # Number of tests failed so far # Scheduler variables - my $max_ndb= $opt_parallel / 2; + my $max_ndb= $childs / 2; $max_ndb = 4 if $max_ndb > 4; $max_ndb = 1 if $max_ndb < 1; my $num_ndb_tests= 0; @@ -598,8 +610,28 @@ sub run_worker ($) { $SIG{INT}= sub { exit(1); }; + # -------------------------------------------------------------------------- + # Set worker name + # -------------------------------------------------------------------------- report_option('name',"worker[$thread_num]"); + # -------------------------------------------------------------------------- + # Use auto build thread in all but first worker + # -------------------------------------------------------------------------- + set_build_thread_ports($thread_num > 1 ? 'auto' : $opt_build_thread); + + if (check_ports_free()){ + # Some port was not free(which one has already been printed) + mtr_error("Some port(s) was not free") + } + + # -------------------------------------------------------------------------- + # Turn off verbosity in workers, unless explicitly specified + # -------------------------------------------------------------------------- + report_option('verbose', undef) if ($opt_verbose == 0); + + environment_setup(); + # Connect to server my $server = new IO::Socket::INET ( @@ -614,8 +646,6 @@ sub run_worker ($) { # resources have been setup my $hello= <$server>; - command_line_setup($thread_num); - setup_vardir(); check_running_as_root(); mysql_install_db($thread_num); @@ -658,15 +688,30 @@ sub ignore_option { mtr_report("Ignoring option '$opt'"); } -sub command_line_setup { - my ($thread_num)= @_; + +# Setup any paths that are $opt_vardir related +sub set_vardir { + my ($vardir)= @_; + + $opt_vardir= $vardir; + + $path_vardir_trace= $opt_vardir; + # Chop off any "c:", DBUG likes a unix path ex: c:/src/... => /src/... + $path_vardir_trace=~ s/^\w://; + + # Location of my.cnf that all clients use + $path_config_file= "$opt_vardir/my.cnf"; + + $path_testlog= "$opt_vardir/log/mysqltest.log"; + $path_current_testlog= "$opt_vardir/log/current_test"; + +} + +sub command_line_setup { my $opt_comment; my $opt_usage; - # Default verbosity, server ON and workers OFF - report_option('verbose', $thread_num ? undef : 0); - # Read the command line options # Note: Keep list, and the order, in sync with usage at end of this file Getopt::Long::Configure("pass_through"); @@ -787,9 +832,9 @@ sub command_line_setup { 'timediff' => \&report_option, 'help|h' => \$opt_usage, - ) or usage($thread_num, "Can't read options"); + ) or usage("Can't read options"); - usage($thread_num, "") if $opt_usage; + usage("") if $opt_usage; # -------------------------------------------------------------------------- # Setup verbosity @@ -798,12 +843,6 @@ sub command_line_setup { report_option('verbose', $opt_verbose); } - # -------------------------------------------------------------------------- - # Check build_thread and calculate baseport - # Use auto build thread in all but first worker - # -------------------------------------------------------------------------- - set_build_thread_ports($thread_num > 1 ? 'auto' : $opt_build_thread); - if ( -d "../sql" ) { $source_dist= 1; @@ -892,7 +931,7 @@ sub command_line_setup { } elsif ( $arg =~ /^-/ ) { - usage($thread_num, "Invalid option \"$arg\""); + usage("Invalid option \"$arg\""); } else { @@ -929,9 +968,8 @@ sub command_line_setup { # -------------------------------------------------------------------------- # Check if we should speed up tests by trying to run on tmpfs - # - Dont check in workers # -------------------------------------------------------------------------- - if ( defined $opt_mem and $thread_num == 0) + if ( defined $opt_mem) { mtr_error("Can't use --mem and --vardir at the same time ") if $opt_vardir; @@ -955,7 +993,7 @@ sub command_line_setup { } # -------------------------------------------------------------------------- - # Set the "var/" directory, as it is the base for everything else + # Set the "var/" directory, the base for everything else # -------------------------------------------------------------------------- $default_vardir= "$glob_mysql_test_dir/var"; if ( ! $opt_vardir ) @@ -963,15 +1001,6 @@ sub command_line_setup { $opt_vardir= $default_vardir; } - # If more than one parallel run, use a subdir of the selected var - if ($thread_num && $opt_parallel > 1) { - $opt_vardir.= "/".$thread_num; - } - - $path_vardir_trace= $opt_vardir; - # Chop off any "c:", DBUG likes a unix path ex: c:/src/... => /src/... - $path_vardir_trace=~ s/^\w://; - # We make the path absolute, as the server will do a chdir() before usage unless ( $opt_vardir =~ m,^/, or (IS_WINDOWS and $opt_vardir =~ m,^[a-z]:/,i) ) @@ -980,20 +1009,14 @@ sub command_line_setup { $opt_vardir= "$glob_mysql_test_dir/$opt_vardir"; } - # Location of my.cnf that all clients use - $path_config_file= "$opt_vardir/my.cnf"; + set_vardir($opt_vardir); # -------------------------------------------------------------------------- - # Set tmpdir + # Set the "tmp" directory # -------------------------------------------------------------------------- $opt_tmpdir= "$opt_vardir/tmp" unless $opt_tmpdir; $opt_tmpdir =~ s,/+$,,; # Remove ending slash if any - # If more than one parallel run, use a subdir of the selected tmpdir - if ($thread_num && $opt_parallel > 1 and $opt_tmpdir ne "$opt_vardir/tmp") { - $opt_tmpdir.= "/".$thread_num; - } - # -------------------------------------------------------------------------- # fast option # -------------------------------------------------------------------------- @@ -1099,11 +1122,6 @@ sub command_line_setup { } } - # -------------------------------------------------------------------------- - # Set timeout values - # -------------------------------------------------------------------------- - $opt_start_timeout*= $opt_parallel; - # # Check valgrind arguments # -------------------------------------------------------------------------- @@ -1157,9 +1175,6 @@ sub command_line_setup { $opt_user= "root"; # We want to do FLUSH xxx commands } - $path_testlog= "$opt_vardir/log/mysqltest.log"; - $path_current_testlog= "$opt_vardir/log/current_test"; - mtr_report("Checking supported features..."); check_ndbcluster_support(\%mysqld_variables); @@ -1168,8 +1183,6 @@ sub command_line_setup { executable_setup(); - environment_setup(); - } @@ -1192,12 +1205,12 @@ sub set_build_thread_ports($) { my $build_thread= shift || 0; if ( lc($build_thread) eq 'auto' ) { - mtr_report("Requesting build thread... "); + #mtr_report("Requesting build thread... "); $build_thread= mtr_get_unique_id(250, 299); if ( !defined $build_thread ) { mtr_error("Could not get a unique build thread id"); } - mtr_report(" - got $build_thread"); + #mtr_report(" - got $build_thread"); } $ENV{MTR_BUILD_THREAD}= $build_thread; $opt_build_thread= $build_thread; @@ -1614,9 +1627,9 @@ sub environment_setup { $ENV{'LC_COLLATE'}= "C"; $ENV{'USE_RUNNING_SERVER'}= using_extern(); $ENV{'MYSQL_TEST_DIR'}= $glob_mysql_test_dir; - $ENV{'MYSQLTEST_VARDIR'}= $opt_vardir; $ENV{'DEFAULT_MASTER_PORT'}= $mysqld_variables{'master-port'} || 3306; $ENV{'MYSQL_TMP_DIR'}= $opt_tmpdir; + $ENV{'MYSQLTEST_VARDIR'}= $opt_vardir; # ---------------------------------------------------- # Setup env for NDB @@ -2303,7 +2316,7 @@ sub check_ports_free for ($baseport..$baseport+9){ push(@ports_to_check, $_); } - mtr_report("Checking ports..."); + #mtr_report("Checking ports..."); # print "@ports_to_check\n"; foreach my $port (@ports_to_check){ if (mtr_ping_port($port)){ @@ -2337,11 +2350,6 @@ sub initialize_servers { # using any pidfiles found in var/run kill_leftovers("$opt_vardir/run"); - if (check_ports_free()){ - # Some port was not free(which one has already been printed) - mtr_error("Some port(s) was not free") - } - if ( ! $opt_start_dirty ) { remove_stale_vardir(); @@ -4534,10 +4542,7 @@ sub valgrind_arguments { # Usage # sub usage ($) { - my ($thread_num, $message)= @_; - - # Only main thread should print usage - return if $thread_num != 0; + my ($message)= @_; if ( $message ) { From 8fb38c6b78432938a09e0856e5fe4034623f298d Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 5 Sep 2008 14:23:52 +0200 Subject: [PATCH 282/705] Make mysql-test-run.pl executable by user --- mysql-test/mysql-test-run.pl | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 mysql-test/mysql-test-run.pl diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl old mode 100644 new mode 100755 From d616caa6bc73422c524545ed3dd22062ff659b4e Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 5 Sep 2008 14:40:07 +0200 Subject: [PATCH 283/705] Bug#39008 perl warning in mtr: 'use of uninitialized value in concatenation' in mtr:3995 --- mysql-test/mysql-test-run.pl | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index c6005d889e5..1baeec2e137 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4015,29 +4015,14 @@ sub start_servers($) { } my $datadir= $mysqld->value('datadir'); - - # Don't delete anything if starting dirty if (!$opt_start_dirty) { - my @options= ('log-bin', 'relay-log'); + # Don't delete anything if starting dirty - foreach my $option_name ( @options ) { - next unless $mysqld->option($option_name); - - my $value= $mysqld->value($option_name); - - foreach my $file ( glob("$datadir/$value*") ) - { - #print "removing: $file\n"; - mtr_debug("Removing '$file'"); - unlink($file); - } + if (-d $datadir ) { + mtr_verbose(" - removing '$datadir'"); + rmtree($datadir); } - - # Remove old master.info and relay-log.info files - # from the servers datadir - unlink("$datadir/master.info"); - unlink("$datadir/relay-log.info"); } # Copy datadir from installed system db From e1524b2f1c81264273e80cc82a0a8492a25e1ff7 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 5 Sep 2008 15:08:55 +0200 Subject: [PATCH 284/705] Bug #38540 rpl_server_id2 uses show slave status unnecessarily --- mysql-test/suite/rpl/t/disabled.def | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def index a8c83d58884..7c6fb9c700f 100644 --- a/mysql-test/suite/rpl/t/disabled.def +++ b/mysql-test/suite/rpl/t/disabled.def @@ -14,3 +14,4 @@ rpl_redirect : Failure is sporadic and and the test is superfluous rpl_innodb_bug28430 : Failure on Solaris Bug #36793 rpl_temporary : BUG#38269 2008-07-21 Sven valgrind error in pushbuild rpl_flushlog_loop : BUG#37733 2008-07-23 Sven disabled in 5.1-bugteam. the bug has been fixed in 5.1-rpl: please re-enable when that gets pushed to main +rpl_server_id2 : Bug#38540 rpl_server_id2 uses show slave status unnecessarily From 5834ef2c4a651a713fcf2c2e18088ae3770a7e19 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 5 Sep 2008 15:09:29 +0200 Subject: [PATCH 285/705] WL#4350 - fix scheduler bug --- mysql-test/mysql-test-run.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 1baeec2e137..365d224f468 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -544,7 +544,7 @@ sub run_test_server ($$$) { # Move the test to completed list #mtr_report("skip - Moving test $i to completed"); push(@$completed, splice(@$tests, $i, 1)); - redo; # Start over again + next; } # Limit number of parallell NDB tests From 9dbcf1b26f86603c06bbd714274294d83e279c52 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 5 Sep 2008 15:31:09 +0200 Subject: [PATCH 286/705] WL#4350 Options in my.cnf style config file should not start with -- --- mysql-test/lib/My/Config.pm | 10 ++++++++++ mysql-test/lib/mtr_cases.pm | 2 +- mysql-test/suite/binlog/combinations | 6 +++--- mysql-test/suite/bugs/combinations | 6 +++--- mysql-test/suite/rpl/combinations | 6 +++--- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/mysql-test/lib/My/Config.pm b/mysql-test/lib/My/Config.pm index 35273f08cf7..f8416e3df3a 100644 --- a/mysql-test/lib/My/Config.pm +++ b/mysql-test/lib/My/Config.pm @@ -27,6 +27,16 @@ sub value { return $self->{value}; } +sub option { + my ($self)= @_; + my $name= $self->{name}; + my $value= $self->{value}; + + my $opt= $name; + $opt= "$name=$value" if ($value); + $opt= "--$opt" unless ($opt =~ /^--/); + return $opt; +} package My::Config::Group; diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 93236e483a1..fd3c9a8c00f 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -397,7 +397,7 @@ sub collect_one_suite($) my $comb= {}; $comb->{name}= $group->name(); foreach my $option ( $group->options() ) { - push(@{$comb->{comb_opt}}, $option->name()."=".$option->value()); + push(@{$comb->{comb_opt}}, $option->option()); } push(@combinations, $comb); } diff --git a/mysql-test/suite/binlog/combinations b/mysql-test/suite/binlog/combinations index ea25611a5d4..07042c2cbec 100644 --- a/mysql-test/suite/binlog/combinations +++ b/mysql-test/suite/binlog/combinations @@ -1,8 +1,8 @@ [row] ---binlog-format=row +binlog-format=row [stmt] ---binlog-format=statement +binlog-format=statement [mix] ---binlog-format=mixed +binlog-format=mixed diff --git a/mysql-test/suite/bugs/combinations b/mysql-test/suite/bugs/combinations index ea25611a5d4..07042c2cbec 100644 --- a/mysql-test/suite/bugs/combinations +++ b/mysql-test/suite/bugs/combinations @@ -1,8 +1,8 @@ [row] ---binlog-format=row +binlog-format=row [stmt] ---binlog-format=statement +binlog-format=statement [mix] ---binlog-format=mixed +binlog-format=mixed diff --git a/mysql-test/suite/rpl/combinations b/mysql-test/suite/rpl/combinations index ea25611a5d4..07042c2cbec 100644 --- a/mysql-test/suite/rpl/combinations +++ b/mysql-test/suite/rpl/combinations @@ -1,8 +1,8 @@ [row] ---binlog-format=row +binlog-format=row [stmt] ---binlog-format=statement +binlog-format=statement [mix] ---binlog-format=mixed +binlog-format=mixed From 40db2c21e4d21ff2bc83cd556a291ec40fad89a3 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 5 Sep 2008 16:06:08 +0200 Subject: [PATCH 287/705] Bug #39213 Could not find reason for skipping test --- mysql-test/mysql-test-run.pl | 6 ++++++ 1 file changed, 6 insertions(+) mode change 100644 => 100755 mysql-test/mysql-test-run.pl diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl old mode 100644 new mode 100755 index c6005d889e5..e86dc07809b --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4259,6 +4259,12 @@ sub start_mysqltest ($) { my $extra_opts= get_extra_opts($mysqld, $tinfo); mysqld_arguments($mysqld_args, $mysqld, $extra_opts); mtr_add_arg($args, "--server-arg=%s", $_) for @$mysqld_args; + + if (IS_WINDOWS) + { + # Trick the server to send output to stderr, with --console + mtr_add_arg($args, "--server-arg=--console"); + } } # ---------------------------------------------------------------------- From b0750d6843eabbf9e080336abb763cb85f4d7c64 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 5 Sep 2008 16:22:02 +0200 Subject: [PATCH 288/705] Bug #39071 mtr's check-testcase reports extra failures for correct test cases --- mysql-test/mysql-test-run.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index f3b3c66e822..c59ff79b5ff 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2762,7 +2762,6 @@ sub start_run_one ($$) { sub run_on_all($$) { my ($tinfo, $run)= @_; - my $tname= $tinfo->{name}; # Start the mysqltest processes in parallel to save time # also makes it possible to wait for any process to exit during the check @@ -3181,7 +3180,6 @@ sub start_check_warnings ($$) { my $mysqld= shift; my $name= "warnings-".$mysqld->name(); - my $tname= $tinfo->{name}; my $args; mtr_init_args(\$args); @@ -4120,7 +4118,9 @@ sub start_check_testcase ($$$) { my $mysqld= shift; my $name= "check-".$mysqld->name(); - my $tname= $tinfo->{name}; + # Replace dots in name with underscore to avoid that mysqltest + # misinterpret's what the filename extension is :( + $name=~ s/\./_/g; my $args; mtr_init_args(\$args); From d266e9d5534bafdc06ce87f9a4cae23aafb12a45 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 5 Sep 2008 17:37:55 +0200 Subject: [PATCH 289/705] Bug#32052 Small inconsistency with the big_test and ndb_extra test options --- mysql-test/mysql-test-run.pl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index c59ff79b5ff..f382b64893d 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3682,7 +3682,7 @@ sub mysqld_start ($$) { } elsif ( $opt_manual_debug ) { - print "\nStart $mysqld->name() in your debugger\n" . + print "\nStart " .$mysqld->name()." in your debugger\n" . "dir: $glob_mysql_test_dir\n" . "exe: $exe\n" . "args: " . join(" ", @$args) . "\n\n" . @@ -4599,8 +4599,7 @@ Options to control what test suites or cases to run list of suite names. The default is: "$DEFAULT_SUITES" skip-rpl Skip the replication test cases. - big-test Set the environment variable BIG_TEST, which can be - checked from test cases. + big-test Also run tests marked as "big" Options that specify ports From 189ac2c7d4b545ef715d7c8e6582ad4b72cb1cdf Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 5 Sep 2008 18:28:20 +0200 Subject: [PATCH 290/705] Bug#35482 mysql-test-run have_innodb does not detect external server has Innodb support --- mysql-test/lib/My/Find.pm | 2 +- mysql-test/mysql-test-run.pl | 70 +++++++++++++++++++++++++++++------- 2 files changed, 58 insertions(+), 14 deletions(-) diff --git a/mysql-test/lib/My/Find.pm b/mysql-test/lib/My/Find.pm index 1b1b5645dc9..8b90e757917 100644 --- a/mysql-test/lib/My/Find.pm +++ b/mysql-test/lib/My/Find.pm @@ -53,7 +53,7 @@ sub NOT_REQUIRED { return 0; } # binary is not found # my $mysql_exe= my_find_bin($basedir, # ["client", "bin"], -# "mysql", 0); +# "mysql", NOT_REQUIRED); # # NOTE: The function honours MTR_VS_CONFIG environment variable # diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index f382b64893d..fa795ba9989 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -167,7 +167,7 @@ my $opt_retry_failure= 2; my $opt_strace_client; -our $opt_user; +our $opt_user = "root"; my $opt_valgrind= 0; my $opt_valgrind_mysqld= 0; @@ -906,8 +906,16 @@ sub command_line_setup { "$basedir/scripts"); } - # Run the mysqld to find out what features are available - collect_mysqld_features(); + if (using_extern()) + { + # Connect to the running mysqld and find out what it supports + collect_mysqld_features_from_running_server(); + } + else + { + # Run the mysqld to find out what features are available + collect_mysqld_features(); + } if ( $opt_comment ) { @@ -1170,11 +1178,6 @@ sub command_line_setup { join(" ", @valgrind_args), "\""); } - if ( ! $opt_user ) - { - $opt_user= "root"; # We want to do FLUSH xxx commands - } - mtr_report("Checking supported features..."); check_ndbcluster_support(\%mysqld_variables); @@ -1322,6 +1325,50 @@ sub collect_mysqld_features { } + +sub collect_mysqld_features_from_running_server () +{ + my $mysql= mtr_exe_exists("$path_client_bindir/mysql"); + + my $args; + mtr_init_args(\$args); + + mtr_add_arg($args, "--no-defaults"); + mtr_add_arg($args, "--user=%s", $opt_user); + + while (my ($option, $value)= each( %opts_extern )) { + mtr_add_arg($args, "--$option=$value"); + } + + mtr_add_arg($args, "--silent"); # Tab separated output + mtr_add_arg($args, "-e '%s'", "use mysql; SHOW VARIABLES"); + my $cmd= "$mysql " . join(' ', @$args); + mtr_verbose("cmd: $cmd"); + + my $list = `$cmd` or + mtr_error("Could not connect to extern server using command: '$cmd'"); + foreach my $line (split('\n', $list )) + { + # Put variables into hash + if ( $line =~ /^([\S]+)[ \t]+(.*?)\r?$/ ) + { + # print "$1=\"$2\"\n"; + $mysqld_variables{$1}= $2; + } + } + + # Parse version + my $version_str= $mysqld_variables{'version'}; + if ( $version_str =~ /^([0-9]*)\.([0-9]*)\.([0-9]*)/ ) + { + #print "Major: $1 Minor: $2 Build: $3\n"; + $mysql_version_id= $1*10000 + $2*100 + $3; + #print "mysql_version_id: $mysql_version_id\n"; + mtr_report("MySQL Version $1.$2.$3"); + } + mtr_error("Could not find version of MySQL") unless $mysql_version_id; +} + sub find_mysqld { my ($mysqld_basedir)= @_; @@ -2218,7 +2265,7 @@ sub create_config_file_for_extern { ( socket => '/tmp/mysqld.sock', port => 3306, - user => 'test', + user => $opt_user, password => '', @_ ); @@ -4626,9 +4673,6 @@ Options to run test on running server For example: ./$0 --extern socket=/tmp/mysqld.sock - user=USER User for connection to extern server - socket=PATH Socket for connection to extern server - Options for debugging the product client-ddd Start mysqltest client in ddd @@ -4675,7 +4719,7 @@ Options for valgrind callgrind Instruct valgrind to use callgrind Misc options - + user=USER User for connecting to mysqld(default: $opt_user) comment=STR Write STR to the output notimer Don't show test case execution time verbose More verbose output(use multiple times for even more) From 4299844ad5272d7eac8eddfb9262c97145f79c0a Mon Sep 17 00:00:00 2001 From: He Zhenxing Date: Sat, 6 Sep 2008 12:49:43 +0800 Subject: [PATCH 291/705] Postfix of tests after merge --- mysql-test/include/mysqlbinlog_row_engine.inc | 10 +++++----- mysql-test/r/csv.result | 2 +- mysql-test/r/mysqlbinlog_row.result | 2 +- mysql-test/r/mysqlbinlog_row_innodb.result | 10 +++++----- mysql-test/r/mysqlbinlog_row_myisam.result | 10 +++++----- mysql-test/r/mysqlbinlog_row_trans.result | 2 +- mysql-test/t/csv.test | 2 +- mysql-test/t/mysqlbinlog_row.test | 2 +- mysql-test/t/mysqlbinlog_row_big.test | 2 +- mysql-test/t/mysqlbinlog_row_trans.test | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/mysql-test/include/mysqlbinlog_row_engine.inc b/mysql-test/include/mysqlbinlog_row_engine.inc index 8211baea22c..95440ab04a0 100644 --- a/mysql-test/include/mysqlbinlog_row_engine.inc +++ b/mysql-test/include/mysqlbinlog_row_engine.inc @@ -1651,7 +1651,7 @@ FLUSH LOGS; let $MYSQLD_DATADIR= `select @@datadir`; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ /(@[0-9]*=[0-9-]*[.][0-9]{1,3})[0-9e+-]*[^ ]*[ ]*(.*(FLOAT|DOUBLE).*[*].)/\1... \2/ ---exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLD_DATADIR/master-bin.000001 --echo # --echo # Cleanup. @@ -1731,7 +1731,7 @@ FLUSH LOGS; let $MYSQLD_DATADIR= `select @@datadir`; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ /(@[0-9]*=[0-9-]*[.][0-9]{1,3})[0-9e+-]*[^ ]*[ ]*(.*(FLOAT|DOUBLE).*[*].)/\1... \2/ ---exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLD_DATADIR/master-bin.000001 --echo # --echo # Cleanup. @@ -1854,7 +1854,7 @@ FLUSH LOGS; let $MYSQLD_DATADIR= `select @@datadir`; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ /(@[0-9]*=[0-9-]*[.][0-9]{1,3})[0-9e+-]*[^ ]*[ ]*(.*(FLOAT|DOUBLE).*[*].)/\1... \2/ ---exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLD_DATADIR/master-bin.000001 --echo # --echo # Cleanup. @@ -1887,7 +1887,7 @@ eval CREATE TABLE t1 ( --echo # --echo # Load data. --echo # -LOAD DATA INFILE '../std_data_ln/loaddata5.dat' +LOAD DATA INFILE '../../std_data/loaddata5.dat' INTO TABLE t1 FIELDS TERMINATED BY '' ENCLOSED BY '' (c1,c2) SET c3 = 'Wow'; @@ -1912,7 +1912,7 @@ FLUSH LOGS; let $MYSQLD_DATADIR= `select @@datadir`; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ /(@[0-9]*=[0-9-]*[.][0-9]{1,3})[0-9e+-]*[^ ]*[ ]*(.*(FLOAT|DOUBLE).*[*].)/\1... \2/ ---exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLD_DATADIR/master-bin.000001 --echo # --echo # Cleanup. diff --git a/mysql-test/r/csv.result b/mysql-test/r/csv.result index 8bc6114dbc2..3bd5869775b 100644 --- a/mysql-test/r/csv.result +++ b/mysql-test/r/csv.result @@ -5391,7 +5391,7 @@ drop table t1; create table t1 (a int not null) engine=csv; lock tables t1 read; select * from t1; -ERROR HY000: File './test/t1.CSV' not found (Errcode: 2) +ERROR HY000: File 'MYSQLD_DATADIR/test/t1.CSV' not found (Errcode: 2) unlock tables; drop table t1; End of 5.1 tests diff --git a/mysql-test/r/mysqlbinlog_row.result b/mysql-test/r/mysqlbinlog_row.result index 39ca296e343..9b562ac0fff 100644 --- a/mysql-test/r/mysqlbinlog_row.result +++ b/mysql-test/r/mysqlbinlog_row.result @@ -339,7 +339,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/r/mysqlbinlog_row_innodb.result b/mysql-test/r/mysqlbinlog_row_innodb.result index 56efba0362f..86f0b67ebb3 100644 --- a/mysql-test/r/mysqlbinlog_row_innodb.result +++ b/mysql-test/r/mysqlbinlog_row_innodb.result @@ -2256,7 +2256,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8 *//*!*/; @@ -3879,7 +3879,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8 *//*!*/; @@ -4246,7 +4246,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8 *//*!*/; @@ -4772,7 +4772,7 @@ c3 VARCHAR(60) # # Load data. # -LOAD DATA INFILE '../std_data_ln/loaddata5.dat' +LOAD DATA INFILE '../../std_data/loaddata5.dat' INTO TABLE t1 FIELDS TERMINATED BY '' ENCLOSED BY '' (c1,c2) SET c3 = 'Wow'; affected rows: 3 @@ -4807,7 +4807,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8 *//*!*/; diff --git a/mysql-test/r/mysqlbinlog_row_myisam.result b/mysql-test/r/mysqlbinlog_row_myisam.result index d3f2a2a1f2f..b9366d941f8 100644 --- a/mysql-test/r/mysqlbinlog_row_myisam.result +++ b/mysql-test/r/mysqlbinlog_row_myisam.result @@ -2256,7 +2256,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8 *//*!*/; @@ -3901,7 +3901,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8 *//*!*/; @@ -4274,7 +4274,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8 *//*!*/; @@ -4810,7 +4810,7 @@ c3 VARCHAR(60) # # Load data. # -LOAD DATA INFILE '../std_data_ln/loaddata5.dat' +LOAD DATA INFILE '../../std_data/loaddata5.dat' INTO TABLE t1 FIELDS TERMINATED BY '' ENCLOSED BY '' (c1,c2) SET c3 = 'Wow'; affected rows: 3 @@ -4845,7 +4845,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8 *//*!*/; diff --git a/mysql-test/r/mysqlbinlog_row_trans.result b/mysql-test/r/mysqlbinlog_row_trans.result index b7dd6a68096..9c3348a9e76 100644 --- a/mysql-test/r/mysqlbinlog_row_trans.result +++ b/mysql-test/r/mysqlbinlog_row_trans.result @@ -135,7 +135,7 @@ ROLLBACK/*!*/; use test/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/t/csv.test b/mysql-test/t/csv.test index 52b73af9fd7..eb93288b0aa 100644 --- a/mysql-test/t/csv.test +++ b/mysql-test/t/csv.test @@ -1796,7 +1796,7 @@ lock tables t1 read; connect (con1,localhost,root,,); --connection con1 --remove_file $MYSQLD_DATADIR/test/t1.CSV ---replace_result $MYSQLD_DATADIR '' 13 2 +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR/ ./ MYSQLD_DATADIR/ 13 2 # EE_FILENOTFOUND 29 --error 29 select * from t1; diff --git a/mysql-test/t/mysqlbinlog_row.test b/mysql-test/t/mysqlbinlog_row.test index 9d94e1f55e7..9b41c63d195 100644 --- a/mysql-test/t/mysqlbinlog_row.test +++ b/mysql-test/t/mysqlbinlog_row.test @@ -443,4 +443,4 @@ flush logs; let $MYSQLD_DATADIR= `select @@datadir`; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ /(@[0-9]*=[0-9]*[.][0-9]{1,3})[0-9e+-]*[^ ]*(.*(FLOAT|DOUBLE).*[*].)/\1...\2/ ---exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLD_DATADIR/master-bin.000001 diff --git a/mysql-test/t/mysqlbinlog_row_big.test b/mysql-test/t/mysqlbinlog_row_big.test index 62c8c7df327..bad39255bac 100644 --- a/mysql-test/t/mysqlbinlog_row_big.test +++ b/mysql-test/t/mysqlbinlog_row_big.test @@ -115,7 +115,7 @@ FLUSH LOGS; let $MYSQLD_DATADIR= `select @@datadir`; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ ---exec $MYSQL_BINLOG -v -v $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/$mysqlbinlog_output +--exec $MYSQL_BINLOG -v -v $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/$mysqlbinlog_output --echo # --echo # Cleanup. diff --git a/mysql-test/t/mysqlbinlog_row_trans.test b/mysql-test/t/mysqlbinlog_row_trans.test index d84b1743783..24abc441c4c 100644 --- a/mysql-test/t/mysqlbinlog_row_trans.test +++ b/mysql-test/t/mysqlbinlog_row_trans.test @@ -151,7 +151,7 @@ FLUSH LOGS; let $MYSQLD_DATADIR= `select @@datadir`; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ ---exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLD_DATADIR/master-bin.000001 --echo # --echo # Cleanup. From 1d8583f5a292d19f9acfdba3c1976896bed6a385 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Sat, 6 Sep 2008 08:57:05 +0200 Subject: [PATCH 292/705] Bug#38817 please make mtr analyze crashes better --- mysql-test/Makefile.am | 1 + mysql-test/lib/My/CoreDump.pm | 79 +++++++++++++++++++++++++++++++++++ mysql-test/mysql-test-run.pl | 14 ++++--- 3 files changed, 88 insertions(+), 6 deletions(-) create mode 100644 mysql-test/lib/My/CoreDump.pm diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 83b688ff600..0f9a9d2c1ab 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -43,6 +43,7 @@ nobase_test_DATA = lib/mtr_cases.pm \ lib/My/SafeProcess.pm \ lib/My/File/Path.pm \ lib/My/SysInfo.pm \ + lib/My/CoreDump.pm \ lib/My/SafeProcess/Base.pm \ lib/My/SafeProcess/safe_process.pl diff --git a/mysql-test/lib/My/CoreDump.pm b/mysql-test/lib/My/CoreDump.pm new file mode 100644 index 00000000000..5f7427768c2 --- /dev/null +++ b/mysql-test/lib/My/CoreDump.pm @@ -0,0 +1,79 @@ +# -*- cperl -*- +# Copyright (C) 2004-2006 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +package My::CoreDump; + +use strict; +use Carp; +use My::Platform; + +use File::Temp qw/ tempfile tempdir /; + +sub _gdb { + my ($core_name)= @_; + + return unless -f $core_name; + + my $dir = tempdir( CLEANUP => 1 ); + my ($tmp, $tmp_name) = tempfile( DIR => $dir ); + + print $tmp + "thread apply all bt\n", + "quit\n"; + + # Find out name of binary that generated core + my $list= `gdb -c $core_name -x $tmp_name -q 2>&1` + or return; + + my $binary; + foreach my $line (split('\n', $list)) + { + $binary= $1 + if ($line =~ /Core was generated by `(\S+)/); + } + + return unless $binary; + + print "Generated by '$binary'\n"; + + my $list= `gdb $binary -c $core_name -x $tmp_name -q 2>&1` + or return; + + print $list, "\n"; + + return 1; +} + + +sub show { + my ($class, $core_name)= @_; + + my @debuggers = + ( + \&_gdb, + # TODO... + ); + + foreach my $debugger (@debuggers){ + if ($debugger->($core_name)){ + return; + } + } + return; +} + + +1; diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index fa795ba9989..5b91517117a 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -50,6 +50,7 @@ use My::ConfigFactory; use My::Options; use My::Find; use My::SysInfo; +use My::CoreDump; use mtr_cases; use mtr_report; use mtr_match; @@ -446,15 +447,16 @@ sub run_test_server ($$$) { my $core_name= basename($core_file); if ($core_name =~ "core*"){ + mtr_report(" - found '$core_name'", + "($num_saved_cores/$opt_max_save_core)"); + + My::CoreDump->show($core_file); + if ($num_saved_cores >= $opt_max_save_core) { - mtr_report(" - deleting '$core_name'", - "($num_saved_cores/$opt_max_save_core)"); + mtr_report(" - deleting it, already saved", + "$opt_max_save_core"); unlink("$core_file"); } - else { - mtr_report(" - found '$core_name'", - "($num_saved_cores/$opt_max_save_core)"); - } ++$num_saved_cores; } } From b76b046daadd35842777aa7ed65ccc85bbc90433 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Tue, 9 Sep 2008 09:49:58 +0200 Subject: [PATCH 293/705] WL#4350 Add missing 'exit' --- mysql-test/include/analyze-timeout.test | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql-test/include/analyze-timeout.test b/mysql-test/include/analyze-timeout.test index 1de0dcb483c..179ad8f748a 100644 --- a/mysql-test/include/analyze-timeout.test +++ b/mysql-test/include/analyze-timeout.test @@ -1 +1,3 @@ SHOW PROCESSLIST; + +exit; From a5e248d4023180d81c27acb9f764e00d4b7cc488 Mon Sep 17 00:00:00 2001 From: Horst Hunger Date: Wed, 10 Sep 2008 12:50:39 +0200 Subject: [PATCH 294/705] Final fix for bug#38349: Did the changes due to the 2 reviews. - Updated slow_query_log_file_basic and general_log_file basis instead of the func version as the func version run good but the basic versions fail. - Sent innodb.test to dev@innodb.com. - variables.test has differences probably due to a bug in mtr or in the SET statement (see bug#39369). - general_log_file_basic.test and slow_query_log_file_bsaic.test have differences, which might be produced by the new mtr (see bug#38124). --- mysql-test/r/binlog_format_basic.result | 28 ++- .../r/character_set_connection_func.result | 3 +- mysql-test/r/completion_type_func.result | 45 ++--- mysql-test/r/concurrent_insert_func.result | 108 ++++++++---- mysql-test/r/delay_key_write_func.result | 14 +- mysql-test/r/general_log_file_basic.result | 1 + mysql-test/r/general_log_file_func.result | 12 +- .../innodb_autoextend_increment_basic.result | 12 +- .../r/innodb_autoinc_lock_mode_func.result | 5 +- .../r/innodb_fast_shutdown_basic.result | 10 +- .../r/innodb_max_dirty_pages_pct_func.result | 7 +- mysql-test/r/innodb_table_locks_func.result | 8 + mysql-test/r/insert_update.result | 1 + mysql-test/r/key_buffer_size_func.result | 57 ++++-- mysql-test/r/log_basic.result | 6 +- ...og_bin_trust_function_creators_func.result | 22 +-- ...log_queries_not_using_indexes_basic.result | 145 ++++++++++----- mysql-test/r/log_state.result | 6 + mysql-test/r/log_tables.result | 8 + mysql-test/r/max_allowed_packet_func.result | 14 +- mysql-test/r/max_seeks_for_key_func.result | 38 ++-- mysql-test/r/max_sort_length_func.result | 2 + .../r/myisam_data_pointer_size_func.result | 2 + mysql-test/r/myisam_stats_method_func.result | 26 +-- mysql-test/r/profiling.result | 2 + mysql-test/r/query_cache_limit_func.result | 10 +- mysql-test/r/query_cache_type_func.result | 2 + mysql-test/r/query_prealloc_size_func.result | 15 +- mysql-test/r/slow_query_log_file_basic.result | 4 +- mysql-test/r/slow_query_log_file_func.result | 2 +- mysql-test/r/variables-notembedded.result | 1 + mysql-test/r/variables.result | 4 +- mysql-test/t/binlog_format_basic.test | 37 ++-- .../t/character_set_connection_func.test | 17 +- mysql-test/t/completion_type_func.test | 58 +++--- mysql-test/t/concurrent_insert_func.test | 139 ++++++++------- mysql-test/t/delay_key_write_func.test | 34 ++-- mysql-test/t/disabled.def | 2 +- mysql-test/t/general_log_file_basic.test | 7 +- mysql-test/t/general_log_file_func.test | 14 +- .../t/innodb_autoextend_increment_basic.test | 129 ++++++-------- .../t/innodb_autoinc_lock_mode_func.test | 15 +- mysql-test/t/innodb_fast_shutdown_basic.test | 89 +++++----- .../t/innodb_max_dirty_pages_pct_func.test | 60 +++---- mysql-test/t/innodb_table_locks_func.test | 12 +- mysql-test/t/insert_update.test | 15 +- mysql-test/t/key_buffer_size_func.test | 69 +++++--- mysql-test/t/log_basic.test | 26 +-- .../log_bin_trust_function_creators_func.test | 23 +-- .../log_queries_not_using_indexes_basic.test | 165 ++++++++++-------- mysql-test/t/log_state.test | 28 ++- mysql-test/t/log_tables.test | 9 + mysql-test/t/max_allowed_packet_func.test | 27 ++- mysql-test/t/max_seeks_for_key_func.test | 58 +++--- mysql-test/t/max_sort_length_func.test | 16 +- .../t/myisam_data_pointer_size_func.test | 15 +- mysql-test/t/myisam_stats_method_func.test | 37 ++-- mysql-test/t/profiling.test | 3 +- mysql-test/t/query_cache_limit_func.test | 18 +- mysql-test/t/query_cache_type_func.test | 7 +- mysql-test/t/query_prealloc_size_func.test | 64 ++++--- mysql-test/t/slow_query_log_file_basic.test | 10 +- mysql-test/t/slow_query_log_file_func.test | 2 +- mysql-test/t/variables-notembedded.test | 2 + mysql-test/t/variables.test | 6 +- 65 files changed, 1059 insertions(+), 774 deletions(-) diff --git a/mysql-test/r/binlog_format_basic.result b/mysql-test/r/binlog_format_basic.result index 3fee9bade7e..f9b1c2c6e09 100644 --- a/mysql-test/r/binlog_format_basic.result +++ b/mysql-test/r/binlog_format_basic.result @@ -1,4 +1,5 @@ '#---------------------BS_STVARS_002_01----------------------#' +SET @start_value= @@global.binlog_format; SELECT COUNT(@@GLOBAL.binlog_format); COUNT(@@GLOBAL.binlog_format) 1 @@ -9,19 +10,13 @@ COUNT(@@SESSION.binlog_format) 1 Expected '#---------------------BS_STVARS_002_02----------------------#' SET @@GLOBAL.binlog_format=1; -Expected error 'Read only variable' -Bug: Writeable static variable -SELECT COUNT(@@GLOBAL.binlog_format); -COUNT(@@GLOBAL.binlog_format) -1 -1 Expected +SELECT @@GLOBAL.binlog_format; +@@GLOBAL.binlog_format +STATEMENT SET @@SESSION.binlog_format=1; -Expected error 'Read only variable' -Bug: Writeable static variable -SELECT COUNT(@@SESSION.binlog_format); -COUNT(@@SESSION.binlog_format) -1 -1 Expected +SELECT @@SESSION.binlog_format; +@@SESSION.binlog_format +STATEMENT '#---------------------BS_STVARS_002_03----------------------#' SELECT @@GLOBAL.binlog_format = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES @@ -34,14 +29,14 @@ COUNT(@@GLOBAL.binlog_format) 1 1 Expected SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='binlog_format'; COUNT(VARIABLE_VALUE) 1 1 Expected '#---------------------BS_STVARS_002_04----------------------#' -SELECT @@SESSION.binlog_format = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES +SELECT @@SESSION.binlog_format = VARIABLE_VALUE +FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='binlog_format'; @@SESSION.binlog_format = VARIABLE_VALUE 1 @@ -51,7 +46,7 @@ COUNT(@@SESSION.binlog_format) 1 1 Expected SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.SESSION_VARIABLES +FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='binlog_format'; COUNT(VARIABLE_VALUE) 1 @@ -73,3 +68,4 @@ SELECT COUNT(@@GLOBAL.binlog_format); COUNT(@@GLOBAL.binlog_format) 1 1 Expected +SET @@global.binlog_format= @start_value; diff --git a/mysql-test/r/character_set_connection_func.result b/mysql-test/r/character_set_connection_func.result index 2f5d28ec8af..6fc33a4f369 100644 --- a/mysql-test/r/character_set_connection_func.result +++ b/mysql-test/r/character_set_connection_func.result @@ -15,7 +15,7 @@ utf8 '#--------------------FN_DYNVARS_011_02-------------------------#' 'connection default' DROP TABLE IF EXISTS t1; -CREATE TABLE t1(b CHAR(40) character set utf8); +CREATE TABLE t1(b CHAR(40) CHARACTER SET utf8); '--verify that character_set_connection converts character_set_client--' SET @@session.character_set_client = utf8; SET @@session.character_set_results = utf8; @@ -53,3 +53,4 @@ SET @@global.character_set_connection = @global_character_set_connection; SET @@session.character_set_connection = @session_character_set_connection; SET @@session.character_set_client = @session_character_set_client; SET @@session.character_set_results = @session_character_set_results; +DROP TABLE t1; diff --git a/mysql-test/r/completion_type_func.result b/mysql-test/r/completion_type_func.result index 282bd1006cd..daee738c10d 100644 --- a/mysql-test/r/completion_type_func.result +++ b/mysql-test/r/completion_type_func.result @@ -1,67 +1,67 @@ -drop table if exists t1; +DROP TABLE IF EXISTS t1; ## Creating new table ## CREATE TABLE t1 ( -id INT NOT NULL auto_increment, +id INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (id), -name varchar(30) +name VARCHAR(30) ) ENGINE = INNODB; '#--------------------FN_DYNVARS_017_01-------------------------#' ## Creating new connection ## -INSERT into t1(name) values('Record_1'); +INSERT INTO t1(name) VALUES('Record_1'); SET @@autocommit = 0; -SELECT * from t1; +SELECT * FROM t1; id name 1 Record_1 ## Setting value of variable to 0 ## SET @@session.completion_type = 0; ## Here commit & rollback should work normally ## START TRANSACTION; -SELECT * from t1; +SELECT * FROM t1; id name 1 Record_1 -INSERT into t1(name) values('Record_2'); -INSERT into t1(name) values('Record_3'); -SELECT * from t1; +INSERT INTO t1(name) VALUES('Record_2'); +INSERT INTO t1(name) VALUES('Record_3'); +SELECT * FROM t1; id name 1 Record_1 2 Record_2 3 Record_3 -DELETE FROM t1 where id = 2; -SELECT * from t1; +DELETE FROM t1 WHERE id = 2; +SELECT * FROM t1; id name 1 Record_1 3 Record_3 START TRANSACTION; -SELECT * from t1; +SELECT * FROM t1; id name 1 Record_1 3 Record_3 -INSERT into t1(name) values('Record_4'); -INSERT into t1(name) values('Record_5'); +INSERT INTO t1(name) VALUES('Record_4'); +INSERT INTO t1(name) VALUES('Record_5'); COMMIT; '#--------------------FN_DYNVARS_017_02-------------------------#' SET @@session.completion_type = 2; ## Here commit should work as COMMIT RELEASE ## START TRANSACTION; -SELECT * from t1; +SELECT * FROM t1; id name 1 Record_1 3 Record_3 4 Record_4 5 Record_5 -INSERT into t1(name) values('Record_6'); -INSERT into t1(name) values('Record_7'); +INSERT INTO t1(name) VALUES('Record_6'); +INSERT INTO t1(name) VALUES('Record_7'); COMMIT; ## Inserting rows should give error here because connection should ## ## disconnect after using COMMIT ## -INSERT into t1(name) values('Record_4'); +INSERT INTO t1(name) VALUES('Record_4'); Got one of the listed errors ## Creating new connection test_con2 ## SET @@session.completion_type = 2; ## Inserting rows and using Rollback which should Rollback & release ## START TRANSACTION; -SELECT * from t1; +SELECT * FROM t1; id name 1 Record_1 3 Record_3 @@ -69,8 +69,9 @@ id name 5 Record_5 6 Record_6 7 Record_7 -INSERT into t1(name) values('Record_8'); -INSERT into t1(name) values('Record_9'); +INSERT INTO t1(name) VALUES('Record_8'); +INSERT INTO t1(name) VALUES('Record_9'); ROLLBACK; -INSERT into t1(name) values('Record_4'); +INSERT INTO t1(name) VALUES('Record_4'); Got one of the listed errors +DROP TABLE t1; diff --git a/mysql-test/r/concurrent_insert_func.result b/mysql-test/r/concurrent_insert_func.result index 87573bb2873..774775a8287 100644 --- a/mysql-test/r/concurrent_insert_func.result +++ b/mysql-test/r/concurrent_insert_func.result @@ -1,73 +1,121 @@ -drop table if exists t1; +DROP TABLE IF EXISTS t1; ## Creating new table ## CREATE TABLE t1 ( -name varchar(30) +name VARCHAR(30) ); '#--------------------FN_DYNVARS_018_01-------------------------#' +SET @start_value= @@global.concurrent_insert; ## Setting initial value of variable to 1 ## SET @@global.concurrent_insert = 1; -INSERT into t1(name) values('Record_1'); -INSERT into t1(name) values('Record_2'); -INSERT into t1(name) values('Record_3'); +INSERT INTO t1(name) VALUES('Record_1'); +INSERT INTO t1(name) VALUES('Record_2'); +INSERT INTO t1(name) VALUES('Record_3'); ## locking table ## -lock table t1 read local; -## Creating new connection to insert some rows in table ## +LOCK TABLE t1 READ LOCAL; +## Creating new connection to insert some rows in table ## +connection test_con1; ## New records should come at the end of all rows ## -INSERT into t1(name) values('Record_4'); -SELECT * from t1; +INSERT INTO t1(name) VALUES('Record_4'); +SELECT * FROM t1; name Record_1 Record_2 Record_3 Record_4 ## unlocking tables ## -unlock tables; -## deleting record to create hole in table ## -DELETE from t1 where name ='Record_2'; +connection default; +UNLOCK TABLES; +## deleting record to create hole in table ## +DELETE FROM t1 WHERE name ='Record_2'; '#--------------------FN_DYNVARS_018_02-------------------------#' -'#--------------------FN_DYNVARS_018_03-------------------------#' -## lock table and connect with connection1 ## -lock table t1 read local; -## setting value of concurrent_insert to 2 ## -SET @@global.concurrent_insert=2; -## Inserting record in table, record should go at the end of the table ## -INSERT into t1(name) values('Record_5'); -SELECT * from t1; +LOCK TABLE t1 READ LOCAL; +connection test_con1; +SET @@global.concurrent_insert=1; +## send INSERT which should be blocked until unlock of the table ## +INSERT INTO t1(name) VALUES('Record_7'); +connection default; +## show processlist info and state ## +SELECT state,info FROM INFORMATION_SCHEMA.PROCESSLIST +WHERE state= "Locked" AND info LIKE "INSERT INTO t1%"; +state info +Locked INSERT INTO t1(name) VALUES('Record_7') +## table contents befor UNLOCK ## +SELECT * FROM t1; name Record_1 Record_3 Record_4 +UNLOCK TABLES; +## table contens after UNLOCK ## +SELECT * FROM t1; +name +Record_1 +Record_7 +Record_3 +Record_4 +INSERT INTO t1(name) VALUES('Record_6'); +connection test_con1; +SELECT * FROM t1; +name +Record_1 +Record_7 +Record_3 +Record_4 +Record_6 +connection default; +'#--------------------FN_DYNVARS_018_03-------------------------#' +## lock table and connect with connection1 ## +LOCK TABLE t1 READ LOCAL; +connection test_con1; +## setting value of concurrent_insert to 2 ## +SET @@global.concurrent_insert=2; +## Inserting record in table, record should go at the end of the table ## +INSERT INTO t1(name) VALUES('Record_5'); +SELECT * FROM t1; +name +Record_1 +Record_7 +Record_3 +Record_4 +Record_6 Record_5 SELECT @@concurrent_insert; @@concurrent_insert 2 -## Switching to default connection ## +connection default; ## Unlocking table ## -unlock tables; -SELECT * from t1; +UNLOCK TABLES; +SELECT * FROM t1; name Record_1 +Record_7 Record_3 Record_4 +Record_6 Record_5 ## Inserting new row, this should go in the hole ## -INSERT into t1(name) values('Record_6'); -SELECT * from t1; +INSERT INTO t1(name) VALUES('Record_6'); +SELECT * FROM t1; name Record_1 -Record_6 +Record_7 Record_3 Record_4 +Record_6 Record_5 +Record_6 ## connection test_con1 ## -DELETE from t1 where name ='Record_3'; -SELECT * from t1; +DELETE FROM t1 WHERE name ='Record_3'; +SELECT * FROM t1; name Record_1 -Record_6 +Record_7 Record_4 +Record_6 Record_5 +Record_6 ## Dropping table ## -DROP table t1; +DROP TABLE t1; ## Disconnecting connection ## +SET @@global.concurrent_insert= @start_value; diff --git a/mysql-test/r/delay_key_write_func.result b/mysql-test/r/delay_key_write_func.result index ca4e25e08b1..d55cca7ab8e 100644 --- a/mysql-test/r/delay_key_write_func.result +++ b/mysql-test/r/delay_key_write_func.result @@ -1,4 +1,5 @@ '#--------------------FN_DYNVARS_023_01-------------------------#' +SET @start_value= @@global.delay_key_write; SET @@global.delay_key_write = ON; SELECT @@global.delay_key_write; @@global.delay_key_write @@ -28,8 +29,8 @@ Key_writes 9 SHOW STATUS LIKE 'Key_write_requests'; Variable_name Value Key_write_requests 9 -select count(*) from t1; -count(*) +SELECT COUNT(*) FROM t1; +COUNT(*) 9 '----check when delay_key_write is ON---' SET @@global.delay_key_write = ON; @@ -44,8 +45,8 @@ Key_writes 0 SHOW STATUS LIKE 'Key_write_requests'; Variable_name Value Key_write_requests 9 -select count(*) from t1; -count(*) +SELECT COUNT(*) FROM t1; +COUNT(*) 9 '----check when delay_key_write is ALL---' SET @@global.delay_key_write = ALL; @@ -60,8 +61,9 @@ Key_writes 0 SHOW STATUS LIKE 'Key_write_requests'; Variable_name Value Key_write_requests 9 -select count(*) from t1; -count(*) +SELECT COUNT(*) FROM t1; +COUNT(*) 9 DROP PROCEDURE sp_addRecords; DROP TABLE t1; +SET @@global.delay_key_write= @start_value; diff --git a/mysql-test/r/general_log_file_basic.result b/mysql-test/r/general_log_file_basic.result index 2d98da6f1a0..48a8d90b55e 100644 --- a/mysql-test/r/general_log_file_basic.result +++ b/mysql-test/r/general_log_file_basic.result @@ -17,3 +17,4 @@ FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='general_log_file'; @@global.general_log_file = VARIABLE_VALUE 1 +SET @@global.general_log_file= @start_value; diff --git a/mysql-test/r/general_log_file_func.result b/mysql-test/r/general_log_file_func.result index 42ef723e644..482a03c1a97 100644 --- a/mysql-test/r/general_log_file_func.result +++ b/mysql-test/r/general_log_file_func.result @@ -1,8 +1,8 @@ -drop table if exists t1; +DROP TABLE IF EXISTS t1; ## Creating new table ## CREATE TABLE t1 ( -id INT NOT NULL auto_increment, +id INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (id), name VARCHAR(30) ); @@ -10,10 +10,10 @@ name VARCHAR(30) SELECT @@general_log_file; @@general_log_file mysql-test.log -INSERT into t1(name) values('Record_1'); -INSERT into t1(name) values('Record_2'); -INSERT into t1(name) values('Record_3'); -INSERT into t1(name) values('Record_4'); +INSERT INTO t1(name) VALUES('Record_1'); +INSERT INTO t1(name) VALUES('Record_2'); +INSERT INTO t1(name) VALUES('Record_3'); +INSERT INTO t1(name) VALUES('Record_4'); ## Verifying general log file ## ## Dropping table ## DROP TABLE t1; diff --git a/mysql-test/r/innodb_autoextend_increment_basic.result b/mysql-test/r/innodb_autoextend_increment_basic.result index dafc71fd25d..69a8b6cc430 100644 --- a/mysql-test/r/innodb_autoextend_increment_basic.result +++ b/mysql-test/r/innodb_autoextend_increment_basic.result @@ -1,7 +1,4 @@ SET @global_start_value = @@global.innodb_autoextend_increment ; -SELECT @global_start_value; -@global_start_value -8 '#--------------------FN_DYNVARS_046_01------------------------#' SET @@global.innodb_autoextend_increment = 0; Warnings: @@ -57,16 +54,16 @@ SELECT @@global.innodb_autoextend_increment; @@global.innodb_autoextend_increment 1000 '#----------------------FN_DYNVARS_046_05------------------------#' -SELECT @@global.innodb_autoextend_increment = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +SELECT @@global.innodb_autoextend_increment = VARIABLE_VALUE +FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_autoextend_increment '; @@global.innodb_autoextend_increment = VARIABLE_VALUE 1 SELECT @@global.innodb_autoextend_increment ; @@global.innodb_autoextend_increment 1000 -SELECT VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +SELECT VARIABLE_VALUE +FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_autoextend_increment '; VARIABLE_VALUE 1000 @@ -92,3 +89,4 @@ Warning 1292 Truncated incorrect autoextend_increment value: '0' SELECT @@global.innodb_autoextend_increment ; @@global.innodb_autoextend_increment 1 +SET @@global.innodb_autoextend_increment = @global_start_value; diff --git a/mysql-test/r/innodb_autoinc_lock_mode_func.result b/mysql-test/r/innodb_autoinc_lock_mode_func.result index 4c594558a6f..f8082cfaedb 100644 --- a/mysql-test/r/innodb_autoinc_lock_mode_func.result +++ b/mysql-test/r/innodb_autoinc_lock_mode_func.result @@ -9,14 +9,15 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1( a INT AUTO_INCREMENT PRIMARY KEY, b CHAR -)ENGINE=INNODB, AUTO_INCREMENT=100; +) ENGINE=INNODB, AUTO_INCREMENT=100; INSERT INTO t1 (a,b) VALUES (5,'a'), (NULL,'b'), (1,'c'), (NULL,'d'); INSERT INTO t1 (a,b) VALUES (NULL,'e'); 'the new auto incremented value should be 104' -SELECT * from t1; +SELECT * FROM t1; a b 1 c 5 a 100 b 101 d 104 e +DROP TABLE t1; diff --git a/mysql-test/r/innodb_fast_shutdown_basic.result b/mysql-test/r/innodb_fast_shutdown_basic.result index adbfb6ec867..4b923f4bdd2 100644 --- a/mysql-test/r/innodb_fast_shutdown_basic.result +++ b/mysql-test/r/innodb_fast_shutdown_basic.result @@ -93,14 +93,14 @@ ERROR HY000: Variable 'innodb_fast_shutdown' is a GLOBAL variable and should be SET @@local.innodb_fast_shutdown = 0; ERROR HY000: Variable 'innodb_fast_shutdown' is a GLOBAL variable and should be set with SET GLOBAL '#----------------------FN_DYNVARS_042_06------------------------#' -SELECT count(VARIABLE_VALUE) AS res_is_0 -FROM INFORMATION_SCHEMA.SESSION_VARIABLES +SELECT count(VARIABLE_VALUE) AS res_is_0 +FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fast_shutdown'; res_is_0 1 '#----------------------FN_DYNVARS_042_07------------------------#' SELECT @@global.innodb_fast_shutdown = -VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_fast_shutdown'; @@global.innodb_fast_shutdown = VARIABLE_VALUE @@ -125,3 +125,7 @@ SET @@global.innodb_fast_shutdown = FALSE; SELECT @@global.innodb_fast_shutdown; @@global.innodb_fast_shutdown 0 +SET @@global.innodb_fast_shutdown = @global_start_value; +SELECT @@global.innodb_fast_shutdown; +@@global.innodb_fast_shutdown +1 diff --git a/mysql-test/r/innodb_max_dirty_pages_pct_func.result b/mysql-test/r/innodb_max_dirty_pages_pct_func.result index 2f1467af94e..d46c0d4a70a 100644 --- a/mysql-test/r/innodb_max_dirty_pages_pct_func.result +++ b/mysql-test/r/innodb_max_dirty_pages_pct_func.result @@ -1,14 +1,12 @@ +SET @start_value= @@global.innodb_max_dirty_pages_pct; '#--------------------FN_DYNVARS_044_02-------------------------#' -SET @old_innodb_max_dirty_pages_pct= @@global.innodb_max_dirty_pages_pct; SET @@global.innodb_max_dirty_pages_pct = 80; 'connect (con1,localhost,root,,,,)' -'connection con1' SELECT @@global.innodb_max_dirty_pages_pct; @@global.innodb_max_dirty_pages_pct 80 SET @@global.innodb_max_dirty_pages_pct = 70; 'connect (con2,localhost,root,,,,)' -'connection con2' SELECT @@global.innodb_max_dirty_pages_pct; @@global.innodb_max_dirty_pages_pct 70 @@ -20,7 +18,6 @@ FLUSH STATUS; CALL add_until(10); FLUSH TABLES; CALL add_records(500); -'--sleep 5' 'We expect dirty pages pct to be BELOW_MAX' CALL check_pct(10); PCT_VALUE @@ -30,4 +27,4 @@ DROP PROCEDURE add_until; DROP PROCEDURE check_pct; DROP FUNCTION dirty_pct; DROP TABLE t1; -SET @@global.innodb_max_dirty_pages_pct = @old_innodb_max_dirty_pages_pct; +SET @@global.innodb_max_dirty_pages_pct= @start_value; diff --git a/mysql-test/r/innodb_table_locks_func.result b/mysql-test/r/innodb_table_locks_func.result index 22a52ce17fd..824d196d295 100644 --- a/mysql-test/r/innodb_table_locks_func.result +++ b/mysql-test/r/innodb_table_locks_func.result @@ -1,4 +1,8 @@ '#--------------------FN_DYNVARS_048_01-------------------------#' +SET @start_value= @@global.innodb_table_locks; +SELECT @start_value; +@start_value +1 SET @@global.innodb_table_locks = OFF; 'connect (con1,localhost,root,,,,)' 'connection con1' @@ -30,3 +34,7 @@ COMMIT; 'CONNECTION con2' UNLOCK tables; DROP TABLE t1; +SET @@global.innodb_table_locks= @start_value; +SELECT @@global.innodb_table_locks; +@@global.innodb_table_locks +1 diff --git a/mysql-test/r/insert_update.result b/mysql-test/r/insert_update.result index 704cf444681..a285810b78b 100644 --- a/mysql-test/r/insert_update.result +++ b/mysql-test/r/insert_update.result @@ -393,6 +393,7 @@ id c1 cnt 1 0 3 2 2 1 DROP TABLE t1; +DROP TABLE t2; create table t1(f1 int primary key, f2 timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP); insert into t1(f1) values(1); diff --git a/mysql-test/r/key_buffer_size_func.result b/mysql-test/r/key_buffer_size_func.result index e2eff04f030..d5b79c260a0 100644 --- a/mysql-test/r/key_buffer_size_func.result +++ b/mysql-test/r/key_buffer_size_func.result @@ -1,12 +1,13 @@ -drop table if exists t1; +DROP TABLE IF EXISTS t1; ## Creating new table t1 ## CREATE TABLE t1 ( -id INT NOT NULL auto_increment, +id INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (id), -rollno int NOT NULL, +rollno INT NOT NULL, name VARCHAR(30) ); +SET @start_value= @@global.key_buffer_size; FLUSH STATUS; '#--------------------FN_DYNVARS_055_01-------------------------#' ## Setting initial value of variable to 131072 ## @@ -18,19 +19,43 @@ SELECT @@global.key_buffer_size; @@global.key_buffer_size 131072 ## Inserting some rows in table ## -INSERT into t1(rollno, name) values(1, 'Record_1'); -INSERT into t1(rollno, name) values(2, 'Record_2'); -INSERT into t1(rollno, name) values(1, 'Record_3'); -INSERT into t1(rollno, name) values(3, 'Record_4'); -INSERT into t1(rollno, name) values(1, 'Record_5'); -INSERT into t1(rollno, name) values(3, 'Record_6'); -INSERT into t1(rollno, name) values(4, 'Record_7'); -INSERT into t1(rollno, name) values(4, 'Record_8'); -INSERT into t1(rollno, name) values(4, 'Record_9'); -INSERT into t1(rollno, name) values(4, 'Record_10'); -## Verifying status of reading & writing variables ## +INSERT INTO t1(rollno, name) VALUES(1, 'Record_1'); +INSERT INTO t1(rollno, name) VALUES(2, 'Record_2'); +INSERT INTO t1(rollno, name) VALUES(1, 'Record_3'); +INSERT INTO t1(rollno, name) VALUES(3, 'Record_4'); +INSERT INTO t1(rollno, name) VALUES(1, 'Record_5'); +INSERT INTO t1(rollno, name) VALUES(3, 'Record_6'); +INSERT INTO t1(rollno, name) VALUES(4, 'Record_7'); +INSERT INTO t1(rollno, name) VALUES(4, 'Record_8'); +INSERT INTO t1(rollno, name) VALUES(4, 'Record_9'); +INSERT INTO t1(rollno, name) VALUES(4, 'Record_10'); +## Key_reads must be zero (no disk access) ## +show status like 'Key_reads'; +Variable_name Value +Key_reads 0 ## Switching to connection test_con2 ## -## Verifying status of reading & writing variables ## +## Key_reads must be zero (no disk access) ## +show status like 'Key_reads'; +Variable_name Value +Key_reads 0 +SET @@global.key_buffer_size = 36; +## Connecting with connection test_con1 ## +## Inserting some rows in table ## +INSERT INTO t1(rollno, name) VALUES(5, 'Record_11'); +INSERT INTO t1(rollno, name) VALUES(6, 'Record_12'); +INSERT INTO t1(rollno, name) VALUES(5, 'Record_13'); +INSERT INTO t1(rollno, name) VALUES(7, 'Record_14'); +INSERT INTO t1(rollno, name) VALUES(5, 'Record_15'); +INSERT INTO t1(rollno, name) VALUES(7, 'Record_16'); +INSERT INTO t1(rollno, name) VALUES(8, 'Record_17'); +INSERT INTO t1(rollno, name) VALUES(8, 'Record_18'); +INSERT INTO t1(rollno, name) VALUES(8, 'Record_19'); +INSERT INTO t1(rollno, name) VALUES(8, 'Record_20'); +## Key_reads must be zero (no disk access) ## +show status like 'Key_reads'; +Variable_name Value +Key_reads 10 ## Dropping table ## -DROP table if exists t1; +DROP TABLE IF EXISTS t1; ## Disconnecting both the connections ## +SET @@global.key_buffer_size= @start_value; diff --git a/mysql-test/r/log_basic.result b/mysql-test/r/log_basic.result index 44d0ff48f1d..20ec6bcc88f 100644 --- a/mysql-test/r/log_basic.result +++ b/mysql-test/r/log_basic.result @@ -1,4 +1,5 @@ '#--------------------FN_DYNVARS_062_01------------------#' +SET @start_log= @@global.log; SELECT @@global.log AS INIT_VALUE; INIT_VALUE 1 @@ -10,8 +11,9 @@ SET global log = 0; 'Bug# 34832: log is a system but it is not accessible using SET @@global.log;' 'SET GLOBAL log; and SELECT @@global.log. SHOW VARIABLES shows the value of log.' '#--------------------FN_DYNVARS_062_02-------------------------#' -SELECT VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +SELECT VARIABLE_VALUE +FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log'; VARIABLE_VALUE OFF +SET @@global.log= @start_log; diff --git a/mysql-test/r/log_bin_trust_function_creators_func.result b/mysql-test/r/log_bin_trust_function_creators_func.result index 3611f0f08fd..30ba316eb31 100644 --- a/mysql-test/r/log_bin_trust_function_creators_func.result +++ b/mysql-test/r/log_bin_trust_function_creators_func.result @@ -1,12 +1,12 @@ drop table if exists t1; '#--------------------FN_DYNVARS_063_01-------------------------#' +SET @start_value= @@global.log_bin_trust_function_creators; ## Creating new user tt ## -CREATE user tt@localhost; +CREATE USER tt@localhost; ## Setting value of variable to 0 ## -SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; SET @@global.log_bin_trust_function_creators = 0; ## Creating new table t2 ## -create table t2 (a INT); +CREATE TABLE t2 (a INT); ## Creating & connecting with new connection test_con1 ## SELECT @@log_bin_trust_function_creators; @@log_bin_trust_function_creators @@ -17,7 +17,7 @@ SELECT @@sql_log_bin; ## Creating new function f1 ## CREATE FUNCTION f1(a INT) RETURNS INT BEGIN -IF (a < 3) THEN +IF (a < 3) THEN INSERT INTO t2 VALUES (a); END IF; RETURN 1; @@ -34,8 +34,8 @@ f1(a) 1 1 ## Dropping function f1 & table t1 ## -drop function f1; -drop table t1; +DROP FUNCTION f1; +DROP TABLE t1; '#--------------------FN_DYNVARS_063_02-------------------------#' ## Switching to default connection ## ## Setting value of variable to 1 ## @@ -51,7 +51,7 @@ SELECT @@sql_log_bin; ## Creating new function f1 ## CREATE FUNCTION f1(a INT) RETURNS INT BEGIN -IF (a < 3) THEN +IF (a < 3) THEN INSERT INTO t2 VALUES (a); END IF; RETURN 1; @@ -66,9 +66,9 @@ f1(a) 1 1 ## Dropping function f1 ## -drop function f1; +DROP FUNCTION f1; ## Dropping table t1 & t2 ## -drop table t1,t2; -## Disconnecting both the connections ## +DROP TABLE t1,t2; +## Disconnecting test_con2## DROP USER tt@localhost; -SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; +SET @@global.log_bin_trust_function_creators= @start_value; diff --git a/mysql-test/r/log_queries_not_using_indexes_basic.result b/mysql-test/r/log_queries_not_using_indexes_basic.result index d05437e3f66..b19b11a4209 100644 --- a/mysql-test/r/log_queries_not_using_indexes_basic.result +++ b/mysql-test/r/log_queries_not_using_indexes_basic.result @@ -1,53 +1,104 @@ -'#---------------------BS_STVARS_041_01----------------------#' -SELECT COUNT(@@GLOBAL.log_queries_not_using_indexes); -COUNT(@@GLOBAL.log_queries_not_using_indexes) -1 -1 Expected -'#---------------------BS_STVARS_041_02----------------------#' -SET @@GLOBAL.log_queries_not_using_indexes=1; -Expected error 'Read only variable' -"BUG:It should give error on setting this variable as it is readonly variable" -SELECT COUNT(@@GLOBAL.log_queries_not_using_indexes); -COUNT(@@GLOBAL.log_queries_not_using_indexes) -1 -1 Expected -'#---------------------BS_STVARS_041_03----------------------#' -SELECT @@GLOBAL.log_queries_not_using_indexes = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='log_queries_not_using_indexes'; -@@GLOBAL.log_queries_not_using_indexes = VARIABLE_VALUE +SET @start_value= @@global.log_queries_not_using_indexes; +SET @@global.log_queries_not_using_indexes= DEFAULT; +SELECT @@global.log_queries_not_using_indexes; +@@global.log_queries_not_using_indexes 0 -1 Expected -SELECT COUNT(@@GLOBAL.log_queries_not_using_indexes); -COUNT(@@GLOBAL.log_queries_not_using_indexes) +SET @@global.log_queries_not_using_indexes= TRUE; +SELECT @@global.log_queries_not_using_indexes; +@@global.log_queries_not_using_indexes 1 -1 Expected -SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='log_queries_not_using_indexes'; -COUNT(VARIABLE_VALUE) +SET @@global.log_queries_not_using_indexes= true; +SELECT @@global.log_queries_not_using_indexes; +@@global.log_queries_not_using_indexes 1 -1 Expected -'#---------------------BS_STVARS_041_04----------------------#' -SELECT @@log_queries_not_using_indexes = @@GLOBAL.log_queries_not_using_indexes; -@@log_queries_not_using_indexes = @@GLOBAL.log_queries_not_using_indexes +SET @@global.log_queries_not_using_indexes= 0; +SELECT @@global.log_queries_not_using_indexes; +@@global.log_queries_not_using_indexes +0 +SET @@global.log_queries_not_using_indexes= 1; +SELECT @@global.log_queries_not_using_indexes; +@@global.log_queries_not_using_indexes 1 -1 Expected -'#---------------------BS_STVARS_041_05----------------------#' -SELECT COUNT(@@log_queries_not_using_indexes); -COUNT(@@log_queries_not_using_indexes) +SET @goodvar= TRUE; +SET @@global.log_queries_not_using_indexes= @goodvar; +SELECT @@global.log_queries_not_using_indexes; +@@global.log_queries_not_using_indexes 1 -1 Expected -SELECT COUNT(@@local.log_queries_not_using_indexes); -ERROR HY000: Variable 'log_queries_not_using_indexes' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT COUNT(@@SESSION.log_queries_not_using_indexes); -ERROR HY000: Variable 'log_queries_not_using_indexes' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT COUNT(@@GLOBAL.log_queries_not_using_indexes); -COUNT(@@GLOBAL.log_queries_not_using_indexes) +SET GLOBAL log_queries_not_using_indexes= DEFAULT; +SELECT @@global.log_queries_not_using_indexes; +@@global.log_queries_not_using_indexes +0 +SET GLOBAL log_queries_not_using_indexes= ON; +SELECT @@global.log_queries_not_using_indexes; +@@global.log_queries_not_using_indexes 1 -1 Expected -SELECT log_queries_not_using_indexes = @@SESSION.log_queries_not_using_indexes; -ERROR 42S22: Unknown column 'log_queries_not_using_indexes' in 'field list' -Expected error 'Readonly variable' +SET GLOBAL log_queries_not_using_indexes= OFF; +SELECT @@global.log_queries_not_using_indexes; +@@global.log_queries_not_using_indexes +0 +SET GLOBAL log_queries_not_using_indexes= -0; +SELECT @@global.log_queries_not_using_indexes; +@@global.log_queries_not_using_indexes +0 +SET GLOBAL log_queries_not_using_indexes= 0.00; +SELECT @@global.log_queries_not_using_indexes; +@@global.log_queries_not_using_indexes +0 +SET GLOBAL log_queries_not_using_indexes= -0.0; +SELECT @@global.log_queries_not_using_indexes; +@@global.log_queries_not_using_indexes +0 +SET GLOBAL log_queries_not_using_indexes= 001.00; +SELECT @@global.log_queries_not_using_indexes; +@@global.log_queries_not_using_indexes +1 +SET GLOBAL log_queries_not_using_indexes= +1.0; +SELECT @@global.log_queries_not_using_indexes; +@@global.log_queries_not_using_indexes +1 +SET GLOBAL log_queries_not_using_indexes= +0; +SELECT @@global.log_queries_not_using_indexes; +@@global.log_queries_not_using_indexes +0 +SET GLOBAL log_queries_not_using_indexes= +0.000000; +SELECT @@global.log_queries_not_using_indexes; +@@global.log_queries_not_using_indexes +0 +SET GLOBAL log_queries_not_using_indexes= 0000.00000; +SELECT @@global.log_queries_not_using_indexes; +@@global.log_queries_not_using_indexes +0 +SET GLOBAL log_queries_not_using_indexes= .0; +SELECT @@global.log_queries_not_using_indexes; +@@global.log_queries_not_using_indexes +0 +SET @@global.log_queries_not_using_indexes= 'DEFAULT'; +ERROR 42000: Variable 'log_queries_not_using_indexes' can't be set to the value of 'DEFAULT' +SET @@global.log_queries_not_using_indexes= 'true'; +ERROR 42000: Variable 'log_queries_not_using_indexes' can't be set to the value of 'true' +SET @@global.log_queries_not_using_indexes= BLABLA; +ERROR 42000: Variable 'log_queries_not_using_indexes' can't be set to the value of 'BLABLA' +SET @@global.log_queries_not_using_indexes= 25; +ERROR 42000: Variable 'log_queries_not_using_indexes' can't be set to the value of '25' +SET @@global.log_queries_not_using_indexes= 12.34; +ERROR 42000: Variable 'log_queries_not_using_indexes' can't be set to the value of '12' +SET GLOBAL log_queries_not_using_indexes= -1; +ERROR 42000: Variable 'log_queries_not_using_indexes' can't be set to the value of '-1' +SET @badvar= 'true'; +SET @@global.log_queries_not_using_indexes= @badvar; +ERROR 42000: Variable 'log_queries_not_using_indexes' can't be set to the value of 'true' +SET GLOBAL log_queries_not_using_indexes= 'DEFAULT'; +ERROR 42000: Variable 'log_queries_not_using_indexes' can't be set to the value of 'DEFAULT' +SET log_queries_not_using_indexes= TRUE; +ERROR HY000: Variable 'log_queries_not_using_indexes' is a GLOBAL variable and should be set with SET GLOBAL +SET SESSION log_queries_not_using_indexes= TRUE; +ERROR HY000: Variable 'log_queries_not_using_indexes' is a GLOBAL variable and should be set with SET GLOBAL +SET @@session.log_queries_not_using_indexes= TRUE; +ERROR HY000: Variable 'log_queries_not_using_indexes' is a GLOBAL variable and should be set with SET GLOBAL +SET LOCAL log_queries_not_using_indexes= TRUE; +ERROR HY000: Variable 'log_queries_not_using_indexes' is a GLOBAL variable and should be set with SET GLOBAL +SET @@global log_queries_not_using_indexes= TRUE; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'log_queries_not_using_indexes= TRUE' at line 1 +SET @@SESSION log_queries_not_using_indexes= TRUE; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'log_queries_not_using_indexes= TRUE' at line 1 +SET @@global.log_queries_not_using_indexes= @start_value; diff --git a/mysql-test/r/log_state.result b/mysql-test/r/log_state.result index c293956148f..9e1a541fc9e 100644 --- a/mysql-test/r/log_state.result +++ b/mysql-test/r/log_state.result @@ -1,3 +1,6 @@ +set @start_general_log= @@global.general_log; +set @start_slow_query_log= @@global.slow_query_log; +set @start_general_log_file= @@global.general_log_file; set global general_log= OFF; truncate table mysql.general_log; truncate table mysql.slow_log; @@ -271,3 +274,6 @@ SET GLOBAL slow_query_log_file = @slow_query_log_file_saved; # -- End of Bug#32748. End of 5.1 tests +set @@global.general_log= @start_general_log; +set @@global.slow_query_log= @start_slow_query_log; +set @@global.general_log_file= @start_general_log_file; diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result index 2a4cee9fbbc..2af4d5e94dc 100644 --- a/mysql-test/r/log_tables.result +++ b/mysql-test/r/log_tables.result @@ -1,3 +1,5 @@ +SET @old_general_log_state = @@global.general_log; +SET @old_slow_log_state = @@global.slow_query_log; use mysql; truncate table general_log; select * from general_log; @@ -354,6 +356,7 @@ slow_log slow_log_new drop table slow_log_new, general_log_new; use test; +SET @my_log_output= @@global.log_output; SET GLOBAL LOG_OUTPUT = 'TABLE'; SET GLOBAL general_log = 0; FLUSH LOGS; @@ -422,6 +425,8 @@ SET SESSION long_query_time =@old_long_query_time; FLUSH LOGS; ALTER TABLE mysql.slow_log DROP COLUMN seq; ALTER TABLE mysql.slow_log ENGINE = CSV; +SET GLOBAL general_log = @old_general_log_state; +SET GLOBAL slow_query_log = @old_slow_log_state; drop procedure if exists proc25422_truncate_slow; drop procedure if exists proc25422_truncate_general; drop procedure if exists proc25422_alter_slow; @@ -725,6 +730,8 @@ execute long_query using @lparam; set global general_log = off; select command_type, argument from mysql.general_log where thread_id = @thread_id; command_type argument +Query set @old_general_log_state = @@global.general_log +Query set global general_log = on Query set @lparam = "000 001 002 003 004 005 006 007 008 009" "010 011 012 013 014 015 016 017 018 019" "020 021 022 023 024 025 026 027 028 029" @@ -858,5 +865,6 @@ TIMESTAMP 1 1 SELECT SQL_NO_CACHE 'Bug#31700 - KEY', f1,f2,f3,SLEEP(1.1) FROM t1 TIMESTAMP 1 1 SELECT SQL_NO_CACHE 'Bug#31700 - PK', f1,f2,f3,SLEEP(1.1) FROM t1 WHERE f1=2 DROP TABLE t1; TRUNCATE TABLE mysql.slow_log; +SET GLOBAL log_output= @my_log_output; SET GLOBAL slow_query_log = @old_slow_log_state; SET SESSION long_query_time =@old_long_query_time; diff --git a/mysql-test/r/max_allowed_packet_func.result b/mysql-test/r/max_allowed_packet_func.result index 9e44bcfb7b1..87d1a908932 100644 --- a/mysql-test/r/max_allowed_packet_func.result +++ b/mysql-test/r/max_allowed_packet_func.result @@ -1,4 +1,5 @@ -1048576 +SET @start_max_allowed_packet= @@global.max_allowed_packet; +SET @start_value= @@global.net_buffer_length; drop table if exists t1; ## Creating new table t1 ## CREATE TABLE t1 @@ -8,7 +9,7 @@ PRIMARY KEY (id), name BLOB ); '#--------------------FN_DYNVARS_070_01-------------------------#' -## Setting value of max_allowed packet and net_buffer_length to 1024 ## +## Setting value of max_allowed packet and net_buffer_length to 1024 ## SET @@session.max_allowed_packet = 1024; SET @@session.net_buffer_length = 1024; SELECT @@session.max_allowed_packet; @@ -29,7 +30,7 @@ id name 'Bug#35381: Error is not coming on inserting and fetching data of length' 'greater than max_allowed_packet size at session level'; '#--------------------FN_DYNVARS_070_02-------------------------#' -## Setting value of max_allowed packet and net_buffer_length to 1024 ## +## Setting value of max_allowed packet and net_buffer_length to 1024 ## SET @@global.max_allowed_packet = 1024; SET @@global.net_buffer_length = 1024; SELECT @@global.max_allowed_packet; @@ -39,9 +40,8 @@ SELECT @@global.net_buffer_length; @@global.net_buffer_length 1024 ## Creating new connection test_con1 ## -## Inserting and fetching data of length greater than 1024 ## +## Inserting and fetching data of length greater than 1024 ## INSERT into t1(name) values("aaassssssssddddddddffffffgggggggg, askdlfjalsdkjfalksdjflaksdjfalkjdflaksjdflakjdflajsflajflajdfalsjfdlajfladjslfajdflajdsflajsflakjsdfla;kjflsdjkf;aljfa;lkdsfjla;sjlkajffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllakjsdffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa;;;;;;;;;;;;;;;;;;;;;;;;;;;dsklfjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjkljffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdkskkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"); drop table t1; -SET @@global.max_allowed_packet = 1048576; -## Server disconnects after this case and error occurs that Server ## -## has gone away ## +SET @@global.max_allowed_packet= @start_max_allowed_packet; +SET @@global.net_buffer_length= @start_value; diff --git a/mysql-test/r/max_seeks_for_key_func.result b/mysql-test/r/max_seeks_for_key_func.result index b4c863af17b..5a2441276ec 100644 --- a/mysql-test/r/max_seeks_for_key_func.result +++ b/mysql-test/r/max_seeks_for_key_func.result @@ -1,8 +1,9 @@ -drop table if exists t1; +DROP TABLE IF EXISTS t1; CREATE TABLE t1 -(a int auto_increment primary key, -b char(20) +(a INT AUTO_INCREMENT PRIMARY KEY, +b CHAR(20) ); +SET @start_value= @@global.max_seeks_for_key; '#--------------------FN_DYNVARS_084_01-------------------------#' SELECT @@global.max_seeks_for_key = 10; @@global.max_seeks_for_key = 10 @@ -14,8 +15,8 @@ SET @@global.max_seeks_for_key = 20; SELECT @@global.max_seeks_for_key; @@global.max_seeks_for_key 20 -INSERT into t1(b) values("AREc"); -explain select STRAIGHT_JOIN * from t1,t1 as t2 where t1.b=t2.b; +INSERT INTO t1(b) VALUES("AREc"); +EXPLAIN SELECT STRAIGHT_JOIN * FROM t1,t1 AS t2 WHERE t1.b = t2.b; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 system NULL NULL NULL NULL 1 1 SIMPLE t2 system NULL NULL NULL NULL 1 @@ -23,9 +24,9 @@ SET @@session.max_seeks_for_key = 2; SELECT @@session.max_seeks_for_key; @@session.max_seeks_for_key 2 -INSERT into t1(b) values("BREc"); -INSERT into t1(b) values("CRec"); -explain select STRAIGHT_JOIN * from t1,t1 as t2 where t1.b=t2.b; +INSERT INTO t1(b) VALUES("BREc"); +INSERT INTO t1(b) VALUES("CRec"); +EXPLAIN SELECT STRAIGHT_JOIN * FROM t1,t1 AS t2 WHERE t1.b = t2.b; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 3 1 SIMPLE t2 ALL NULL NULL NULL NULL 3 Using where; Using join buffer @@ -40,8 +41,8 @@ SET @@global.max_seeks_for_key = 20; SELECT @@global.max_seeks_for_key; @@global.max_seeks_for_key 20 -INSERT into t1(b) values("AREc"); -explain select STRAIGHT_JOIN * from t1,t1 as t2 where t1.b=t2.b; +INSERT INTO t1(b) VALUES("AREc"); +EXPLAIN SELECT STRAIGHT_JOIN * FROM t1,t1 AS t2 WHERE t1.b = t2.b; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 4 1 SIMPLE t2 ALL NULL NULL NULL NULL 4 Using where; Using join buffer @@ -49,27 +50,28 @@ SET @@session.max_seeks_for_key = 2; SELECT @@session.max_seeks_for_key; @@session.max_seeks_for_key 2 -INSERT into t1(b) values("BREc"); -INSERT into t1(b) values("CRec"); -explain select STRAIGHT_JOIN * from t1,t1 as t2 where t1.b=t2.b; +INSERT INTO t1(b) VALUES("BREc"); +INSERT INTO t1(b) VALUES("CRec"); +EXPLAIN SELECT STRAIGHT_JOIN * FROM t1,t1 AS t2 WHERE t1.b = t2.b; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 6 1 SIMPLE t2 ALL NULL NULL NULL NULL 6 Using where; Using join buffer -INSERT INTO t1 values(null,"test"); +INSERT INTO t1 VALUES(null,"test"); INSERT INTO t1 VALUES (null,"a"),(null,"a"),(null,"a"), (null,"a"),(null,"a"),(null,"a"),(null,"a"), (null,"a"),(null,"a"),(null,"a"); -explain SELECT STRAIGHT_JOIN * from t1,t1 as t2 where t1.b=t2.b; +EXPLAIN SELECT STRAIGHT_JOIN * FROM t1,t1 AS t2 WHERE t1.b = t2.b; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 17 1 SIMPLE t2 ALL NULL NULL NULL NULL 17 Using where; Using join buffer -analyze table t1; +ANALYZE TABLE t1; Table Op Msg_type Msg_text test.t1 analyze status OK SET MAX_SEEKS_FOR_KEY=1; -explain select STRAIGHT_JOIN * from t1,t1 as t2 where t1.b=t2.b; +EXPLAIN SELECT STRAIGHT_JOIN * FROM t1,t1 AS t2 WHERE t1.b = t2.b; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 17 1 SIMPLE t2 ALL NULL NULL NULL NULL 17 Using where; Using join buffer SET MAX_SEEKS_FOR_KEY=DEFAULT; -drop table t1; +DROP TABLE t1; +SET @@global.max_seeks_for_key= @start_value; diff --git a/mysql-test/r/max_sort_length_func.result b/mysql-test/r/max_sort_length_func.result index 04f5aa7f4f1..9254f1fadd7 100644 --- a/mysql-test/r/max_sort_length_func.result +++ b/mysql-test/r/max_sort_length_func.result @@ -1,3 +1,4 @@ +SET @start_value= @@global.max_sort_length; SET @session_max_sort_length = @@Session.max_sort_length; DROP TABLE IF EXISTS t; ** creating tables ** @@ -296,3 +297,4 @@ SET @@SESSION.max_sort_length = @session_max_sort_length; DROP TABLE IF EXISTS t; DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t2; +SET @@global.max_sort_length= @start_value; diff --git a/mysql-test/r/myisam_data_pointer_size_func.result b/mysql-test/r/myisam_data_pointer_size_func.result index f32e25c7427..82d9a7dad66 100644 --- a/mysql-test/r/myisam_data_pointer_size_func.result +++ b/mysql-test/r/myisam_data_pointer_size_func.result @@ -1,4 +1,5 @@ '#--------------------FN_DYNVARS_093_01-------------------------#' +SET @start_value= @@global.myisam_data_pointer_size; SET @@global.myisam_data_pointer_size = 2; 'connect (con1,localhost,root,,,,)' 'connection con1' @@ -40,3 +41,4 @@ count(*) 65536 DROP PROCEDURE sp_addRec; DROP TABLE t1; +SET @@global.myisam_data_pointer_size= @start_value; diff --git a/mysql-test/r/myisam_stats_method_func.result b/mysql-test/r/myisam_stats_method_func.result index ace6887cc90..55d91b7417d 100644 --- a/mysql-test/r/myisam_stats_method_func.result +++ b/mysql-test/r/myisam_stats_method_func.result @@ -1,4 +1,5 @@ '#--------------------FN_DYNVARS_097_01-------------------------#' +SET @start_value = @@global.myisam_stats_method; SET @@global.myisam_stats_method = nulls_equal; 'connect (con1,localhost,root,,,,)' 'connection con1' @@ -11,11 +12,11 @@ nulls_equal '#--------------------FN_DYNVARS_097_02-------------------------#' 'connection default' DROP TABLE IF EXISTS t1; -CREATE TABLE t1 (a int, key (a)); +CREATE TABLE t1 (a INT, KEY (a)); INSERT INTO t1 VALUES (0),(1),(2),(3),(4); INSERT INTO t1 SELECT NULL FROM t1; 'default: NULLs considered unequal' -SET myisam_stats_method=nulls_unequal; +SET myisam_stats_method = nulls_unequal; ANALYZE TABLE t1; Table Op Msg_type Msg_text test.t1 analyze status OK @@ -23,7 +24,7 @@ SHOW INDEX FROM t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment t1 1 a 1 a A 10 NULL NULL YES BTREE INSERT INTO t1 VALUES (11); -DELETE FROM t1 WHERE a=11; +DELETE FROM t1 WHERE a = 11; CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check status OK @@ -31,9 +32,9 @@ SHOW INDEX FROM t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment t1 1 a 1 a A 10 NULL NULL YES BTREE 'Set nulls to be equal' -SET myisam_stats_method=nulls_equal; +SET myisam_stats_method = nulls_equal; INSERT INTO t1 VALUES (11); -DELETE FROM t1 WHERE a=11; +DELETE FROM t1 WHERE a = 11; ANALYZE TABLE t1; Table Op Msg_type Msg_text test.t1 analyze status OK @@ -41,7 +42,7 @@ SHOW INDEX FROM t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment t1 1 a 1 a A 5 NULL NULL YES BTREE INSERT INTO t1 VALUES (11); -DELETE FROM t1 WHERE a=11; +DELETE FROM t1 WHERE a = 11; CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check status OK @@ -49,14 +50,14 @@ SHOW INDEX FROM t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment t1 1 a 1 a A 5 NULL NULL YES BTREE 'Set nulls to be ignored' -SET myisam_stats_method=nulls_ignored; -SHOW variables LIKE 'myisam_stats_method'; +SET myisam_stats_method = nulls_ignored; +SHOW VARIABLES LIKE 'myisam_stats_method'; Variable_name Value myisam_stats_method nulls_ignored -drop TABLE t1; +DROP TABLE t1; CREATE TABLE t1 ( -a char(3), b char(4), c char(5), d char(6), -key(a,b,c,d) +a CHAR(3), b CHAR(4), c CHAR(5), d CHAR(6), +KEY(a,b,c,d) ); INSERT INTO t1 VALUES ('bcd','def1', NULL, 'zz'); INSERT INTO t1 VALUES ('bcd','def2', NULL, 'zz'); @@ -81,5 +82,6 @@ t1 1 a 1 a A 0 NULL NULL YES BTREE t1 1 a 2 b A 0 NULL NULL YES BTREE t1 1 a 3 c A 0 NULL NULL YES BTREE t1 1 a 4 d A 0 NULL NULL YES BTREE -SET myisam_stats_method=DEFAULT; +SET myisam_stats_method = DEFAULT; DROP TABLE t1; +SET @@global.myisam_stats_method= @start_value; diff --git a/mysql-test/r/profiling.result b/mysql-test/r/profiling.result index a9ada576b4b..c96074eb830 100644 --- a/mysql-test/r/profiling.result +++ b/mysql-test/r/profiling.result @@ -11,6 +11,7 @@ select @@profiling; 0 set global profiling = ON; ERROR HY000: Variable 'profiling' is a SESSION variable and can't be used with SET GLOBAL +set @start_value= @@global.profiling_history_size; set global profiling_history_size=100; show global variables like 'profil%'; Variable_name Value @@ -412,4 +413,5 @@ Warnings: Note 1051 Unknown table 'test.v1' drop function if exists f1; set session profiling = OFF; +set global profiling_history_size= @start_value; End of 5.0 tests diff --git a/mysql-test/r/query_cache_limit_func.result b/mysql-test/r/query_cache_limit_func.result index e54884cd5c3..bbbb273428a 100644 --- a/mysql-test/r/query_cache_limit_func.result +++ b/mysql-test/r/query_cache_limit_func.result @@ -1,6 +1,8 @@ ** Setup ** SET @global_query_cache_limit = @@global.query_cache_limit; +SET @global_query_cache_size = @@global.query_cache_size; +SET @global_query_cache_type = @@global.query_cache_type; ** warnings ** DROP TABLE IF EXISTS t; ** creating table ** @@ -48,7 +50,7 @@ Qcache_queries_in_cache 1 FLUSH STATUS; RESET QUERY CACHE; ** set cache limit ** -SET @@GLOBAL.query_cache_limit=0; +SET @@GLOBAL.query_cache_limit = 0; ** fetching results ** SELECT * FROM t; id c @@ -67,7 +69,7 @@ Qcache_queries_in_cache 0 0 Expected '#---------------------FN_DYNVARS_132_03----------------------#' ** set cache limit ** -SET @@GLOBAL.query_cache_limit=DEFAULT; +SET @@GLOBAL.query_cache_limit = DEFAULT; ** Reset cache values ** FLUSH STATUS; RESET QUERY CACHE; @@ -86,7 +88,7 @@ SHOW STATUS LIKE 'Qcache_queries_in_cache'; Variable_name Value Qcache_queries_in_cache 1 1 Expected -SET @@GLOBAL.query_cache_limit=0; +SET @@GLOBAL.query_cache_limit = 0; SHOW STATUS LIKE 'Qcache_not_cached'; Variable_name Value Qcache_not_cached 0 @@ -112,4 +114,6 @@ Variable_name Value Qcache_queries_in_cache 1 1 Expected SET @@GLOBAL.query_cache_limit = @global_query_cache_limit; +SET GLOBAL query_cache_size = @global_query_cache_size; +SET GLOBAL query_cache_type = @global_query_cache_type; DROP TABLE IF EXISTS t; diff --git a/mysql-test/r/query_cache_type_func.result b/mysql-test/r/query_cache_type_func.result index 94c31804248..af121244572 100644 --- a/mysql-test/r/query_cache_type_func.result +++ b/mysql-test/r/query_cache_type_func.result @@ -4,6 +4,7 @@ ** Connection con0 ** SET @start_global_value = @@GLOBAL.query_cache_type; SET @start_session_value = @@SESSION.query_cache_type; +SET @start_query_cache_size= @@global.query_cache_size; CREATE TABLE t1(id int, value varchar(10)); INSERT INTO t1 VALUES(1, 'val1'); INSERT INTO t1 VALUES(2, 'val2'); @@ -216,6 +217,7 @@ Disconnecting con1,con2,con3 ** Connection con0 ** SET @@GLOBAL.query_cache_type = @start_global_value; SET @@SESSION.query_cache_type = @start_session_value; +SET GLOBAL query_cache_size = @start_query_cache_size; DROP TABLE t1; DROP PROCEDURE testProcHit; Disconnecting con0 diff --git a/mysql-test/r/query_prealloc_size_func.result b/mysql-test/r/query_prealloc_size_func.result index c77586f2fc4..4f7a8d18f32 100644 --- a/mysql-test/r/query_prealloc_size_func.result +++ b/mysql-test/r/query_prealloc_size_func.result @@ -1,17 +1,18 @@ ** Setup ** -CREATE TABLE t1 (id int auto_increment primary key, val text(200)); -INSERT INTO t1 values(NULL,'a'); -INSERT INTO t1 values(NULL,'b'); -INSERT INTO t1 values(NULL,'c'); -INSERT INTO t1 values(NULL,'d'); +SET @start_value = @@global.query_prealloc_size; +CREATE TABLE t1 (id INT AUTO_INCREMENT PRIMARY KEY, val TEXT(200)); +INSERT INTO t1 VALUES(NULL,'a'); +INSERT INTO t1 VALUES(NULL,'b'); +INSERT INTO t1 VALUES(NULL,'c'); +INSERT INTO t1 VALUES(NULL,'d'); SELECT * FROM t1 ORDER BY val; id val 1 a 2 b 3 c 4 d -SET SESSION query_prealloc_size = 8192; +SET SESSION query_prealloc_size = 8192; '#----------------------------FN_DYNVARS_137_05-----------------#' SET GLOBAL query_prealloc_size = 8192; SELECT @@SESSION.query_prealloc_size; @@ -36,3 +37,5 @@ SELECT @@GLOBAL.query_prealloc_size; @@GLOBAL.query_prealloc_size 8192 Expected Value : 8192; +DROP TABLE t1; +SET @@global.query_prealloc_size = @start_value; diff --git a/mysql-test/r/slow_query_log_file_basic.result b/mysql-test/r/slow_query_log_file_basic.result index 29ee7430d51..925f940a5c4 100644 --- a/mysql-test/r/slow_query_log_file_basic.result +++ b/mysql-test/r/slow_query_log_file_basic.result @@ -1,7 +1,4 @@ SET @start_value = @@global.slow_query_log_file; -SELECT @start_value; -@start_value -slowtest.log '#---------------------FN_DYNVARS_004_01-------------------------#' SET @@global.slow_query_log_file = DEFAULT; SELECT RIGHT(@@global.slow_query_log_file,15); @@ -17,3 +14,4 @@ FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='slow_query_log_file'; @@global.slow_query_log_file = VARIABLE_VALUE 1 +SET @@global.slow_query_log_file= @start_value; diff --git a/mysql-test/r/slow_query_log_file_func.result b/mysql-test/r/slow_query_log_file_func.result index 61d71f38891..201b33c8edb 100644 --- a/mysql-test/r/slow_query_log_file_func.result +++ b/mysql-test/r/slow_query_log_file_func.result @@ -1,3 +1,3 @@ '#--------------------FN_DYNVARS_018_01-------------------------#' -## Checking if my_slow_test.log exist in servers datadir ## +## Checking if my_slow_test.log exists in servers datadir ## ## This case should pass because we have set this filename in opt file ## diff --git a/mysql-test/r/variables-notembedded.result b/mysql-test/r/variables-notembedded.result index 48a1719e2c7..e241edcc5ec 100644 --- a/mysql-test/r/variables-notembedded.result +++ b/mysql-test/r/variables-notembedded.result @@ -15,3 +15,4 @@ slave_skip_errors 3,100,137,643,1752 ---- Clean Up ---- set global slave_net_timeout=default; set global sql_slave_skip_counter= 0; +set @@global.slave_net_timeout= @my_slave_net_timeout; diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 3f66599751d..06bbdcfd175 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -15,6 +15,7 @@ set @my_max_heap_table_size =@@global.max_heap_table_size; set @my_max_insert_delayed_threads=@@global.max_insert_delayed_threads; set @my_max_join_size =@@global.max_join_size; set @my_myisam_data_pointer_size =@@global.myisam_data_pointer_size; +set @my_myisam_max_sort_file_size =@@global.myisam_max_sort_file_size; set @my_net_buffer_length =@@global.net_buffer_length; set @my_net_write_timeout =@@global.net_write_timeout; set @my_net_read_timeout =@@global.net_read_timeout; @@ -988,7 +989,7 @@ set global delayed_queue_size =@my_delayed_queue_size; set global flush =@my_flush; set global flush_time =@my_flush_time; set global key_buffer_size =@my_key_buffer_size; -set global max_binlog_cache_size =default; +set global max_binlog_cache_size =@my_max_binlog_cache_size; set global max_binlog_size =@my_max_binlog_size; set global max_connect_errors =@my_max_connect_errors; set global max_connections =@my_max_connections; @@ -999,6 +1000,7 @@ set global max_join_size =@my_max_join_size; set global max_user_connections =default; set global max_write_lock_count =default; set global myisam_data_pointer_size =@my_myisam_data_pointer_size; +set global myisam_max_sort_file_size =@my_myisam_max_sort_file_size; set global net_buffer_length =@my_net_buffer_length; set global net_write_timeout =@my_net_write_timeout; set global net_read_timeout =@my_net_read_timeout; diff --git a/mysql-test/t/binlog_format_basic.test b/mysql-test/t/binlog_format_basic.test index e9dfade8f56..d7a4fb190ab 100644 --- a/mysql-test/t/binlog_format_basic.test +++ b/mysql-test/t/binlog_format_basic.test @@ -1,5 +1,3 @@ - - ################## mysql-test\t\binlog_format_basic.test ###################### # # # Variable Name: binlog_format # @@ -17,8 +15,8 @@ # * Value Check # # * Scope Check # # # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # +# Reference: # +# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html # # # ############################################################################### @@ -26,6 +24,8 @@ #################################################################### # Displaying default value # #################################################################### +SET @start_value= @@global.binlog_format; + SELECT COUNT(@@GLOBAL.binlog_format); --echo 1 Expected @@ -36,24 +36,11 @@ SELECT COUNT(@@SESSION.binlog_format); #################################################################### # Check if Value can set # #################################################################### - -#--error ER_INCORRECT_GLOBAL_LOCAL_VAR SET @@GLOBAL.binlog_format=1; ---echo Expected error 'Read only variable' ---echo Bug: Writeable static variable -SELECT COUNT(@@GLOBAL.binlog_format); ---echo 1 Expected +SELECT @@GLOBAL.binlog_format; - - -#--error ER_INCORRECT_GLOBAL_LOCAL_VAR SET @@SESSION.binlog_format=1; ---echo Expected error 'Read only variable' ---echo Bug: Writeable static variable -SELECT COUNT(@@SESSION.binlog_format); ---echo 1 Expected - - +SELECT @@SESSION.binlog_format; --echo '#---------------------BS_STVARS_002_03----------------------#' ################################################################# @@ -69,7 +56,7 @@ SELECT COUNT(@@GLOBAL.binlog_format); --echo 1 Expected SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='binlog_format'; --echo 1 Expected @@ -79,8 +66,8 @@ WHERE VARIABLE_NAME='binlog_format'; # Check if the value in SESSION Table matches value in variable # ################################################################# -SELECT @@SESSION.binlog_format = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES +SELECT @@SESSION.binlog_format = VARIABLE_VALUE +FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='binlog_format'; --echo 1 Expected @@ -88,13 +75,11 @@ SELECT COUNT(@@SESSION.binlog_format); --echo 1 Expected SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.SESSION_VARIABLES +FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='binlog_format'; --echo 1 Expected - - --echo '#---------------------BS_STVARS_002_05----------------------#' ################################################################################ # Check if binlog_format can be accessed with and without @@ sign # @@ -109,5 +94,5 @@ SELECT COUNT(@@SESSION.binlog_format); SELECT COUNT(@@GLOBAL.binlog_format); --echo 1 Expected - +SET @@global.binlog_format= @start_value; diff --git a/mysql-test/t/character_set_connection_func.test b/mysql-test/t/character_set_connection_func.test index 04883b66544..11a8e311fd1 100644 --- a/mysql-test/t/character_set_connection_func.test +++ b/mysql-test/t/character_set_connection_func.test @@ -14,14 +14,14 @@ # Description: Test Cases of Dynamic System Variable character_set_connection # # that checks the behavior of this variable # # # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # +# Reference: # +# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html # # # ############################################################################### --echo '#--------------------FN_DYNVARS_011_01-------------------------#' ########################################################################## -# Check if setting character_set_connection is changed in new connection # +# Check if setting character_set_connection is changed in new connection # ########################################################################## #save @@ -35,7 +35,7 @@ SET @@global.character_set_connection = utf8; --echo 'connect (con1,localhost,root,,,,)' connect (con1,localhost,root,,,,); --echo 'connection con1' -connection con1; +connection con1; SELECT @@global.character_set_connection; SELECT @@session.character_set_connection; disconnect con1; @@ -51,7 +51,7 @@ connection default; --disable_warnings DROP TABLE IF EXISTS t1; --enable_warnings -CREATE TABLE t1(b CHAR(40) character set utf8); +CREATE TABLE t1(b CHAR(40) CHARACTER SET utf8); #============================================================================== --echo '--verify that character_set_connection converts character_set_client--' #============================================================================== @@ -90,13 +90,16 @@ INSERT INTO t1 VALUES('ÐЂЃЄ'); SELECT * FROM t1; TRUNCATE TABLE t1; -#restore -#save + +# Cleanup SET @@global.character_set_connection = @global_character_set_connection; SET @@session.character_set_connection = @session_character_set_connection; SET @@session.character_set_client = @session_character_set_client; SET @@session.character_set_results = @session_character_set_results; +DROP TABLE t1; + ############################################################# # End of functionality Testing for character_set_connection # ############################################################# + diff --git a/mysql-test/t/completion_type_func.test b/mysql-test/t/completion_type_func.test index 4f1ebf6700b..ed0f04c37b4 100644 --- a/mysql-test/t/completion_type_func.test +++ b/mysql-test/t/completion_type_func.test @@ -1,4 +1,4 @@ -############## mysql-test\t\completion_type_func.test ######################### +############## mysql-test\t\completion_type_func.test ########################## # # # Variable Name: completion_type # # Scope: GLOBAL & SESSION # @@ -12,7 +12,7 @@ # Author: Salman Rawala # # # # Description: Test Cases of Dynamic System Variable "completion_type" # -# that checks functinality of this variable # +# that checks functionality of this variable # # # # Reference: http://dev.mysql.com/doc/refman/5.1/en/ # # server-system-variables.html#option_mysqld_completion_type # @@ -22,7 +22,7 @@ --source include/have_innodb.inc --disable_warnings -drop table if exists t1; +DROP TABLE IF EXISTS t1; --enable_warnings ######################### @@ -32,62 +32,62 @@ drop table if exists t1; --echo ## Creating new table ## CREATE TABLE t1 ( -id INT NOT NULL auto_increment, +id INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (id), -name varchar(30) +name VARCHAR(30) ) ENGINE = INNODB; --echo '#--------------------FN_DYNVARS_017_01-------------------------#' ######################################################### -# Setting initial value of completion_type to zero # +# Setting initial value of completion_type to zero # ######################################################### --echo ## Creating new connection ## connect (test_con1,localhost,root,,); connection test_con1; -INSERT into t1(name) values('Record_1'); +INSERT INTO t1(name) VALUES('Record_1'); SET @@autocommit = 0; -SELECT * from t1; +SELECT * FROM t1; --echo ## Setting value of variable to 0 ## SET @@session.completion_type = 0; --echo ## Here commit & rollback should work normally ## START TRANSACTION; -SELECT * from t1; -INSERT into t1(name) values('Record_2'); -INSERT into t1(name) values('Record_3'); -SELECT * from t1; -DELETE FROM t1 where id = 2; -SELECT * from t1; +SELECT * FROM t1; +INSERT INTO t1(name) VALUES('Record_2'); +INSERT INTO t1(name) VALUES('Record_3'); +SELECT * FROM t1; +DELETE FROM t1 WHERE id = 2; +SELECT * FROM t1; START TRANSACTION; -SELECT * from t1; -INSERT into t1(name) values('Record_4'); -INSERT into t1(name) values('Record_5'); +SELECT * FROM t1; +INSERT INTO t1(name) VALUES('Record_4'); +INSERT INTO t1(name) VALUES('Record_5'); COMMIT; --echo '#--------------------FN_DYNVARS_017_02-------------------------#' ######################################################### -# Setting initial value of completion_type to 2 # +# Setting initial value of completion_type to 2 # ######################################################### SET @@session.completion_type = 2; --echo ## Here commit should work as COMMIT RELEASE ## START TRANSACTION; -SELECT * from t1; -INSERT into t1(name) values('Record_6'); -INSERT into t1(name) values('Record_7'); +SELECT * FROM t1; +INSERT INTO t1(name) VALUES('Record_6'); +INSERT INTO t1(name) VALUES('Record_7'); COMMIT; --echo ## Inserting rows should give error here because connection should ## --echo ## disconnect after using COMMIT ## --Error 2006,2013,1053 -INSERT into t1(name) values('Record_4'); +INSERT INTO t1(name) VALUES('Record_4'); --echo ## Creating new connection test_con2 ## connect (test_con2,localhost,root,,); @@ -96,11 +96,17 @@ SET @@session.completion_type = 2; --echo ## Inserting rows and using Rollback which should Rollback & release ## START TRANSACTION; -SELECT * from t1; -INSERT into t1(name) values('Record_8'); -INSERT into t1(name) values('Record_9'); +SELECT * FROM t1; +INSERT INTO t1(name) VALUES('Record_8'); +INSERT INTO t1(name) VALUES('Record_9'); ROLLBACK; --Error 2006,2013,1053 -INSERT into t1(name) values('Record_4'); +INSERT INTO t1(name) VALUES('Record_4'); + +connection default; +disconnect test_con1; +disconnect test_con2; + +DROP TABLE t1; diff --git a/mysql-test/t/concurrent_insert_func.test b/mysql-test/t/concurrent_insert_func.test index e6ea7c4304b..3810a559244 100644 --- a/mysql-test/t/concurrent_insert_func.test +++ b/mysql-test/t/concurrent_insert_func.test @@ -14,14 +14,14 @@ # Description: Test Cases of Dynamic System Variable "concurrent_insert" # # that checks functionality of this variable # # # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html#option_mysqld_concurrent_insert # +# Reference: # +# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html # # # ################################################################################ --disable_warnings -drop table if exists t1; +DROP TABLE IF EXISTS t1; --enable_warnings ######################### @@ -31,110 +31,131 @@ drop table if exists t1; --echo ## Creating new table ## CREATE TABLE t1 ( -name varchar(30) +name VARCHAR(30) ); --echo '#--------------------FN_DYNVARS_018_01-------------------------#' #################################################################### -# Setting initial value of concurrent_insert to 1 -# concurrent_insert = 1 means Enables concurrent insert +# Setting initial value of concurrent_insert to 1 +# concurrent_insert = 1 means Enables concurrent insert # for MyISAM tables that don't have holes #################################################################### +SET @start_value= @@global.concurrent_insert; + --echo ## Setting initial value of variable to 1 ## SET @@global.concurrent_insert = 1; -INSERT into t1(name) values('Record_1'); -INSERT into t1(name) values('Record_2'); -INSERT into t1(name) values('Record_3'); +INSERT INTO t1(name) VALUES('Record_1'); +INSERT INTO t1(name) VALUES('Record_2'); +INSERT INTO t1(name) VALUES('Record_3'); --echo ## locking table ## -lock table t1 read local; +LOCK TABLE t1 READ LOCAL; ---echo ## Creating new connection to insert some rows in table ## +--echo ## Creating new connection to insert some rows in table ## connect (test_con1,localhost,root,,); +--echo connection test_con1; connection test_con1; --echo ## New records should come at the end of all rows ## -INSERT into t1(name) values('Record_4'); -SELECT * from t1; +INSERT INTO t1(name) VALUES('Record_4'); +SELECT * FROM t1; --echo ## unlocking tables ## +--echo connection default; connection default; -unlock tables; +UNLOCK TABLES; ---echo ## deleting record to create hole in table ## -DELETE from t1 where name ='Record_2'; +--echo ## deleting record to create hole in table ## +DELETE FROM t1 WHERE name ='Record_2'; --echo '#--------------------FN_DYNVARS_018_02-------------------------#' #################################################################### -# Setting initial value of concurrent_insert to 1 -# concurrent_insert = 1 and trying to insert some values +# Setting initial value of concurrent_insert to 1 +# concurrent_insert = 1 and trying to insert some values # in MyISAM tables that have holes #################################################################### - # lock table and connect with connection1 -#lock table t1 read local; -#connection test_con1; - -# setting value of concurrent_insert to 1 -#SET @@global.concurrent_insert=1; - -#INSERT into t1(name) values('Record_7'); -#SELECT * from t1; - -#connection default; -#unlock tables; - -#SELECT * from t1; -#INSERT into t1(name) values('Record_6'); - -# On inserting rows in hole while the value of concurrent_insert is 1 -# MySQL server hangs. - - - ---echo '#--------------------FN_DYNVARS_018_03-------------------------#' -############################################################################### -# Setting value of concurrent_insert to 2 to verify values after inserting -# it into table with holes -# concurrent_insert = 2 means Enables concurrent insert -# for MyISAM tables that have holes but inserts values at the end of all rows -############################################################################### - ---echo ## lock table and connect with connection1 ## -lock table t1 read local; +LOCK TABLE t1 READ LOCAL; +--echo connection test_con1; connection test_con1; +# setting value of concurrent_insert to 1 +SET @@global.concurrent_insert=1; + +--echo ## send INSERT which should be blocked until unlock of the table ## +send +INSERT INTO t1(name) VALUES('Record_7'); + +--echo connection default; +connection default; +# wait until INSERT will be locked (low performance) +let $wait_condition= SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST + WHERE state= "Locked" AND info LIKE "INSERT INTO t1%"; +--source include/wait_condition.inc + +--echo ## show processlist info and state ## +SELECT state,info FROM INFORMATION_SCHEMA.PROCESSLIST +WHERE state= "Locked" AND info LIKE "INSERT INTO t1%"; +--echo ## table contents befor UNLOCK ## +SELECT * FROM t1; +UNLOCK TABLES; +--echo ## table contens after UNLOCK ## +SELECT * FROM t1; +INSERT INTO t1(name) VALUES('Record_6'); + +--echo connection test_con1; +connection test_con1; +# to complete the send above^ +reap; +SELECT * FROM t1; +--echo connection default; +connection default; + +--echo '#--------------------FN_DYNVARS_018_03-------------------------#' +################################################################################ +# Setting value of concurrent_insert to 2 to verify values after inserting +# it into table with holes +# concurrent_insert = 2 means Enables concurrent insert +# for MyISAM tables that have holes but inserts values at the end of all rows +################################################################################ + +--echo ## lock table and connect with connection1 ## +LOCK TABLE t1 READ LOCAL; +--echo connection test_con1; +connection test_con1; --echo ## setting value of concurrent_insert to 2 ## SET @@global.concurrent_insert=2; --echo ## Inserting record in table, record should go at the end of the table ## -INSERT into t1(name) values('Record_5'); -SELECT * from t1; +INSERT INTO t1(name) VALUES('Record_5'); +SELECT * FROM t1; SELECT @@concurrent_insert; ---echo ## Switching to default connection ## +--echo connection default; connection default; --echo ## Unlocking table ## -unlock tables; +UNLOCK TABLES; -SELECT * from t1; +SELECT * FROM t1; --echo ## Inserting new row, this should go in the hole ## -INSERT into t1(name) values('Record_6'); -SELECT * from t1; +INSERT INTO t1(name) VALUES('Record_6'); +SELECT * FROM t1; --echo ## connection test_con1 ## -DELETE from t1 where name ='Record_3'; -SELECT * from t1; +DELETE FROM t1 WHERE name ='Record_3'; +SELECT * FROM t1; --echo ## Dropping table ## -DROP table t1; +DROP TABLE t1; --echo ## Disconnecting connection ## disconnect test_con1; +SET @@global.concurrent_insert= @start_value; + diff --git a/mysql-test/t/delay_key_write_func.test b/mysql-test/t/delay_key_write_func.test index 3c0319be427..a44b37653d2 100644 --- a/mysql-test/t/delay_key_write_func.test +++ b/mysql-test/t/delay_key_write_func.test @@ -14,16 +14,17 @@ # Description: Test Cases of Dynamic System Variable delay_key_write # # that checks the behavior of this variable # # # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # +# Reference: # +# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html # # # ############################################################################### --echo '#--------------------FN_DYNVARS_023_01-------------------------#' ####################################################################### -# Check if setting delay_key_write is changed in every new connection # +# Check if setting delay_key_write is changed in every new connection # ####################################################################### +SET @start_value= @@global.delay_key_write; SET @@global.delay_key_write = ON; SELECT @@global.delay_key_write; @@ -51,11 +52,11 @@ SELECT @@global.delay_key_write AS res_is_ALL; --disable_query_log DELIMITER //; CREATE PROCEDURE sp_addRecords (IN var1 INT,IN var2 INT) -BEGIN - WHILE (var1 < var2) DO - INSERT INTO t1 VALUES(var1,REPEAT('MYSQL',10),100000.0/var1); - SET var1=var1+1; - END WHILE; +BEGIN + WHILE (var1 < var2) DO + INSERT INTO t1 VALUES(var1,REPEAT('MYSQL',10),100000.0/var1); + SET var1=var1+1; + END WHILE; END// DELIMITER ;// --enable_query_log @@ -77,7 +78,7 @@ CREATE TABLE t1( a INT PRIMARY KEY, b VARCHAR(512), c DOUBLE -)delay_key_write = 1; +) DELAY_KEY_WRITE = 1; --enable_query_log @@ -88,7 +89,7 @@ CALL sp_addRecords(1,10); SHOW STATUS LIKE 'Key_reads'; SHOW STATUS LIKE 'Key_writes'; SHOW STATUS LIKE 'Key_write_requests'; -select count(*) from t1; +SELECT COUNT(*) FROM t1; #============================================================================== --echo '----check when delay_key_write is ON---' @@ -105,7 +106,7 @@ CREATE TABLE t1( a INT PRIMARY KEY, b VARCHAR(512), c DOUBLE -)delay_key_write = 1; +) DELAY_KEY_WRITE = 1; --enable_query_log FLUSH STATUS; @@ -114,7 +115,7 @@ CALL sp_addRecords(1,10); SHOW STATUS LIKE 'Key_reads'; SHOW STATUS LIKE 'Key_writes'; SHOW STATUS LIKE 'Key_write_requests'; -select count(*) from t1; +SELECT COUNT(*) FROM t1; #============================================================================== --echo '----check when delay_key_write is ALL---' @@ -130,7 +131,7 @@ CREATE TABLE t1( a INT PRIMARY KEY, b VARCHAR(512), c DOUBLE -)delay_key_write = 0; +) DELAY_KEY_WRITE = 0; --enable_query_log FLUSH STATUS; @@ -139,11 +140,16 @@ CALL sp_addRecords(1,10); SHOW STATUS LIKE 'Key_reads'; SHOW STATUS LIKE 'Key_writes'; SHOW STATUS LIKE 'Key_write_requests'; -select count(*) from t1; +SELECT COUNT(*) FROM t1; DROP PROCEDURE sp_addRecords; DROP TABLE t1; +disconnect user1; + +connection default; +SET @@global.delay_key_write= @start_value; #################################################### # End of functionality testing for delay_key_write # #################################################### + diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 24935ce397d..0e72351fcd6 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -16,7 +16,6 @@ log_tables.test : Bug #37798: main.log_tables fails random wait_timeout_func : BUG#36873 2008-07-06 sven wait_timeout_func.test fails randomly delayed_insert_limit_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions event_scheduler_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions -innodb_max_dirty_pages_pct_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions interactive_timeout_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions query_cache_wlock_invalidate_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions rpl_init_slave_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions @@ -25,3 +24,4 @@ slow_query_log_func : BUG#37962 2008-07-08 sven *_func tests c sql_low_priority_updates_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions timestamp_func : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions log_output_func : BUG#37766 2008-07-10 sven main.log_output_func randomly fails in pushbuild + diff --git a/mysql-test/t/general_log_file_basic.test b/mysql-test/t/general_log_file_basic.test index 639e6619ef9..014108f88d2 100644 --- a/mysql-test/t/general_log_file_basic.test +++ b/mysql-test/t/general_log_file_basic.test @@ -10,6 +10,7 @@ # # # Creation Date: 2008-03-16 # # Author: Salman Rawala # +# Modified: HHunger 2008-09-11 Set system variable back to the start value # # # # Description: Test Cases of Dynamic System Variable "general_log_file" # # that checks behavior of this variable in the following ways # @@ -18,8 +19,8 @@ # * Scope & Access method # # * Data Integrity # # # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html#option_mysqld_general_log_file # +# Reference: # +# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html # # # ################################################################################ @@ -67,7 +68,9 @@ SELECT @@global.general_log_file = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='general_log_file'; +SET @@global.general_log_file= @start_value; ##################################################### # END OF general_log_file TESTS # ##################################################### + diff --git a/mysql-test/t/general_log_file_func.test b/mysql-test/t/general_log_file_func.test index 96951785ca2..1a73a4a5eaa 100644 --- a/mysql-test/t/general_log_file_func.test +++ b/mysql-test/t/general_log_file_func.test @@ -21,7 +21,7 @@ --disable_warnings -drop table if exists t1; +DROP TABLE IF EXISTS t1; --enable_warnings ######################### @@ -31,7 +31,7 @@ drop table if exists t1; --echo ## Creating new table ## CREATE TABLE t1 ( -id INT NOT NULL auto_increment, +id INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (id), name VARCHAR(30) ); @@ -40,14 +40,12 @@ name VARCHAR(30) #################################################################### # Verifying general log as we have initialized in opt file # #################################################################### - - SELECT @@general_log_file; -INSERT into t1(name) values('Record_1'); -INSERT into t1(name) values('Record_2'); -INSERT into t1(name) values('Record_3'); -INSERT into t1(name) values('Record_4'); +INSERT INTO t1(name) VALUES('Record_1'); +INSERT INTO t1(name) VALUES('Record_2'); +INSERT INTO t1(name) VALUES('Record_3'); +INSERT INTO t1(name) VALUES('Record_4'); --echo ## Verifying general log file ## let $MYSQLD_DATADIR= `select @@datadir`; diff --git a/mysql-test/t/innodb_autoextend_increment_basic.test b/mysql-test/t/innodb_autoextend_increment_basic.test index 86f8c7aa7a4..eb208e7197f 100644 --- a/mysql-test/t/innodb_autoextend_increment_basic.test +++ b/mysql-test/t/innodb_autoextend_increment_basic.test @@ -1,99 +1,87 @@ -################# mysql-test\t\innodb_autoextend_increment _basic.test ################### -# # -# Variable Name: innodb_autoextend_increment # -# Scope: GLOBAL # -# Access Type: Dynamic # -# Data Type: Numeric # -# Default Value: 8 # -# Range: 0,1 # -# # -# # -# Creation Date: 2008-02-07 # -# Author: Rizwan # -# # -#Description:Test Cases of Dynamic System Variable innodb_autoextend_increment# -# that checks the behavior of this variable in the following ways # -# * Default Value # -# * Valid & Invalid values # -# * Scope & Access method # -# * Data Integrity # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # -# # -############################################################################### +################# mysql-test\t\innodb_autoextend_increment _basic.test ########### +# # +# Variable Name: innodb_autoextend_increment # +# Scope: GLOBAL # +# Access Type: Dynamic # +# Data Type: Numeric # +# Default Value: 8 # +# Range: 0,1 # +# # +# # +# Creation Date: 2008-02-07 # +# Author: Rizwan # +# # +# Description: # +# Test Cases of Dynamic System Variable innodb_autoextend_increment that # +# checks the behavior of this variable in the following ways # +# * Default Value # +# * Valid & Invalid values # +# * Scope & Access method # +# * Data Integrity # +# # +# Reference: http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html # +# # +################################################################################## --source include/have_innodb.inc --source include/load_sysvars.inc -######################################################################## +######################################################################## # START OF innodb_autoextend_increment TESTS # -######################################################################## +######################################################################## -################################################################################ -# Saving initial value of innodb_autoextend_increment in a temporary variable# -################################################################################ +############################################################################### +# Saving initial value of innodb_autoextend_increment in a temporary variable # +############################################################################### SET @global_start_value = @@global.innodb_autoextend_increment ; -SELECT @global_start_value; - - --echo '#--------------------FN_DYNVARS_046_01------------------------#' -######################################################################## +######################################################################## # Display the DEFAULT value of innodb_autoextend_increment # -######################################################################## - - +######################################################################## SET @@global.innodb_autoextend_increment = 0; SET @@global.innodb_autoextend_increment = DEFAULT; SELECT @@global.innodb_autoextend_increment ; --echo '#---------------------FN_DYNVARS_046_02-------------------------#' -#################################################################################### +#################################################################################### # Check if innodb_autoextend_increment can be accessed with and without @@ sign # -#################################################################################### +#################################################################################### --Error ER_GLOBAL_VARIABLE SET innodb_autoextend_increment = 1; SELECT @@innodb_autoextend_increment ; - --Error ER_UNKNOWN_TABLE SELECT local.innodb_autoextend_increment ; - SET global innodb_autoextend_increment = 0; SELECT @@global.innodb_autoextend_increment ; --echo '#--------------------FN_DYNVARS_046_03------------------------#' -########################################################################## -# change the value of innodb_autoextend_increment to a valid value # -########################################################################## - - +########################################################################## +# change the value of innodb_autoextend_increment to a valid value # +########################################################################## SET @@global.innodb_autoextend_increment = 1; SELECT @@global.innodb_autoextend_increment ; SET @@global.innodb_autoextend_increment = 1000; SELECT @@global.innodb_autoextend_increment ; + --echo '#--------------------FN_DYNVARS_046_04-------------------------#' -########################################################################### -# Change the value of innodb_autoextend_increment to invalid value # -########################################################################### - - - +########################################################################### +# Change the value of innodb_autoextend_increment to invalid value # +########################################################################### SET @@global.innodb_autoextend_increment = -1; SELECT @@global.innodb_autoextend_increment; - --Error ER_WRONG_TYPE_FOR_VAR SET @@global.innodb_autoextend_increment = "T"; SELECT @@global.innodb_autoextend_increment; @@ -102,31 +90,28 @@ SELECT @@global.innodb_autoextend_increment; SET @@global.innodb_autoextend_increment = "Y"; SELECT @@global.innodb_autoextend_increment; - SET @@global.innodb_autoextend_increment = 1001; SELECT @@global.innodb_autoextend_increment; - - --echo '#----------------------FN_DYNVARS_046_05------------------------#' -######################################################################### +######################################################################### # Check if the value in GLOBAL Table matches value in variable # ######################################################################### -SELECT @@global.innodb_autoextend_increment = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +SELECT @@global.innodb_autoextend_increment = VARIABLE_VALUE +FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_autoextend_increment '; SELECT @@global.innodb_autoextend_increment ; -SELECT VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +SELECT VARIABLE_VALUE +FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_autoextend_increment '; --echo '#---------------------FN_DYNVARS_046_06-------------------------#' -################################################################### +################################################################### # Check if ON and OFF values can be used on variable # -################################################################### +################################################################### --ERROR ER_WRONG_TYPE_FOR_VAR SET @@global.innodb_autoextend_increment = OFF; @@ -136,25 +121,25 @@ SELECT @@global.innodb_autoextend_increment ; SET @@global.innodb_autoextend_increment = ON; SELECT @@global.innodb_autoextend_increment ; ---echo '#---------------------FN_DYNVARS_046_07----------------------#' -################################################################### -# Check if TRUE and FALSE values can be used on variable # -################################################################### +--echo '#---------------------FN_DYNVARS_046_07----------------------#' +################################################################### +# Check if TRUE and FALSE values can be used on variable # +################################################################### SET @@global.innodb_autoextend_increment = TRUE; SELECT @@global.innodb_autoextend_increment ; SET @@global.innodb_autoextend_increment = FALSE; SELECT @@global.innodb_autoextend_increment ; -############################## + +############################## # Restore initial value # ############################## - -#SET @@global.innodb_autoextend_increment = @global_start_value; -#SELECT @@global.innodb_autoextend_increment ; +SET @@global.innodb_autoextend_increment = @global_start_value; ############################################################### -# END OF innodb_autoextend_increment TESTS # -############################################################### +# END OF innodb_autoextend_increment TESTS # +############################################################### + diff --git a/mysql-test/t/innodb_autoinc_lock_mode_func.test b/mysql-test/t/innodb_autoinc_lock_mode_func.test index 1ff7868ce87..89c1c80a6dc 100644 --- a/mysql-test/t/innodb_autoinc_lock_mode_func.test +++ b/mysql-test/t/innodb_autoinc_lock_mode_func.test @@ -11,11 +11,12 @@ # Creation Date: 2008-03-08 # # Author: Rizwan Maredia # # # -#Description:Test Cases of Dynamic System Variable innodb_autoextend_increment# -# that checks the behavior of this variable # +# Description: # +# Test Cases of Dynamic System Variable innodb_autoextend_increment that # +# checks the behavior of this variable # # # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # +# Reference: # +# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html # # # ############################################################################### @@ -43,12 +44,14 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1( a INT AUTO_INCREMENT PRIMARY KEY, b CHAR -)ENGINE=INNODB, AUTO_INCREMENT=100; +) ENGINE=INNODB, AUTO_INCREMENT=100; INSERT INTO t1 (a,b) VALUES (5,'a'), (NULL,'b'), (1,'c'), (NULL,'d'); INSERT INTO t1 (a,b) VALUES (NULL,'e'); --echo 'the new auto incremented value should be 104' -SELECT * from t1; +SELECT * FROM t1; + +DROP TABLE t1; ############################################################### # End of functionality Testing for innodb_autoinc_lock_mode # diff --git a/mysql-test/t/innodb_fast_shutdown_basic.test b/mysql-test/t/innodb_fast_shutdown_basic.test index 5e108708716..7de63332844 100644 --- a/mysql-test/t/innodb_fast_shutdown_basic.test +++ b/mysql-test/t/innodb_fast_shutdown_basic.test @@ -9,54 +9,51 @@ # # # # # Creation Date: 2008-02-20 # -# Author: Sharique Abdullah # +# Author: Sharique Abdullah # # # -# Description: Test Cases of Dynamic System Variable innodb_fast_shutdown # -# that checks the behavior of this variable in the following ways# +# Description: # +# Test Cases of Dynamic System Variable innodb_fast_shutdown that checks # +# the behavior of this variable in the following ways # # * Default Value # # * Valid & Invalid values # # * Scope & Access method # # * Data Integrity # # # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # +# Reference: # +# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html # # # ############################################################################### --source include/have_innodb.inc --source include/load_sysvars.inc -######################################################################## +######################################################################## # START OF innodb_fast_shutdown TESTS # -######################################################################## +######################################################################## -############################################################################## +############################################################################## # Saving initial value of innodb_fast_shutdown in a temporary variable # -############################################################################## - - +############################################################################## SET @global_start_value = @@global.innodb_fast_shutdown; SELECT @@global.innodb_fast_shutdown; - + --echo '#--------------------FN_DYNVARS_042_01------------------------#' -######################################################################## +######################################################################## # Display the DEFAULT value of innodb_fast_shutdown # -######################################################################## +######################################################################## SET @@global.innodb_fast_shutdown = 0; SET @@global.innodb_fast_shutdown = DEFAULT; SELECT @@global.innodb_fast_shutdown; - --echo '#---------------------FN_DYNVARS_042_02-------------------------#' -############################################################################# +############################################################################# # Check if innodb_fast_shutdown can be accessed with and without @@ sign # -############################################################################# - +############################################################################# --ERROR ER_GLOBAL_VARIABLE SET innodb_fast_shutdown = 1; @@ -70,25 +67,26 @@ SELECT @@global.innodb_fast_shutdown; --echo '#--------------------FN_DYNVARS_042_03------------------------#' -######################################################################## -# Change the value of innodb_fast_shutdown to a valid value # -######################################################################## +########################################################################## +# Change the value of innodb_fast_shutdown to a valid value # +########################################################################## SET @@global.innodb_fast_shutdown = 0; SELECT @@global.innodb_fast_shutdown; SET @@global.innodb_fast_shutdown = 1; SELECT @@global.innodb_fast_shutdown; -## a value of 2 is used to just flush logs and then shutdown cold. Not supported on Netware +## A value of 2 is used to just flush logs and then shutdown cold. +## Not supported on Netware SET @@global.innodb_fast_shutdown = 2; SELECT @@global.innodb_fast_shutdown; ---echo '#--------------------FN_DYNVARS_042_04-------------------------#' -########################################################################### -# Change the value of innodb_fast_shutdown to invalid value # -########################################################################### +--echo '#--------------------FN_DYNVARS_042_04-------------------------#' +########################################################################### +# Change the value of innodb_fast_shutdown to invalid value # +########################################################################### SET @@global.innodb_fast_shutdown = -1; SELECT @@global.innodb_fast_shutdown; @@ -121,11 +119,10 @@ SET @@global.innodb_fast_shutdown = "0"; SELECT @@global.innodb_fast_shutdown; - --echo '#-------------------FN_DYNVARS_042_05----------------------------#' -########################################################################### +########################################################################### # Test if accessing session innodb_fast_shutdown gives error # -########################################################################### +########################################################################### --Error ER_GLOBAL_VARIABLE SET @@session.innodb_fast_shutdown = 0; @@ -136,32 +133,30 @@ SET @@innodb_fast_shutdown = 0; SET @@local.innodb_fast_shutdown = 0; - --echo '#----------------------FN_DYNVARS_042_06------------------------#' -######################################################################### +######################################################################### # Check if the value in SESSION Table contains variable value # ######################################################################### -SELECT count(VARIABLE_VALUE) AS res_is_0 -FROM INFORMATION_SCHEMA.SESSION_VARIABLES +SELECT count(VARIABLE_VALUE) AS res_is_0 +FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fast_shutdown'; --echo '#----------------------FN_DYNVARS_042_07------------------------#' -######################################################################### -# Check if the value in GLOBAL Table matches value in variable # +######################################################################### +# Check if the value in GLOBAL Table matches value in variable # ######################################################################### SELECT @@global.innodb_fast_shutdown = -VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_fast_shutdown'; --echo '#---------------------FN_DYNVARS_042_08-------------------------#' -################################################################### +################################################################### # Check if ON and OFF values can be used on variable # -################################################################### - +################################################################### --Error ER_WRONG_TYPE_FOR_VAR SET @@global.innodb_fast_shutdown = OFF; @@ -171,23 +166,25 @@ SELECT @@global.innodb_fast_shutdown; SET @@global.innodb_fast_shutdown = ON; SELECT @@global.innodb_fast_shutdown; + --echo '#---------------------FN_DYNVARS_042_09----------------------#' -################################################################### +################################################################### # Check if TRUE and FALSE values can be used on variable # -################################################################### +################################################################### SET @@global.innodb_fast_shutdown = TRUE; SELECT @@global.innodb_fast_shutdown; SET @@global.innodb_fast_shutdown = FALSE; SELECT @@global.innodb_fast_shutdown; -############################## + +############################## # Restore initial value # ############################## -#SET @@innodb_fast_shutdown = @global_start_value; -#SELECT @@innodb_fast_shutdown; +SET @@global.innodb_fast_shutdown = @global_start_value; +SELECT @@global.innodb_fast_shutdown; -######################################################################## +######################################################################## # END OF innodb_fast_shutdown TESTS # -######################################################################## +######################################################################## diff --git a/mysql-test/t/innodb_max_dirty_pages_pct_func.test b/mysql-test/t/innodb_max_dirty_pages_pct_func.test index 4b2af554810..52ebc2f4c49 100644 --- a/mysql-test/t/innodb_max_dirty_pages_pct_func.test +++ b/mysql-test/t/innodb_max_dirty_pages_pct_func.test @@ -11,33 +11,31 @@ # Creation Date: 2008-03-08 # # Author: Rizwan # # # -#Description: Test Cases of Dynamic System Variable innodb_max_dirty_pages_pct# -# that checks the behavior of this variable # +# Description: # +# Test cases of Dynamic System Variable innodb_max_dirty_pages_pct that # +# checks the behavior of this variable # # # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # +# Reference: # +# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html # # # ############################################################################### --source include/have_innodb.inc ---echo '#--------------------FN_DYNVARS_044_02-------------------------#' -########################################################################### -# Check if setting innodb_max_dirty_pages_pct is changed in new connection# -########################################################################### -SET @old_innodb_max_dirty_pages_pct= @@global.innodb_max_dirty_pages_pct; +SET @start_value= @@global.innodb_max_dirty_pages_pct; + +--echo '#--------------------FN_DYNVARS_044_02-------------------------#' +############################################################################ +# Check if setting innodb_max_dirty_pages_pct is changed in new connection # +############################################################################ SET @@global.innodb_max_dirty_pages_pct = 80; --echo 'connect (con1,localhost,root,,,,)' connect (con1,localhost,root,,,,); ---echo 'connection con1' -connection con1; SELECT @@global.innodb_max_dirty_pages_pct; SET @@global.innodb_max_dirty_pages_pct = 70; --echo 'connect (con2,localhost,root,,,,)' connect (con2,localhost,root,,,,); ---echo 'connection con2' -connection con2; SELECT @@global.innodb_max_dirty_pages_pct; disconnect con2; disconnect con1; @@ -60,6 +58,11 @@ DROP FUNCTION IF EXISTS dirty_pct; DROP TABLE IF EXISTS t1; --enable_warnings +CREATE TABLE t1( +a INT AUTO_INCREMENT PRIMARY KEY, +b CHAR(200) +)ENGINE=INNODB; + DELIMITER //; CREATE PROCEDURE add_records(IN NUM INT) BEGIN @@ -76,21 +79,21 @@ BEGIN DECLARE res DECIMAL(20,17); DECLARE a1,b1 VARCHAR(256); DECLARE a2,b2 VARCHAR(256); - DECLARE dirty CURSOR FOR SELECT * FROM information_schema.global_status + DECLARE dirty CURSOR FOR SELECT * FROM information_schema.global_status WHERE variable_name LIKE 'Innodb_buffer_pool_pages_dirty' - UNION SELECT * FROM information_schema.session_status + UNION SELECT * FROM information_schema.session_status WHERE variable_name LIKE 'Innodb_buffer_pool_pages_dirty'; DECLARE total CURSOR FOR SELECT * FROM information_schema.global_status WHERE variable_name LIKE 'Innodb_buffer_pool_pages_total' UNION SELECT * FROM information_schema.session_status WHERE variable_name LIKE 'Innodb_buffer_pool_pages_total'; - + OPEN dirty; OPEN total; FETCH dirty INTO a1, b1; FETCH total INTO a2, b2; - + SET res = ( CONVERT(b1,DECIMAL)*100)/CONVERT(b2,DECIMAL); CLOSE dirty; @@ -104,7 +107,7 @@ BEGIN SET pct = dirty_pct(); SET last = 0; - WHILE (pctNUM and pct<100) DO CALL add_records(500); SET pct = dirty_pct(); IF (pct0) DO @@ -70,7 +67,6 @@ BEGIN SET count = count -1; END WHILE; END // - DELIMITER ;// # setting 2 will allow data pointer to access files with size < 65536 @@ -105,6 +101,9 @@ SELECT count(*) from t1; DROP PROCEDURE sp_addRec; DROP TABLE t1; +connection default; +SET @@global.myisam_data_pointer_size= @start_value; + ################################################################ # End of functionality Testing for myisam_data_pointer_size # ################################################################ diff --git a/mysql-test/t/myisam_stats_method_func.test b/mysql-test/t/myisam_stats_method_func.test index 8b47015ba87..a317f8d93da 100644 --- a/mysql-test/t/myisam_stats_method_func.test +++ b/mysql-test/t/myisam_stats_method_func.test @@ -14,16 +14,18 @@ # Description: Test Cases of Dynamic System Variable myisam_stats_method # # that checks the behavior of this variable # # # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # +# Reference: # +# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html # # # ############################################################################### --echo '#--------------------FN_DYNVARS_097_01-------------------------#' ##################################################################### -# Check if Setting myisam_stats_method is changed in new connection # +# Check if Setting myisam_stats_method is changed in new connection # ##################################################################### +SET @start_value = @@global.myisam_stats_method; + SET @@global.myisam_stats_method = nulls_equal; --echo 'connect (con1,localhost,root,,,,)' connect (con1,localhost,root,,,,); @@ -45,19 +47,19 @@ connection default; DROP TABLE IF EXISTS t1; --enable_warnings -CREATE TABLE t1 (a int, key (a)); +CREATE TABLE t1 (a INT, KEY (a)); INSERT INTO t1 VALUES (0),(1),(2),(3),(4); INSERT INTO t1 SELECT NULL FROM t1; #======================================= --echo 'default: NULLs considered unequal' #======================================= -SET myisam_stats_method=nulls_unequal; +SET myisam_stats_method = nulls_unequal; ANALYZE TABLE t1; SHOW INDEX FROM t1; INSERT INTO t1 VALUES (11); -DELETE FROM t1 WHERE a=11; +DELETE FROM t1 WHERE a = 11; CHECK TABLE t1; SHOW INDEX FROM t1; @@ -65,14 +67,14 @@ SHOW INDEX FROM t1; #===================================== --echo 'Set nulls to be equal' #===================================== -SET myisam_stats_method=nulls_equal; +SET myisam_stats_method = nulls_equal; INSERT INTO t1 VALUES (11); -DELETE FROM t1 WHERE a=11; -ANALYZE TABLE t1; +DELETE FROM t1 WHERE a = 11; +ANALYZE TABLE t1; SHOW INDEX FROM t1; INSERT INTO t1 VALUES (11); -DELETE FROM t1 WHERE a=11; +DELETE FROM t1 WHERE a = 11; CHECK TABLE t1; SHOW INDEX FROM t1; @@ -80,13 +82,13 @@ SHOW INDEX FROM t1; --echo 'Set nulls to be ignored' #===================================== -SET myisam_stats_method=nulls_ignored; -SHOW variables LIKE 'myisam_stats_method'; -drop TABLE t1; +SET myisam_stats_method = nulls_ignored; +SHOW VARIABLES LIKE 'myisam_stats_method'; +DROP TABLE t1; CREATE TABLE t1 ( - a char(3), b char(4), c char(5), d char(6), - key(a,b,c,d) + a CHAR(3), b CHAR(4), c CHAR(5), d CHAR(6), + KEY(a,b,c,d) ); INSERT INTO t1 VALUES ('bcd','def1', NULL, 'zz'); INSERT INTO t1 VALUES ('bcd','def2', NULL, 'zz'); @@ -98,9 +100,12 @@ DELETE FROM t1; ANALYZE TABLE t1; SHOW INDEX FROM t1; -SET myisam_stats_method=DEFAULT; +SET myisam_stats_method = DEFAULT; DROP TABLE t1; +SET @@global.myisam_stats_method= @start_value; + ######################################################## # End of functionality Testing for myisam_stats_method # ######################################################## + diff --git a/mysql-test/t/profiling.test b/mysql-test/t/profiling.test index 5cb3f66aa2b..275c2d77c4a 100644 --- a/mysql-test/t/profiling.test +++ b/mysql-test/t/profiling.test @@ -14,6 +14,7 @@ select @@profiling; set global profiling = ON; # But size is okay +set @start_value= @@global.profiling_history_size; set global profiling_history_size=100; show global variables like 'profil%'; @@ -261,6 +262,6 @@ drop function if exists f1; ## last thing in the file set session profiling = OFF; - +set global profiling_history_size= @start_value; ## --echo End of 5.0 tests diff --git a/mysql-test/t/query_cache_limit_func.test b/mysql-test/t/query_cache_limit_func.test index 8dd5cf42d3d..e90a0e6adda 100644 --- a/mysql-test/t/query_cache_limit_func.test +++ b/mysql-test/t/query_cache_limit_func.test @@ -9,14 +9,14 @@ # # # # # Creation Date: 2008-03-02 # -# Author: Sharique Abdullah # +# Author: Sharique Abdullah # # # # Description: Test Cases of Dynamic System Variable "Query_cache_limit" # # that checks behavior of this variable in the following ways # # * Functionality based on different values # # # -# Reference: http://dev.mysql.com/doc/refman/5.1/en # -# /server-system-variables.html#option_mysqld_Query_cache_limit # +# Reference: # +# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html # # # ############################################################################### @@ -28,6 +28,8 @@ # SET @global_query_cache_limit = @@global.query_cache_limit; +SET @global_query_cache_size = @@global.query_cache_size; +SET @global_query_cache_type = @@global.query_cache_type; --echo ** warnings ** --disable_warnings @@ -105,7 +107,7 @@ RESET QUERY CACHE; #set cache limit --echo ** set cache limit ** -SET @@GLOBAL.query_cache_limit=0; +SET @@GLOBAL.query_cache_limit = 0; #fetching results# --echo ** fetching results ** @@ -113,7 +115,6 @@ SELECT * FROM t; # Check status after setting value# --echo ** Check status after setting value ** -#let $newcachevalue1= query_get_value(SHOW STATUS LIKE 'Qcache_queries_in_cache', Value, 1); SHOW STATUS LIKE 'Qcache_not_cached'; --echo 1 Expected SHOW STATUS LIKE 'Qcache_queries_in_cache'; @@ -127,7 +128,7 @@ SHOW STATUS LIKE 'Qcache_queries_in_cache'; #set cache limit to default --echo ** set cache limit ** -SET @@GLOBAL.query_cache_limit=DEFAULT; +SET @@GLOBAL.query_cache_limit = DEFAULT; # Reset cache & flush status --echo ** Reset cache values ** @@ -143,7 +144,7 @@ SHOW STATUS LIKE 'Qcache_not_cached'; SHOW STATUS LIKE 'Qcache_queries_in_cache'; --echo 1 Expected -SET @@GLOBAL.query_cache_limit=0; +SET @@GLOBAL.query_cache_limit = 0; SHOW STATUS LIKE 'Qcache_not_cached'; --echo 0 Expected @@ -167,7 +168,10 @@ SHOW STATUS LIKE 'Qcache_queries_in_cache'; # SET @@GLOBAL.query_cache_limit = @global_query_cache_limit; +SET GLOBAL query_cache_size = @global_query_cache_size; +SET GLOBAL query_cache_type = @global_query_cache_type; --disable_warnings DROP TABLE IF EXISTS t; --enable_warnings + diff --git a/mysql-test/t/query_cache_type_func.test b/mysql-test/t/query_cache_type_func.test index 64f332eb7c0..4679d1ec339 100644 --- a/mysql-test/t/query_cache_type_func.test +++ b/mysql-test/t/query_cache_type_func.test @@ -14,8 +14,8 @@ # Description: Test Cases of Dynamic System Variable "query_cache_type" # # that checks behavior of this variable in the following ways # # # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html#option_mysqld_query_cache_type # +# Reference: # +# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html # # # ############################################################################### @@ -36,6 +36,7 @@ connection con0; SET @start_global_value = @@GLOBAL.query_cache_type; SET @start_session_value = @@SESSION.query_cache_type; +SET @start_query_cache_size= @@global.query_cache_size; # # Creating test table @@ -305,6 +306,7 @@ connection con0; SET @@GLOBAL.query_cache_type = @start_global_value; SET @@SESSION.query_cache_type = @start_session_value; +SET GLOBAL query_cache_size = @start_query_cache_size; DROP TABLE t1; @@ -312,3 +314,4 @@ DROP PROCEDURE testProcHit; --echo Disconnecting con0 disconnect con0; + diff --git a/mysql-test/t/query_prealloc_size_func.test b/mysql-test/t/query_prealloc_size_func.test index 4f1e3e63e16..7267b9e317e 100644 --- a/mysql-test/t/query_prealloc_size_func.test +++ b/mysql-test/t/query_prealloc_size_func.test @@ -1,32 +1,32 @@ ############# mysql-test\t\query_prealloc_size_func.test ###################### -# # -# Variable Name: query_prealloc_size # -# Scope: GLOBAL & SESSION # -# Access Type: Dynamic # -# Data Type: integer # -# Default Value: 8192 # -# Values: 8192-4294967295 # -# # -# # -# Creation Date: 2008-02-22 # -# Author: Sharique Abdullah # -# # -# Description: Test Cases of Dynamic System Variable "query_prealloc_size" # -# that checks behavior of this variable in the following ways # -# * Default Value # -# * Valid & Invalid values # -# * Scope & Access method # -# * Cache behaviors # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html#option_mysqld_query_prealloc_size # -# # +# # +# Variable Name: query_prealloc_size # +# Scope: GLOBAL & SESSION # +# Access Type: Dynamic # +# Data Type: integer # +# Default Value: 8192 # +# Values: 8192-4294967295 # +# # +# # +# Creation Date: 2008-02-22 # +# Author: Sharique Abdullah # +# # +# Description: Test Cases of Dynamic System Variable "query_prealloc_size" # +# that checks behavior of this variable in the following ways # +# * Default Value # +# * Valid & Invalid values # +# * Scope & Access method # +# * Cache behaviors # +# # +# Reference: # +# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html # +# # ############################################################################### --echo ** Setup ** ---echo +--echo # # Setup # @@ -35,16 +35,18 @@ # Save initial value # -CREATE TABLE t1 (id int auto_increment primary key, val text(200)); +SET @start_value = @@global.query_prealloc_size; -INSERT INTO t1 values(NULL,'a'); -INSERT INTO t1 values(NULL,'b'); -INSERT INTO t1 values(NULL,'c'); -INSERT INTO t1 values(NULL,'d'); +CREATE TABLE t1 (id INT AUTO_INCREMENT PRIMARY KEY, val TEXT(200)); + +INSERT INTO t1 VALUES(NULL,'a'); +INSERT INTO t1 VALUES(NULL,'b'); +INSERT INTO t1 VALUES(NULL,'c'); +INSERT INTO t1 VALUES(NULL,'d'); SELECT * FROM t1 ORDER BY val; -SET SESSION query_prealloc_size = 8192; +SET SESSION query_prealloc_size = 8192; --echo '#----------------------------FN_DYNVARS_137_05-----------------#' @@ -84,3 +86,7 @@ connection default; disconnect con_int1; disconnect con_int2; +DROP TABLE t1; + +SET @@global.query_prealloc_size = @start_value; + diff --git a/mysql-test/t/slow_query_log_file_basic.test b/mysql-test/t/slow_query_log_file_basic.test index 2620cd5eabc..9125b686cad 100644 --- a/mysql-test/t/slow_query_log_file_basic.test +++ b/mysql-test/t/slow_query_log_file_basic.test @@ -10,6 +10,7 @@ # # # Creation Date: 2008-03-16 # # Author: Salman Rawala # +# Modified: HHunger 2008-09-11 set system var back to start value # # # # Description: Test Cases of Dynamic System Variable "slow_query_log_file" # # that checks behavior of this variable in the following ways # @@ -18,8 +19,8 @@ # * Scope & Access method # # * Data Integrity # # # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html#option_mysqld_slow_query_log_file # +# Reference: # +# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html # # ################################################################################ @@ -35,8 +36,6 @@ ########################################################################### SET @start_value = @@global.slow_query_log_file; -SELECT @start_value; - --echo '#---------------------FN_DYNVARS_004_01-------------------------#' ############################################### @@ -66,7 +65,8 @@ SELECT @@global.slow_query_log_file = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='slow_query_log_file'; - +SET @@global.slow_query_log_file= @start_value; ##################################################### # END OF slow_query_log_file TESTS # ##################################################### + diff --git a/mysql-test/t/slow_query_log_file_func.test b/mysql-test/t/slow_query_log_file_func.test index 9a2ddae8c4a..32420fc294a 100644 --- a/mysql-test/t/slow_query_log_file_func.test +++ b/mysql-test/t/slow_query_log_file_func.test @@ -26,7 +26,7 @@ #################################################################### let $MYSQLD_DATADIR= `select @@datadir`; ---echo ## Checking if my_slow_test.log exist in servers datadir ## +--echo ## Checking if my_slow_test.log exists in servers datadir ## --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR --file_exists $MYSQLD_DATADIR/my_slow_test.log diff --git a/mysql-test/t/variables-notembedded.test b/mysql-test/t/variables-notembedded.test index 79011a89b36..20ce3a74532 100644 --- a/mysql-test/t/variables-notembedded.test +++ b/mysql-test/t/variables-notembedded.test @@ -28,3 +28,5 @@ set global slave_net_timeout=default; # sql_slave_skip_counter is write-only, so we can't save previous # value and restore it here. That's ok, because it's normally 0. set global sql_slave_skip_counter= 0; +set @@global.slave_net_timeout= @my_slave_net_timeout; + diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 221f46605cd..7dbe72865d3 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -24,6 +24,7 @@ set @my_max_heap_table_size =@@global.max_heap_table_size; set @my_max_insert_delayed_threads=@@global.max_insert_delayed_threads; set @my_max_join_size =@@global.max_join_size; set @my_myisam_data_pointer_size =@@global.myisam_data_pointer_size; +set @my_myisam_max_sort_file_size =@@global.myisam_max_sort_file_size; set @my_net_buffer_length =@@global.net_buffer_length; set @my_net_write_timeout =@@global.net_write_timeout; set @my_net_read_timeout =@@global.net_read_timeout; @@ -34,7 +35,6 @@ set @my_server_id =@@global.server_id; set @my_slow_launch_time =@@global.slow_launch_time; set @my_storage_engine =@@global.storage_engine; set @my_thread_cache_size =@@global.thread_cache_size; - # case insensitivity tests (new in 5.0) set @`test`=1; select @test, @`test`, @TEST, @`TEST`, @"teSt"; @@ -750,7 +750,7 @@ set global delayed_queue_size =@my_delayed_queue_size; set global flush =@my_flush; set global flush_time =@my_flush_time; set global key_buffer_size =@my_key_buffer_size; -set global max_binlog_cache_size =default; #@my_max_binlog_cache_size; +set global max_binlog_cache_size =@my_max_binlog_cache_size; set global max_binlog_size =@my_max_binlog_size; set global max_connect_errors =@my_max_connect_errors; set global max_connections =@my_max_connections; @@ -761,6 +761,7 @@ set global max_join_size =@my_max_join_size; set global max_user_connections =default; set global max_write_lock_count =default; set global myisam_data_pointer_size =@my_myisam_data_pointer_size; +set global myisam_max_sort_file_size =@my_myisam_max_sort_file_size; set global net_buffer_length =@my_net_buffer_length; set global net_write_timeout =@my_net_write_timeout; set global net_read_timeout =@my_net_read_timeout; @@ -771,7 +772,6 @@ set global server_id =@my_server_id; set global slow_launch_time =@my_slow_launch_time; set global storage_engine =@my_storage_engine; set global thread_cache_size =@my_thread_cache_size; - # # Bug#28580 Repeatation of status variables # From 48868b2d0e9ea83b83df077a65c6f6aa590e12d6 Mon Sep 17 00:00:00 2001 From: Horst Hunger Date: Wed, 10 Sep 2008 16:11:08 +0200 Subject: [PATCH 295/705] Fix for bug#38349: concurrent_insert_func must not with embedded server. --- mysql-test/t/concurrent_insert_func.test | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/t/concurrent_insert_func.test b/mysql-test/t/concurrent_insert_func.test index 3810a559244..cdeb76d9cac 100644 --- a/mysql-test/t/concurrent_insert_func.test +++ b/mysql-test/t/concurrent_insert_func.test @@ -19,6 +19,7 @@ # # ################################################################################ +--source include/not_embedded.inc --disable_warnings DROP TABLE IF EXISTS t1; From 6e47698f21b14ab4e9a8d79f9a89dedec2450f64 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Thu, 11 Sep 2008 18:30:30 +0200 Subject: [PATCH 296/705] WL#4350 Improve error message --- mysql-test/mysql-test-run.pl | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 5b91517117a..09733007d1e 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2752,8 +2752,8 @@ sub check_testcase($$) else { # Unknown process returned, most likley a crash, abort everything $tinfo->{comment}= - "Unexpected process $proc returned during ". - "check testcase $mode test"; + "The server $proc crashed while running ". + "'check testcase $mode test'"; $result= 3; } @@ -2864,8 +2864,7 @@ sub run_on_all($$) else { # Unknown process returned, most likley a crash, abort everything $tinfo->{comment}.= - "Unexpected process $proc returned during ". - "execution of '$run'"; + "The server $proc crashed while running '$run'"; } # Kill any check processes still running @@ -3352,8 +3351,7 @@ sub check_warnings ($) { else { # Unknown process returned, most likley a crash, abort everything $tinfo->{comment}= - "Unexpected process $proc returned during ". - "check warnings"; + "The server $proc crashed while running 'check warnings'"; $result= 3; } From b928473b71fbd677712811fcb91941b683f4b9c7 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Thu, 11 Sep 2008 22:05:44 +0200 Subject: [PATCH 297/705] WL#4350 Fix --record and no .result file --- mysql-test/lib/mtr_cases.pm | 6 ++++++ mysql-test/mysql-test-run.pl | 15 +++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index fd3c9a8c00f..3ca766039ec 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -699,6 +699,12 @@ sub collect_one_test_case { # should fail by default $tinfo->{result_file}= $result_file; } + else { + # No .result file exist + # Remember the path where it should be + # saved in case of --record + $tinfo->{record_file}= $result_file; + } # ---------------------------------------------------------------------- # Skip some tests but include in list, just mark them as skipped diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 09733007d1e..cbb56e634d1 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2638,12 +2638,14 @@ sub do_before_run_mysqltest($) my $tinfo= shift; # Remove old files produced by mysqltest - my $base_file= mtr_match_extension($tinfo->{'result_file'}, - "result"); # Trim extension - unlink("$base_file.reject"); - unlink("$base_file.progress"); - unlink("$base_file.log"); - unlink("$base_file.warnings"); + my $base_file= mtr_match_extension($tinfo->{result_file}, + "result"); # Trim extension + if (defined $base_file ){ + unlink("$base_file.reject"); + unlink("$base_file.progress"); + unlink("$base_file.log"); + unlink("$base_file.warnings"); + } if ( $mysql_version_id < 50000 ) { # Set environment variable NDB_STATUS_OK to 1 @@ -4332,6 +4334,7 @@ sub start_mysqltest ($) { if ( $opt_record ) { mtr_add_arg($args, "--record"); + mtr_add_arg($args, "--result-file=%s", $tinfo->{record_file}); } if ( $opt_client_gdb ) From 88a9c6f5a4658e8ad5c2ac1af6f4620d488e4cf3 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 15 Sep 2008 12:13:47 +0200 Subject: [PATCH 298/705] WL#4189 mtr --embedded from binary distribution --- mysql-test/mysql-test-run.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index cbb56e634d1..88a580858e2 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1523,8 +1523,9 @@ sub mysql_client_test_arguments(){ # mysql_client_test executable may _not_ exist if ( $opt_embedded_server ) { $exe= mtr_exe_maybe_exists( - vs_config_dirs('libmysqld/examples','mysql_client_test_embedded'), - "$basedir/libmysqld/examples/mysql_client_test_embedded"); + vs_config_dirs('libmysqld/examples','mysql_client_test_embedded'), + "$basedir/libmysqld/examples/mysql_client_test_embedded", + "$basedir/bin/mysql_client_test_embedded"); } else { $exe= mtr_exe_maybe_exists(vs_config_dirs('tests', 'mysql_client_test'), "$basedir/tests/mysql_client_test", From 7e0869b9f1f742d484276df5e696a4d8ee96d9a2 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 15 Sep 2008 12:15:08 +0200 Subject: [PATCH 299/705] WL#4189 mtr, hang if worker fails before connected to server --- mysql-test/mysql-test-run.pl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 88a580858e2..ce4f9bda6c2 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -612,6 +612,16 @@ sub run_worker ($) { $SIG{INT}= sub { exit(1); }; + # Connect to server + my $server = new IO::Socket::INET + ( + PeerAddr => 'localhost', + PeerPort => $server_port, + Proto => 'tcp' + ); + mtr_error("Could not connect to server at port $server_port: $!") + unless $server; + # -------------------------------------------------------------------------- # Set worker name # -------------------------------------------------------------------------- @@ -634,16 +644,6 @@ sub run_worker ($) { environment_setup(); - # Connect to server - my $server = new IO::Socket::INET - ( - PeerAddr => 'localhost', - PeerPort => $server_port, - Proto => 'tcp' - ); - mtr_error("Could not connect to server at port $server_port: $!") - unless $server; - # Read hello from server which it will send when shared # resources have been setup my $hello= <$server>; From 4174c685952de7ae3772d936579051293ab38c85 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 15 Sep 2008 16:27:12 +0200 Subject: [PATCH 300/705] WL#4189 Wrap the check for socket path length in eval --- mysql-test/lib/My/Platform.pm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/mysql-test/lib/My/Platform.pm b/mysql-test/lib/My/Platform.pm index cee0c8778fe..507a9453f91 100644 --- a/mysql-test/lib/My/Platform.pm +++ b/mysql-test/lib/My/Platform.pm @@ -102,14 +102,22 @@ sub check_socket_path_length { require IO::Socket::UNIX; - my $sock = new IO::Socket::UNIX - ( - Local => $path, - Listen => 1, - ); + my $sock; + eval { + $sock= new IO::Socket::UNIX + ( + Local => $path, + Listen => 1, + ); + }; + if ($@) + { + print $@, '\n'; + return 2; + } if (!defined $sock){ # Could not create a UNIX domain socket - return 0; # Ok, will not be used by mysqld either + return 3; } if ($path ne $sock->hostpath()){ # Path was truncated From 588efe1216f60bb2c491a7077f0162d9a1abff45 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 15 Sep 2008 17:05:14 +0200 Subject: [PATCH 301/705] WL#4189 Create a tempdir if tmpdir path becomes too long --- mysql-test/mysql-test-run.pl | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index ce4f9bda6c2..cd1007e24dc 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1024,7 +1024,20 @@ sub command_line_setup { # -------------------------------------------------------------------------- # Set the "tmp" directory # -------------------------------------------------------------------------- - $opt_tmpdir= "$opt_vardir/tmp" unless $opt_tmpdir; + if ( ! $opt_tmpdir ) + { + $opt_tmpdir= "$opt_vardir/tmp" unless $opt_tmpdir; + + if (check_socket_path_length("$opt_tmpdir/testsocket.sock")) + { + mtr_report("Too long tmpdir path '$opt_tmpdir'", + " creating a shorter one..."); + + # Create temporary directory in standard location for temporary files + $opt_tmpdir= tempdir( TMPDIR => 1, CLEANUP => 1 ); + mtr_report(" - using tmpdir: '$opt_tmpdir'\n"); + } + } $opt_tmpdir =~ s,/+$,,; # Remove ending slash if any # -------------------------------------------------------------------------- From 2f5e98264a5ddd2121a46162c66b15a730663fb0 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 15 Sep 2008 17:09:27 +0200 Subject: [PATCH 302/705] WL4189 Cap the autodetected parallelism value to 8 --- mysql-test/mysql-test-run.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index cd1007e24dc..53f916a630a 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -279,6 +279,7 @@ sub main { for my $limit (2000, 1500, 1000, 500){ $opt_parallel-- if ($sys_info->min_bogomips() < $limit); } + $opt_parallel= 8 if ($opt_parallel > 8); $opt_parallel= $num_tests if ($opt_parallel > $num_tests); $opt_parallel= 1 if ($opt_parallel < 1); mtr_report("Using parallel: $opt_parallel"); From 67580cd220d4eeeb6ac7bd8e3a11336d2de2e2af Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Sat, 20 Sep 2008 15:21:29 +0300 Subject: [PATCH 303/705] Make sure the direcory where the test socket is to be created exists --- mysql-test/lib/My/Platform.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mysql-test/lib/My/Platform.pm b/mysql-test/lib/My/Platform.pm index 507a9453f91..630f14d957a 100644 --- a/mysql-test/lib/My/Platform.pm +++ b/mysql-test/lib/My/Platform.pm @@ -17,6 +17,8 @@ package My::Platform; use strict; +use File::Basename; +use My::File::Path; # Patched version of File::Path use base qw(Exporter); our @EXPORT= qw(IS_CYGWIN IS_WINDOWS IS_WIN32PERL @@ -104,11 +106,16 @@ sub check_socket_path_length { my $sock; eval { + # Create the directories where the + # socket till be created + mkpath(dirname($path)); + $sock= new IO::Socket::UNIX ( Local => $path, Listen => 1, ); + }; if ($@) { @@ -116,7 +123,7 @@ sub check_socket_path_length { return 2; } if (!defined $sock){ - # Could not create a UNIX domain socket + #print "Could not create UNIX domain socket: $!\n"; return 3; } if ($path ne $sock->hostpath()){ From 02eee93f3aa476280f80042809574d00f1c20de2 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Sat, 20 Sep 2008 16:51:31 +0300 Subject: [PATCH 304/705] Versional testing support --- mysql-test/lib/My/Find.pm | 36 ++++++++++- mysql-test/mysql-test-run.pl | 117 ++++++++++++++++++++++------------- 2 files changed, 108 insertions(+), 45 deletions(-) diff --git a/mysql-test/lib/My/Find.pm b/mysql-test/lib/My/Find.pm index 8b90e757917..8557584bbc8 100644 --- a/mysql-test/lib/My/Find.pm +++ b/mysql-test/lib/My/Find.pm @@ -26,7 +26,7 @@ use Carp; use My::Platform; use base qw(Exporter); -our @EXPORT= qw(my_find_bin my_find_dir NOT_REQUIRED); +our @EXPORT= qw(my_find_bin my_find_dir my_find_file NOT_REQUIRED); our $vs_config_dir; @@ -77,6 +77,40 @@ sub my_find_bin { } +# +# my_find_file - find a file with "name_1...name_n" in +# paths "path_1...path_n" and return the full path +# +# Example: +# my $mysqld_exe= my_find_file($basedir. +# ["sql", "bin"], +# "filename"); +# +# +# Also supports NOT_REQUIRED flag +# +# NOTE: The function honours MTR_VS_CONFIG environment variable +# +# +sub my_find_file { + my ($base, $paths, $names, $required)= @_; + croak "usage: my_find_file(, , , [])" + unless @_ == 4 or @_ == 3; + + # ------------------------------------------------------- + # Find and return the first executable + # ------------------------------------------------------- + foreach my $path (my_find_paths($base, $paths, $names, $bin_extension)) { + return $path if ( -f $path ); + } + if (defined $required and $required == NOT_REQUIRED){ + # Return empty string to indicate not found + return ""; + } + find_error($base, $paths, $names); +} + + # # my_find_dir - find the first existing directory in one of # the given paths diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 53f916a630a..1eb767ee47f 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -188,8 +188,6 @@ my $exe_ndbd; my $exe_ndb_mgmd; my $exe_ndb_waiter; -our $path_sql_dir; - our $debug_compiled_binaries; our %mysqld_variables; @@ -651,7 +649,6 @@ sub run_worker ($) { setup_vardir(); check_running_as_root(); - mysql_install_db($thread_num); if ( using_extern() ) { create_config_file_for_extern(%opts_extern); @@ -894,21 +891,10 @@ sub command_line_setup { "$basedir/sql/share", "$basedir/share"); + $path_language= mtr_path_exists("$path_share/english"); $path_charsetsdir= mtr_path_exists("$path_share/charsets"); - # Look for SQL scripts directory - if ( mtr_file_exists("$path_share/mysql_system_tables.sql") ne "") - { - # The SQL scripts are in path_share - $path_sql_dir= $path_share; - } - else - { - $path_sql_dir= mtr_path_exists("$basedir/share", - "$basedir/scripts"); - } - if (using_extern()) { # Connect to the running mysqld and find out what it supports @@ -2419,7 +2405,7 @@ sub initialize_servers { remove_stale_vardir(); setup_vardir(); - mysql_install_db(0); + mysql_install_db(default_mysqld(), "$opt_vardir/install.db"); } } } @@ -2474,9 +2460,33 @@ sub sql_to_bootstrap { } +sub default_mysqld { + # Generate new config file from template + my $config= My::ConfigFactory->new_config + ( { + basedir => $basedir, + template_path => "include/default_my.cnf", + vardir => $opt_vardir, + tmpdir => $opt_tmpdir, + baseport => 0, + user => $opt_user, + password => '', + } + ); + + my $mysqld= $config->group('mysqld.1') + or mtr_error("Couldn't find mysqld.1 in default config"); + return $mysqld; +} + + sub mysql_install_db { - my ($thread_num)= @_; - my $data_dir= "$opt_vardir/install.db"; + my ($mysqld, $datadir)= @_; + + my $install_datadir= $datadir || $mysqld->value('datadir'); + my $install_basedir= $mysqld->value('basedir'); + my $install_lang= $mysqld->value('language'); + my $install_chsdir= $mysqld->value('character-sets-dir'); mtr_report("Installing system database..."); @@ -2484,8 +2494,8 @@ sub mysql_install_db { mtr_init_args(\$args); mtr_add_arg($args, "--no-defaults"); mtr_add_arg($args, "--bootstrap"); - mtr_add_arg($args, "--basedir=%s", $basedir); - mtr_add_arg($args, "--datadir=%s", $data_dir); + mtr_add_arg($args, "--basedir=%s", $install_basedir); + mtr_add_arg($args, "--datadir=%s", $install_datadir); mtr_add_arg($args, "--loose-skip-innodb"); mtr_add_arg($args, "--loose-skip-ndbcluster"); mtr_add_arg($args, "--tmpdir=%s", "$opt_vardir/tmp/"); @@ -2497,47 +2507,60 @@ sub mysql_install_db { $path_vardir_trace); } - mtr_add_arg($args, "--language=%s", $path_language); - mtr_add_arg($args, "--character-sets-dir=%s", $path_charsetsdir); + mtr_add_arg($args, "--language=%s", $install_lang); + mtr_add_arg($args, "--character-sets-dir=%s", $install_chsdir); # If DISABLE_GRANT_OPTIONS is defined when the server is compiled (e.g., # configure --disable-grant-options), mysqld will not recognize the # --bootstrap or --skip-grant-tables options. The user can set # MYSQLD_BOOTSTRAP to the full path to a mysqld which does accept # --bootstrap, to accommodate this. - my $exe_mysqld_bootstrap = $ENV{'MYSQLD_BOOTSTRAP'} || find_mysqld($basedir); + my $exe_mysqld_bootstrap = + $ENV{'MYSQLD_BOOTSTRAP'} || find_mysqld($install_basedir); # ---------------------------------------------------------------------- # export MYSQLD_BOOTSTRAP_CMD variable containing /mysqld # ---------------------------------------------------------------------- $ENV{'MYSQLD_BOOTSTRAP_CMD'}= "$exe_mysqld_bootstrap " . join(" ", @$args); - return if $thread_num > 0; # Only generate MYSQLD_BOOTSTRAP_CMD in workers + # ---------------------------------------------------------------------- # Create the bootstrap.sql file # ---------------------------------------------------------------------- my $bootstrap_sql_file= "$opt_vardir/tmp/bootstrap.sql"; - if (-f "$path_sql_dir/mysql_system_tables.sql") + my $path_sql= my_find_file($install_basedir, + ["mysql", "sql/share", "share", "scripts"], + "mysql_system_tables.sql", + NOT_REQUIRED); + + if (-f $path_sql ) { + my $sql_dir= dirname($path_sql); # Use the mysql database for system tables mtr_tofile($bootstrap_sql_file, "use mysql\n"); # Add the offical mysql system tables # for a production system - mtr_appendfile_to_file("$path_sql_dir/mysql_system_tables.sql", + mtr_appendfile_to_file("$sql_dir/mysql_system_tables.sql", $bootstrap_sql_file); # Add the mysql system tables initial data # for a production system - mtr_appendfile_to_file("$path_sql_dir/mysql_system_tables_data.sql", + mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql", $bootstrap_sql_file); # Add test data for timezone - this is just a subset, on a real # system these tables will be populated either by mysql_tzinfo_to_sql # or by downloading the timezone table package from our website - mtr_appendfile_to_file("$path_sql_dir/mysql_test_data_timezone.sql", + mtr_appendfile_to_file("$sql_dir/mysql_test_data_timezone.sql", + $bootstrap_sql_file); + + # Fill help tables, just an empty file when running from bk repo + # but will be replaced by a real fill_help_tables.sql when + # building the source dist + mtr_appendfile_to_file("$sql_dir/fill_help_tables.sql", $bootstrap_sql_file); } @@ -2545,7 +2568,7 @@ sub mysql_install_db { { # Install db from init_db.sql that exist in early 5.1 and 5.0 # versions of MySQL - my $init_file= "$basedir/mysql-test/lib/init_db.sql"; + my $init_file= "$install_basedir/mysql-test/lib/init_db.sql"; mtr_report(" - from '$init_file'"); my $text= mtr_grab_file($init_file) or mtr_error("Can't open '$init_file': $!"); @@ -2554,12 +2577,6 @@ sub mysql_install_db { sql_to_bootstrap($text)); } - # Fill help tables, just an empty file when running from bk repo - # but will be replaced by a real fill_help_tables.sql when - # building the source dist - mtr_appendfile_to_file("$path_sql_dir/fill_help_tables.sql", - $bootstrap_sql_file); - # Remove anonymous users mtr_tofile($bootstrap_sql_file, "DELETE FROM mysql.user where user= '';\n"); @@ -2582,8 +2599,8 @@ sub mysql_install_db { "$exe_mysqld_bootstrap " . join(" ", @$args) . "\n"); # Create directories mysql and test - mkpath("$data_dir/mysql"); - mkpath("$data_dir/test"); + mkpath("$install_datadir/mysql"); + mkpath("$install_datadir/test"); if ( My::SafeProcess->run ( @@ -4087,14 +4104,26 @@ sub start_servers($) { } } - # Copy datadir from installed system db - for my $path ( "$opt_vardir", "$opt_vardir/..") { - my $install_db= "$path/install.db"; - copytree($install_db, $datadir) - if -d $install_db; + my $mysqld_basedir= $mysqld->value('basedir'); + if ( $basedir eq $mysqld_basedir ) + { + # Copy datadir from installed system db + for my $path ( "$opt_vardir", "$opt_vardir/..") { + my $install_db= "$path/install.db"; + copytree($install_db, $datadir) + if -d $install_db; + } + mtr_error("Failed to copy system db to '$datadir'") + unless -d $datadir; + } + else + { + mysql_install_db($mysqld); + + mtr_error("Failed to install system db to '$datadir'") + unless -d $datadir; + } - mtr_error("Failed to copy system db to '$datadir'") - unless -d $datadir; # Create the servers tmpdir my $tmpdir= $mysqld->value('tmpdir'); From bffebb9cbc61a4a79c108b2f726068e7d804a053 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Sat, 20 Sep 2008 17:00:05 +0300 Subject: [PATCH 305/705] Change typo . -> , --- mysql-test/include/report-features.test | 1 + mysql-test/mysql-test-run.pl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mysql-test/include/report-features.test b/mysql-test/include/report-features.test index df395f6e3f0..1e4ab232490 100644 --- a/mysql-test/include/report-features.test +++ b/mysql-test/include/report-features.test @@ -9,3 +9,4 @@ show engines; show variables; --echo ===== STOP ===== --enable_query_log +exit; \ No newline at end of file diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 1eb767ee47f..b02fbf3aa60 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -256,7 +256,7 @@ sub main { ( name => 'report_features', # No result_file => Prints result - path => 'include/report-features.test'. + path => 'include/report-features.test', template_path => "include/default_my.cnf", master_opt => [], slave_opt => [], From 9e06353040ae8eee2e0118d595e43417c7e41df2 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Sat, 20 Sep 2008 17:10:22 +0300 Subject: [PATCH 306/705] Use --batch when invoking gdb, to make sure it will exit in case of an error in the command files. --- mysql-test/lib/My/CoreDump.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/lib/My/CoreDump.pm b/mysql-test/lib/My/CoreDump.pm index 5f7427768c2..87d9a8e84ce 100644 --- a/mysql-test/lib/My/CoreDump.pm +++ b/mysql-test/lib/My/CoreDump.pm @@ -35,7 +35,7 @@ sub _gdb { "quit\n"; # Find out name of binary that generated core - my $list= `gdb -c $core_name -x $tmp_name -q 2>&1` + my $list= `gdb -c $core_name -x $tmp_name -q --batch 2>&1` or return; my $binary; @@ -49,7 +49,7 @@ sub _gdb { print "Generated by '$binary'\n"; - my $list= `gdb $binary -c $core_name -x $tmp_name -q 2>&1` + my $list= `gdb $binary -c $core_name -x $tmp_name -q --batch 2>&1` or return; print $list, "\n"; From 623a10868bfd985eb59bb287ebe8c3e44adb534b Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 22 Sep 2008 10:02:45 +0300 Subject: [PATCH 307/705] WL#4189 fix small scheduler loop problem causing report that not all tests were run --- mysql-test/mysql-test-run.pl | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index b02fbf3aa60..ab02616678f 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -343,12 +343,12 @@ sub main { if ( @$completed != $num_tests){ - if ($opt_force){ - # All test should have been run, print any that are still in $tests - foreach my $test ( @$tests ){ - $test->print_test(); - } - } + #if ($opt_force){ + # # All test should have been run, print any that are still in $tests + # foreach my $test ( @$tests ){ + # $test->print_test(); + # } + #} # Not all tests completed, failure mtr_report(); @@ -537,15 +537,20 @@ sub run_test_server ($$$) { my $next; my $second_best; - for(my $i= 0; $i <= $#$tests; $i++) + for(my $i= 0; $i <= @$tests; $i++) { my $t= $tests->[$i]; + last unless defined $t; + if (run_testcase_check_skip_test($t)){ # Move the test to completed list #mtr_report("skip - Moving test $i to completed"); push(@$completed, splice(@$tests, $i, 1)); - next; + + # Since the test at pos $i was taken away, next + # test will also be at $i -> redo + redo; } # Limit number of parallell NDB tests @@ -575,7 +580,7 @@ sub run_test_server ($$$) { # Use second best choice if no other test has been found if (!$next and defined $second_best){ #mtr_report("Take second best choice $second_best"); - mtr_error("Internal error, second best too large") + mtr_error("Internal error, second best too large($second_best)") if $second_best > $#$tests; $next= splice(@$tests, $second_best, 1); } From c955eb6b68a6e85240a25d9f82fdc319eed29c2b Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 22 Sep 2008 18:44:35 +0300 Subject: [PATCH 308/705] Print 'cygpath -m' command if it fails --- mysql-test/lib/My/Platform.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/lib/My/Platform.pm b/mysql-test/lib/My/Platform.pm index 630f14d957a..658e7c7eaef 100644 --- a/mysql-test/lib/My/Platform.pm +++ b/mysql-test/lib/My/Platform.pm @@ -69,8 +69,8 @@ sub mixed_path { if (IS_CYGWIN){ return unless defined $path; my $cmd= "cygpath -m $path"; - print "$cmd\n"; - $path= `$cmd`; + $path= `$cmd` or + print "Failed to run: '$cmd', $!\n"; chomp $path; } return $path; From 8764738aefcd54b527155132ebbbb9c8b4d2ee37 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 22 Sep 2008 18:52:19 +0300 Subject: [PATCH 309/705] Print tests that has not been run --- mysql-test/mysql-test-run.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index ab02616678f..8ee2648d16f 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -343,12 +343,12 @@ sub main { if ( @$completed != $num_tests){ - #if ($opt_force){ - # # All test should have been run, print any that are still in $tests - # foreach my $test ( @$tests ){ - # $test->print_test(); - # } - #} + if ($opt_force){ + # All test should have been run, print any that are still in $tests + foreach my $test ( @$tests ){ + $test->print_test(); + } + } # Not all tests completed, failure mtr_report(); From 13e6758df056d458d18db46dd7fe105640dca2a5 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 22 Sep 2008 19:15:55 +0300 Subject: [PATCH 310/705] Memoize functions that converts between different paths, a given input string will always return the same output. This save a lot of calls to cygpath for example --- mysql-test/lib/My/Platform.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mysql-test/lib/My/Platform.pm b/mysql-test/lib/My/Platform.pm index 658e7c7eaef..96e22e54ded 100644 --- a/mysql-test/lib/My/Platform.pm +++ b/mysql-test/lib/My/Platform.pm @@ -64,6 +64,11 @@ BEGIN { # in cygwin perl (that uses unix paths) # +use Memoize; +memoize('mixed_path'); +memoize('native_path'); +memoize('posix_path'); + sub mixed_path { my ($path)= @_; if (IS_CYGWIN){ @@ -76,7 +81,6 @@ sub mixed_path { return $path; } - sub native_path { my ($path)= @_; $path=~ s/\//\\/g @@ -84,7 +88,6 @@ sub native_path { return $path; } - sub posix_path { my ($path)= @_; if (IS_CYGWIN){ From 0d2025e1d4c0b80a13bff64165a06ff71721a7b8 Mon Sep 17 00:00:00 2001 From: He Zhenxing Date: Sun, 28 Sep 2008 15:34:25 +0800 Subject: [PATCH 311/705] BUG#38734 rpl_server_id2 sync_with_master failed Rotate event is automatically generated and written when rotating binary log or relay log. Rotate events for relay logs are usually ignored by slave SQL thread becuase they have the same server id as that of the slave. However, if --replicate-same-server-id is enabled, rotate event for relay log would be treated as if it's a rotate event from master, and would be executed by slave to update the rli->group_master_log_name and rli->group_master_log_pos to a wrong value and cause the MASTER_POS_WAIT function to fail and return NULL. This patch fixed this problem by setting a flag bit (LOG_EVENT_RELAY_LOG_F) in the event to tell the SQL thread to ignore these Rotate events generated for relay logs. This patch also added another binlog event flag bit (LOG_EVENT_ARTIFICIAL_F) to distinquish faked events, the method used before this was by checking if log_pos was zero. --- sql/log.cc | 5 +++-- sql/log.h | 4 ++++ sql/log_event.cc | 34 ++++++++++++++++------------------ sql/log_event.h | 34 +++++++++++++++++++++++++--------- sql/rpl_rli.cc | 1 + sql/sql_repl.cc | 2 +- 6 files changed, 50 insertions(+), 30 deletions(-) diff --git a/sql/log.cc b/sql/log.cc index 49c9bce95f1..f459b4349cb 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -2346,6 +2346,7 @@ const char *MYSQL_LOG::generate_name(const char *log_name, MYSQL_BIN_LOG::MYSQL_BIN_LOG() :bytes_written(0), prepared_xids(0), file_id(1), open_count(1), need_start_event(TRUE), m_table_map_version(0), + is_relay_log(0), description_event_for_exec(0), description_event_for_queue(0) { /* @@ -2543,7 +2544,7 @@ bool MYSQL_BIN_LOG::open(const char *log_name, */ description_event_for_queue->created= 0; /* Don't set log_pos in event header */ - description_event_for_queue->artificial_event=1; + description_event_for_queue->set_artificial_event(); if (description_event_for_queue->write(&log_file)) goto err; @@ -3466,7 +3467,7 @@ void MYSQL_BIN_LOG::new_file_impl(bool need_lock) to change base names at some point. */ Rotate_log_event r(new_name+dirname_length(new_name), - 0, LOG_EVENT_OFFSET, 0); + 0, LOG_EVENT_OFFSET, is_relay_log ? Rotate_log_event::RELAY_LOG : 0); r.write(&log_file); bytes_written += r.data_written; } diff --git a/sql/log.h b/sql/log.h index 20a1b7e8e6d..b1a3274b60e 100644 --- a/sql/log.h +++ b/sql/log.h @@ -274,6 +274,10 @@ class MYSQL_BIN_LOG: public TC_LOG, private MYSQL_LOG public: MYSQL_LOG::generate_name; MYSQL_LOG::is_open; + + /* This is relay log */ + bool is_relay_log; + /* These describe the log's format. This is used only for relay logs. _for_exec is used by the SQL thread, _for_queue by the I/O thread. It's diff --git a/sql/log_event.cc b/sql/log_event.cc index 8527109ca89..b6b1b88e58c 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -810,9 +810,8 @@ bool Log_event::write_header(IO_CACHE* file, ulong event_data_length) if (is_artificial_event()) { /* - We should not do any cleanup on slave when reading this. We - mark this by setting log_pos to 0. Start_log_event_v3() will - detect this on reading and set artificial_event=1 for the event. + Artificial events are automatically generated and do not exist + in master's binary log, so log_pos should be set to 0. */ log_pos= 0; } @@ -2625,7 +2624,7 @@ Query_log_event::do_shall_skip(Relay_log_info *rli) #ifndef MYSQL_CLIENT Start_log_event_v3::Start_log_event_v3() :Log_event(), created(0), binlog_version(BINLOG_VERSION), - artificial_event(0), dont_set_created(0) + dont_set_created(0) { memcpy(server_version, ::server_version, ST_SERVER_VER_LEN); } @@ -2673,7 +2672,7 @@ void Start_log_event_v3::print(FILE* file, PRINT_EVENT_INFO* print_event_info) my_b_printf(&cache, "# Warning: this binlog was not closed properly. " "Most probably mysqld crashed writing it.\n"); } - if (!artificial_event && created) + if (!is_artificial_event() && created) { #ifdef WHEN_WE_HAVE_THE_RESET_CONNECTION_SQL_COMMAND /* @@ -2715,8 +2714,6 @@ Start_log_event_v3::Start_log_event_v3(const char* buf, // prevent overrun if log is corrupted on disk server_version[ST_SERVER_VER_LEN-1]= 0; created= uint4korr(buf+ST_CREATED_OFFSET); - /* We use log_pos to mark if this was an artificial event or not */ - artificial_event= (log_pos == 0); dont_set_created= 1; } @@ -3117,7 +3114,7 @@ int Format_description_log_event::do_apply_event(Relay_log_info const *rli) original place when it comes to us; we'll know this by checking log_pos ("artificial" events have log_pos == 0). */ - if (!artificial_event && created && thd->transaction.all.ha_list) + if (!is_artificial_event() && created && thd->transaction.all.ha_list) { /* This is not an error (XA is safe), just an information */ rli->report(INFORMATION_LEVEL, 0, @@ -4054,6 +4051,8 @@ Rotate_log_event::Rotate_log_event(const char* new_log_ident_arg, #endif if (flags & DUP_NAME) new_log_ident= my_strndup(new_log_ident_arg, ident_len, MYF(MY_WME)); + if (flags & RELAY_LOG) + set_relay_log_event(); DBUG_VOID_RETURN; } #endif @@ -4125,8 +4124,6 @@ int Rotate_log_event::do_update_pos(Relay_log_info *rli) DBUG_PRINT("info", ("new_log_ident: %s", this->new_log_ident)); DBUG_PRINT("info", ("pos: %s", llstr(this->pos, buf))); - pthread_mutex_lock(&rli->data_lock); - rli->event_relay_log_pos= my_b_tell(rli->cur_log); /* If we are in a transaction or in a group: the only normal case is when the I/O thread was copying a big transaction, then it was @@ -4144,23 +4141,24 @@ int Rotate_log_event::do_update_pos(Relay_log_info *rli) relay log, which shall not change the group positions. */ if ((server_id != ::server_id || rli->replicate_same_server_id) && + !is_relay_log_event() && !rli->is_in_group()) { + pthread_mutex_lock(&rli->data_lock); DBUG_PRINT("info", ("old group_master_log_name: '%s' " "old group_master_log_pos: %lu", rli->group_master_log_name, (ulong) rli->group_master_log_pos)); memcpy(rli->group_master_log_name, new_log_ident, ident_len+1); rli->notify_group_master_log_name_update(); - rli->group_master_log_pos= pos; - strmake(rli->group_relay_log_name, rli->event_relay_log_name, - sizeof(rli->group_relay_log_name) - 1); - rli->notify_group_relay_log_name_update(); - rli->group_relay_log_pos= rli->event_relay_log_pos; + rli->inc_group_relay_log_pos(pos, TRUE /* skip_lock */); DBUG_PRINT("info", ("new group_master_log_name: '%s' " "new group_master_log_pos: %lu", rli->group_master_log_name, (ulong) rli->group_master_log_pos)); + pthread_mutex_unlock(&rli->data_lock); + flush_relay_log_info(rli); + /* Reset thd->options and sql_mode etc, because this could be the signal of a master's downgrade from 5.0 to 4.0. @@ -4174,9 +4172,9 @@ int Rotate_log_event::do_update_pos(Relay_log_info *rli) thd->variables.auto_increment_increment= thd->variables.auto_increment_offset= 1; } - pthread_mutex_unlock(&rli->data_lock); - pthread_cond_broadcast(&rli->data_cond); - flush_relay_log_info(rli); + else + rli->inc_event_relay_log_pos(); + DBUG_RETURN(0); } diff --git a/sql/log_event.h b/sql/log_event.h index 041c41dc71b..2ee0bf7e51d 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -449,6 +449,25 @@ struct sql_ex_info */ #define LOG_EVENT_UPDATE_TABLE_MAP_VERSION_F 0x10 +/** + @def LOG_EVENT_ARTIFICIAL_F + + Artificial events are created arbitarily and not written to binary + log + + These events should not update the master log position when slave + SQL thread executes them. +*/ +#define LOG_EVENT_ARTIFICIAL_F 0x20 + +/** + @def LOG_EVENT_RELAY_LOG_F + + Events with this flag set are created by slave IO thread and written + to relay log +*/ +#define LOG_EVENT_RELAY_LOG_F 0x40 + /** @def OPTIONS_WRITTEN_TO_BIN_LOG @@ -966,7 +985,10 @@ public: #endif virtual Log_event_type get_type_code() = 0; virtual bool is_valid() const = 0; - virtual bool is_artificial_event() { return 0; } + void set_artificial_event() { flags |= LOG_EVENT_ARTIFICIAL_F; } + void set_relay_log_event() { flags |= LOG_EVENT_RELAY_LOG_F; } + bool is_artificial_event() const { return flags & LOG_EVENT_ARTIFICIAL_F; } + bool is_relay_log_event() const { return flags & LOG_EVENT_RELAY_LOG_F; } inline bool get_cache_stmt() const { return cache_stmt; } Log_event(const char* buf, const Format_description_log_event *description_event); @@ -2064,12 +2086,6 @@ public: time_t created; uint16 binlog_version; char server_version[ST_SERVER_VER_LEN]; - /* - artifical_event is 1 in the case where this is a generated event that - should not case any cleanup actions. We handle this in the log by - setting log_event == 0 (for now). - */ - bool artificial_event; /* We set this to 1 if we don't want to have the created time in the log, which is the case when we rollover to a new log. @@ -2098,7 +2114,6 @@ public: { return START_V3_HEADER_LEN; //no variable-sized part } - virtual bool is_artificial_event() { return artificial_event; } protected: #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) @@ -2518,7 +2533,8 @@ class Rotate_log_event: public Log_event { public: enum { - DUP_NAME= 2 // if constructor should dup the string argument + DUP_NAME= 2, // if constructor should dup the string argument + RELAY_LOG=4 // rotate event for relay log }; const char* new_log_ident; ulonglong pos; diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index b6dfd1a1dc8..3a0f784d195 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -155,6 +155,7 @@ int init_relay_log_info(Relay_log_info* rli, sql_print_error("Failed in open_log() called from init_relay_log_info()"); DBUG_RETURN(1); } + rli->relay_log.is_relay_log= TRUE; } /* if file does not exist */ diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 932b7a67b4d..7aa54d3208f 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -63,7 +63,7 @@ static int fake_rotate_event(NET* net, String* packet, char* log_file_name, ulong event_len = ident_len + LOG_EVENT_HEADER_LEN + ROTATE_HEADER_LEN; int4store(header + SERVER_ID_OFFSET, server_id); int4store(header + EVENT_LEN_OFFSET, event_len); - int2store(header + FLAGS_OFFSET, 0); + int2store(header + FLAGS_OFFSET, LOG_EVENT_ARTIFICIAL_F); // TODO: check what problems this may cause and fix them int4store(header + LOG_POS_OFFSET, 0); From 4bb00b74addb3085197435d81de900716146bf59 Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Sat, 4 Oct 2008 13:06:15 +0200 Subject: [PATCH 312/705] BUG#39102: valgrind build does not compile in realpath, which make DATA/INDEX DIR fail Disable the test case on valgrind. This is a backport to 5.1-rpl of something that already exists in 5.1 main. --- mysql-test/t/partition_not_windows.test | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql-test/t/partition_not_windows.test b/mysql-test/t/partition_not_windows.test index 333e12e2b16..ca5f1ba441e 100644 --- a/mysql-test/t/partition_not_windows.test +++ b/mysql-test/t/partition_not_windows.test @@ -3,6 +3,8 @@ --source include/have_partition.inc # DATA DIRECTORY/INDEX DIRECTORY require symbolic link support --source include/have_symlink.inc +# realpath is not compiled in when building with valgrind +--source include/not_valgrind.inc # The test for Bug 20770 is disabled on Windows due to BUG#19107; it # should be moved into partition.test once the bug has been resolved. From c84dfbbd6af1bb8b3a428a27552a582d2b568029 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 6 Oct 2008 10:49:12 +0200 Subject: [PATCH 313/705] Improve gdb coredump --- mysql-test/lib/My/CoreDump.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mysql-test/lib/My/CoreDump.pm b/mysql-test/lib/My/CoreDump.pm index 5f7427768c2..513226d1b47 100644 --- a/mysql-test/lib/My/CoreDump.pm +++ b/mysql-test/lib/My/CoreDump.pm @@ -25,6 +25,8 @@ use File::Temp qw/ tempfile tempdir /; sub _gdb { my ($core_name)= @_; + print "\nTrying 'gdb' to get a backtrace\n"; + return unless -f $core_name; my $dir = tempdir( CLEANUP => 1 ); @@ -35,7 +37,7 @@ sub _gdb { "quit\n"; # Find out name of binary that generated core - my $list= `gdb -c $core_name -x $tmp_name -q 2>&1` + my $list= `gdb -c $core_name -x $tmp_name -batch 2>&1` or return; my $binary; @@ -47,9 +49,9 @@ sub _gdb { return unless $binary; - print "Generated by '$binary'\n"; + print " - core generated by '$binary'\n"; - my $list= `gdb $binary -c $core_name -x $tmp_name -q 2>&1` + my $list= `gdb $binary -c $core_name -x $tmp_name -batch 2>&1` or return; print $list, "\n"; From 22a893895c24e2da7c2ebb3e139d5998a63282bd Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 6 Oct 2008 19:34:00 +0200 Subject: [PATCH 314/705] WL#4189 add verbose also when starting check testcase --- mysql-test/mysql-test-run.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 53f916a630a..b2a074f70b2 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4210,6 +4210,7 @@ sub start_check_testcase ($$$) { error => $errfile, args => \$args, user_data => $errfile, + verbose => $opt_verbose, ); mtr_report("Started $proc"); From ab5c044e4d653efdb38f6463e13ba5cf00589f91 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 6 Oct 2008 19:51:33 +0200 Subject: [PATCH 315/705] WL4189 Add Handles.pm and use it from My::File::Path to show open handles. Rewrite rmtree to use File::Find so we can get better debug printouts when something fails --- mysql-test/lib/My/File/Path.pm | 43 ++++++++++++--------- mysql-test/lib/My/Handles.pm | 69 ++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 18 deletions(-) create mode 100755 mysql-test/lib/My/Handles.pm diff --git a/mysql-test/lib/My/File/Path.pm b/mysql-test/lib/My/File/Path.pm index b6056bf470f..4ec7fbac33d 100644 --- a/mysql-test/lib/My/File/Path.pm +++ b/mysql-test/lib/My/File/Path.pm @@ -20,33 +20,40 @@ use Exporter; use base "Exporter"; our @EXPORT= qw / rmtree mkpath copytree /; - use File::Find; -use File::Path; use File::Copy; use Carp; - -no warnings 'redefine'; +use My::Handles; sub rmtree { my ($dir)= @_; - - # - # chmod all files to 0777 before calling rmtree - # find( { - no_chdir => 1, + bydepth => 1, + no_chdir => 1, wanted => sub { - chmod(0777, $_) - or warn("couldn't chmod(0777, $_): $!"); + my $name= $_; + if (!-l $name && -d _){ + return if (rmdir($name) == 1); + + chmod(0777, $name) or carp("couldn't chmod(0777, $name): $!"); + + return if (rmdir($name) == 1); + + # Failed to remove the directory, analyze + carp("Couldn't remove directory '$name': $!"); + My::Handles::show_handles($name); + } else { + return if (unlink($name) == 1); + + chmod(0777, $name) or carp("couldn't chmod(0777, $name): $!"); + + return if (unlink($name) == 1); + + carp("Couldn't delete file '$name': $!"); + My::Handles::show_handles($name); + } } - }, - $dir - ); - - - # Call rmtree from File::Path - goto &File::Path::rmtree; + }, $dir ); }; diff --git a/mysql-test/lib/My/Handles.pm b/mysql-test/lib/My/Handles.pm new file mode 100755 index 00000000000..66ee22b403f --- /dev/null +++ b/mysql-test/lib/My/Handles.pm @@ -0,0 +1,69 @@ +# -*- cperl -*- +# Copyright (C) 2008 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +package My::Handles; + + +use strict; +use Carp; + +use My::Platform; + +my $handle_exe; + + +if (IS_WINDOWS){ + # Check if handle.exe is available + # Pass switch to accept the EULA to avoid hanging + # if the program hasn't been run before. + my $list= `handle.exe -? -accepteula 2>&1`; + foreach my $line (split('\n', $list)) + { + $handle_exe= "$1.$2" + if ($line =~ /Handle v([0-9]*)\.([0-9]*)/); + } + if ($handle_exe){ + print "Found handle.exe version $handle_exe\n"; + } +} + + +sub show_handles +{ + my ($dir)= @_; + return unless $handle_exe; + return unless $dir; + + $dir= native_path($dir); + + # Get a list of open handles in a particular directory + my $list= `handle.exe "$dir" 2>&1` or return; + + foreach my $line (split('\n', $list)) + { + return if ($line =~ /No matching handles found/); + } + + print "\n"; + print "=" x 50, "\n"; + print "Open handles in '$dir':\n"; + print "$list\n"; + print "=" x 50, "\n\n"; + + return; +} + +1; From 870699c9f7462d3b02461cbe5cfbe66dc5d1aff6 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 6 Oct 2008 19:52:26 +0200 Subject: [PATCH 316/705] WL#4189 Only kill process that hasn't yet finished at end of mtr.pl. Improve debug printout --- mysql-test/lib/My/SafeProcess.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index 83749514622..f990d889a02 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -66,7 +66,9 @@ END { for my $proc (values %running){ if ( $proc->is_child($$) ){ #print "Killing: $proc\n"; - $proc->kill(); + if ($proc->wait_one(0)){ + $proc->kill(); + } } } } @@ -315,7 +317,7 @@ sub start_kill { $ret= system($safe_kill, $pid) >> 8; if (IS_CYGWIN and $ret == 3) { - print "safe_process is gone, kickstart the fake process\n"; + print "safe_process is gone, kickstart the fake process, $self\n"; if (kill(15, $self->{SAFE_PID}) != 1){ print STDERR "Failed to kickstart the fake process\n"; } From c8574b77d71af84f3cfc18a1828c2245210ead54 Mon Sep 17 00:00:00 2001 From: Mats Kindahl Date: Tue, 7 Oct 2008 10:25:12 +0200 Subject: [PATCH 317/705] Post-merge fixes. --- mysql-test/extra/rpl_tests/rpl_log.test | 8 ++------ mysql-test/suite/rpl/r/rpl_row_log.result | 2 +- mysql-test/suite/rpl/r/rpl_row_log_innodb.result | 2 +- mysql-test/suite/rpl/r/rpl_stm_log.result | 2 +- mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test | 3 ++- mysql-test/suite/rpl/t/rpl_misc_functions.test | 2 +- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/mysql-test/extra/rpl_tests/rpl_log.test b/mysql-test/extra/rpl_tests/rpl_log.test index a7e5de6b7c1..cff6951fdcd 100644 --- a/mysql-test/extra/rpl_tests/rpl_log.test +++ b/mysql-test/extra/rpl_tests/rpl_log.test @@ -70,11 +70,7 @@ eval create table t3 (a int)ENGINE=$engine_type; connection master; select * from t1 order by 1 asc; -save_master_pos; -connection slave; -source include/start_slave.inc; - -sync_with_master; +sync_slave_with_master; #check t1 on slave to ensure whether it's identical with on master select * from t1 order by 1 asc; flush logs; @@ -142,4 +138,4 @@ drop table t1; # End of 4.1 tests sync_slave_with_master; - +drop table t1; diff --git a/mysql-test/suite/rpl/r/rpl_row_log.result b/mysql-test/suite/rpl/r/rpl_row_log.result index d08444ce586..6c3811daa47 100644 --- a/mysql-test/suite/rpl/r/rpl_row_log.result +++ b/mysql-test/suite/rpl/r/rpl_row_log.result @@ -113,7 +113,6 @@ Aberdeen Abernathy aberrant aberration -include/start_slave.inc select * from t1 order by 1 asc; word Aarhus @@ -306,3 +305,4 @@ a b 5 1 6 1 drop table t1; +drop table t1; diff --git a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result index 412f24602a8..7c2ffdba473 100644 --- a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result +++ b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result @@ -113,7 +113,6 @@ Aberdeen Abernathy aberrant aberration -include/start_slave.inc select * from t1 order by 1 asc; word Aarhus @@ -306,3 +305,4 @@ a b 5 1 6 1 drop table t1; +drop table t1; diff --git a/mysql-test/suite/rpl/r/rpl_stm_log.result b/mysql-test/suite/rpl/r/rpl_stm_log.result index 7c0f5547470..d8528ff1c44 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_log.result +++ b/mysql-test/suite/rpl/r/rpl_stm_log.result @@ -109,7 +109,6 @@ Aberdeen Abernathy aberrant aberration -include/start_slave.inc select * from t1 order by 1 asc; word Aarhus @@ -287,3 +286,4 @@ a b 5 1 6 1 drop table t1; +drop table t1; diff --git a/mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test b/mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test index d8e25b244fa..d56a32ce2bd 100644 --- a/mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test +++ b/mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test @@ -16,8 +16,9 @@ reset master; create table t1 (a int); insert into t1 values (1); +let $MYSQLD_DATADIR= `select @@datadir`; flush logs; ---exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/bug36099.sql +--exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/bug36099.sql drop table t1; --exec $MYSQL -e "source $MYSQLTEST_VARDIR/tmp/bug36099.sql" diff --git a/mysql-test/suite/rpl/t/rpl_misc_functions.test b/mysql-test/suite/rpl/t/rpl_misc_functions.test index 873c54b679b..d2e61d579e3 100644 --- a/mysql-test/suite/rpl/t/rpl_misc_functions.test +++ b/mysql-test/suite/rpl/t/rpl_misc_functions.test @@ -23,7 +23,7 @@ insert into t1 values(4, connection_id(), rand()*1000, rand()*1000, password('do select * into outfile 'rpl_misc_functions.outfile' from t1; let $MYSQLD_DATADIR= `select @@datadir`; sync_slave_with_master; -create table t2 like t1; +create temporary table t2 like t1; # read the values from the master table --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR eval load data local infile '$MYSQLD_DATADIR/test/rpl_misc_functions.outfile' into table t2; From 7a6cac5fc059c51f2498cc50a33868b467310ef7 Mon Sep 17 00:00:00 2001 From: Mats Kindahl Date: Tue, 7 Oct 2008 14:22:28 +0200 Subject: [PATCH 318/705] Fixing some missing table drops. --- mysql-test/suite/rpl/r/rpl_misc_functions.result | 2 +- mysql-test/suite/rpl/t/rpl_ps.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/rpl/r/rpl_misc_functions.result b/mysql-test/suite/rpl/r/rpl_misc_functions.result index 8025387b43e..28b777822e4 100644 --- a/mysql-test/suite/rpl/r/rpl_misc_functions.result +++ b/mysql-test/suite/rpl/r/rpl_misc_functions.result @@ -14,7 +14,7 @@ set sql_log_bin=1; insert into t1 values(3, 0, 0, 0, password('does_this_work?')); insert into t1 values(4, connection_id(), rand()*1000, rand()*1000, password('does_this_still_work?')); select * into outfile 'rpl_misc_functions.outfile' from t1; -create table t2 like t1; +create temporary table t2 like t1; load data local infile 'MYSQLD_DATADIR/test/rpl_misc_functions.outfile' into table t2; select * from t1, t2 where (t1.id=t2.id) and not(t1.i=t2.i and t1.r1=t2.r1 and t1.r2=t2.r2 and t1.p=t2.p); id i r1 r2 p id i r1 r2 p diff --git a/mysql-test/suite/rpl/t/rpl_ps.test b/mysql-test/suite/rpl/t/rpl_ps.test index 27f1ac3348d..b00dec6b80c 100644 --- a/mysql-test/suite/rpl/t/rpl_ps.test +++ b/mysql-test/suite/rpl/t/rpl_ps.test @@ -123,7 +123,7 @@ DROP DATABASE mysqltest1; --echo use test; - +DROP TABLE t1; --echo --save_master_pos From 5b8771ea3a6030549a7232aaf6ef6884552f7f52 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Wed, 8 Oct 2008 20:25:28 +0200 Subject: [PATCH 319/705] WL4189 Active state perl fixes --- mysql-test/lib/My/Platform.pm | 8 +++++--- mysql-test/lib/My/SafeProcess.pm | 8 ++++++++ mysql-test/lib/My/SysInfo.pm | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/mysql-test/lib/My/Platform.pm b/mysql-test/lib/My/Platform.pm index 96e22e54ded..25233753ccd 100644 --- a/mysql-test/lib/My/Platform.pm +++ b/mysql-test/lib/My/Platform.pm @@ -65,9 +65,11 @@ BEGIN { # use Memoize; -memoize('mixed_path'); -memoize('native_path'); -memoize('posix_path'); +if (!IS_WIN32PERL){ + memoize('mixed_path'); + memoize('native_path'); + memoize('posix_path'); +} sub mixed_path { my ($path)= @_; diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index 83749514622..5ff51146071 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -212,6 +212,14 @@ sub timer { }; $0= "safe_timer($duration)"; + + if (IS_WIN32PERL){ + # Just a thread in same process + sleep($duration); + print STDERR "timer $$: expired after $duration seconds\n"; + exit(0); + } + my $count_down= $duration; while($count_down--){ diff --git a/mysql-test/lib/My/SysInfo.pm b/mysql-test/lib/My/SysInfo.pm index 88a6d3dc4b9..8cb399c73ba 100644 --- a/mysql-test/lib/My/SysInfo.pm +++ b/mysql-test/lib/My/SysInfo.pm @@ -76,7 +76,7 @@ sub _kstat { my ($self)= @_; while (1){ my $instance_num= $self->{cpus} ? @{$self->{cpus}} : 0; - my $list= `kstat -p -m cpu_info -i $instance_num`; + my $list= `kstat -p -m cpu_info -i $instance_num 2> /dev/null`; my @lines= split('\n', $list) or last; # Break loop my $cpuinfo= {}; From c2858e8b5bf5d98353b91fe3f9f0949177ea5c1b Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Wed, 8 Oct 2008 22:02:32 +0200 Subject: [PATCH 320/705] WL#4189 NO need to retry OpenEvent if the process does not exist anymore --- mysql-test/lib/My/SafeProcess/safe_kill_win.cc | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/mysql-test/lib/My/SafeProcess/safe_kill_win.cc b/mysql-test/lib/My/SafeProcess/safe_kill_win.cc index 9955a9f72f2..c6256fd92e1 100755 --- a/mysql-test/lib/My/SafeProcess/safe_kill_win.cc +++ b/mysql-test/lib/My/SafeProcess/safe_kill_win.cc @@ -49,12 +49,25 @@ int main(int argc, const char** argv ) while ((shutdown_event= OpenEvent(EVENT_MODIFY_STATE, FALSE, safe_process_name)) == NULL) { + /* + Check if the process is alive, otherwise there is really + no idea to retry the open of the event + */ + HANDLE process; + if ((process= OpenProcess(SYNCHRONIZE, FALSE, pid)) == NULL) + { + fprintf(stderr, "Could not open event or process %d, error: %d\n", + pid, GetLastError()); + exit(3); + } + CloseHandle(process); + if (retry_open_event--) Sleep(100); else { fprintf(stderr, "Failed to open shutdown_event '%s', error: %d\n", - safe_process_name, GetLastError()); + safe_process_name, GetLastError()); exit(3); } } From 956c109c0f223e57d36aed4ae929f990f7c9dcdb Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Wed, 8 Oct 2008 22:06:10 +0200 Subject: [PATCH 321/705] BUG#38559 Annoying cygwin problem fixed by resolving pid->winpid before kill instead of just after fork --- mysql-test/lib/My/SafeProcess.pm | 42 ++++++++++++++++++--------- mysql-test/lib/My/SafeProcess/Base.pm | 28 ++---------------- 2 files changed, 30 insertions(+), 40 deletions(-) diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index f990d889a02..655960222e7 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -148,7 +148,7 @@ sub new { print "### safe_path: ", $safe_path, " ", join(" ", @safe_args), "\n" if $verbose > 1; - my ($pid, $winpid)= create_process( + my $pid= create_process( path => $safe_path, input => $input, output => $output, @@ -161,7 +161,7 @@ sub new { my $proc= bless ({ SAFE_PID => $pid, - SAFE_WINPID => $winpid, + SAFE_WINPID => $pid, # Inidicates this is always a real process SAFE_NAME => $name, SAFE_SHUTDOWN => $shutdown, PARENT => $$, @@ -296,6 +296,18 @@ sub shutdown { } +sub _winpid ($) { + my ($pid)= @_; + + # In win32 perl, the pid is already the winpid + return $pid unless IS_CYGWIN; + + # In cygwin, the pid is the pseudo process -> + # get the real winpid of my_safe_process + return Cygwin::pid_to_winpid($pid); +} + + # # Tell the process to die as fast as possible # @@ -305,22 +317,24 @@ sub start_kill { _verbose("start_kill: $self"); my $ret= 1; - my $pid; + my $pid= $self->{SAFE_PID}; + die "INTERNAL ERROR: no pid" unless defined $pid; + if (IS_WINDOWS and defined $self->{SAFE_WINPID}) { die "INTERNAL ERROR: no safe_kill" unless defined $safe_kill; - die "INTERNAL ERROR: no winpid" unless defined $self->{SAFE_WINPID}; - # Use my_safe_kill to tell my_safe_process - # it's time to kill it's child and return - $pid= $self->{SAFE_WINPID}; - $ret= system($safe_kill, $pid) >> 8; - if (IS_CYGWIN and $ret == 3) - { - print "safe_process is gone, kickstart the fake process, $self\n"; - if (kill(15, $self->{SAFE_PID}) != 1){ - print STDERR "Failed to kickstart the fake process\n"; - } + my $winpid= _winpid($pid); + $ret= system($safe_kill, $winpid) >> 8; + + if ($ret == 3){ + print "Couldn't open the winpid: $winpid ", + "for pid: $pid, try one more time\n"; + sleep(1); + $winpid= _winpid($pid); + $ret= system($safe_kill, $winpid) >> 8; + print "Couldn't open the winpid: $winpid ", + "for pid: $pid, continue and see what happens...\n"; } } else diff --git a/mysql-test/lib/My/SafeProcess/Base.pm b/mysql-test/lib/My/SafeProcess/Base.pm index 2f3cf9d037a..3fc1b1be017 100644 --- a/mysql-test/lib/My/SafeProcess/Base.pm +++ b/mysql-test/lib/My/SafeProcess/Base.pm @@ -33,30 +33,6 @@ use base qw(Exporter); our @EXPORT= qw(create_process); -sub winpid { - my ($pid)= @_; - - return undef unless $^O eq "cygwin"; - - # The child get a new winpid when the exec takes - # place, wait for that to happen - my $winpid; - my $delay= 0; - do - { - # Yield to the child - select(undef, undef, undef, $delay); - # Increase the delay slightly for each loop - $delay += 0.000001; - - $winpid= Cygwin::pid_to_winpid($pid); - - } until ($winpid != $pid); - - return $winpid; -} - - # # safe_fork @@ -179,7 +155,7 @@ sub create_process { or croak("unable to reestablish STDIN"); #printf STDERR "stdin %d, stdout %d, stderr %d\n", # fileno STDIN, fileno STDOUT, fileno STDERR; - return wantarray ? ($pid, $pid) : $pid; + return $pid; } @@ -190,7 +166,7 @@ sub create_process { # Parent $pipe->reader(); my $line= <$pipe>; # Wait for child to say it's ready - return wantarray ? ($pid, winpid($pid)) : $pid; + return $pid; } $SIG{INT}= 'DEFAULT'; From 846c8e03f86a76926ef224574ac8fc15488ddd4e Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Wed, 8 Oct 2008 22:29:15 +0200 Subject: [PATCH 322/705] WL#4189 Add smoke target --- Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile.am b/Makefile.am index d7745d96e6c..a623c79c177 100644 --- a/Makefile.am +++ b/Makefile.am @@ -119,6 +119,10 @@ test-reprepare: test: test-unit test-ns test-pr +smoke: + cd mysql-test ; \ + @PERL@ ./mysql-test-run.pl --do-test=s + test-full: test test-nr test-ps test-force: From cc08b5cd85a50c7d8b42766e20fca6da09d44308 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Wed, 8 Oct 2008 22:43:37 +0200 Subject: [PATCH 323/705] Merge --- mysql-test/lib/My/Platform.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/lib/My/Platform.pm b/mysql-test/lib/My/Platform.pm index f87a6f87eec..0ea135756b8 100644 --- a/mysql-test/lib/My/Platform.pm +++ b/mysql-test/lib/My/Platform.pm @@ -18,7 +18,7 @@ package My::Platform; use strict; use File::Basename; -use File::Path; # Patched version of File::Path +use File::Path; use base qw(Exporter); our @EXPORT= qw(IS_CYGWIN IS_WINDOWS IS_WIN32PERL From 9ee8d5e2f73f681f0b1569d92d79cce6e187758d Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Thu, 9 Oct 2008 00:03:56 +0200 Subject: [PATCH 324/705] WL#4189 Add Handles.pm to Makefile.am --- mysql-test/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 0f9a9d2c1ab..616ae633eb7 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -37,6 +37,7 @@ nobase_test_DATA = lib/mtr_cases.pm \ lib/My/ConfigFactory.pm \ lib/My/Config.pm \ lib/My/Find.pm \ + lib/My/Handles.pm \ lib/My/Options.pm \ lib/My/Test.pm \ lib/My/Platform.pm \ From 260c3491a90297b40d4aae3934884a88a0e71c30 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 10 Oct 2008 09:19:19 +0200 Subject: [PATCH 325/705] WL#41890 After review fixes, remove unecessary if's --- mysql-test/lib/My/SafeProcess.pm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index a4348699d9c..cb68b323d5e 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -501,13 +501,6 @@ sub wait_any { last if $pid == $ret_pid; } } while ($ret_pid == 0); - - # Special processig of return code - # since negative pids are valid - if ($ret_pid == 0 or $ret_pid == -1) { - print STDERR "wait_any, got invalid pid: $ret_pid\n"; - return undef; - } } else { @@ -522,7 +515,7 @@ sub wait_any { # Look it up in "running" table my $proc= $running{$ret_pid}; unless (defined $proc){ - print STDERR "Could not find pid in running list\n"; + print STDERR "Could not find pid: $ret_pid in running list\n"; print STDERR "running: ". join(", ", keys(%running)). "\n"; return undef; } From ac24a792905c2b3d20f7f137ce94f8c013162981 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 10 Oct 2008 16:19:04 +0200 Subject: [PATCH 326/705] BUG#39008 Additional fix after review, remove files that could potentially be set to path outside datadir --- mysql-test/mysql-test-run.pl | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index e9793e37a5a..64bb21479ce 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4099,9 +4099,26 @@ sub start_servers($) { } my $datadir= $mysqld->value('datadir'); - if (!$opt_start_dirty) + if ($opt_start_dirty) { # Don't delete anything if starting dirty + ; + } + else + { + + my @options= ('log-bin', 'relay-log'); + foreach my $option_name ( @options ) { + next unless $mysqld->option($option_name); + + my $file_name= $mysqld->value($option_name); + next unless + defined $file_name and + -e $file_name; + + mtr_debug(" -removing '$file_name'"); + unlink($file_name) or die ("unable to remove file '$file_name'"); + } if (-d $datadir ) { mtr_verbose(" - removing '$datadir'"); From f0ed343ba4336f65e333d31dd001d82719bca9a3 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Sat, 11 Oct 2008 17:06:34 +0200 Subject: [PATCH 327/705] WL#4189 Add retry logic to mkpath to avoid temporary permission denied problems --- mysql-test/lib/My/File/Path.pm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/mysql-test/lib/My/File/Path.pm b/mysql-test/lib/My/File/Path.pm index 4ec7fbac33d..eeb7546b0b8 100644 --- a/mysql-test/lib/My/File/Path.pm +++ b/mysql-test/lib/My/File/Path.pm @@ -22,8 +22,10 @@ our @EXPORT= qw / rmtree mkpath copytree /; use File::Find; use File::Copy; +use File::Spec; use Carp; use My::Handles; +use My::Platform; sub rmtree { my ($dir)= @_; @@ -58,7 +60,34 @@ sub rmtree { sub mkpath { - goto &File::Path::mkpath; + my $path; + foreach my $dir ( File::Spec->splitdir( @_ ) ) { + #print "dir: $dir\n"; + if ($dir =~ /^[a-z]:/i){ + # Found volume ie. C: + $path= $dir; + next; + } + + $path= File::Spec->catdir($path, $dir); + #print "path: $path\n"; + + next if -d $path; # Path already exist + next if mkdir($path); # mkdir worked + + # mkdir failed, try one more time + next if mkdir($path); + + # mkdir failed again, try two more time after sleep(s) + sleep(1); + next if mkdir($path); + sleep(1); + next if mkdir($path); + + # Report failure and die + croak("Couldn't create directory '$path' ", + " after 4 attempts and 2 sleep(1): $!"); + } }; From b7967587e6602af08b441ed454d12bef85a2d8bb Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Sat, 11 Oct 2008 17:30:26 +0200 Subject: [PATCH 328/705] WL#4189 Set parallel to 1 if running under vmware on windows --- mysql-test/lib/My/SysInfo.pm | 15 +++++++++++++++ mysql-test/mysql-test-run.pl | 1 + 2 files changed, 16 insertions(+) diff --git a/mysql-test/lib/My/SysInfo.pm b/mysql-test/lib/My/SysInfo.pm index 8cb399c73ba..f1ba5fb610f 100644 --- a/mysql-test/lib/My/SysInfo.pm +++ b/mysql-test/lib/My/SysInfo.pm @@ -126,6 +126,15 @@ sub new { \&_unamex, ); + # Detect virtual machines + my $isvm= 0; + + if (IS_WINDOWS) { + # Detect vmware service + $isvm= `tasklist` =~ /vmwareservice/i; + } + $self->{isvm}= $isvm; + foreach my $method (@info_methods){ if ($method->($self)){ return $self; @@ -174,6 +183,12 @@ sub min_bogomips { return $bogomips; } +sub isvm { + my ($self)= @_; + + return $self->{isvm}; +} + # Prit the cpuinfo sub print_info { diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 64bb21479ce..20fdc6704da 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -279,6 +279,7 @@ sub main { } $opt_parallel= 8 if ($opt_parallel > 8); $opt_parallel= $num_tests if ($opt_parallel > $num_tests); + $opt_parallel= 1 if (IS_WINDOWS and $sys_info->isvm()); $opt_parallel= 1 if ($opt_parallel < 1); mtr_report("Using parallel: $opt_parallel"); } From 2d7c2274c2b9aefcf22af44830ea5e6b4184ad2f Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Sat, 11 Oct 2008 17:35:10 +0200 Subject: [PATCH 329/705] Add missing DROP TABLE t1 to reslt file --- mysql-test/suite/rpl/r/rpl_ps.result | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/suite/rpl/r/rpl_ps.result b/mysql-test/suite/rpl/r/rpl_ps.result index faba43ae934..89e822b3eb6 100644 --- a/mysql-test/suite/rpl/r/rpl_ps.result +++ b/mysql-test/suite/rpl/r/rpl_ps.result @@ -68,6 +68,7 @@ test latin1_swedish_ci DROP DATABASE mysqltest1; use test; +DROP TABLE t1; # Connection: slave From 746734d974bd84ec431e2746a9bbfe368f00405e Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Mon, 13 Oct 2008 18:14:30 +0200 Subject: [PATCH 330/705] BUG#38817: please make mtr analyze crashes better Post-push fixes making it work on pushbuild's valgrind host, and clarifying the output. --- mysql-test/lib/My/CoreDump.pm | 38 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/mysql-test/lib/My/CoreDump.pm b/mysql-test/lib/My/CoreDump.pm index 513226d1b47..ab00d15feb3 100644 --- a/mysql-test/lib/My/CoreDump.pm +++ b/mysql-test/lib/My/CoreDump.pm @@ -29,33 +29,33 @@ sub _gdb { return unless -f $core_name; - my $dir = tempdir( CLEANUP => 1 ); - my ($tmp, $tmp_name) = tempfile( DIR => $dir ); + # Find out name of binary that generated core + `gdb -c '$core_name' --batch 2>&1` =~ + /Core was generated by `([^\s\'\`]+)/; + my $binary= $1 or return; + print "Core generated by '$binary'\n"; + # Create tempfile containing gdb commands + my ($tmp, $tmp_name) = tempfile(); print $tmp + "bt\n", "thread apply all bt\n", "quit\n"; + close $tmp or die "Error closing $tmp_name: $!"; - # Find out name of binary that generated core - my $list= `gdb -c $core_name -x $tmp_name -batch 2>&1` - or return; + # Run gdb + my $gdb_output= + `gdb '$binary' -c '$core_name' -x '$tmp_name' --batch 2>&1`; - my $binary; - foreach my $line (split('\n', $list)) - { - $binary= $1 - if ($line =~ /Core was generated by `(\S+)/); - } + unlink $tmp_name or die "Error removing $tmp_name: $!"; - return unless $binary; - - print " - core generated by '$binary'\n"; - - my $list= `gdb $binary -c $core_name -x $tmp_name -batch 2>&1` - or return; - - print $list, "\n"; + return unless $gdb_output; + print < Date: Mon, 13 Oct 2008 20:33:08 +0200 Subject: [PATCH 331/705] BUG#39853: lowercase_table3 fails on powermacg5 in rpl tree Problem: during a refactoring of mtr, a pattern for suppressing a warning from lowercase_table3 was lost. Fix: re-introduce the suppression. Problem 2: suppression was misspelt as supression. Fixed by adding a p. --- mysql-test/include/mtr_warnings.sql | 48 +++++++++---------- mysql-test/r/mysql_upgrade.result | 16 +++---- mysql-test/r/mysqlcheck.result | 4 +- mysql-test/suite/rpl/r/rpl_bug33931.result | 2 +- mysql-test/suite/rpl/r/rpl_idempotency.result | 4 +- mysql-test/suite/rpl/r/rpl_temporary.result | 2 +- .../suite/rpl/r/rpl_temporary_errors.result | 2 +- mysql-test/suite/rpl/t/rpl_bug33931.test | 4 +- mysql-test/suite/rpl/t/rpl_idempotency.test | 6 +-- mysql-test/suite/rpl/t/rpl_temporary.test | 4 +- .../suite/rpl/t/rpl_temporary_errors.test | 2 +- mysql-test/t/lowercase_table3.test | 2 + 12 files changed, 49 insertions(+), 47 deletions(-) diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index cf259703a4f..b1eb094c4ee 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -42,9 +42,9 @@ INSERT INTO suspicious_patterns VALUES -- -- Create table where testcases can insert patterns to --- be supressed +-- be suppressed -- -CREATE TABLE test_supressions ( +CREATE TABLE test_suppressions ( pattern VARCHAR(255) ) ENGINE=MyISAM|| @@ -52,11 +52,11 @@ CREATE TABLE test_supressions ( -- -- Declare a trigger that makes sure -- no invalid patterns can be inserted --- into test_supressions +-- into test_suppressions -- /*!50002 CREATE DEFINER=root@localhost TRIGGER ts_insert -BEFORE INSERT ON test_supressions +BEFORE INSERT ON test_suppressions FOR EACH ROW BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; @@ -65,20 +65,20 @@ END -- --- Load table with patterns that will be supressed globally(always) +-- Load table with patterns that will be suppressed globally(always) -- -CREATE TABLE global_supressions ( +CREATE TABLE global_suppressions ( pattern VARCHAR(255) ) ENGINE=MyISAM|| -- Declare a trigger that makes sure -- no invalid patterns can be inserted --- into global_supressions +-- into global_suppressions -- /*!50002 CREATE DEFINER=root@localhost TRIGGER gs_insert -BEFORE INSERT ON global_supressions +BEFORE INSERT ON global_suppressions FOR EACH ROW BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; @@ -88,9 +88,9 @@ END -- --- Insert patterns that should always be supressed +-- Insert patterns that should always be suppressed -- -INSERT INTO global_supressions VALUES +INSERT INTO global_suppressions VALUES ("'SELECT UNIX_TIMESTAMP\\(\\)' failed on master"), ("Aborted connection"), ("Client requested master to start replication from impossible position"), @@ -256,28 +256,28 @@ BEGIN DELETE FROM error_log WHERE row < @max_row; CREATE TEMPORARY TABLE suspect_lines ENGINE=MyISAM AS - SELECT DISTINCT el.line, 0 as "supressed" + SELECT DISTINCT el.line, 0 as "suppressed" FROM error_log el, suspicious_patterns ep WHERE el.line REGEXP ep.pattern; - -- Mark lines that are supressed by global supressions - UPDATE suspect_lines sl, global_supressions gs - SET supressed=1 + -- Mark lines that are suppressed by global suppressions + UPDATE suspect_lines sl, global_suppressions gs + SET suppressed=1 WHERE sl.line REGEXP gs.pattern; - -- Mark lines that are supressed by test specific supressions - UPDATE suspect_lines sl, test_supressions ts - SET supressed=2 + -- Mark lines that are suppressed by test specific suppressions + UPDATE suspect_lines sl, test_suppressions ts + SET suppressed=2 WHERE sl.line REGEXP ts.pattern; SELECT COUNT(*) INTO @num_warnings FROM suspect_lines - WHERE supressed=0; + WHERE suppressed=0; IF @num_warnings > 0 THEN SELECT @log_error; SELECT line as log_error - FROM suspect_lines WHERE supressed=0; - --SELECT * FROM test_supressions; + FROM suspect_lines WHERE suppressed=0; + --SELECT * FROM test_suppressions; -- Return 2 -> check failed SELECT 2 INTO result; ELSE @@ -286,19 +286,19 @@ BEGIN END IF; -- Cleanup for next test - TRUNCATE test_supressions; + TRUNCATE test_suppressions; END|| -- -- Declare a procedure testcases can use to insert test --- specific supressions +-- specific suppressions -- /*!50001 CREATE DEFINER=root@localhost -PROCEDURE add_supression(pattern VARCHAR(255)) +PROCEDURE add_suppression(pattern VARCHAR(255)) BEGIN - INSERT INTO test_supressions (pattern) VALUES (pattern); + INSERT INTO test_suppressions (pattern) VALUES (pattern); END */|| diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result index 8f4c311a7a7..be14e282f2a 100644 --- a/mysql-test/r/mysql_upgrade.result +++ b/mysql-test/r/mysql_upgrade.result @@ -1,7 +1,7 @@ Run mysql_upgrade once -mtr.global_supressions OK +mtr.global_suppressions OK mtr.suspicious_patterns OK -mtr.test_supressions OK +mtr.test_suppressions OK mysql.columns_priv OK mysql.db OK mysql.event OK @@ -32,9 +32,9 @@ mysql.user OK Run it again - should say already completed This installation of MySQL is already upgraded to VERSION, use --force if you still need to run mysql_upgrade Force should run it regardless of wether it's been run before -mtr.global_supressions OK +mtr.global_suppressions OK mtr.suspicious_patterns OK -mtr.test_supressions OK +mtr.test_suppressions OK mysql.columns_priv OK mysql.db OK mysql.event OK @@ -65,9 +65,9 @@ mysql.user OK CREATE USER mysqltest1@'%' IDENTIFIED by 'sakila'; GRANT ALL ON *.* TO mysqltest1@'%'; Run mysql_upgrade with password protected account -mtr.global_supressions OK +mtr.global_suppressions OK mtr.suspicious_patterns OK -mtr.test_supressions OK +mtr.test_suppressions OK mysql.columns_priv OK mysql.db OK mysql.event OK @@ -100,9 +100,9 @@ Run mysql_upgrade with a non existing server socket mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errno) when trying to connect FATAL ERROR: Upgrade failed set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE'; -mtr.global_supressions OK +mtr.global_suppressions OK mtr.suspicious_patterns OK -mtr.test_supressions OK +mtr.test_suppressions OK mysql.columns_priv OK mysql.db OK mysql.event OK diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result index 8a819496eeb..138d36ad606 100644 --- a/mysql-test/r/mysqlcheck.result +++ b/mysql-test/r/mysqlcheck.result @@ -1,9 +1,9 @@ DROP TABLE IF EXISTS t1, `t``1`, `t 1`; drop view if exists v1; drop database if exists client_test_db; -mtr.global_supressions OK +mtr.global_suppressions OK mtr.suspicious_patterns OK -mtr.test_supressions OK +mtr.test_suppressions OK mysql.columns_priv OK mysql.db OK mysql.event OK diff --git a/mysql-test/suite/rpl/r/rpl_bug33931.result b/mysql-test/suite/rpl/r/rpl_bug33931.result index f20cc03df89..1b3f2cfc7dc 100644 --- a/mysql-test/suite/rpl/r/rpl_bug33931.result +++ b/mysql-test/suite/rpl/r/rpl_bug33931.result @@ -1,5 +1,5 @@ reset master; -call mtr.add_supression("Failed during slave.*thread initialization"); +call mtr.add_suppression("Failed during slave.*thread initialization"); stop slave; reset slave; SET GLOBAL debug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init"; diff --git a/mysql-test/suite/rpl/r/rpl_idempotency.result b/mysql-test/suite/rpl/r/rpl_idempotency.result index f02ff899ad5..0930904626b 100644 --- a/mysql-test/suite/rpl/r/rpl_idempotency.result +++ b/mysql-test/suite/rpl/r/rpl_idempotency.result @@ -4,8 +4,8 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -call mtr.add_supression("Slave: Can\'t find record in \'t1\' Error_code: 1032"); -call mtr.add_supression("Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452"); +call mtr.add_suppression("Slave: Can\'t find record in \'t1\' Error_code: 1032"); +call mtr.add_suppression("Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452"); CREATE TABLE t1 (a INT PRIMARY KEY); CREATE TABLE t2 (a INT); INSERT INTO t1 VALUES (-1),(-2),(-3); diff --git a/mysql-test/suite/rpl/r/rpl_temporary.result b/mysql-test/suite/rpl/r/rpl_temporary.result index 23fc199ba11..dc3826c83b9 100644 --- a/mysql-test/suite/rpl/r/rpl_temporary.result +++ b/mysql-test/suite/rpl/r/rpl_temporary.result @@ -4,7 +4,7 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -call mtr.add_supression("Slave: Can\'t find record in \'user\' Error_code: 1032"); +call mtr.add_suppression("Slave: Can\'t find record in \'user\' Error_code: 1032"); reset master; SET @save_select_limit=@@session.sql_select_limit; SET @@session.sql_select_limit=10, @@session.pseudo_thread_id=100; diff --git a/mysql-test/suite/rpl/r/rpl_temporary_errors.result b/mysql-test/suite/rpl/r/rpl_temporary_errors.result index 75fbf187fd3..d14380a6369 100644 --- a/mysql-test/suite/rpl/r/rpl_temporary_errors.result +++ b/mysql-test/suite/rpl/r/rpl_temporary_errors.result @@ -4,7 +4,7 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -call mtr.add_supression("Deadlock found"); +call mtr.add_suppression("Deadlock found"); **** On Master **** SET SESSION BINLOG_FORMAT=ROW; CREATE TABLE t1 (a INT PRIMARY KEY, b INT); diff --git a/mysql-test/suite/rpl/t/rpl_bug33931.test b/mysql-test/suite/rpl/t/rpl_bug33931.test index ae51793bba8..a439b346538 100644 --- a/mysql-test/suite/rpl/t/rpl_bug33931.test +++ b/mysql-test/suite/rpl/t/rpl_bug33931.test @@ -14,8 +14,8 @@ reset master; connection slave; -# Add supression for expected warnings in slaves error log -call mtr.add_supression("Failed during slave.*thread initialization"); +# Add suppression for expected warnings in slaves error log +call mtr.add_suppression("Failed during slave.*thread initialization"); --disable_warnings stop slave; diff --git a/mysql-test/suite/rpl/t/rpl_idempotency.test b/mysql-test/suite/rpl/t/rpl_idempotency.test index 989066dad2e..8c571fa1a5b 100644 --- a/mysql-test/suite/rpl/t/rpl_idempotency.test +++ b/mysql-test/suite/rpl/t/rpl_idempotency.test @@ -7,9 +7,9 @@ source include/have_innodb.inc; connection slave; source include/have_innodb.inc; -# Add supression for expected warning(s) in slaves error log -call mtr.add_supression("Slave: Can\'t find record in \'t1\' Error_code: 1032"); -call mtr.add_supression("Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452"); +# Add suppression for expected warning(s) in slaves error log +call mtr.add_suppression("Slave: Can\'t find record in \'t1\' Error_code: 1032"); +call mtr.add_suppression("Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452"); connection master; CREATE TABLE t1 (a INT PRIMARY KEY); diff --git a/mysql-test/suite/rpl/t/rpl_temporary.test b/mysql-test/suite/rpl/t/rpl_temporary.test index 713f8a25c35..83ec14c9308 100644 --- a/mysql-test/suite/rpl/t/rpl_temporary.test +++ b/mysql-test/suite/rpl/t/rpl_temporary.test @@ -17,8 +17,8 @@ source include/add_anonymous_users.inc; save_master_pos; connection slave; -# Add supression for expected warning(s) in slaves error log -call mtr.add_supression("Slave: Can\'t find record in \'user\' Error_code: 1032"); +# Add suppression for expected warning(s) in slaves error log +call mtr.add_suppression("Slave: Can\'t find record in \'user\' Error_code: 1032"); sync_with_master; reset master; diff --git a/mysql-test/suite/rpl/t/rpl_temporary_errors.test b/mysql-test/suite/rpl/t/rpl_temporary_errors.test index d557566acf9..3b373e00a62 100644 --- a/mysql-test/suite/rpl/t/rpl_temporary_errors.test +++ b/mysql-test/suite/rpl/t/rpl_temporary_errors.test @@ -1,6 +1,6 @@ source include/master-slave.inc; -call mtr.add_supression("Deadlock found"); +call mtr.add_suppression("Deadlock found"); --echo **** On Master **** connection master; diff --git a/mysql-test/t/lowercase_table3.test b/mysql-test/t/lowercase_table3.test index d3c9ec5145e..e71d9029606 100644 --- a/mysql-test/t/lowercase_table3.test +++ b/mysql-test/t/lowercase_table3.test @@ -9,6 +9,8 @@ --source include/have_case_insensitive_file_system.inc --source include/not_windows.inc +call mtr.add_suppression("Cannot find or open table test/BUG29839 from"); + --disable_warnings DROP TABLE IF EXISTS t1,T1; --enable_warnings From f1a1e89f5a16f7b48cbd2b47e9de5d881448fcb4 Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Fri, 17 Oct 2008 13:55:16 +0300 Subject: [PATCH 332/705] Bug #38637: COUNT DISTINCT prevents NULL testing in HAVING clause IS NULL was not checking the correct row in a HAVING context. At the first row of a new group (where the HAVING clause is evaluated) the column and SELECT list references in the HAVING clause should refer to the last row of the previous group and not to the current one. This was not done for IS NULL, because it was using Item::is_null() doesn't have a Item_is_null_result() counterpart to access the data from the last row of the previous group. Note that all the Item::val_xxx() functions (e.g. Item::val_int()) have their _result counterparts (e.g. Item::val_int_result()). Fixed by implementing a is_null_result() (similarly to int_result()) and calling this instead of is_null() column and SELECT list references inside the HAVING clause. --- mysql-test/r/having.result | 7 +++++++ mysql-test/t/having.test | 11 +++++++++++ sql/item.cc | 19 ++++++++++++++++++- sql/item.h | 3 +++ sql/item_func.cc | 9 +++++++++ sql/item_func.h | 1 + 6 files changed, 49 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/having.result b/mysql-test/r/having.result index f113304c767..bc8596100f8 100644 --- a/mysql-test/r/having.result +++ b/mysql-test/r/having.result @@ -424,3 +424,10 @@ select f1 from t1 group by f1 having max(f1)=f1; f1 set session sql_mode=''; drop table t1; +CREATE TABLE t1 ( a INT, b INT); +INSERT INTO t1 VALUES (1, 1), (2,2), (3, NULL); +SELECT b, COUNT(DISTINCT a) FROM t1 GROUP BY b HAVING b is NULL; +b COUNT(DISTINCT a) +NULL 1 +DROP TABLE t1; +End of 5.0 tests diff --git a/mysql-test/t/having.test b/mysql-test/t/having.test index 827b83f11a0..adabbb711d4 100644 --- a/mysql-test/t/having.test +++ b/mysql-test/t/having.test @@ -432,3 +432,14 @@ select f1 from t1 having max(f1)=f1; select f1 from t1 group by f1 having max(f1)=f1; set session sql_mode=''; drop table t1; + + +# +# Bug #38637: COUNT DISTINCT prevents NULL testing in HAVING clause +# +CREATE TABLE t1 ( a INT, b INT); +INSERT INTO t1 VALUES (1, 1), (2,2), (3, NULL); +SELECT b, COUNT(DISTINCT a) FROM t1 GROUP BY b HAVING b is NULL; +DROP TABLE t1; + +--echo End of 5.0 tests diff --git a/sql/item.cc b/sql/item.cc index 182f4abdfe6..e71268724b4 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -2041,6 +2041,12 @@ bool Item_field::val_bool_result() } +bool Item_field::is_null_result() +{ + return (null_value=result_field->is_null()); +} + + bool Item_field::eq(const Item *item, bool binary_cmp) const { Item *real_item= ((Item *) item)->real_item(); @@ -5626,6 +5632,15 @@ double Item_ref::val_result() } +bool Item_ref::is_null_result() +{ + if (result_field) + return (null_value=result_field->is_null()); + + return is_null(); +} + + longlong Item_ref::val_int_result() { if (result_field) @@ -5731,7 +5746,9 @@ String *Item_ref::val_str(String* tmp) bool Item_ref::is_null() { DBUG_ASSERT(fixed); - return (*ref)->is_null(); + bool tmp=(*ref)->is_null_result(); + null_value=(*ref)->null_value; + return tmp; } diff --git a/sql/item.h b/sql/item.h index 250bb3f67ef..1058cc5dbb8 100644 --- a/sql/item.h +++ b/sql/item.h @@ -652,6 +652,7 @@ public: virtual my_decimal *val_decimal_result(my_decimal *val) { return val_decimal(val); } virtual bool val_bool_result() { return val_bool(); } + virtual bool is_null_result() { return is_null(); } /* bit map of tables used by item */ virtual table_map used_tables() const { return (table_map) 0L; } @@ -1301,6 +1302,7 @@ public: String *str_result(String* tmp); my_decimal *val_decimal_result(my_decimal *); bool val_bool_result(); + bool is_null_result(); bool send(Protocol *protocol, String *str_arg); void reset_field(Field *f); bool fix_fields(THD *, Item **); @@ -1942,6 +1944,7 @@ public: String *str_result(String* tmp); my_decimal *val_decimal_result(my_decimal *); bool val_bool_result(); + bool is_null_result(); bool send(Protocol *prot, String *tmp); void make_field(Send_field *field); bool fix_fields(THD *, Item **); diff --git a/sql/item_func.cc b/sql/item_func.cc index e663e1fcf83..382fea6dfe2 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4283,6 +4283,15 @@ my_decimal *Item_func_set_user_var::val_decimal_result(my_decimal *val) } +bool Item_func_set_user_var::is_null_result() +{ + DBUG_ASSERT(fixed == 1); + check(TRUE); + update(); // Store expression + return is_null(); +} + + void Item_func_set_user_var::print(String *str) { str->append(STRING_WITH_LEN("(@")); diff --git a/sql/item_func.h b/sql/item_func.h index 6dcf32cba07..8c7becb681b 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1299,6 +1299,7 @@ public: longlong val_int_result(); String *str_result(String *str); my_decimal *val_decimal_result(my_decimal *); + bool is_null_result(); bool update_hash(void *ptr, uint length, enum Item_result type, CHARSET_INFO *cs, Derivation dv, bool unsigned_arg); bool send(Protocol *protocol, String *str_arg); From d88716c2cf990ae8e6b2de75612219b22259b3cf Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Sat, 18 Oct 2008 20:36:34 +0200 Subject: [PATCH 333/705] BUG#39851: race between check_testcase and tests running 'show processlist' Problem 1: not_embedded_server runs SELECT FROM I_S.PROCESSLIST near the beginning. check_testcase executes a query to the server before that. There is a race here, because there is no guarantee that the thread executing check_testcase's query is finished. Problem 2: The SELECT FROM I_S.PROCESSLIST doens't seem very useful in the test. It's at least misplaced. Fix to both problems: Comment out SELECT FROM I_S.PROCESSLIST. --- mysql-test/r/not_embedded_server.result | 5 ---- mysql-test/t/not_embedded_server.test | 40 ++++++++++++++++--------- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/mysql-test/r/not_embedded_server.result b/mysql-test/r/not_embedded_server.result index 89f48a1ea56..4373d6356d9 100644 --- a/mysql-test/r/not_embedded_server.result +++ b/mysql-test/r/not_embedded_server.result @@ -1,7 +1,2 @@ -prepare stmt1 from ' SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!=\'Daemon\' '; -execute stmt1; -ID USER HOST DB COMMAND TIME STATE INFO -number root localhost test Query time executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!='Daemon' -deallocate prepare stmt1; FLUSH STATUS; Value of com_select did not change diff --git a/mysql-test/t/not_embedded_server.test b/mysql-test/t/not_embedded_server.test index fe6b8825a87..562194a62a4 100644 --- a/mysql-test/t/not_embedded_server.test +++ b/mysql-test/t/not_embedded_server.test @@ -4,21 +4,33 @@ -- source include/not_embedded.inc -# -# Show full process list with prepare -# To not show other connections, this must be the first test and we must -# have a server restart before this one -# -# We don't have any 4.1 tests as we use I_S to query the PROCESSLIST to -# exclude system threads that may/may not be active in the server -# (namely the ndb injector thread) -# -# End of 4.1 tests -prepare stmt1 from ' SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!=\'Daemon\' '; ---replace_column 1 number 6 time 3 localhost -execute stmt1; -deallocate prepare stmt1; +# The following fails sporadically because 'check-testcase' runs +# queries before this test and there is no way to guarantee that any +# previous process finishes. The purpose of the test is not clearly +# stated, there is no reference to any bug report, and "select from +# I_S from prepared statement" doesn't look like something that's +# really imporant to test. I'm commenting out this for now. If +# anyone wants to keep this, please fix the race and motivate why we +# need to test this. If you see this comment and it is after mid-2009 +# or so, feel free to remove this test from the file. /Sven +# +# +## Show full process list with prepare +## To not show other connections, this must be the first test and we must +## have a server restart before this one +## +## We don't have any 4.1 tests as we use I_S to query the PROCESSLIST to +## exclude system threads that may/may not be active in the server +## (namely the ndb injector thread) +## +## End of 4.1 tests +# +#prepare stmt1 from ' SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!=\'Daemon\' '; +#--replace_column 1 number 6 time 3 localhost +#execute stmt1; +#deallocate prepare stmt1; + # From 39987388a0cb001a0435ef71d1b1a3554563345a Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Thu, 23 Oct 2008 16:23:13 +0200 Subject: [PATCH 334/705] BUG#35701: please allow test language variables in connection and sync_slave_with_master Problem: In the mysqltest language, it was not possible to set the current connection from a variable, and it was not possible to read the current connection. Fix: Allow setting the connection from a variable, like: connection $variable; and introduce the mysqltest language variable $CURRENT_CONNECTION, which holds the name of the current connection. --- client/mysqltest.cc | 102 +++++++++++++++++----------------- mysql-test/r/mysqltest.result | 5 ++ mysql-test/t/mysqltest.test | 24 ++++++++ 3 files changed, 80 insertions(+), 51 deletions(-) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index c86b213c238..f944b7b6fed 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -2035,17 +2035,6 @@ void var_set_errno(int sql_errno) } -/* - Update $mysql_get_server_version variable with version - of the currently connected server -*/ - -void var_set_mysql_get_server_version(MYSQL* mysql) -{ - var_set_int("$mysql_get_server_version", mysql_get_server_version(mysql)); -} - - /* Set variable from the result of a query @@ -4461,36 +4450,51 @@ void set_reconnect(MYSQL* mysql, int val) } -int select_connection_name(const char *name) +/** + Change the current connection to the given st_connection, and update + $mysql_get_server_version and $CURRENT_CONNECTION accordingly. +*/ +void set_current_connection(struct st_connection *con) { - DBUG_ENTER("select_connection_name"); - DBUG_PRINT("enter",("name: '%s'", name)); - - if (!(cur_con= find_connection_by_name(name))) - die("connection '%s' not found in connection pool", name); - + cur_con= con; /* Update $mysql_get_server_version to that of current connection */ - var_set_mysql_get_server_version(&cur_con->mysql); - - DBUG_RETURN(0); + var_set_int("$mysql_get_server_version", + mysql_get_server_version(&con->mysql)); + /* Update $CURRENT_CONNECTION to the name of the current connection */ + var_set_string("$CURRENT_CONNECTION", con->name); } -int select_connection(struct st_command *command) +void select_connection_name(const char *name) { - char *name; - char *p= command->first_argument; - DBUG_ENTER("select_connection"); + DBUG_ENTER("select_connection_name"); + DBUG_PRINT("enter",("name: '%s'", name)); + st_connection *con= find_connection_by_name(name); - if (!*p) - die("Missing connection name in connect"); - name= p; - while (*p && !my_isspace(charset_info,*p)) - p++; - if (*p) - *p++= 0; - command->last_argument= p; - DBUG_RETURN(select_connection_name(name)); + if (!con) + die("connection '%s' not found in connection pool", name); + + set_current_connection(con); + + DBUG_VOID_RETURN; +} + + +void select_connection(struct st_command *command) +{ + DBUG_ENTER("select_connection"); + static DYNAMIC_STRING ds_connection; + const struct command_arg connection_args[] = { + { "connection_name", ARG_STRING, TRUE, &ds_connection, "Name of the connection that we switch to." } + }; + check_command_args(command, command->first_argument, connection_args, + sizeof(connection_args)/sizeof(struct command_arg), + ','); + + DBUG_PRINT("info", ("changing connection: %s", ds_connection.str)); + select_connection_name(ds_connection.str); + dynstr_free(&ds_connection); + DBUG_VOID_RETURN; } @@ -4898,15 +4902,12 @@ void do_connect(struct st_command *command) if (!(con_slot->name= my_strdup(ds_connection_name.str, MYF(MY_WME)))) die("Out of memory"); con_slot->name_len= strlen(con_slot->name); - cur_con= con_slot; - + set_current_connection(con_slot); + if (con_slot == next_con) next_con++; /* if we used the next_con slot, advance the pointer */ } - /* Update $mysql_get_server_version to that of current connection */ - var_set_mysql_get_server_version(&cur_con->mysql); - dynstr_free(&ds_connection_name); dynstr_free(&ds_host); dynstr_free(&ds_user); @@ -7478,37 +7479,37 @@ int main(int argc, char **argv) if (cursor_protocol_enabled) ps_protocol_enabled= 1; - cur_con= connections; - if (!( mysql_init(&cur_con->mysql))) + st_connection *con= connections; + if (!( mysql_init(&con->mysql))) die("Failed in mysql_init()"); if (opt_compress) - mysql_options(&cur_con->mysql,MYSQL_OPT_COMPRESS,NullS); - mysql_options(&cur_con->mysql, MYSQL_OPT_LOCAL_INFILE, 0); - mysql_options(&cur_con->mysql, MYSQL_SET_CHARSET_NAME, + mysql_options(&con->mysql,MYSQL_OPT_COMPRESS,NullS); + mysql_options(&con->mysql, MYSQL_OPT_LOCAL_INFILE, 0); + mysql_options(&con->mysql, MYSQL_SET_CHARSET_NAME, charset_info->csname); if (opt_charsets_dir) - mysql_options(&cur_con->mysql, MYSQL_SET_CHARSET_DIR, + mysql_options(&con->mysql, MYSQL_SET_CHARSET_DIR, opt_charsets_dir); #ifdef HAVE_OPENSSL if (opt_use_ssl) { - mysql_ssl_set(&cur_con->mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca, + mysql_ssl_set(&con->mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca, opt_ssl_capath, opt_ssl_cipher); #if MYSQL_VERSION_ID >= 50000 /* Turn on ssl_verify_server_cert only if host is "localhost" */ opt_ssl_verify_server_cert= opt_host && !strcmp(opt_host, "localhost"); - mysql_options(&cur_con->mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, + mysql_options(&con->mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &opt_ssl_verify_server_cert); #endif } #endif - if (!(cur_con->name = my_strdup("default", MYF(MY_WME)))) + if (!(con->name = my_strdup("default", MYF(MY_WME)))) die("Out of memory"); - safe_connect(&cur_con->mysql, cur_con->name, opt_host, opt_user, opt_pass, + safe_connect(&con->mysql, con->name, opt_host, opt_user, opt_pass, opt_db, opt_port, unix_sock); /* Use all time until exit if no explicit 'start_timer' */ @@ -7521,8 +7522,7 @@ int main(int argc, char **argv) */ var_set_errno(-1); - /* Update $mysql_get_server_version to that of current connection */ - var_set_mysql_get_server_version(&cur_con->mysql); + set_current_connection(con); if (opt_include) { diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 8fb53360cc8..567dd33f0fc 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -740,4 +740,9 @@ select 1; 1 -- a comment for the server; mysqltest: At line 1: Found line beginning with -- that didn't contain a valid mysqltest command, check your syntax or use # if you intended to write a comment +con1 +default +con1 +default +con1 End of tests diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index ccc40072220..ba3f2f5da5e 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -2183,5 +2183,29 @@ select 1; --exec echo "--select 1;" | $MYSQL_TEST 2>&1 +# ---------------------------------------------------------------------------- +# BUG#35701: please allow test language variables in connection and sync_slave_with_master +# Test that "connection $variable" works and that $CURRENT_CONNECTION has the right value. +# ---------------------------------------------------------------------------- + +connect (con1,localhost,root,,); +--echo $CURRENT_CONNECTION + +connection default; +--echo $CURRENT_CONNECTION + +connection con1; +--echo $CURRENT_CONNECTION + +let $x= default; +let $y= con1; + +connection $x; +--echo $CURRENT_CONNECTION + +connection $y; +--echo $CURRENT_CONNECTION + + --echo End of tests From de87fd3a94240642366635467a6445925b4f74fa Mon Sep 17 00:00:00 2001 From: Jonathan Perkin Date: Thu, 23 Oct 2008 19:04:52 +0200 Subject: [PATCH 335/705] Raise version number for 5.0.66sp1 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index a1dc9d36d82..8c177892f18 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! # remember to also change ndb version below and update version.c in ndb -AM_INIT_AUTOMAKE(mysql, 5.0.66a) +AM_INIT_AUTOMAKE(mysql, 5.0.66sp1) AM_CONFIG_HEADER([include/config.h:config.h.in]) PROTOCOL_VERSION=10 From 6e6d0c8216a1f82003eb34950cc596cdb372e419 Mon Sep 17 00:00:00 2001 From: Jonathan Perkin Date: Thu, 23 Oct 2008 19:36:48 +0200 Subject: [PATCH 336/705] Merge fix for bug#38296 into 5.0.66sp1 --- mysys/my_alloc.c | 2 +- sql/field.h | 3 +- sql/item.h | 4 +- sql/sp_head.cc | 2 +- sql/sql_lex.h | 4 +- sql/sql_list.h | 4 +- sql/sql_string.h | 2 +- sql/sql_yacc.yy | 1775 ++++++++++++++++++++++++++++++++++++--------- sql/thr_malloc.cc | 31 +- 9 files changed, 1483 insertions(+), 344 deletions(-) diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c index 5983a29a3e1..99b5aec7eea 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -202,7 +202,7 @@ gptr alloc_root(MEM_ROOT *mem_root,unsigned int Size) { if (mem_root->error_handler) (*mem_root->error_handler)(); - return((gptr) 0); /* purecov: inspected */ + DBUG_RETURN((gptr) 0); /* purecov: inspected */ } mem_root->block_num++; next->next= *prev; diff --git a/sql/field.h b/sql/field.h index 8d771a151a7..241ad61f339 100644 --- a/sql/field.h +++ b/sql/field.h @@ -48,7 +48,8 @@ class Field Field(const Item &); /* Prevent use of these */ void operator=(Field &); public: - static void *operator new(size_t size) {return (void*) sql_alloc((uint) size); } + static void *operator new(size_t size) throw () + { return (void*) sql_alloc((uint) size); } static void operator delete(void *ptr_arg, size_t size) { TRASH(ptr_arg, size); } char *ptr; // Position to field in record diff --git a/sql/item.h b/sql/item.h index a948c5a45f7..126730bb892 100644 --- a/sql/item.h +++ b/sql/item.h @@ -439,9 +439,9 @@ class Item { Item(const Item &); /* Prevent use of these */ void operator=(Item &); public: - static void *operator new(size_t size) + static void *operator new(size_t size) throw () { return (void*) sql_alloc((uint) size); } - static void *operator new(size_t size, MEM_ROOT *mem_root) + static void *operator new(size_t size, MEM_ROOT *mem_root) throw () { return (void*) alloc_root(mem_root, (uint) size); } static void operator delete(void *ptr,size_t size) { TRASH(ptr, size); } static void operator delete(void *ptr, MEM_ROOT *mem_root) {} diff --git a/sql/sp_head.cc b/sql/sp_head.cc index aea81e301ef..7cc551a76c0 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -446,7 +446,7 @@ sp_head::operator new(size_t size) throw() init_sql_alloc(&own_root, MEM_ROOT_BLOCK_SIZE, MEM_ROOT_PREALLOC); sp= (sp_head *) alloc_root(&own_root, size); if (sp == NULL) - return NULL; + DBUG_RETURN(NULL); sp->main_mem_root= own_root; DBUG_PRINT("info", ("mem_root 0x%lx", (ulong) &sp->mem_root)); DBUG_RETURN(sp); diff --git a/sql/sql_lex.h b/sql/sql_lex.h index cde4c3a97b3..79cc0b6b3f2 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -331,11 +331,11 @@ public: bool no_table_names_allowed; /* used for global order by */ bool no_error; /* suppress error message (convert it to warnings) */ - static void *operator new(size_t size) + static void *operator new(size_t size) throw () { return (void*) sql_alloc((uint) size); } - static void *operator new(size_t size, MEM_ROOT *mem_root) + static void *operator new(size_t size, MEM_ROOT *mem_root) throw () { return (void*) alloc_root(mem_root, (uint) size); } static void operator delete(void *ptr,size_t size) { TRASH(ptr, size); } static void operator delete(void *ptr, MEM_ROOT *mem_root) {} diff --git a/sql/sql_list.h b/sql/sql_list.h index 7913acfd086..1ad2051f065 100644 --- a/sql/sql_list.h +++ b/sql/sql_list.h @@ -27,7 +27,7 @@ public: { return (void*) sql_alloc((uint) size); } - static void *operator new[](size_t size) + static void *operator new[](size_t size) throw () { return (void*) sql_alloc((uint) size); } @@ -466,7 +466,7 @@ public: struct ilink { struct ilink **prev,*next; - static void *operator new(size_t size) + static void *operator new(size_t size) throw () { return (void*)my_malloc((uint)size, MYF(MY_WME | MY_FAE)); } diff --git a/sql/sql_string.h b/sql/sql_string.h index c1d27cb1791..4432451464e 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -78,7 +78,7 @@ public: Alloced_length=str.Alloced_length; alloced=0; str_charset=str.str_charset; } - static void *operator new(size_t size, MEM_ROOT *mem_root) + static void *operator new(size_t size, MEM_ROOT *mem_root) throw () { return (void*) alloc_root(mem_root, (uint) size); } static void operator delete(void *ptr_arg,size_t size) { TRASH(ptr_arg, size); } diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 090585392a0..c89676d0bde 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1539,6 +1539,8 @@ create: { LEX *lex=Lex; Key *key= new Key($2, $4.str, $5, 0, lex->col_list); + if (key == NULL) + MYSQL_YYABORT; lex->alter_info.key_list.push_back(key); lex->col_list.empty(); @@ -1598,6 +1600,8 @@ sp_name: MYSQL_YYABORT; } $$= new sp_name($1, $3, true); + if ($$ == NULL) + MYSQL_YYABORT; $$->init_qname(YYTHD); } | ident @@ -1613,8 +1617,9 @@ sp_name: if (lex->copy_db_to(&db.str, &db.length)) MYSQL_YYABORT; $$= new sp_name(db, $1, false); - if ($$) - $$->init_qname(YYTHD); + if ($$ == NULL) + MYSQL_YYABORT; + $$->init_qname(YYTHD); } ; @@ -1865,6 +1870,8 @@ sp_decl: if (!dflt_value_item) { dflt_value_item= new Item_null(); + if (dflt_value_item == NULL) + MYSQL_YYABORT; /* QQ Set to the var_type with null_value? */ } @@ -1890,10 +1897,17 @@ sp_decl: /* The last instruction is responsible for freeing LEX. */ - lex->sphead->add_instr( - new sp_instr_set(lex->sphead->instructions(), pctx, var_idx, - dflt_value_item, var_type, lex, - (i == num_vars - 1))); + sp_instr_set *is= new sp_instr_set(lex->sphead->instructions(), + pctx, + var_idx, + dflt_value_item, + var_type, + lex, + (i == num_vars - 1)); + if (is == NULL) + MYSQL_YYABORT; + + lex->sphead->add_instr(is); } pctx->declare_var_boundary(0); @@ -1927,6 +1941,8 @@ sp_decl: sp_instr_hpush_jump *i= new sp_instr_hpush_jump(sp->instructions(), ctx, $2, ctx->current_var_count()); + if (i == NULL) + MYSQL_YYABORT; sp->add_instr(i); sp->push_backpatch(i, ctx->push_label((char *)"", 0)); @@ -1979,7 +1995,7 @@ sp_decl: } i= new sp_instr_cpush(sp->instructions(), ctx, $5, ctx->current_cursor_count()); - if ( i==NULL ) + if (i == NULL) MYSQL_YYABORT; sp->add_instr(i); ctx->push_cursor(&$2); @@ -2060,6 +2076,8 @@ sp_cond: ulong_num { /* mysql errno */ $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); + if ($$ == NULL) + YYABORT; $$->type= sp_cond_type_t::number; $$->mysqlerr= $1; } @@ -2071,6 +2089,8 @@ sp_cond: MYSQL_YYABORT; } $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); + if ($$ == NULL) + YYABORT; $$->type= sp_cond_type_t::state; memcpy($$->sqlstate, $3.str, 5); $$->sqlstate[5]= '\0'; @@ -2099,16 +2119,22 @@ sp_hcond: | SQLWARNING_SYM /* SQLSTATEs 01??? */ { $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); + if ($$ == NULL) + YYABORT; $$->type= sp_cond_type_t::warning; } | not FOUND_SYM /* SQLSTATEs 02??? */ { $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); + if ($$ == NULL) + YYABORT; $$->type= sp_cond_type_t::notfound; } | SQLEXCEPTION_SYM /* All other SQLSTATEs */ { $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); + if ($$ == NULL) + YYABORT; $$->type= sp_cond_type_t::exception; } ; @@ -3084,6 +3110,8 @@ key_def: { LEX *lex=Lex; Key *key= new Key($1, $2, $7 ? $7 : $3, 0, lex->col_list); + if (key == NULL) + MYSQL_YYABORT; lex->alter_info.key_list.push_back(key); lex->col_list.empty(); /* Alloced by sql_alloc */ @@ -3093,6 +3121,8 @@ key_def: LEX *lex=Lex; const char *key_name= $3 ? $3:$1; Key *key= new Key($2, key_name, $4, 0, lex->col_list); + if (key == NULL) + MYSQL_YYABORT; lex->alter_info.key_list.push_back(key); lex->col_list.empty(); /* Alloced by sql_alloc */ } @@ -3106,10 +3136,14 @@ key_def: lex->fk_delete_opt, lex->fk_update_opt, lex->fk_match_option); + if (key == NULL) + MYSQL_YYABORT; lex->alter_info.key_list.push_back(key); key= new Key(Key::MULTIPLE, key_name, HA_KEY_ALG_UNDEF, 1, lex->col_list); + if (key == NULL) + MYSQL_YYABORT; lex->alter_info.key_list.push_back(key); lex->col_list.empty(); /* Alloced by sql_alloc */ } @@ -3399,7 +3433,12 @@ attribute: ; now_or_signed_literal: - NOW_SYM optional_braces { $$= new Item_func_now_local(); } + NOW_SYM optional_braces + { + $$= new Item_func_now_local(); + if ($$ == NULL) + MYSQL_YYABORT; + } | signed_literal { $$=$1; } ; @@ -3525,8 +3564,21 @@ opt_ref_list: | '(' ref_list ')' opt_on_delete {}; ref_list: - ref_list ',' ident { Lex->ref_list.push_back(new key_part_spec($3.str)); } - | ident { Lex->ref_list.push_back(new key_part_spec($1.str)); }; + ref_list ',' ident + { + key_part_spec *key= new key_part_spec($3.str); + if (key == NULL) + MYSQL_YYABORT; + Lex->ref_list.push_back(key); + } + | ident + { + key_part_spec *key= new key_part_spec($1.str); + if (key == NULL) + MYSQL_YYABORT; + Lex->ref_list.push_back(key); + } + ; opt_on_delete: @@ -3617,16 +3669,24 @@ key_list: | key_part order_dir { Lex->col_list.push_back($1); }; key_part: - ident { $$=new key_part_spec($1.str); } - | ident '(' NUM ')' - { - int key_part_len= atoi($3.str); - if (!key_part_len) + ident { - my_error(ER_KEY_PART_0, MYF(0), $1.str); + $$= new key_part_spec($1.str); + if ($$ == NULL) + MYSQL_YYABORT; } - $$=new key_part_spec($1.str,(uint) key_part_len); - }; + | ident '(' NUM ')' + { + int key_part_len= atoi($3.str); + if (!key_part_len) + { + my_error(ER_KEY_PART_0, MYF(0), $1.str); + } + $$=new key_part_spec($1.str,(uint) key_part_len); + if ($$ == NULL) + MYSQL_YYABORT; + } + ; opt_ident: /* empty */ { $$=(char*) 0; } /* Defaultlength */ @@ -3796,8 +3856,10 @@ alter_list_item: | DROP opt_column field_ident opt_restrict { LEX *lex=Lex; - lex->alter_info.drop_list.push_back(new Alter_drop(Alter_drop::COLUMN, - $3.str)); + Alter_drop *ad= new Alter_drop(Alter_drop::COLUMN, $3.str); + if (ad == NULL) + MYSQL_YYABORT; + lex->alter_info.drop_list.push_back(ad); lex->alter_info.flags|= ALTER_DROP_COLUMN; } | DROP FOREIGN KEY_SYM opt_ident @@ -3807,15 +3869,19 @@ alter_list_item: | DROP PRIMARY_SYM KEY_SYM { LEX *lex=Lex; - lex->alter_info.drop_list.push_back(new Alter_drop(Alter_drop::KEY, - primary_key_name)); + Alter_drop *ad= new Alter_drop(Alter_drop::KEY, primary_key_name); + if (ad == NULL) + MYSQL_YYABORT; + lex->alter_info.drop_list.push_back(ad); lex->alter_info.flags|= ALTER_DROP_INDEX; } | DROP key_or_index field_ident { LEX *lex=Lex; - lex->alter_info.drop_list.push_back(new Alter_drop(Alter_drop::KEY, - $3.str)); + Alter_drop *ad= new Alter_drop(Alter_drop::KEY, $3.str); + if (ad == NULL) + MYSQL_YYABORT; + lex->alter_info.drop_list.push_back(ad); lex->alter_info.flags|= ALTER_DROP_INDEX; } | DISABLE_SYM KEYS @@ -3833,14 +3899,19 @@ alter_list_item: | ALTER opt_column field_ident SET DEFAULT signed_literal { LEX *lex=Lex; - lex->alter_info.alter_list.push_back(new Alter_column($3.str,$6)); + Alter_column *ac= new Alter_column($3.str, $6); + if (ac == NULL) + MYSQL_YYABORT; + lex->alter_info.alter_list.push_back(ac); lex->alter_info.flags|= ALTER_CHANGE_COLUMN_DEFAULT; } | ALTER opt_column field_ident DROP DEFAULT { LEX *lex=Lex; - lex->alter_info.alter_list.push_back(new Alter_column($3.str, - (Item*) 0)); + Alter_column *ac= new Alter_column($3.str, (Item*) 0); + if (ac == NULL) + MYSQL_YYABORT; + lex->alter_info.alter_list.push_back(ac); lex->alter_info.flags|= ALTER_CHANGE_COLUMN_DEFAULT; } | RENAME opt_to table_ident @@ -4466,10 +4537,11 @@ select_item_list: | '*' { THD *thd= YYTHD; - if (add_item_to_list(thd, - new Item_field(&thd->lex->current_select-> - context, - NULL, NULL, "*"))) + Item *item= new Item_field(&thd->lex->current_select->context, + NULL, NULL, "*"); + if (item == NULL) + MYSQL_YYABORT; + if (add_item_to_list(thd, item)) MYSQL_YYABORT; (thd->lex->current_select->with_wild)++; }; @@ -4580,12 +4652,16 @@ expr: { /* X OR Y */ $$ = new (YYTHD->mem_root) Item_cond_or($1, $3); + if ($$ == NULL) + MYSQL_YYABORT; } } | expr XOR expr %prec XOR { /* XOR is a proprietary extension */ $$ = new (YYTHD->mem_root) Item_cond_xor($1, $3); + if ($$ == NULL) + MYSQL_YYABORT; } | expr and expr %prec AND_SYM { @@ -4626,62 +4702,124 @@ expr: { /* X AND Y */ $$ = new (YYTHD->mem_root) Item_cond_and($1, $3); + if ($$ == NULL) + MYSQL_YYABORT; } } | NOT_SYM expr %prec NOT_SYM - { $$= negate_expression(YYTHD, $2); } + { + $$= negate_expression(YYTHD, $2); + if ($$ == NULL) + MYSQL_YYABORT; + } | bool_pri IS TRUE_SYM %prec IS - { $$= new (YYTHD->mem_root) Item_func_istrue($1); } + { + $$= new (YYTHD->mem_root) Item_func_istrue($1); + if ($$ == NULL) + MYSQL_YYABORT; + } | bool_pri IS not TRUE_SYM %prec IS - { $$= new (YYTHD->mem_root) Item_func_isnottrue($1); } + { + $$= new (YYTHD->mem_root) Item_func_isnottrue($1); + if ($$ == NULL) + MYSQL_YYABORT; + } | bool_pri IS FALSE_SYM %prec IS - { $$= new (YYTHD->mem_root) Item_func_isfalse($1); } + { + $$= new (YYTHD->mem_root) Item_func_isfalse($1); + if ($$ == NULL) + MYSQL_YYABORT; + } | bool_pri IS not FALSE_SYM %prec IS - { $$= new (YYTHD->mem_root) Item_func_isnotfalse($1); } + { + $$= new (YYTHD->mem_root) Item_func_isnotfalse($1); + if ($$ == NULL) + MYSQL_YYABORT; + } | bool_pri IS UNKNOWN_SYM %prec IS - { $$= new Item_func_isnull($1); } + { + $$= new Item_func_isnull($1); + if ($$ == NULL) + MYSQL_YYABORT; + } | bool_pri IS not UNKNOWN_SYM %prec IS - { $$= new Item_func_isnotnull($1); } + { + $$= new Item_func_isnotnull($1); + if ($$ == NULL) + MYSQL_YYABORT; + } | bool_pri ; bool_pri: bool_pri IS NULL_SYM %prec IS - { $$= new Item_func_isnull($1); } + { + $$= new Item_func_isnull($1); + if ($$ == NULL) + MYSQL_YYABORT; + } | bool_pri IS not NULL_SYM %prec IS - { $$= new Item_func_isnotnull($1); } + { + $$= new Item_func_isnotnull($1); + if ($$ == NULL) + MYSQL_YYABORT; + } | bool_pri EQUAL_SYM predicate %prec EQUAL_SYM - { $$= new Item_func_equal($1,$3); } + { + $$= new Item_func_equal($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } | bool_pri comp_op predicate %prec EQ - { $$= (*$2)(0)->create($1,$3); } + { + $$= (*$2)(0)->create($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } | bool_pri comp_op all_or_any '(' subselect ')' %prec EQ - { $$= all_any_subquery_creator($1, $2, $3, $5); } + { + $$= all_any_subquery_creator($1, $2, $3, $5); + if ($$ == NULL) + MYSQL_YYABORT; + } | predicate ; predicate: bit_expr IN_SYM '(' subselect ')' { $$= new (YYTHD->mem_root) Item_in_subselect($1, $4); + if ($$ == NULL) + MYSQL_YYABORT; } | bit_expr not IN_SYM '(' subselect ')' { THD *thd= YYTHD; Item *item= new (thd->mem_root) Item_in_subselect($1, $5); + if (item == NULL) + MYSQL_YYABORT; $$= negate_expression(thd, item); + if ($$ == NULL) + MYSQL_YYABORT; } | bit_expr IN_SYM '(' expr ')' { $$= handle_sql2003_note184_exception(YYTHD, $1, true, $4); + if ($$ == NULL) + MYSQL_YYABORT; } | bit_expr IN_SYM '(' expr ',' expr_list ')' { $6->push_front($4); $6->push_front($1); $$= new (YYTHD->mem_root) Item_func_in(*$6); + if ($$ == NULL) + MYSQL_YYABORT; } | bit_expr not IN_SYM '(' expr ')' { $$= handle_sql2003_note184_exception(YYTHD, $1, false, $5); + if ($$ == NULL) + MYSQL_YYABORT; } | bit_expr not IN_SYM '(' expr ',' expr_list ')' { @@ -4694,54 +4832,146 @@ predicate: $$= item; } | bit_expr BETWEEN_SYM bit_expr AND_SYM predicate - { $$= new Item_func_between($1,$3,$5); } + { + $$= new Item_func_between($1,$3,$5); + if ($$ == NULL) + MYSQL_YYABORT; + } | bit_expr not BETWEEN_SYM bit_expr AND_SYM predicate { Item_func_between *item= new Item_func_between($1,$4,$6); + if (item == NULL) + MYSQL_YYABORT; item->negate(); $$= item; } | bit_expr SOUNDS_SYM LIKE bit_expr - { $$= new Item_func_eq(new Item_func_soundex($1), - new Item_func_soundex($4)); } + { + Item *item1= new Item_func_soundex($1); + Item *item4= new Item_func_soundex($4); + if ((item1 == NULL) || (item4 == NULL)) + MYSQL_YYABORT; + $$= new Item_func_eq(item1, item4); + if ($$ == NULL) + MYSQL_YYABORT; + } | bit_expr LIKE simple_expr opt_escape - { $$= new Item_func_like($1,$3,$4,Lex->escape_used); } + { + $$= new Item_func_like($1,$3,$4,Lex->escape_used); + if ($$ == NULL) + MYSQL_YYABORT; + } | bit_expr not LIKE simple_expr opt_escape - { $$= new Item_func_not(new Item_func_like($1,$4,$5, Lex->escape_used)); } - | bit_expr REGEXP bit_expr { $$= new Item_func_regex($1,$3); } + { + Item *item= new Item_func_like($1,$4,$5, Lex->escape_used); + if (item == NULL) + MYSQL_YYABORT; + $$= new Item_func_not(item); + if ($$ == NULL) + MYSQL_YYABORT; + } + | bit_expr REGEXP bit_expr + { + $$= new Item_func_regex($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } | bit_expr not REGEXP bit_expr - { $$= negate_expression(YYTHD, new Item_func_regex($1,$4)); } + { + Item *item= new Item_func_regex($1,$4); + if (item == NULL) + MYSQL_YYABORT; + $$= negate_expression(YYTHD, item); + if ($$ == NULL) + MYSQL_YYABORT; + } | bit_expr ; bit_expr: bit_expr '|' bit_expr %prec '|' - { $$= new Item_func_bit_or($1,$3); } + { + $$= new Item_func_bit_or($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } | bit_expr '&' bit_expr %prec '&' - { $$= new Item_func_bit_and($1,$3); } + { + $$= new Item_func_bit_and($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } | bit_expr SHIFT_LEFT bit_expr %prec SHIFT_LEFT - { $$= new Item_func_shift_left($1,$3); } + { + $$= new Item_func_shift_left($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } | bit_expr SHIFT_RIGHT bit_expr %prec SHIFT_RIGHT - { $$= new Item_func_shift_right($1,$3); } + { + $$= new Item_func_shift_right($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } | bit_expr '+' bit_expr %prec '+' - { $$= new Item_func_plus($1,$3); } + { + $$= new Item_func_plus($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } | bit_expr '-' bit_expr %prec '-' - { $$= new Item_func_minus($1,$3); } + { + $$= new Item_func_minus($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } | bit_expr '+' interval_expr interval %prec '+' - { $$= new Item_date_add_interval($1,$3,$4,0); } + { + $$= new Item_date_add_interval($1,$3,$4,0); + if ($$ == NULL) + MYSQL_YYABORT; + } | bit_expr '-' interval_expr interval %prec '-' - { $$= new Item_date_add_interval($1,$3,$4,1); } + { + $$= new Item_date_add_interval($1,$3,$4,1); + if ($$ == NULL) + MYSQL_YYABORT; + } | bit_expr '*' bit_expr %prec '*' - { $$= new Item_func_mul($1,$3); } + { + $$= new Item_func_mul($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } | bit_expr '/' bit_expr %prec '/' - { $$= new Item_func_div($1,$3); } + { + $$= new Item_func_div($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } | bit_expr '%' bit_expr %prec '%' - { $$= new Item_func_mod($1,$3); } + { + $$= new Item_func_mod($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } | bit_expr DIV_SYM bit_expr %prec DIV_SYM - { $$= new Item_func_int_div($1,$3); } + { + $$= new Item_func_int_div($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } | bit_expr MOD_SYM bit_expr %prec MOD_SYM - { $$= new Item_func_mod($1,$3); } + { + $$= new Item_func_mod($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } | bit_expr '^' bit_expr - { $$= new Item_func_bit_xor($1,$3); } + { + $$= new Item_func_bit_xor($1,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } | simple_expr ; @@ -4771,67 +5001,118 @@ simple_expr: simple_ident | simple_expr COLLATE_SYM ident_or_text %prec NEG { - $$= new Item_func_set_collation($1, - new Item_string($3.str, - $3.length, - YYTHD->charset())); + Item *item= new Item_string($3.str, $3.length, YYTHD->charset()); + if (item == NULL) + MYSQL_YYABORT; + $$= new Item_func_set_collation($1, item); + if ($$ == NULL) + MYSQL_YYABORT; } | literal | param_marker | variable | sum_expr | simple_expr OR_OR_SYM simple_expr - { $$= new Item_func_concat($1, $3); } - | '+' simple_expr %prec NEG { $$= $2; } - | '-' simple_expr %prec NEG { $$= new Item_func_neg($2); } - | '~' simple_expr %prec NEG { $$= new Item_func_bit_neg($2); } - | not2 simple_expr %prec NEG { $$= negate_expression(YYTHD, $2); } + { + $$= new Item_func_concat($1, $3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | '+' simple_expr %prec NEG + { $$= $2; } + | '-' simple_expr %prec NEG + { + $$= new Item_func_neg($2); + if ($$ == NULL) + MYSQL_YYABORT; + } + | '~' simple_expr %prec NEG + { + $$= new Item_func_bit_neg($2); + if ($$ == NULL) + MYSQL_YYABORT; + } + | not2 simple_expr %prec NEG + { + $$= negate_expression(YYTHD, $2); + if ($$ == NULL) + MYSQL_YYABORT; + } | '(' subselect ')' { $$= new Item_singlerow_subselect($2); + if ($$ == NULL) + MYSQL_YYABORT; } | '(' expr ')' { $$= $2; } | '(' expr ',' expr_list ')' { $4->push_front($2); $$= new Item_row(*$4); + if ($$ == NULL) + MYSQL_YYABORT; } | ROW_SYM '(' expr ',' expr_list ')' { $5->push_front($3); $$= new Item_row(*$5); + if ($$ == NULL) + MYSQL_YYABORT; } | EXISTS '(' subselect ')' { $$= new Item_exists_subselect($3); + if ($$ == NULL) + MYSQL_YYABORT; } - | '{' ident expr '}' { $$= $3; } + | '{' ident expr '}' + { $$= $3; } | MATCH ident_list_arg AGAINST '(' bit_expr fulltext_options ')' - { $2->push_front($5); - Select->add_ftfunc_to_list((Item_func_match*) - ($$=new Item_func_match(*$2,$6))); } - | ASCII_SYM '(' expr ')' { $$= new Item_func_ascii($3); } + { + $2->push_front($5); + Item_func_match *item= new Item_func_match(*$2,$6); + if (item == NULL) + MYSQL_YYABORT; + Select->add_ftfunc_to_list(item); + $$= item; + } + | ASCII_SYM '(' expr ')' + { + $$= new Item_func_ascii($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | BINARY simple_expr %prec NEG { $$= create_func_cast($2, ITEM_CAST_CHAR, NULL, NULL, &my_charset_bin); + if ($$ == NULL) + MYSQL_YYABORT; } | CAST_SYM '(' expr AS cast_type ')' { LEX *lex= Lex; $$= create_func_cast($3, $5, lex->length, lex->dec, lex->charset); - if (!$$) + if ($$ == NULL) MYSQL_YYABORT; } | CASE_SYM opt_expr when_list opt_else END - { $$= new Item_func_case(* $3, $2, $4 ); } + { + $$= new Item_func_case(* $3, $2, $4 ); + if ($$ == NULL) + MYSQL_YYABORT; + } | CONVERT_SYM '(' expr ',' cast_type ')' { $$= create_func_cast($3, $5, Lex->length, Lex->dec, Lex->charset); - if (!$$) + if ($$ == NULL) MYSQL_YYABORT; } | CONVERT_SYM '(' expr USING charset_name ')' - { $$= new Item_func_conv_charset($3,$5); } + { + $$= new Item_func_conv_charset($3,$5); + if ($$ == NULL) + MYSQL_YYABORT; + } | DEFAULT '(' simple_ident ')' { if ($3->is_splocal()) @@ -4842,9 +5123,15 @@ simple_expr: MYSQL_YYABORT; } $$= new Item_default_value(Lex->current_context(), $3); + if ($$ == NULL) + MYSQL_YYABORT; } | VALUES '(' simple_ident_nospvar ')' - { $$= new Item_insert_value(Lex->current_context(), $3); } + { + $$= new Item_insert_value(Lex->current_context(), $3); + if ($$ == NULL) + MYSQL_YYABORT; + } | FUNC_ARG0 '(' ')' { if (!$1.symbol->create_func) @@ -4855,6 +5142,8 @@ simple_expr: MYSQL_YYABORT; } $$= ((Item*(*)(void))($1.symbol->create_func))(); + if ($$ == NULL) + MYSQL_YYABORT; } | FUNC_ARG1 '(' expr ')' { @@ -4866,6 +5155,8 @@ simple_expr: MYSQL_YYABORT; } $$= ((Item*(*)(Item*))($1.symbol->create_func))($3); + if ($$ == NULL) + MYSQL_YYABORT; } | FUNC_ARG2 '(' expr ',' expr ')' { @@ -4877,6 +5168,8 @@ simple_expr: MYSQL_YYABORT; } $$= ((Item*(*)(Item*,Item*))($1.symbol->create_func))($3,$5); + if ($$ == NULL) + MYSQL_YYABORT; } | FUNC_ARG3 '(' expr ',' expr ',' expr ')' { @@ -4888,106 +5181,264 @@ simple_expr: MYSQL_YYABORT; } $$= ((Item*(*)(Item*,Item*,Item*))($1.symbol->create_func))($3,$5,$7); + if ($$ == NULL) + MYSQL_YYABORT; } | ADDDATE_SYM '(' expr ',' expr ')' - { $$= new Item_date_add_interval($3, $5, INTERVAL_DAY, 0);} + { + $$= new Item_date_add_interval($3, $5, INTERVAL_DAY, 0); + if ($$ == NULL) + MYSQL_YYABORT; + } | ADDDATE_SYM '(' expr ',' INTERVAL_SYM expr interval ')' - { $$= new Item_date_add_interval($3, $6, $7, 0); } + { + $$= new Item_date_add_interval($3, $6, $7, 0); + if ($$ == NULL) + MYSQL_YYABORT; + } | REPEAT_SYM '(' expr ',' expr ')' - { $$= new Item_func_repeat($3,$5); } + { + $$= new Item_func_repeat($3,$5); + if ($$ == NULL) + MYSQL_YYABORT; + } | ATAN '(' expr ')' - { $$= new Item_func_atan($3); } + { + $$= new Item_func_atan($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | ATAN '(' expr ',' expr ')' - { $$= new Item_func_atan($3,$5); } + { + $$= new Item_func_atan($3,$5); + if ($$ == NULL) + MYSQL_YYABORT; + } | CHAR_SYM '(' expr_list ')' - { $$= new Item_func_char(*$3); } + { + $$= new Item_func_char(*$3); + if ($$ == NULL) + MYSQL_YYABORT; + } | CHAR_SYM '(' expr_list USING charset_name ')' - { $$= new Item_func_char(*$3, $5); } + { + $$= new Item_func_char(*$3, $5); + if ($$ == NULL) + MYSQL_YYABORT; + } | CHARSET '(' expr ')' - { $$= new Item_func_charset($3); } + { + $$= new Item_func_charset($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | COALESCE '(' expr_list ')' - { $$= new Item_func_coalesce(* $3); } + { + $$= new Item_func_coalesce(* $3); + if ($$ == NULL) + MYSQL_YYABORT; + } | COLLATION_SYM '(' expr ')' - { $$= new Item_func_collation($3); } + { + $$= new Item_func_collation($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | CONCAT '(' expr_list ')' - { $$= new Item_func_concat(* $3); } + { + $$= new Item_func_concat(* $3); + if ($$ == NULL) + MYSQL_YYABORT; + } | CONCAT_WS '(' expr ',' expr_list ')' - { $5->push_front($3); $$= new Item_func_concat_ws(*$5); } + { + $5->push_front($3); + $$= new Item_func_concat_ws(*$5); + if ($$ == NULL) + MYSQL_YYABORT; + } | CONVERT_TZ_SYM '(' expr ',' expr ',' expr ')' { if (Lex->add_time_zone_tables_to_query_tables(YYTHD)) MYSQL_YYABORT; $$= new Item_func_convert_tz($3, $5, $7); + if ($$ == NULL) + MYSQL_YYABORT; } | CURDATE optional_braces - { $$= new Item_func_curdate_local(); Lex->safe_to_cache_query=0; } + { + $$= new Item_func_curdate_local(); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->safe_to_cache_query=0; + } | CURTIME optional_braces - { $$= new Item_func_curtime_local(); Lex->safe_to_cache_query=0; } + { + $$= new Item_func_curtime_local(); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->safe_to_cache_query=0; + } | CURTIME '(' expr ')' { $$= new Item_func_curtime_local($3); + if ($$ == NULL) + MYSQL_YYABORT; Lex->safe_to_cache_query=0; } | CURRENT_USER optional_braces { $$= new Item_func_current_user(Lex->current_context()); + if ($$ == NULL) + MYSQL_YYABORT; Lex->safe_to_cache_query= 0; } | DATE_ADD_INTERVAL '(' expr ',' interval_expr interval ')' - { $$= new Item_date_add_interval($3,$5,$6,0); } + { + $$= new Item_date_add_interval($3,$5,$6,0); + if ($$ == NULL) + MYSQL_YYABORT; + } | DATE_SUB_INTERVAL '(' expr ',' interval_expr interval ')' - { $$= new Item_date_add_interval($3,$5,$6,1); } + { + $$= new Item_date_add_interval($3,$5,$6,1); + if ($$ == NULL) + MYSQL_YYABORT; + } | DATABASE '(' ')' { $$= new Item_func_database(); + if ($$ == NULL) + MYSQL_YYABORT; Lex->safe_to_cache_query=0; } | DATE_SYM '(' expr ')' - { $$= new Item_date_typecast($3); } + { + $$= new Item_date_typecast($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | DAY_SYM '(' expr ')' - { $$= new Item_func_dayofmonth($3); } + { + $$= new Item_func_dayofmonth($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | ELT_FUNC '(' expr ',' expr_list ')' - { $5->push_front($3); $$= new Item_func_elt(*$5); } + { + $5->push_front($3); + $$= new Item_func_elt(*$5); + if ($$ == NULL) + MYSQL_YYABORT; + } | MAKE_SET_SYM '(' expr ',' expr_list ')' - { $$= new Item_func_make_set($3, *$5); } + { + $$= new Item_func_make_set($3, *$5); + if ($$ == NULL) + MYSQL_YYABORT; + } | ENCRYPT '(' expr ')' { $$= new Item_func_encrypt($3); + if ($$ == NULL) + MYSQL_YYABORT; Lex->uncacheable(UNCACHEABLE_RAND); } - | ENCRYPT '(' expr ',' expr ')' { $$= new Item_func_encrypt($3,$5); } + | ENCRYPT '(' expr ',' expr ')' + { + $$= new Item_func_encrypt($3,$5); + if ($$ == NULL) + MYSQL_YYABORT; + } | DECODE_SYM '(' expr ',' TEXT_STRING_literal ')' - { $$= new Item_func_decode($3,$5.str); } + { + $$= new Item_func_decode($3,$5.str); + if ($$ == NULL) + MYSQL_YYABORT; + } | ENCODE_SYM '(' expr ',' TEXT_STRING_literal ')' - { $$= new Item_func_encode($3,$5.str); } + { + $$= new Item_func_encode($3,$5.str); + if ($$ == NULL) + MYSQL_YYABORT; + } | DES_DECRYPT_SYM '(' expr ')' - { $$= new Item_func_des_decrypt($3); } + { + $$= new Item_func_des_decrypt($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | DES_DECRYPT_SYM '(' expr ',' expr ')' - { $$= new Item_func_des_decrypt($3,$5); } + { + $$= new Item_func_des_decrypt($3,$5); + if ($$ == NULL) + MYSQL_YYABORT; + } | DES_ENCRYPT_SYM '(' expr ')' - { $$= new Item_func_des_encrypt($3); } + { + $$= new Item_func_des_encrypt($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | DES_ENCRYPT_SYM '(' expr ',' expr ')' - { $$= new Item_func_des_encrypt($3,$5); } + { + $$= new Item_func_des_encrypt($3,$5); + if ($$ == NULL) + MYSQL_YYABORT; + } | EXPORT_SET '(' expr ',' expr ',' expr ')' - { $$= new Item_func_export_set($3, $5, $7); } + { + $$= new Item_func_export_set($3, $5, $7); + if ($$ == NULL) + MYSQL_YYABORT; + } | EXPORT_SET '(' expr ',' expr ',' expr ',' expr ')' - { $$= new Item_func_export_set($3, $5, $7, $9); } + { + $$= new Item_func_export_set($3, $5, $7, $9); + if ($$ == NULL) + MYSQL_YYABORT; + } | EXPORT_SET '(' expr ',' expr ',' expr ',' expr ',' expr ')' - { $$= new Item_func_export_set($3, $5, $7, $9, $11); } + { + $$= new Item_func_export_set($3, $5, $7, $9, $11); + if ($$ == NULL) + MYSQL_YYABORT; + } | FORMAT_SYM '(' expr ',' NUM ')' - { $$= new Item_func_format($3,atoi($5.str)); } + { + $$= new Item_func_format($3,atoi($5.str)); + if ($$ == NULL) + MYSQL_YYABORT; + } | FROM_UNIXTIME '(' expr ')' - { $$= new Item_func_from_unixtime($3); } + { + $$= new Item_func_from_unixtime($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | FROM_UNIXTIME '(' expr ',' expr ')' { - $$= new Item_func_date_format (new Item_func_from_unixtime($3),$5,0); + Item *item= new Item_func_from_unixtime($3); + if (item == NULL) + MYSQL_YYABORT; + $$= new Item_func_date_format (item, $5, 0); + if ($$ == NULL) + MYSQL_YYABORT; } | FIELD_FUNC '(' expr ',' expr_list ')' - { $5->push_front($3); $$= new Item_func_field(*$5); } + { + $5->push_front($3); + $$= new Item_func_field(*$5); + if ($$ == NULL) + MYSQL_YYABORT; + } | geometry_function { #ifdef HAVE_SPATIAL $$= $1; + /* $1 may be NULL, GEOM_NEW not tested for out of memory */ + if ($$ == NULL) + MYSQL_YYABORT; #else my_error(ER_FEATURE_DISABLED, MYF(0), sym_group_geom.name, sym_group_geom.needed_define); @@ -4995,16 +5446,36 @@ simple_expr: #endif } | GET_FORMAT '(' date_time_type ',' expr ')' - { $$= new Item_func_get_format($3, $5); } + { + $$= new Item_func_get_format($3, $5); + if ($$ == NULL) + MYSQL_YYABORT; + } | HOUR_SYM '(' expr ')' - { $$= new Item_func_hour($3); } + { + $$= new Item_func_hour($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | IF '(' expr ',' expr ',' expr ')' - { $$= new Item_func_if($3,$5,$7); } + { + $$= new Item_func_if($3,$5,$7); + if ($$ == NULL) + MYSQL_YYABORT; + } | INSERT '(' expr ',' expr ',' expr ',' expr ')' - { $$= new Item_func_insert($3,$5,$7,$9); } + { + $$= new Item_func_insert($3,$5,$7,$9); + if ($$ == NULL) + MYSQL_YYABORT; + } | interval_expr interval '+' expr /* we cannot put interval before - */ - { $$= new Item_date_add_interval($4,$1,$2,0); } + { + $$= new Item_date_add_interval($4,$1,$2,0); + if ($$ == NULL) + MYSQL_YYABORT; + } | interval_expr { if ($1->type() != Item::ROW_ITEM) @@ -5013,102 +5484,248 @@ simple_expr: MYSQL_YYABORT; } $$= new Item_func_interval((Item_row *)$1); + if ($$ == NULL) + MYSQL_YYABORT; } | LAST_INSERT_ID '(' ')' { $$= new Item_func_last_insert_id(); + if ($$ == NULL) + MYSQL_YYABORT; Lex->safe_to_cache_query= 0; } | LAST_INSERT_ID '(' expr ')' { $$= new Item_func_last_insert_id($3); + if ($$ == NULL) + MYSQL_YYABORT; Lex->safe_to_cache_query= 0; } | LEFT '(' expr ',' expr ')' - { $$= new Item_func_left($3,$5); } + { + $$= new Item_func_left($3,$5); + if ($$ == NULL) + MYSQL_YYABORT; + } | LOCATE '(' expr ',' expr ')' - { $$= new Item_func_locate($5,$3); } + { + $$= new Item_func_locate($5,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } | LOCATE '(' expr ',' expr ',' expr ')' - { $$= new Item_func_locate($5,$3,$7); } + { + $$= new Item_func_locate($5,$3,$7); + if ($$ == NULL) + MYSQL_YYABORT; + } | GREATEST_SYM '(' expr ',' expr_list ')' - { $5->push_front($3); $$= new Item_func_max(*$5); } + { + $5->push_front($3); + $$= new Item_func_max(*$5); + if ($$ == NULL) + MYSQL_YYABORT; + } | LEAST_SYM '(' expr ',' expr_list ')' - { $5->push_front($3); $$= new Item_func_min(*$5); } + { + $5->push_front($3); + $$= new Item_func_min(*$5); + if ($$ == NULL) + MYSQL_YYABORT; + } | LOG_SYM '(' expr ')' - { $$= new Item_func_log($3); } + { + $$= new Item_func_log($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | LOG_SYM '(' expr ',' expr ')' - { $$= new Item_func_log($3, $5); } + { + $$= new Item_func_log($3, $5); + if ($$ == NULL) + MYSQL_YYABORT; + } | MASTER_POS_WAIT '(' expr ',' expr ')' { $$= new Item_master_pos_wait($3, $5); + if ($$ == NULL) + MYSQL_YYABORT; Lex->safe_to_cache_query=0; - } + } | MASTER_POS_WAIT '(' expr ',' expr ',' expr ')' { $$= new Item_master_pos_wait($3, $5, $7); + if ($$ == NULL) + MYSQL_YYABORT; Lex->safe_to_cache_query=0; } | MICROSECOND_SYM '(' expr ')' - { $$= new Item_func_microsecond($3); } + { + $$= new Item_func_microsecond($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | MINUTE_SYM '(' expr ')' - { $$= new Item_func_minute($3); } + { + $$= new Item_func_minute($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | MOD_SYM '(' expr ',' expr ')' - { $$ = new Item_func_mod( $3, $5); } + { + $$= new Item_func_mod( $3, $5); + if ($$ == NULL) + MYSQL_YYABORT; + } | MONTH_SYM '(' expr ')' - { $$= new Item_func_month($3); } + { + $$= new Item_func_month($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | NOW_SYM optional_braces - { $$= new Item_func_now_local(); Lex->safe_to_cache_query=0;} + { + $$= new Item_func_now_local(); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->safe_to_cache_query=0; + } | NOW_SYM '(' expr ')' - { $$= new Item_func_now_local($3); Lex->safe_to_cache_query=0;} + { + $$= new Item_func_now_local($3); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->safe_to_cache_query=0; + } | PASSWORD '(' expr ')' { $$= YYTHD->variables.old_passwords ? (Item *) new Item_func_old_password($3) : (Item *) new Item_func_password($3); + if ($$ == NULL) + MYSQL_YYABORT; } | OLD_PASSWORD '(' expr ')' - { $$= new Item_func_old_password($3); } + { + $$= new Item_func_old_password($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | POSITION_SYM '(' bit_expr IN_SYM expr ')' - { $$ = new Item_func_locate($5,$3); } + { + $$= new Item_func_locate($5,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } | QUARTER_SYM '(' expr ')' - { $$ = new Item_func_quarter($3); } + { + $$= new Item_func_quarter($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | RAND '(' expr ')' - { $$= new Item_func_rand($3); Lex->uncacheable(UNCACHEABLE_RAND);} + { + $$= new Item_func_rand($3); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->uncacheable(UNCACHEABLE_RAND); + } | RAND '(' ')' - { $$= new Item_func_rand(); Lex->uncacheable(UNCACHEABLE_RAND);} + { + $$= new Item_func_rand(); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->uncacheable(UNCACHEABLE_RAND); + } | REPLACE '(' expr ',' expr ',' expr ')' - { $$= new Item_func_replace($3,$5,$7); } + { + $$= new Item_func_replace($3,$5,$7); + if ($$ == NULL) + MYSQL_YYABORT; + } | RIGHT '(' expr ',' expr ')' - { $$= new Item_func_right($3,$5); } + { + $$= new Item_func_right($3,$5); + if ($$ == NULL) + MYSQL_YYABORT; + } | ROUND '(' expr ')' - { $$= new Item_func_round($3, new Item_int((char*)"0",0,1),0); } - | ROUND '(' expr ',' expr ')' { $$= new Item_func_round($3,$5,0); } + { + Item *item= new Item_int((char*)"0",0,1); + if (item == NULL) + MYSQL_YYABORT; + $$= new Item_func_round($3, item, 0); + if ($$ == NULL) + MYSQL_YYABORT; + } + | ROUND '(' expr ',' expr ')' + { + $$= new Item_func_round($3,$5,0); + if ($$ == NULL) + MYSQL_YYABORT; + } | ROW_COUNT_SYM '(' ')' { $$= new Item_func_row_count(); + if ($$ == NULL) + MYSQL_YYABORT; Lex->safe_to_cache_query= 0; } | SUBDATE_SYM '(' expr ',' expr ')' - { $$= new Item_date_add_interval($3, $5, INTERVAL_DAY, 1);} + { + $$= new Item_date_add_interval($3, $5, INTERVAL_DAY, 1); + if ($$ == NULL) + MYSQL_YYABORT; + } | SUBDATE_SYM '(' expr ',' INTERVAL_SYM expr interval ')' - { $$= new Item_date_add_interval($3, $6, $7, 1); } + { + $$= new Item_date_add_interval($3, $6, $7, 1); + if ($$ == NULL) + MYSQL_YYABORT; + } | SECOND_SYM '(' expr ')' - { $$= new Item_func_second($3); } + { + $$= new Item_func_second($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | SUBSTRING '(' expr ',' expr ',' expr ')' - { $$= new Item_func_substr($3,$5,$7); } + { + $$= new Item_func_substr($3,$5,$7); + if ($$ == NULL) + MYSQL_YYABORT; + } | SUBSTRING '(' expr ',' expr ')' - { $$= new Item_func_substr($3,$5); } + { + $$= new Item_func_substr($3,$5); + if ($$ == NULL) + MYSQL_YYABORT; + } | SUBSTRING '(' expr FROM expr FOR_SYM expr ')' - { $$= new Item_func_substr($3,$5,$7); } + { + $$= new Item_func_substr($3,$5,$7); + if ($$ == NULL) + MYSQL_YYABORT; + } | SUBSTRING '(' expr FROM expr ')' - { $$= new Item_func_substr($3,$5); } + { + $$= new Item_func_substr($3,$5); + if ($$ == NULL) + MYSQL_YYABORT; + } | SUBSTRING_INDEX '(' expr ',' expr ',' expr ')' - { $$= new Item_func_substr_index($3,$5,$7); } + { + $$= new Item_func_substr_index($3,$5,$7); + if ($$ == NULL) + MYSQL_YYABORT; + } | SYSDATE optional_braces { if (global_system_variables.sysdate_is_now == 0) $$= new Item_func_sysdate_local(); else $$= new Item_func_now_local(); + if ($$ == NULL) + MYSQL_YYABORT; Lex->safe_to_cache_query=0; } | SYSDATE '(' expr ')' @@ -5116,36 +5733,94 @@ simple_expr: if (global_system_variables.sysdate_is_now == 0) $$= new Item_func_sysdate_local($3); else $$= new Item_func_now_local($3); + if ($$ == NULL) + MYSQL_YYABORT; Lex->safe_to_cache_query=0; } | TIME_SYM '(' expr ')' - { $$= new Item_time_typecast($3); } + { + $$= new Item_time_typecast($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | TIMESTAMP '(' expr ')' - { $$= new Item_datetime_typecast($3); } + { + $$= new Item_datetime_typecast($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | TIMESTAMP '(' expr ',' expr ')' - { $$= new Item_func_add_time($3, $5, 1, 0); } + { + $$= new Item_func_add_time($3, $5, 1, 0); + if ($$ == NULL) + MYSQL_YYABORT; + } | TIMESTAMP_ADD '(' interval_time_stamp ',' expr ',' expr ')' - { $$= new Item_date_add_interval($7,$5,$3,0); } + { + $$= new Item_date_add_interval($7,$5,$3,0); + if ($$ == NULL) + MYSQL_YYABORT; + } | TIMESTAMP_DIFF '(' interval_time_stamp ',' expr ',' expr ')' - { $$= new Item_func_timestamp_diff($5,$7,$3); } + { + $$= new Item_func_timestamp_diff($5,$7,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } | TRIM '(' expr ')' - { $$= new Item_func_trim($3); } + { + $$= new Item_func_trim($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | TRIM '(' LEADING expr FROM expr ')' - { $$= new Item_func_ltrim($6,$4); } + { + $$= new Item_func_ltrim($6,$4); + if ($$ == NULL) + MYSQL_YYABORT; + } | TRIM '(' TRAILING expr FROM expr ')' - { $$= new Item_func_rtrim($6,$4); } + { + $$= new Item_func_rtrim($6,$4); + if ($$ == NULL) + MYSQL_YYABORT; + } | TRIM '(' BOTH expr FROM expr ')' - { $$= new Item_func_trim($6,$4); } + { + $$= new Item_func_trim($6,$4); + if ($$ == NULL) + MYSQL_YYABORT; + } | TRIM '(' LEADING FROM expr ')' - { $$= new Item_func_ltrim($5); } + { + $$= new Item_func_ltrim($5); + if ($$ == NULL) + MYSQL_YYABORT; + } | TRIM '(' TRAILING FROM expr ')' - { $$= new Item_func_rtrim($5); } + { + $$= new Item_func_rtrim($5); + if ($$ == NULL) + MYSQL_YYABORT; + } | TRIM '(' BOTH FROM expr ')' - { $$= new Item_func_trim($5); } + { + $$= new Item_func_trim($5); + if ($$ == NULL) + MYSQL_YYABORT; + } | TRIM '(' expr FROM expr ')' - { $$= new Item_func_trim($5,$3); } + { + $$= new Item_func_trim($5,$3); + if ($$ == NULL) + MYSQL_YYABORT; + } | TRUNCATE_SYM '(' expr ',' expr ')' - { $$= new Item_func_round($3,$5,1); } + { + $$= new Item_func_round($3,$5,1); + if ($$ == NULL) + MYSQL_YYABORT; + } | ident '.' ident '(' opt_expr_list ')' { LEX *lex= Lex; @@ -5158,6 +5833,8 @@ simple_expr: $$= new Item_func_sp(Lex->current_context(), name, *$5); else $$= new Item_func_sp(Lex->current_context(), name); + if ($$ == NULL) + MYSQL_YYABORT; lex->safe_to_cache_query=0; } | IDENT_sys '(' @@ -5298,47 +5975,110 @@ simple_expr: else $$= new Item_func_sp(Lex->current_context(), name); } - lex->safe_to_cache_query=0; + lex->safe_to_cache_query=0; + + if ($$ == NULL) + MYSQL_YYABORT; } | UNIQUE_USERS '(' text_literal ',' NUM ',' NUM ',' expr_list ')' { $$= new Item_func_unique_users($3,atoi($5.str),atoi($7.str), * $9); + if ($$ == NULL) + MYSQL_YYABORT; } | UNIX_TIMESTAMP '(' ')' { $$= new Item_func_unix_timestamp(); + if ($$ == NULL) + MYSQL_YYABORT; Lex->safe_to_cache_query=0; } | UNIX_TIMESTAMP '(' expr ')' - { $$= new Item_func_unix_timestamp($3); } + { + $$= new Item_func_unix_timestamp($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | USER '(' ')' - { $$= new Item_func_user(); Lex->safe_to_cache_query=0; } + { + $$= new Item_func_user(); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->safe_to_cache_query=0; + } | UTC_DATE_SYM optional_braces - { $$= new Item_func_curdate_utc(); Lex->safe_to_cache_query=0;} + { + $$= new Item_func_curdate_utc(); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->safe_to_cache_query=0; + } | UTC_TIME_SYM optional_braces - { $$= new Item_func_curtime_utc(); Lex->safe_to_cache_query=0;} + { + $$= new Item_func_curtime_utc(); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->safe_to_cache_query=0; + } | UTC_TIMESTAMP_SYM optional_braces - { $$= new Item_func_now_utc(); Lex->safe_to_cache_query=0;} + { + $$= new Item_func_now_utc(); + if ($$ == NULL) + MYSQL_YYABORT; + Lex->safe_to_cache_query=0; + } | WEEK_SYM '(' expr ')' { - $$= new Item_func_week($3,new Item_int((char*) "0", - YYTHD->variables.default_week_format,1)); + Item *item= new Item_int((char*) "0", + YYTHD->variables.default_week_format, + 1); + if (item == NULL) + MYSQL_YYABORT; + $$= new Item_func_week($3, item); + if ($$ == NULL) + MYSQL_YYABORT; } | WEEK_SYM '(' expr ',' expr ')' - { $$= new Item_func_week($3,$5); } + { + $$= new Item_func_week($3,$5); + if ($$ == NULL) + MYSQL_YYABORT; + } | YEAR_SYM '(' expr ')' - { $$= new Item_func_year($3); } + { + $$= new Item_func_year($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | YEARWEEK '(' expr ')' - { $$= new Item_func_yearweek($3,new Item_int((char*) "0",0,1)); } + { + Item *item= new Item_int((char*) "0",0,1); + if (item == NULL) + MYSQL_YYABORT; + $$= new Item_func_yearweek($3, item); + if ($$ == NULL) + MYSQL_YYABORT; + } | YEARWEEK '(' expr ',' expr ')' - { $$= new Item_func_yearweek($3, $5); } + { + $$= new Item_func_yearweek($3, $5); + if ($$ == NULL) + MYSQL_YYABORT; + } | BENCHMARK_SYM '(' ulong_num ',' expr ')' { $$=new Item_func_benchmark($3,$5); + if ($$ == NULL) + MYSQL_YYABORT; Lex->uncacheable(UNCACHEABLE_SIDEEFFECT); } | EXTRACT_SYM '(' interval FROM expr ')' - { $$=new Item_extract( $3, $5); }; + { + $$=new Item_extract( $3, $5); + if ($$ == NULL) + MYSQL_YYABORT; + } + ; geometry_function: CONTAINS_SYM '(' expr ',' expr ')' @@ -5414,7 +6154,12 @@ udf_expr_list: ; udf_expr_list2: - { Select->expr_list.push_front(new List); } + { + List *list= new List; + if (list == NULL) + MYSQL_YYABORT; + Select->expr_list.push_front(list); + } udf_expr_list3 { $$= Select->expr_list.pop(); } ; @@ -5462,53 +6207,132 @@ udf_expr: ; sum_expr: - AVG_SYM '(' in_sum_expr ')' - { $$=new Item_sum_avg($3); } + AVG_SYM '(' in_sum_expr ')' + { + $$=new Item_sum_avg($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | AVG_SYM '(' DISTINCT in_sum_expr ')' - { $$=new Item_sum_avg_distinct($4); } + { + $$=new Item_sum_avg_distinct($4); + if ($$ == NULL) + MYSQL_YYABORT; + } | BIT_AND '(' in_sum_expr ')' - { $$=new Item_sum_and($3); } + { + $$=new Item_sum_and($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | BIT_OR '(' in_sum_expr ')' - { $$=new Item_sum_or($3); } + { + $$=new Item_sum_or($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | BIT_XOR '(' in_sum_expr ')' - { $$=new Item_sum_xor($3); } + { + $$=new Item_sum_xor($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | COUNT_SYM '(' opt_all '*' ')' - { $$=new Item_sum_count(new Item_int((int32) 0L,1)); } + { + Item *item= new Item_int((int32) 0L,1); + if (item == NULL) + MYSQL_YYABORT; + $$=new Item_sum_count(new Item_int((int32) 0L,1)); + if ($$ == NULL) + MYSQL_YYABORT; + } | COUNT_SYM '(' in_sum_expr ')' - { $$=new Item_sum_count($3); } + { + $$=new Item_sum_count($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | COUNT_SYM '(' DISTINCT { Select->in_sum_expr++; } expr_list { Select->in_sum_expr--; } ')' - { $$=new Item_sum_count_distinct(* $5); } + { + $$=new Item_sum_count_distinct(* $5); + if ($$ == NULL) + MYSQL_YYABORT; + } | GROUP_UNIQUE_USERS '(' text_literal ',' NUM ',' NUM ',' in_sum_expr ')' - { $$= new Item_sum_unique_users($3,atoi($5.str),atoi($7.str),$9); } + { + $$= new Item_sum_unique_users($3,atoi($5.str),atoi($7.str),$9); + if ($$ == NULL) + MYSQL_YYABORT; + } | MIN_SYM '(' in_sum_expr ')' - { $$=new Item_sum_min($3); } + { + $$=new Item_sum_min($3); + if ($$ == NULL) + MYSQL_YYABORT; + } /* According to ANSI SQL, DISTINCT is allowed and has no sence inside MIN and MAX grouping functions; so MIN|MAX(DISTINCT ...) is processed like an ordinary MIN | MAX() */ | MIN_SYM '(' DISTINCT in_sum_expr ')' - { $$=new Item_sum_min($4); } + { + $$=new Item_sum_min($4); + if ($$ == NULL) + MYSQL_YYABORT; + } | MAX_SYM '(' in_sum_expr ')' - { $$=new Item_sum_max($3); } + { + $$=new Item_sum_max($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | MAX_SYM '(' DISTINCT in_sum_expr ')' - { $$=new Item_sum_max($4); } + { + $$=new Item_sum_max($4); + if ($$ == NULL) + MYSQL_YYABORT; + } | STD_SYM '(' in_sum_expr ')' - { $$=new Item_sum_std($3, 0); } + { + $$=new Item_sum_std($3, 0); + if ($$ == NULL) + MYSQL_YYABORT; + } | VARIANCE_SYM '(' in_sum_expr ')' - { $$=new Item_sum_variance($3, 0); } + { + $$=new Item_sum_variance($3, 0); + if ($$ == NULL) + MYSQL_YYABORT; + } | STDDEV_SAMP_SYM '(' in_sum_expr ')' - { $$=new Item_sum_std($3, 1); } + { + $$=new Item_sum_std($3, 1); + if ($$ == NULL) + MYSQL_YYABORT; + } | VAR_SAMP_SYM '(' in_sum_expr ')' - { $$=new Item_sum_variance($3, 1); } + { + $$=new Item_sum_variance($3, 1); + if ($$ == NULL) + MYSQL_YYABORT; + } | SUM_SYM '(' in_sum_expr ')' - { $$=new Item_sum_sum($3); } + { + $$=new Item_sum_sum($3); + if ($$ == NULL) + MYSQL_YYABORT; + } | SUM_SYM '(' DISTINCT in_sum_expr ')' - { $$=new Item_sum_sum_distinct($4); } + { + $$=new Item_sum_sum_distinct($4); + if ($$ == NULL) + MYSQL_YYABORT; + } | GROUP_CONCAT_SYM '(' opt_distinct { Select->in_sum_expr++; } expr_list opt_gorder_clause @@ -5519,6 +6343,8 @@ sum_expr: sel->in_sum_expr--; $$=new Item_func_group_concat(Lex->current_context(), $3, $5, sel->gorder_list, $7); + if ($$ == NULL) + MYSQL_YYABORT; $5->empty(); }; @@ -5541,12 +6367,16 @@ variable_aux: ident_or_text SET_VAR expr { $$= new Item_func_set_user_var($1, $3); + if ($$ == NULL) + MYSQL_YYABORT; LEX *lex= Lex; lex->uncacheable(UNCACHEABLE_RAND); } | ident_or_text { $$= new Item_func_get_user_var($1); + if ($$ == NULL) + MYSQL_YYABORT; LEX *lex= Lex; lex->uncacheable(UNCACHEABLE_RAND); } @@ -5567,11 +6397,14 @@ opt_distinct: |DISTINCT { $$ = 1; }; opt_gconcat_separator: - /* empty */ - { - $$= new (YYTHD->mem_root) String(",", 1, &my_charset_latin1); - } - | SEPARATOR_SYM text_string { $$ = $2; }; + /* empty */ + { + $$= new (YYTHD->mem_root) String(",", 1, &my_charset_latin1); + if ($$ == NULL) + MYSQL_YYABORT; + } + | SEPARATOR_SYM text_string { $$ = $2; } + ; opt_gorder_clause: @@ -5585,6 +6418,8 @@ opt_gorder_clause: select->gorder_list= (SQL_LIST*) sql_memdup((char*) &select->order_list, sizeof(st_sql_list)); + if (select->gorder_list == NULL) + MYSQL_YYABORT; select->order_list.empty(); }; @@ -5625,7 +6460,12 @@ opt_expr_list: ; expr_list: - { Select->expr_list.push_front(new List); } + { + List *list= new List; + if (list == NULL) + MYSQL_YYABORT; + Select->expr_list.push_front(list); + } expr_list2 { $$= Select->expr_list.pop(); }; @@ -5638,7 +6478,12 @@ ident_list_arg: | '(' ident_list ')' { $$= $2; }; ident_list: - { Select->expr_list.push_front(new List); } + { + List *list= new List; + if (list == NULL) + MYSQL_YYABORT; + Select->expr_list.push_front(new List); + } ident_list2 { $$= Select->expr_list.pop(); }; @@ -5658,6 +6503,8 @@ when_list: WHEN_SYM expr THEN_SYM expr { $$= new List; + if ($$ == NULL) + MYSQL_YYABORT; $$->push_back($2); $$->push_back($4); } @@ -6064,32 +6911,53 @@ key_list_or_empty: key_usage_list2: key_usage_list2 ',' ident - { Select-> - interval_list.push_back(new (YYTHD->mem_root) String((const char*) $3.str, $3.length, - system_charset_info)); } + { + String *s= new (YYTHD->mem_root) String((const char*) $3.str, + $3.length, + system_charset_info); + if (s == NULL) + MYSQL_YYABORT; + Select->interval_list.push_back(s); + } | ident - { Select-> - interval_list.push_back(new (YYTHD->mem_root) String((const char*) $1.str, $1.length, - system_charset_info)); } + { + String *s= new (YYTHD->mem_root) String((const char*) $1.str, + $1.length, + system_charset_info); + if (s == NULL) + MYSQL_YYABORT; + Select->interval_list.push_back(s); + } | PRIMARY_SYM - { Select-> - interval_list.push_back(new (YYTHD->mem_root) String("PRIMARY", 7, - system_charset_info)); }; + { + String *s= new (YYTHD->mem_root) String("PRIMARY", 7, + system_charset_info); + if (s == NULL) + MYSQL_YYABORT; + Select->interval_list.push_back(s); + } + ; using_list: ident { if (!($$= new List)) MYSQL_YYABORT; - $$->push_back(new (YYTHD->mem_root) - String((const char *) $1.str, $1.length, - system_charset_info)); + String *s= new (YYTHD->mem_root) String((const char *) $1.str, + $1.length, + system_charset_info); + if (s == NULL) + MYSQL_YYABORT; + $$->push_back(s); } | using_list ',' ident { - $1->push_back(new (YYTHD->mem_root) - String((const char *) $3.str, $3.length, - system_charset_info)); + String *s= new (YYTHD->mem_root) String((const char *) $3.str, + $3.length, + system_charset_info); + if (s == NULL) + MYSQL_YYABORT; + $1->push_back(s); $$= $1; }; @@ -6154,7 +7022,12 @@ table_alias: opt_table_alias: /* empty */ { $$=0; } | table_alias ident - { $$= (LEX_STRING*) sql_memdup(&$2,sizeof(LEX_STRING)); }; + { + $$= (LEX_STRING*) sql_memdup(&$2,sizeof(LEX_STRING)); + if ($$ == NULL) + MYSQL_YYABORT; + } + ; opt_all: /* empty */ @@ -6205,6 +7078,8 @@ opt_escape: $$= ((YYTHD->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) ? new Item_string("", 0, &my_charset_latin1) : new Item_string("\\", 1, &my_charset_latin1)); + if ($$ == NULL) + MYSQL_YYABORT; } ; @@ -6375,9 +7250,24 @@ limit_option: { ((Item_param *) $1)->limit_clause_param= TRUE; } - | ULONGLONG_NUM { $$= new Item_uint($1.str, $1.length); } - | LONG_NUM { $$= new Item_uint($1.str, $1.length); } - | NUM { $$= new Item_uint($1.str, $1.length); } + | ULONGLONG_NUM + { + $$= new Item_uint($1.str, $1.length); + if ($$ == NULL) + MYSQL_YYABORT; + } + | LONG_NUM + { + $$= new Item_uint($1.str, $1.length); + if ($$ == NULL) + MYSQL_YYABORT; + } + | NUM + { + $$= new Item_uint($1.str, $1.length); + if ($$ == NULL) + MYSQL_YYABORT; + } ; delete_limit_clause: @@ -6430,10 +7320,11 @@ procedure_clause: lex->proc_list.elements=0; lex->proc_list.first=0; lex->proc_list.next= (byte**) &lex->proc_list.first; - if (add_proc_to_list(lex->thd, new Item_field(&lex-> - current_select-> - context, - NULL,NULL,$2.str))) + Item_field *item= new Item_field(&lex->current_select->context, + NULL,NULL,$2.str); + if (item == NULL) + MYSQL_YYABORT; + if (add_proc_to_list(lex->thd, item)) MYSQL_YYABORT; Lex->uncacheable(UNCACHEABLE_SIDEEFFECT); } @@ -6484,13 +7375,20 @@ select_var_ident: { LEX *lex=Lex; if (lex->result) - ((select_dumpvar *)lex->result)->var_list.push_back( new my_var($2,0,0,(enum_field_types)0)); + { + my_var *var= new my_var($2,0,0,(enum_field_types)0); + if (var == NULL) + MYSQL_YYABORT; + ((select_dumpvar *)lex->result)->var_list.push_back(var); + } else + { /* The parser won't create select_result instance only if it's an EXPLAIN. */ DBUG_ASSERT(lex->describe); + } } | ident_or_text { @@ -6504,12 +7402,12 @@ select_var_ident: } if (lex->result) { - my_var *var; - ((select_dumpvar *)lex->result)-> - var_list.push_back(var= new my_var($1,1,t->offset,t->type)); + my_var *var= new my_var($1,1,t->offset,t->type); + if (var == NULL) + MYSQL_YYABORT; + ((select_dumpvar *)lex->result)->var_list.push_back(var); #ifndef DBUG_OFF - if (var) - var->sp= lex->sphead; + var->sp= lex->sphead; #endif } else @@ -6594,11 +7492,13 @@ drop: | DROP INDEX_SYM ident ON table_ident {} { LEX *lex=Lex; + Alter_drop *ad= new Alter_drop(Alter_drop::KEY, $3.str); + if (ad == NULL) + MYSQL_YYABORT; lex->sql_command= SQLCOM_DROP_INDEX; lex->alter_info.reset(); lex->alter_info.flags= ALTER_DROP_INDEX; - lex->alter_info.drop_list.push_back(new Alter_drop(Alter_drop::KEY, - $3.str)); + lex->alter_info.drop_list.push_back(ad); if (!lex->current_select->add_table_to_list(lex->thd, $5, NULL, TL_OPTION_UPDATING)) MYSQL_YYABORT; @@ -6623,6 +7523,8 @@ drop: lex->sql_command = SQLCOM_DROP_FUNCTION; lex->drop_if_exists= $3; spname= new sp_name($4, $6, true); + if (spname == NULL) + MYSQL_YYABORT; spname->init_qname(thd); lex->spname= spname; } @@ -6642,6 +7544,8 @@ drop: lex->sql_command = SQLCOM_DROP_FUNCTION; lex->drop_if_exists= $3; spname= new sp_name(db, $4, false); + if (spname == NULL) + MYSQL_YYABORT; spname->init_qname(thd); lex->spname= spname; } @@ -6856,7 +7760,12 @@ values: expr_or_default: expr { $$= $1;} - | DEFAULT {$$= new Item_default_value(Lex->current_context()); } + | DEFAULT + { + $$= new Item_default_value(Lex->current_context()); + if ($$ == NULL) + MYSQL_YYABORT; + } ; opt_insert_update: @@ -6974,15 +7883,21 @@ table_wild_list: table_wild_one: ident opt_wild opt_table_alias { - if (!Select->add_table_to_list(YYTHD, new Table_ident($1), $3, + Table_ident *ti= new Table_ident($1); + if (ti == NULL) + MYSQL_YYABORT; + if (!Select->add_table_to_list(YYTHD, ti, $3, TL_OPTION_UPDATING | TL_OPTION_ALIAS, Lex->lock_option)) MYSQL_YYABORT; } | ident '.' ident opt_wild opt_table_alias { + Table_ident *ti= new Table_ident(YYTHD, $1, $3, 0); + if (ti == NULL) + MYSQL_YYABORT; if (!Select->add_table_to_list(YYTHD, - new Table_ident(YYTHD, $1, $3, 0), + ti, $5, TL_OPTION_UPDATING | TL_OPTION_ALIAS, @@ -7360,8 +8275,12 @@ binlog_from: wild_and_where: /* empty */ | LIKE TEXT_STRING_sys - { Lex->wild= new (YYTHD->mem_root) String($2.str, $2.length, - system_charset_info); } + { + Lex->wild= new (YYTHD->mem_root) String($2.str, $2.length, + system_charset_info); + if (Lex->wild == NULL) + MYSQL_YYABORT; + } | WHERE expr { Select->where= $2; @@ -7409,7 +8328,14 @@ opt_describe_column: /* empty */ {} | text_string { Lex->wild= $1; } | ident - { Lex->wild= new (YYTHD->mem_root) String((const char*) $1.str,$1.length,system_charset_info); }; + { + Lex->wild= new (YYTHD->mem_root) String((const char*) $1.str, + $1.length, + system_charset_info); + if (Lex->wild == NULL) + MYSQL_YYABORT; + } + ; /* flush things */ @@ -7696,7 +8622,11 @@ fields_or_vars: field_or_var: simple_ident_nospvar {$$= $1;} | '@' ident_or_text - { $$= new Item_user_var_as_out_param($2); } + { + $$= new Item_user_var_as_out_param($2); + if ($$ == NULL) + MYSQL_YYABORT; + } ; opt_load_data_set_spec: @@ -7721,9 +8651,14 @@ text_literal: my_charset_is_ascii_based(cs_con))) tmp= $1; else - thd->convert_string(&tmp, cs_con, $1.str, $1.length, cs_cli); + { + if (thd->convert_string(&tmp, cs_con, $1.str, $1.length, cs_cli)) + MYSQL_YYABORT; + } $$= new Item_string(tmp.str, tmp.length, cs_con, DERIVATION_COERCIBLE, repertoire); + if ($$ == NULL) + MYSQL_YYABORT; } | NCHAR_STRING { @@ -7732,10 +8667,14 @@ text_literal: DBUG_ASSERT(my_charset_is_ascii_based(national_charset_info)); $$= new Item_string($1.str, $1.length, national_charset_info, DERIVATION_COERCIBLE, repertoire); + if ($$ == NULL) + MYSQL_YYABORT; } | UNDERSCORE_CHARSET TEXT_STRING { $$= new Item_string($2.str, $2.length, Lex->underscore_charset); + if ($$ == NULL) + MYSQL_YYABORT; ((Item_string*) $$)->set_repertoire_from_value(); } | text_literal TEXT_STRING_literal @@ -7757,28 +8696,37 @@ text_literal: ; text_string: - TEXT_STRING_literal - { $$= new (YYTHD->mem_root) String($1.str,$1.length,YYTHD->variables.collation_connection); } + TEXT_STRING_literal + { + $$= new (YYTHD->mem_root) String($1.str, + $1.length, + YYTHD->variables.collation_connection); + if ($$ == NULL) + MYSQL_YYABORT; + } | HEX_NUM { Item *tmp= new Item_hex_string($1.str, $1.length); + if (tmp == NULL) + MYSQL_YYABORT; /* it is OK only emulate fix_fields, because we need only value of constant */ - $$= tmp ? - tmp->quick_fix_field(), tmp->val_str((String*) 0) : - (String*) 0; + tmp->quick_fix_field(); + $$= tmp->val_str((String*) 0); } | BIN_NUM { Item *tmp= new Item_bin_string($1.str, $1.length); + if (tmp == NULL) + MYSQL_YYABORT; /* it is OK only emulate fix_fields, because we need only value of constant */ - $$= tmp ? tmp->quick_fix_field(), tmp->val_str((String*) 0) : - (String*) 0; + tmp->quick_fix_field(); + $$= tmp->val_str((String*) 0); } ; @@ -7820,76 +8768,121 @@ literal: | NULL_SYM { $$ = new Item_null(); + if ($$ == NULL) + MYSQL_YYABORT; YYTHD->m_lip->next_state=MY_LEX_OPERATOR_OR_IDENT; } - | FALSE_SYM { $$= new Item_int((char*) "FALSE",0,1); } - | TRUE_SYM { $$= new Item_int((char*) "TRUE",1,1); } - | HEX_NUM { $$ = new Item_hex_string($1.str, $1.length);} - | BIN_NUM { $$= new Item_bin_string($1.str, $1.length); } + | FALSE_SYM + { + $$= new Item_int((char*) "FALSE",0,1); + if ($$ == NULL) + MYSQL_YYABORT; + } + | TRUE_SYM + { + $$= new Item_int((char*) "TRUE",1,1); + if ($$ == NULL) + MYSQL_YYABORT; + } + | HEX_NUM + { + $$= new Item_hex_string($1.str, $1.length); + if ($$ == NULL) + MYSQL_YYABORT; + } + | BIN_NUM + { + $$= new Item_bin_string($1.str, $1.length); + if ($$ == NULL) + MYSQL_YYABORT; + } | UNDERSCORE_CHARSET HEX_NUM { Item *tmp= new Item_hex_string($2.str, $2.length); + if (tmp == NULL) + MYSQL_YYABORT; /* it is OK only emulate fix_fieds, because we need only value of constant */ - String *str= tmp ? - tmp->quick_fix_field(), tmp->val_str((String*) 0) : - (String*) 0; - $$= new Item_string(NULL, /* name will be set in select_item */ - str ? str->ptr() : "", - str ? str->length() : 0, - Lex->underscore_charset); - if (!$$ || !$$->check_well_formed_result(&$$->str_value, TRUE)) + tmp->quick_fix_field(); + String *str= tmp->val_str((String*) 0); + Item_string *item_str; + item_str= new Item_string(NULL, /* name will be set in select_item */ + str ? str->ptr() : "", + str ? str->length() : 0, + Lex->underscore_charset); + if (!item_str || + !item_str->check_well_formed_result(&item_str->str_value, TRUE)) { MYSQL_YYABORT; } - ((Item_string *) $$)->set_repertoire_from_value(); + item_str->set_repertoire_from_value(); + $$= item_str; } | UNDERSCORE_CHARSET BIN_NUM { Item *tmp= new Item_bin_string($2.str, $2.length); + if (tmp == NULL) + MYSQL_YYABORT; /* it is OK only emulate fix_fieds, because we need only value of constant */ - String *str= tmp ? - tmp->quick_fix_field(), tmp->val_str((String*) 0) : - (String*) 0; - $$= new Item_string(NULL, /* name will be set in select_item */ - str ? str->ptr() : "", - str ? str->length() : 0, - Lex->underscore_charset); - if (!$$ || !$$->check_well_formed_result(&$$->str_value, TRUE)) + tmp->quick_fix_field(); + String *str= tmp->val_str((String*) 0); + Item_string *item_str; + item_str= new Item_string(NULL, /* name will be set in select_item */ + str ? str->ptr() : "", + str ? str->length() : 0, + Lex->underscore_charset); + if (!item_str || + !item_str->check_well_formed_result(&item_str->str_value, TRUE)) { MYSQL_YYABORT; } + $$= item_str; } | DATE_SYM text_literal { $$ = $2; } | TIME_SYM text_literal { $$ = $2; } | TIMESTAMP text_literal { $$ = $2; }; NUM_literal: - NUM { int error; $$ = new Item_int($1.str, (longlong) my_strtoll10($1.str, NULL, &error), $1.length); } - | LONG_NUM { int error; $$ = new Item_int($1.str, (longlong) my_strtoll10($1.str, NULL, &error), $1.length); } - | ULONGLONG_NUM { $$ = new Item_uint($1.str, $1.length); } + NUM + { + int error; + $$ = new Item_int($1.str, + (longlong) my_strtoll10($1.str, NULL, &error), + $1.length); + } + | LONG_NUM + { + int error; + $$ = new Item_int($1.str, + (longlong) my_strtoll10($1.str, NULL, &error), + $1.length); + } + | ULONGLONG_NUM + { + $$= new Item_uint($1.str, $1.length); + } | DECIMAL_NUM - { - $$= new Item_decimal($1.str, $1.length, YYTHD->charset()); - if (YYTHD->net.report_error) - { - MYSQL_YYABORT; - } - } + { + $$= new Item_decimal($1.str, $1.length, YYTHD->charset()); + if (($$ == NULL) || (YYTHD->net.report_error)) + { + MYSQL_YYABORT; + } + } | FLOAT_NUM - { - $$ = new Item_float($1.str, $1.length); - if (YYTHD->net.report_error) - { - MYSQL_YYABORT; - } - } - ; + { + $$= new Item_float($1.str, $1.length); + if (($$ == NULL) || (YYTHD->net.report_error)) + { + MYSQL_YYABORT; + } + } + ; /********************************************************************** ** Creating different items. @@ -7904,6 +8897,8 @@ table_wild: { SELECT_LEX *sel= Select; $$ = new Item_field(Lex->current_context(), NullS, $1.str, "*"); + if ($$ == NULL) + MYSQL_YYABORT; sel->with_wild++; } | ident '.' ident '.' '*' @@ -7912,6 +8907,8 @@ table_wild: $$ = new Item_field(Lex->current_context(), (YYTHD->client_capabilities & CLIENT_NO_SCHEMA ? NullS : $1.str), $3.str,"*"); + if ($$ == NULL) + MYSQL_YYABORT; sel->with_wild++; } ; @@ -7941,11 +8938,12 @@ simple_ident: lip->tok_start_prev - lex->sphead->m_tmp_query, lip->tok_end - lip->tok_start_prev); + if (splocal == NULL) + MYSQL_YYABORT; #ifndef DBUG_OFF - if (splocal) - splocal->m_sp= lex->sphead; + splocal->m_sp= lex->sphead; #endif - $$ = (Item*) splocal; + $$= splocal; lex->safe_to_cache_query=0; } else @@ -7955,6 +8953,8 @@ simple_ident: sel->get_in_sum_expr() > 0) ? (Item*) new Item_field(Lex->current_context(), NullS, NullS, $1.str) : (Item*) new Item_ref(Lex->current_context(), NullS, NullS, $1.str); + if ($$ == NULL) + MYSQL_YYABORT; } } | simple_ident_q { $$= $1; } @@ -7968,6 +8968,8 @@ simple_ident_nospvar: sel->get_in_sum_expr() > 0) ? (Item*) new Item_field(Lex->current_context(), NullS, NullS, $1.str) : (Item*) new Item_ref(Lex->current_context(), NullS, NullS, $1.str); + if ($$ == NULL) + MYSQL_YYABORT; } | simple_ident_q { $$= $1; } ; @@ -8039,6 +9041,8 @@ simple_ident_q: sel->get_in_sum_expr() > 0) ? (Item*) new Item_field(Lex->current_context(), NullS, $1.str, $3.str) : (Item*) new Item_ref(Lex->current_context(), NullS, $1.str, $3.str); + if ($$ == NULL) + MYSQL_YYABORT; } } | '.' ident '.' ident @@ -8055,6 +9059,8 @@ simple_ident_q: sel->get_in_sum_expr() > 0) ? (Item*) new Item_field(Lex->current_context(), NullS, $2.str, $4.str) : (Item*) new Item_ref(Lex->current_context(), NullS, $2.str, $4.str); + if ($$ == NULL) + MYSQL_YYABORT; } | ident '.' ident '.' ident { @@ -8076,6 +9082,8 @@ simple_ident_q: (YYTHD->client_capabilities & CLIENT_NO_SCHEMA ? NullS : $1.str), $3.str, $5.str); + if ($$ == NULL) + MYSQL_YYABORT; }; @@ -8110,13 +9118,34 @@ field_ident: | '.' ident { $$=$2;} /* For Delphi */; table_ident: - ident { $$=new Table_ident($1); } - | ident '.' ident { $$=new Table_ident(YYTHD, $1,$3,0);} - | '.' ident { $$=new Table_ident($2);} /* For Delphi */ + ident + { + $$=new Table_ident($1); + if ($$ == NULL) + MYSQL_YYABORT; + } + | ident '.' ident + { + $$=new Table_ident(YYTHD, $1,$3,0); + if ($$ == NULL) + MYSQL_YYABORT; + } + | '.' ident + { + $$=new Table_ident($2); /* For Delphi */ + if ($$ == NULL) + MYSQL_YYABORT; + } ; table_ident_nodb: - ident { LEX_STRING db={(char*) any_db,3}; $$=new Table_ident(YYTHD, db,$1,0); } + ident + { + LEX_STRING db={(char*) any_db,3}; + $$=new Table_ident(YYTHD, db,$1,0); + if ($$ == NULL) + MYSQL_YYABORT; + } ; IDENT_sys: @@ -8140,8 +9169,11 @@ IDENT_sys: $$= $1; } else - thd->convert_string(&$$, system_charset_info, - $1.str, $1.length, thd->charset()); + { + if (thd->convert_string(&$$, system_charset_info, + $1.str, $1.length, thd->charset())) + MYSQL_YYABORT; + } } ; @@ -8152,8 +9184,11 @@ TEXT_STRING_sys: if (thd->charset_is_system_charset) $$= $1; else - thd->convert_string(&$$, system_charset_info, - $1.str, $1.length, thd->charset()); + { + if (thd->convert_string(&$$, system_charset_info, + $1.str, $1.length, thd->charset())) + MYSQL_YYABORT; + } } ; @@ -8164,8 +9199,11 @@ TEXT_STRING_literal: if (thd->charset_is_collation_connection) $$= $1; else - thd->convert_string(&$$, thd->variables.collation_connection, - $1.str, $1.length, thd->charset()); + { + if (thd->convert_string(&$$, thd->variables.collation_connection, + $1.str, $1.length, thd->charset())) + MYSQL_YYABORT; + } } ; @@ -8177,8 +9215,11 @@ TEXT_STRING_filesystem: if (thd->charset_is_character_set_filesystem) $$= $1; else - thd->convert_string(&$$, thd->variables.character_set_filesystem, - $1.str, $1.length, thd->charset()); + { + if (thd->convert_string(&$$, thd->variables.character_set_filesystem, + $1.str, $1.length, thd->charset())) + MYSQL_YYABORT; + } } ; @@ -8188,6 +9229,8 @@ ident: { THD *thd= YYTHD; $$.str= thd->strmake($1.str, $1.length); + if ($$.str == NULL) + MYSQL_YYABORT; $$.length= $1.length; } ; @@ -8198,6 +9241,8 @@ label_ident: { THD *thd= YYTHD; $$.str= thd->strmake($1.str, $1.length); + if ($$.str == NULL) + MYSQL_YYABORT; $$.length= $1.length; } ; @@ -8729,29 +9774,50 @@ sys_option_value: LEX *lex=Lex; if ($1) lex->option_type= $1; - lex->var_list.push_back(new set_var(lex->option_type, - find_sys_var("tx_isolation"), - &null_lex_str, - new Item_int((int32) $5))); + Item *item= new Item_int((int32) $5); + if (item == NULL) + MYSQL_YYABORT; + set_var *var= new set_var(lex->option_type, + find_sys_var("tx_isolation"), + &null_lex_str, + item); + if (var == NULL) + MYSQL_YYABORT; + lex->var_list.push_back(var); } ; option_value: '@' ident_or_text equal expr { - Lex->var_list.push_back(new set_var_user(new Item_func_set_user_var($2,$4))); + Item_func_set_user_var *item= new Item_func_set_user_var($2,$4); + if (item == NULL) + MYSQL_YYABORT; + set_var_user *var= new set_var_user(item); + if (var == NULL) + MYSQL_YYABORT; + Lex->var_list.push_back(var); } | '@' '@' opt_var_ident_type internal_variable_name equal set_expr_or_default { LEX *lex=Lex; - lex->var_list.push_back(new set_var($3, $4.var, &$4.base_name, $6)); + set_var *var= new set_var($3, $4.var, &$4.base_name, $6); + if (var == NULL) + MYSQL_YYABORT; + lex->var_list.push_back(var); } | charset old_or_new_charset_name_or_default { THD *thd= YYTHD; LEX *lex= Lex; $2= $2 ? $2: global_system_variables.character_set_client; - lex->var_list.push_back(new set_var_collation_client($2,thd->variables.collation_database,$2)); + set_var_collation_client *var; + var= new set_var_collation_client($2, + thd->variables.collation_database, + $2); + if (var == NULL) + MYSQL_YYABORT; + lex->var_list.push_back(var); } | NAMES_SYM equal expr { @@ -8779,7 +9845,11 @@ option_value: $3->name, $2->csname); MYSQL_YYABORT; } - lex->var_list.push_back(new set_var_collation_client($3,$3,$3)); + set_var_collation_client *var; + var= new set_var_collation_client($3,$3,$3); + if (var == NULL) + MYSQL_YYABORT; + lex->var_list.push_back(var); } | PASSWORD equal text_or_password { @@ -8800,11 +9870,17 @@ option_value: MYSQL_YYABORT; user->host=null_lex_str; user->user.str=thd->security_ctx->priv_user; - thd->lex->var_list.push_back(new set_var_password(user, $3)); + set_var_password *var= new set_var_password(user, $3); + if (var == NULL) + MYSQL_YYABORT; + thd->lex->var_list.push_back(var); } | PASSWORD FOR_SYM user equal text_or_password { - Lex->var_list.push_back(new set_var_password($3,$5)); + set_var_password *var= new set_var_password($3,$5); + if (var == NULL) + MYSQL_YYABORT; + Lex->var_list.push_back(var); } ; @@ -8918,11 +9994,15 @@ text_or_password: Item_func_old_password::alloc(YYTHD, $3.str) : Item_func_password::alloc(YYTHD, $3.str) : $3.str; + if ($$ == NULL) + MYSQL_YYABORT; } | OLD_PASSWORD '(' TEXT_STRING ')' { $$= $3.length ? Item_func_old_password::alloc(YYTHD, $3.str) : $3.str; + if ($$ == NULL) + MYSQL_YYABORT; } ; @@ -8930,9 +10010,24 @@ text_or_password: set_expr_or_default: expr { $$=$1; } | DEFAULT { $$=0; } - | ON { $$=new Item_string("ON", 2, system_charset_info); } - | ALL { $$=new Item_string("ALL", 3, system_charset_info); } - | BINARY { $$=new Item_string("binary", 6, system_charset_info); } + | ON + { + $$=new Item_string("ON", 2, system_charset_info); + if ($$ == NULL) + MYSQL_YYABORT; + } + | ALL + { + $$=new Item_string("ALL", 3, system_charset_info); + if ($$ == NULL) + MYSQL_YYABORT; + } + | BINARY + { + $$=new Item_string("binary", 6, system_charset_info); + if ($$ == NULL) + MYSQL_YYABORT; + } ; @@ -9033,7 +10128,10 @@ handler: } lex->sql_command = SQLCOM_HA_READ; lex->ha_rkey_mode= HA_READ_KEY_EXACT; /* Avoid purify warnings */ - lex->current_select->select_limit= new Item_int((int32) 1); + Item *one= new Item_int((int32) 1); + if (one == NULL) + MYSQL_YYABORT; + lex->current_select->select_limit= one; lex->current_select->offset_limit= 0; if (!lex->current_select->add_table_to_list(lex->thd, $2, 0, 0)) MYSQL_YYABORT; @@ -9340,8 +10438,9 @@ grant_user: { char *buff= (char *) YYTHD->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH_323+1); - if (buff) - make_scrambled_password_323(buff, $4.str); + if (buff == NULL) + MYSQL_YYABORT; + make_scrambled_password_323(buff, $4.str); $1->password.str= buff; $1->password.length= SCRAMBLED_PASSWORD_CHAR_LENGTH_323; } @@ -9349,8 +10448,9 @@ grant_user: { char *buff= (char *) YYTHD->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH+1); - if (buff) - make_scrambled_password(buff, $4.str); + if (buff == NULL) + MYSQL_YYABORT; + make_scrambled_password(buff, $4.str); $1->password.str= buff; $1->password.length= SCRAMBLED_PASSWORD_CHAR_LENGTH; } @@ -9379,6 +10479,8 @@ column_list_id: ident { String *new_str = new (YYTHD->mem_root) String((const char*) $1.str,$1.length,system_charset_info); + if (new_str == NULL) + MYSQL_YYABORT; List_iterator iter(Lex->columns); class LEX_COLUMN *point; LEX *lex=Lex; @@ -9392,7 +10494,12 @@ column_list_id: if (point) point->rights |= lex->which_columns; else - lex->columns.push_back(new LEX_COLUMN (*new_str,lex->which_columns)); + { + LEX_COLUMN *col= new LEX_COLUMN (*new_str,lex->which_columns); + if (col == NULL) + MYSQL_YYABORT; + lex->columns.push_back(col); + } } ; @@ -9806,13 +10913,17 @@ view_list_opt: view_list: ident { - Lex->view_list.push_back((LEX_STRING*) - sql_memdup(&$1, sizeof(LEX_STRING))); + LEX_STRING *ls= (LEX_STRING*) sql_memdup(&$1, sizeof(LEX_STRING)); + if (ls == NULL) + MYSQL_YYABORT; + Lex->view_list.push_back(ls); } | view_list ',' ident { - Lex->view_list.push_back((LEX_STRING*) - sql_memdup(&$3, sizeof(LEX_STRING))); + LEX_STRING *ls= (LEX_STRING*) sql_memdup(&$3, sizeof(LEX_STRING)); + if (ls == NULL) + MYSQL_YYABORT; + Lex->view_list.push_back(ls); } ; @@ -9985,6 +11096,8 @@ sf_tail: /* Order is important here: new - reset - init */ sp= new sp_head(); + if (sp == NULL) + MYSQL_YYABORT; sp->reset_thd_mem_root(thd); sp->init(lex); sp->init_sp_name(thd, lex->spname); diff --git a/sql/thr_malloc.cc b/sql/thr_malloc.cc index 392db9224c3..4ebcf1c50af 100644 --- a/sql/thr_malloc.cc +++ b/sql/thr_malloc.cc @@ -21,10 +21,35 @@ extern "C" { void sql_alloc_error_handler(void) { - THD *thd=current_thd; - if (thd) // QQ; To be removed - thd->fatal_error(); /* purecov: inspected */ sql_print_error(ER(ER_OUT_OF_RESOURCES)); + + THD *thd=current_thd; + if (thd) + { + /* + This thread is Out Of Memory. + An OOM condition is a fatal error. + It should not be caught by error handlers in stored procedures. + Also, recording that SQL condition in the condition area could + cause more memory allocations, which in turn could raise more + OOM conditions, causing recursion in the error handling code itself. + As a result, my_error() should not be invoked, and the + thread diagnostics area is set to an error status directly. + The visible result for a client application will be: + - a query fails with an ER_OUT_OF_RESOURCES error, + returned in the error packet. + - SHOW ERROR/SHOW WARNINGS may be empty. + */ + + NET *net= &thd->net; + thd->fatal_error(); + if (!net->last_error[0]) // Return only first message + { + strmake(net->last_error, ER(ER_OUT_OF_RESOURCES), + sizeof(net->last_error)-1); + net->last_errno= ER_OUT_OF_RESOURCES; + } + } } } From 5af9d27fb1ff5b10e74bb5e6fe2f16ffd56ab9a8 Mon Sep 17 00:00:00 2001 From: Jonathan Perkin Date: Thu, 23 Oct 2008 19:39:56 +0200 Subject: [PATCH 337/705] Merge fixes for bug#32167 and bug#37428 into 5.0.66sp1 --- include/my_sys.h | 1 + include/myisam.h | 4 +++ myisam/mi_check.c | 6 ++-- myisam/mi_open.c | 42 ++++++++++++++++++++++------ myisam/mi_static.c | 9 ++++++ myisam/myisamchk.c | 2 +- myisam/myisamdef.h | 4 ++- mysql-test/r/symlink.result | 2 -- mysql-test/r/udf.result | 6 ++++ mysql-test/t/symlink.test | 8 +++--- mysys/my_symlink.c | 55 +++++++++++++++++++++---------------- mysys/thr_lock.c | 2 +- sql/mysql_priv.h | 6 ++++ sql/mysqld.cc | 22 +++++++++++++-- sql/set_var.cc | 1 + sql/sql_parse.cc | 33 +++++++++++++--------- sql/sql_udf.cc | 26 ++++++++++++++++-- sql/unireg.h | 3 ++ 18 files changed, 170 insertions(+), 62 deletions(-) diff --git a/include/my_sys.h b/include/my_sys.h index db01223602d..5dc73bf84d9 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -574,6 +574,7 @@ extern int my_close(File Filedes,myf MyFlags); extern File my_dup(File file, myf MyFlags); extern int my_mkdir(const char *dir, int Flags, myf MyFlags); extern int my_readlink(char *to, const char *filename, myf MyFlags); +extern int my_is_symlink(const char *filename); extern int my_realpath(char *to, const char *filename, myf MyFlags); extern File my_create_with_symlink(const char *linkname, const char *filename, int createflags, int access_flags, diff --git a/include/myisam.h b/include/myisam.h index 61b9f39e63b..ad585f79608 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -267,6 +267,10 @@ extern my_bool myisam_flush,myisam_delay_key_write,myisam_single_user; extern my_off_t myisam_max_temp_length; extern ulong myisam_bulk_insert_tree_size, myisam_data_pointer_size; +/* usually used to check if a symlink points into the mysql data home */ +/* which is normally forbidden */ +extern int (*myisam_test_invalid_symlink)(const char *filename); + /* Prototypes for myisam-functions */ extern int mi_close(struct st_myisam_info *file); diff --git a/myisam/mi_check.c b/myisam/mi_check.c index daa5886f3ba..4f8883f377e 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -1732,7 +1732,7 @@ err: DATA_TMP_EXT, share->base.raid_chunks, (param->testflag & T_BACKUP_DATA ? MYF(MY_REDEL_MAKE_BACKUP): MYF(0))) || - mi_open_datafile(info,share,-1)) + mi_open_datafile(info,share,name,-1)) got_error=1; } } @@ -2519,7 +2519,7 @@ err: DATA_TMP_EXT, share->base.raid_chunks, (param->testflag & T_BACKUP_DATA ? MYF(MY_REDEL_MAKE_BACKUP): MYF(0))) || - mi_open_datafile(info,share,-1)) + mi_open_datafile(info,share,name,-1)) got_error=1; } } @@ -3050,7 +3050,7 @@ err: DATA_TMP_EXT, share->base.raid_chunks, (param->testflag & T_BACKUP_DATA ? MYF(MY_REDEL_MAKE_BACKUP): MYF(0))) || - mi_open_datafile(info,share,-1)) + mi_open_datafile(info,share,name,-1)) got_error=1; } } diff --git a/myisam/mi_open.c b/myisam/mi_open.c index 6865708a941..8e2f61a3b4b 100644 --- a/myisam/mi_open.c +++ b/myisam/mi_open.c @@ -74,7 +74,7 @@ MI_INFO *test_if_reopen(char *filename) MI_INFO *mi_open(const char *name, int mode, uint open_flags) { - int lock_error,kfile,open_mode,save_errno,have_rtree=0; + int lock_error,kfile,open_mode,save_errno,have_rtree=0, realpath_err; uint i,j,len,errpos,head_length,base_pos,offset,info_length,keys, key_parts,unique_key_parts,fulltext_keys,uniques; char name_buff[FN_REFLEN], org_name[FN_REFLEN], index_name[FN_REFLEN], @@ -94,7 +94,16 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) head_length=sizeof(share_buff.state.header); bzero((byte*) &info,sizeof(info)); - my_realpath(name_buff, fn_format(org_name,name,"",MI_NAME_IEXT,4),MYF(0)); + realpath_err= my_realpath(name_buff, + fn_format(org_name,name,"",MI_NAME_IEXT,4),MYF(0)); + if (my_is_symlink(org_name) && + (realpath_err || (*myisam_test_invalid_symlink)(name_buff))) + { + my_errno= HA_WRONG_CREATE_OPTION; + DBUG_RETURN (NULL); + } + + pthread_mutex_lock(&THR_LOCK_myisam); if (!(old_info=test_if_reopen(name_buff))) { @@ -463,7 +472,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) lock_error=1; /* Database unlocked */ } - if (mi_open_datafile(&info, share, -1)) + if (mi_open_datafile(&info, share, name, -1)) goto err; errpos=5; @@ -534,7 +543,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) my_errno=EACCES; /* Can't open in write mode */ goto err; } - if (mi_open_datafile(&info, share, old_info->dfile)) + if (mi_open_datafile(&info, share, name, old_info->dfile)) goto err; errpos=5; have_rtree= old_info->rtree_recursion_state != NULL; @@ -1191,12 +1200,30 @@ The argument file_to_dup is here for the future if there would on some OS exist a dup()-like call that would give us two different file descriptors. *************************************************************************/ -int mi_open_datafile(MI_INFO *info, MYISAM_SHARE *share, File file_to_dup __attribute__((unused))) +int mi_open_datafile(MI_INFO *info, MYISAM_SHARE *share, const char *org_name, + File file_to_dup __attribute__((unused))) { + char *data_name= share->data_file_name; + char real_data_name[FN_REFLEN]; + + if (org_name) + { + fn_format(real_data_name,org_name,"",MI_NAME_DEXT,4); + if (my_is_symlink(real_data_name)) + { + if (my_realpath(real_data_name, real_data_name, MYF(0)) || + (*myisam_test_invalid_symlink)(real_data_name)) + { + my_errno= HA_WRONG_CREATE_OPTION; + return 1; + } + data_name= real_data_name; + } + } #ifdef USE_RAID if (share->base.raid_type) { - info->dfile=my_raid_open(share->data_file_name, + info->dfile=my_raid_open(data_name, share->mode | O_SHARE, share->base.raid_type, share->base.raid_chunks, @@ -1205,8 +1232,7 @@ int mi_open_datafile(MI_INFO *info, MYISAM_SHARE *share, File file_to_dup __attr } else #endif - info->dfile=my_open(share->data_file_name, share->mode | O_SHARE, - MYF(MY_WME)); + info->dfile=my_open(data_name, share->mode | O_SHARE, MYF(MY_WME)); return info->dfile >= 0 ? 0 : 1; } diff --git a/myisam/mi_static.c b/myisam/mi_static.c index 21a25f66b7c..ab7d3dc592b 100644 --- a/myisam/mi_static.c +++ b/myisam/mi_static.c @@ -41,6 +41,15 @@ my_off_t myisam_max_temp_length= MAX_FILE_SIZE; ulong myisam_bulk_insert_tree_size=8192*1024; ulong myisam_data_pointer_size=4; + +static int always_valid(const char *filename __attribute__((unused))) +{ + return 0; +} + +int (*myisam_test_invalid_symlink)(const char *filename)= always_valid; + + /* read_vec[] is used for converting between P_READ_KEY.. and SEARCH_ Position is , == , >= , <= , > , < diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index d421bbc92ed..29fb2ea1a60 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -1039,7 +1039,7 @@ static int myisamchk(MI_CHECK *param, my_string filename) error|=change_to_newfile(filename,MI_NAME_DEXT,DATA_TMP_EXT, raid_chunks, MYF(0)); - if (mi_open_datafile(info,info->s, -1)) + if (mi_open_datafile(info,info->s, NULL, -1)) error=1; param->out_flag&= ~O_NEW_DATA; /* We are using new datafile */ param->read_cache.file=info->dfile; diff --git a/myisam/myisamdef.h b/myisam/myisamdef.h index 1a04cbe74fc..4ebd5648d26 100644 --- a/myisam/myisamdef.h +++ b/myisam/myisamdef.h @@ -739,7 +739,9 @@ void mi_disable_non_unique_index(MI_INFO *info, ha_rows rows); extern MI_INFO *test_if_reopen(char *filename); my_bool check_table_is_closed(const char *name, const char *where); -int mi_open_datafile(MI_INFO *info, MYISAM_SHARE *share, File file_to_dup); +int mi_open_datafile(MI_INFO *info, MYISAM_SHARE *share, const char *orn_name, + File file_to_dup); + int mi_open_keyfile(MYISAM_SHARE *share); void mi_setup_functions(register MYISAM_SHARE *share); diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result index 689aa724935..47901a5d896 100644 --- a/mysql-test/r/symlink.result +++ b/mysql-test/r/symlink.result @@ -57,8 +57,6 @@ t9 CREATE TABLE `t9` ( Got one of the listed errors Got one of the listed errors Got one of the listed errors -Got one of the listed errors -Got one of the listed errors alter table t9 rename mysqltest.t9; select count(*) from mysqltest.t9; count(*) diff --git a/mysql-test/r/udf.result b/mysql-test/r/udf.result index a79be1c3189..92185962d1f 100644 --- a/mysql-test/r/udf.result +++ b/mysql-test/r/udf.result @@ -1,5 +1,7 @@ drop table if exists t1; CREATE FUNCTION metaphon RETURNS STRING SONAME "UDF_EXAMPLE_LIB"; +Warnings: +Warning 1105 plugin_dir was not specified CREATE FUNCTION myfunc_double RETURNS REAL SONAME "UDF_EXAMPLE_LIB"; CREATE FUNCTION myfunc_nonexist RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB"; ERROR HY000: Can't find function 'myfunc_nonexist' in library @@ -197,6 +199,8 @@ DROP FUNCTION avgcost; select * from mysql.func; name ret dl type CREATE FUNCTION is_const RETURNS STRING SONAME "UDF_EXAMPLE_LIB"; +Warnings: +Warning 1105 plugin_dir was not specified select IS_const(3); IS_const(3) const @@ -206,6 +210,8 @@ name ret dl type select is_const(3); ERROR 42000: FUNCTION test.is_const does not exist CREATE FUNCTION is_const RETURNS STRING SONAME "UDF_EXAMPLE_LIB"; +Warnings: +Warning 1105 plugin_dir was not specified select is_const(3) as const, is_const(3.14) as const, diff --git a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test index 10d8f355c98..9478abe1224 100644 --- a/mysql-test/t/symlink.test +++ b/mysql-test/t/symlink.test @@ -71,8 +71,6 @@ drop table t1; SHOW CREATE TABLE t9; disable_query_log; ---error 1103,1103 -create table t1 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam data directory="tmp"; # Check that we cannot link over a table from another database. @@ -81,8 +79,9 @@ create database mysqltest; --error 1,1 create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="/this-dir-does-not-exist"; ---error 1103,1103 -create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="not-hard-path"; +# temporarily disabled as it returns different result in the embedded server +# --error 1210, 1210 +# create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="not-hard-path"; # Should fail becasue the file t9.MYI already exist in 'run' --error 1,1,1105 @@ -230,6 +229,7 @@ SET SESSION keep_files_on_create = TRUE; EOF --disable_abort_on_error --error 1 +--replace_result $MYSQLTEST_VARDIR . master-data/ '' CREATE TABLE t1 (a INT) ENGINE MYISAM; --error 0,1 --remove_file $MYSQLTEST_VARDIR/master-data/test/t1.MYD; diff --git a/mysys/my_symlink.c b/mysys/my_symlink.c index 810c0c72632..7f2be5644e8 100644 --- a/mysys/my_symlink.c +++ b/mysys/my_symlink.c @@ -106,38 +106,47 @@ int my_symlink(const char *content, const char *linkname, myf MyFlags) #define BUFF_LEN FN_LEN #endif + +int my_is_symlink(const char *filename __attribute__((unused))) +{ +#if defined (HAVE_LSTAT) && defined (S_ISLNK) + struct stat stat_buff; + return !lstat(filename, &stat_buff) && S_ISLNK(stat_buff.st_mode); +#elif defined (_WIN32) + DWORD dwAttr = GetFileAttributes(filename); + return (dwAttr != INVALID_FILE_ATTRIBUTES) && + (dwAttr & FILE_ATTRIBUTE_REPARSE_POINT); +#else /* No symlinks */ + return 0; +#endif +} + + int my_realpath(char *to, const char *filename, myf MyFlags __attribute__((unused))) { #if defined(HAVE_REALPATH) && !defined(HAVE_purify) && !defined(HAVE_BROKEN_REALPATH) int result=0; char buff[BUFF_LEN]; - struct stat stat_buff; + char *ptr; DBUG_ENTER("my_realpath"); - if (!(MyFlags & MY_RESOLVE_LINK) || - (!lstat(filename,&stat_buff) && S_ISLNK(stat_buff.st_mode))) - { - char *ptr; - DBUG_PRINT("info",("executing realpath")); - if ((ptr=realpath(filename,buff))) - { + DBUG_PRINT("info",("executing realpath")); + if ((ptr=realpath(filename,buff))) strmake(to,ptr,FN_REFLEN-1); - } - else - { - /* - Realpath didn't work; Use my_load_path() which is a poor substitute - original name but will at least be able to resolve paths that starts - with '.'. - */ - DBUG_PRINT("error",("realpath failed with errno: %d", errno)); - my_errno=errno; - if (MyFlags & MY_WME) - my_error(EE_REALPATH, MYF(0), filename, my_errno); - my_load_path(to, filename, NullS); - result= -1; - } + else + { + /* + Realpath didn't work; Use my_load_path() which is a poor substitute + original name but will at least be able to resolve paths that starts + with '.'. + */ + DBUG_PRINT("error",("realpath failed with errno: %d", errno)); + my_errno=errno; + if (MyFlags & MY_WME) + my_error(EE_REALPATH, MYF(0), filename, my_errno); + my_load_path(to, filename, NullS); + result= -1; } DBUG_RETURN(result); #else diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index 02c9f08c946..853e1f96b49 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.c @@ -333,10 +333,10 @@ void thr_lock_init(THR_LOCK *lock) void thr_lock_delete(THR_LOCK *lock) { DBUG_ENTER("thr_lock_delete"); - VOID(pthread_mutex_destroy(&lock->mutex)); pthread_mutex_lock(&THR_LOCK_lock); thr_lock_thread_list=list_delete(thr_lock_thread_list,&lock->list); pthread_mutex_unlock(&THR_LOCK_lock); + pthread_mutex_destroy(&lock->mutex); DBUG_VOID_RETURN; } diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 607c06f55d2..cc82e60fc62 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1264,6 +1264,7 @@ extern char *mysql_data_home,server_version[SERVER_VERSION_LENGTH], mysql_real_data_home[], *opt_mysql_tmpdir, mysql_charsets_dir[], mysql_unpacked_real_data_home[], def_ft_boolean_syntax[sizeof(ft_boolean_syntax)]; +extern int mysql_unpacked_real_data_home_len; #define mysql_tmpdir (my_tmpdir(&mysql_tmpdir_list)) extern MY_TMPDIR mysql_tmpdir_list; extern const char *command_name[]; @@ -1342,6 +1343,9 @@ extern char *default_tz_name; extern my_bool opt_large_pages; extern uint opt_large_page_size; +extern char *opt_plugin_dir_ptr; +extern char opt_plugin_dir[FN_REFLEN]; + extern MYSQL_LOG mysql_log,mysql_slow_log,mysql_bin_log; extern FILE *bootstrap_file; extern int bootstrap_error; @@ -1764,6 +1768,8 @@ inline void kill_delayed_threads(void) {} #define check_stack_overrun(A, B, C) 0 #endif +extern "C" int test_if_data_home_dir(const char *dir); + #endif /* MYSQL_CLIENT */ #endif diff --git a/sql/mysqld.cc b/sql/mysqld.cc index cdae94f0a61..757427f9fdf 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -324,6 +324,9 @@ arg_cmp_func Arg_comparator::comparator_matrix[5][2] = /* static variables */ +char opt_plugin_dir[FN_REFLEN]; +char *opt_plugin_dir_ptr; + static bool lower_case_table_names_used= 0; static bool volatile select_thread_in_use, signal_thread_in_use; static bool volatile ready_to_exit; @@ -477,6 +480,7 @@ char mysql_real_data_home[FN_REFLEN], *opt_init_file, *opt_tc_log_file, mysql_unpacked_real_data_home[FN_REFLEN], def_ft_boolean_syntax[sizeof(ft_boolean_syntax)]; +int mysql_unpacked_real_data_home_len; char *mysql_data_home= mysql_real_data_home; const key_map key_map_empty(0); key_map key_map_full(0); // Will be initialized later @@ -4984,6 +4988,7 @@ enum options_mysqld OPT_OLD_STYLE_USER_LIMITS, OPT_LOG_SLOW_ADMIN_STATEMENTS, OPT_TABLE_LOCK_WAIT_TIMEOUT, + OPT_PLUGIN_DIR, OPT_PORT_OPEN_TIMEOUT, OPT_MERGE, OPT_INNODB_ROLLBACK_ON_TIMEOUT, @@ -6216,6 +6221,10 @@ The minimum value for this variable is 4096.", (gptr*) &global_system_variables.optimizer_search_depth, (gptr*) &max_system_variables.optimizer_search_depth, 0, GET_ULONG, OPT_ARG, MAX_TABLES+1, 0, MAX_TABLES+2, 0, 1, 0}, + {"plugin_dir", OPT_PLUGIN_DIR, + "Directory for plugins.", + (gptr*) &opt_plugin_dir_ptr, (gptr*) &opt_plugin_dir_ptr, 0, + GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"preload_buffer_size", OPT_PRELOAD_BUFFER_SIZE, "The size of the buffer that is allocated when preloading indexes", (gptr*) &global_system_variables.preload_buff_size, @@ -6696,6 +6705,7 @@ static void mysql_init_variables(void) /* Things reset to zero */ opt_skip_slave_start= opt_reckless_slave = 0; mysql_home[0]= pidfile_name[0]= log_error_file[0]= 0; + myisam_test_invalid_symlink= test_if_data_home_dir; opt_log= opt_slow_log= 0; opt_update_log= 0; opt_bin_log= 0; @@ -7746,13 +7756,19 @@ static void fix_paths(void) pos[1]= 0; } convert_dirname(mysql_real_data_home,mysql_real_data_home,NullS); - (void) fn_format(buff, mysql_real_data_home, "", "", - (MY_RETURN_REAL_PATH|MY_RESOLVE_SYMLINKS)); - (void) unpack_dirname(mysql_unpacked_real_data_home, buff); + my_realpath(mysql_unpacked_real_data_home, mysql_real_data_home, MYF(0)); + mysql_unpacked_real_data_home_len= strlen(mysql_unpacked_real_data_home); + if (mysql_unpacked_real_data_home[mysql_unpacked_real_data_home_len-1] == FN_LIBCHAR) + --mysql_unpacked_real_data_home_len; + + convert_dirname(language,language,NullS); (void) my_load_path(mysql_home,mysql_home,""); // Resolve current dir (void) my_load_path(mysql_real_data_home,mysql_real_data_home,mysql_home); (void) my_load_path(pidfile_name,pidfile_name,mysql_real_data_home); + (void) my_load_path(opt_plugin_dir, opt_plugin_dir_ptr ? opt_plugin_dir_ptr : + "", ""); + opt_plugin_dir_ptr= opt_plugin_dir; char *sharedir=get_relative_path(SHAREDIR); if (test_if_hard_path(sharedir)) diff --git a/sql/set_var.cc b/sql/set_var.cc index 84766e511ca..6bc19f2e6eb 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1026,6 +1026,7 @@ struct show_var_st init_vars[]= { {sys_optimizer_search_depth.name,(char*) &sys_optimizer_search_depth, SHOW_SYS}, {"pid_file", (char*) pidfile_name, SHOW_CHAR}, + {"plugin_dir", (char*) opt_plugin_dir, SHOW_CHAR}, {"port", (char*) &mysqld_port, SHOW_INT}, {sys_preload_buff_size.name, (char*) &sys_preload_buff_size, SHOW_SYS}, {"protocol_version", (char*) &protocol_version, SHOW_INT}, diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 62a5a79a833..d9339437f50 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -76,7 +76,6 @@ static void remove_escape(char *name); static bool append_file_to_dir(THD *thd, const char **filename_ptr, const char *table_name); static bool check_show_create_table_access(THD *thd, TABLE_LIST *table); -static bool test_if_data_home_dir(const char *dir); const char *any_db="*any*"; // Special symbol for check_access @@ -3044,13 +3043,13 @@ mysql_execute_command(THD *thd) if (test_if_data_home_dir(lex->create_info.data_file_name)) { - my_error(ER_WRONG_ARGUMENTS,MYF(0),"DATA DIRECORY"); + my_error(ER_WRONG_ARGUMENTS,MYF(0),"DATA DIRECTORY"); res= -1; break; } if (test_if_data_home_dir(lex->create_info.index_file_name)) { - my_error(ER_WRONG_ARGUMENTS,MYF(0),"INDEX DIRECORY"); + my_error(ER_WRONG_ARGUMENTS,MYF(0),"INDEX DIRECTORY"); res= -1; break; } @@ -7919,10 +7918,12 @@ bool check_string_length(LEX_STRING *str, const char *err_msg, 1 error */ -static bool test_if_data_home_dir(const char *dir) +C_MODE_START + +int test_if_data_home_dir(const char *dir) { - char path[FN_REFLEN], conv_path[FN_REFLEN]; - uint dir_len, home_dir_len= strlen(mysql_unpacked_real_data_home); + char path[FN_REFLEN]; + int dir_len; DBUG_ENTER("test_if_data_home_dir"); if (!dir) @@ -7930,21 +7931,27 @@ static bool test_if_data_home_dir(const char *dir) (void) fn_format(path, dir, "", "", (MY_RETURN_REAL_PATH|MY_RESOLVE_SYMLINKS)); - dir_len= unpack_dirname(conv_path, dir); - - if (home_dir_len <= dir_len) + dir_len= strlen(path); + if (mysql_unpacked_real_data_home_len<= dir_len) { + if (dir_len > mysql_unpacked_real_data_home_len && + path[mysql_unpacked_real_data_home_len] != FN_LIBCHAR) + DBUG_RETURN(0); + if (lower_case_file_system) { - if (!my_strnncoll(default_charset_info, (const uchar*) conv_path, - home_dir_len, + if (!my_strnncoll(default_charset_info, (const uchar*) path, + mysql_unpacked_real_data_home_len, (const uchar*) mysql_unpacked_real_data_home, - home_dir_len)) + mysql_unpacked_real_data_home_len)) DBUG_RETURN(1); } - else if (!memcmp(conv_path, mysql_unpacked_real_data_home, home_dir_len)) + else if (!memcmp(path, mysql_unpacked_real_data_home, + mysql_unpacked_real_data_home_len)) DBUG_RETURN(1); } DBUG_RETURN(0); } +C_MODE_END + diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc index 34ca18d5c39..e3a0230d2fb 100644 --- a/sql/sql_udf.cc +++ b/sql/sql_udf.cc @@ -214,7 +214,17 @@ void udf_init() void *dl = find_udf_dl(tmp->dl); if (dl == NULL) { - if (!(dl = dlopen(tmp->dl, RTLD_NOW))) + char dlpath[FN_REFLEN]; + if (*opt_plugin_dir) + strxnmov(dlpath, sizeof(dlpath) - 1, opt_plugin_dir, "/", tmp->dl, + NullS); + else + { + strxnmov(dlpath, sizeof(dlpath)-1, tmp->dl, NullS); + push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_UNKNOWN_ERROR, + "plugin_dir was not specified"); + } + if (!(dl = dlopen(dlpath, RTLD_NOW))) { /* Print warning to log */ sql_print_error(ER(ER_CANT_OPEN_LIBRARY), tmp->dl,errno,dlerror()); @@ -443,8 +453,18 @@ int mysql_create_function(THD *thd,udf_func *udf) } if (!(dl = find_udf_dl(udf->dl))) { - DBUG_PRINT("info", ("Calling dlopen, udf->dl: %s", udf->dl)); - if (!(dl = dlopen(udf->dl, RTLD_NOW))) + char dlpath[FN_REFLEN]; + if (*opt_plugin_dir) + strxnmov(dlpath, sizeof(dlpath) - 1, opt_plugin_dir, "/", udf->dl, + NullS); + else + { + strxnmov(dlpath, sizeof(dlpath)-1, udf->dl, NullS); + push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_UNKNOWN_ERROR, + "plugin_dir was not specified"); + } + DBUG_PRINT("info", ("Calling dlopen, udf->dl: %s", dlpath)); + if (!(dl = dlopen(dlpath, RTLD_NOW))) { DBUG_PRINT("error",("dlopen of %s failed, error: %d (%s)", udf->dl,errno,dlerror())); diff --git a/sql/unireg.h b/sql/unireg.h index 1326b22c8c9..8e01e6222e6 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -35,6 +35,9 @@ #ifndef SHAREDIR #define SHAREDIR "share/" #endif +#ifndef PLUGINDIR +#define PLUGINDIR "lib/plugin" +#endif #define ER(X) errmesg[(X) - ER_ERROR_FIRST] #define ER_SAFE(X) (((X) >= ER_ERROR_FIRST && (X) <= ER_ERROR_LAST) ? ER(X) : "Invalid error code") From 1d6fd4cdf3c673fd1b3f9ce88f861c927df7ccf3 Mon Sep 17 00:00:00 2001 From: Jonathan Perkin Date: Thu, 23 Oct 2008 21:46:46 +0200 Subject: [PATCH 338/705] Revert part of last change, it was not related to a security fix. --- mysys/thr_lock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index 853e1f96b49..02c9f08c946 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.c @@ -333,10 +333,10 @@ void thr_lock_init(THR_LOCK *lock) void thr_lock_delete(THR_LOCK *lock) { DBUG_ENTER("thr_lock_delete"); + VOID(pthread_mutex_destroy(&lock->mutex)); pthread_mutex_lock(&THR_LOCK_lock); thr_lock_thread_list=list_delete(thr_lock_thread_list,&lock->list); pthread_mutex_unlock(&THR_LOCK_lock); - pthread_mutex_destroy(&lock->mutex); DBUG_VOID_RETURN; } From 533cf7950ecdccf37d5a603ab769b2dcb986f8c8 Mon Sep 17 00:00:00 2001 From: Mats Kindahl Date: Fri, 24 Oct 2008 14:51:06 +0200 Subject: [PATCH 339/705] Manual merge of 5.1 into 5.1-rpl --- .../suite/binlog/r/binlog_multi_engine.result | 28 +++++++++---------- mysql-test/suite/rpl/r/rpl_sp.result | 4 +-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/mysql-test/suite/binlog/r/binlog_multi_engine.result b/mysql-test/suite/binlog/r/binlog_multi_engine.result index 281e8785a8d..caae5f55d13 100644 --- a/mysql-test/suite/binlog/r/binlog_multi_engine.result +++ b/mysql-test/suite/binlog/r/binlog_multi_engine.result @@ -73,19 +73,19 @@ UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c; ERROR HY000: Binary logging not possible. Message: Statement cannot be written atomically since more than one engine involved and at least one engine is self-logging show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query # # use `test`; BEGIN -master-bin.000001 # Table_map # # table_id: # (test.t1m) -master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F -master-bin.000001 # Query # # use `test`; COMMIT -master-bin.000001 # Query # # use `test`; BEGIN -master-bin.000001 # Table_map # # table_id: # (test.t1b) -master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F -master-bin.000001 # Query # # use `test`; COMMIT -master-bin.000001 # Query # # BEGIN -master-bin.000001 # Table_map # # table_id: # (test.t1n) -master-bin.000001 # Table_map # # table_id: # (mysql.ndb_apply_status) -master-bin.000001 # Write_rows # # table_id: # -master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F -master-bin.000001 # Query # # COMMIT +mysqld-bin.000001 # Query # # use `test`; BEGIN +mysqld-bin.000001 # Table_map # # table_id: # (test.t1m) +mysqld-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query # # use `test`; COMMIT +mysqld-bin.000001 # Query # # use `test`; BEGIN +mysqld-bin.000001 # Table_map # # table_id: # (test.t1b) +mysqld-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query # # use `test`; COMMIT +mysqld-bin.000001 # Query # # BEGIN +mysqld-bin.000001 # Table_map # # table_id: # (test.t1n) +mysqld-bin.000001 # Table_map # # table_id: # (mysql.ndb_apply_status) +mysqld-bin.000001 # Write_rows # # table_id: # +mysqld-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F +mysqld-bin.000001 # Query # # COMMIT RESET MASTER; DROP TABLE t1m, t1b, t1n; diff --git a/mysql-test/suite/rpl/r/rpl_sp.result b/mysql-test/suite/rpl/r/rpl_sp.result index d1420d59af3..4a8a4050c02 100644 --- a/mysql-test/suite/rpl/r/rpl_sp.result +++ b/mysql-test/suite/rpl/r/rpl_sp.result @@ -555,11 +555,11 @@ end master-bin.000001 # Query 1 # use `mysqltest`; SELECT `mysqltest2`.`f1`() set @@global.log_bin_trust_routine_creators= @old_log_bin_trust_routine_creators; Warnings: -Warning 1287 The syntax 'log_bin_trust_routine_creators' is deprecated and will be removed in MySQL 5.2. Please use 'log_bin_trust_function_creators' instead +Warning 1287 The syntax '@@log_bin_trust_routine_creators' is deprecated and will be removed in MySQL 5.2. Please use '@@log_bin_trust_function_creators' instead set @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; set @@global.log_bin_trust_routine_creators= @old_log_bin_trust_routine_creators; Warnings: -Warning 1287 The syntax 'log_bin_trust_routine_creators' is deprecated and will be removed in MySQL 5.2. Please use 'log_bin_trust_function_creators' instead +Warning 1287 The syntax '@@log_bin_trust_routine_creators' is deprecated and will be removed in MySQL 5.2. Please use '@@log_bin_trust_function_creators' instead set @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators; drop database mysqltest; drop database mysqltest2; From 2dca77e466faaeeb21be4a6d37ff0f91b9d839c1 Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Wed, 29 Oct 2008 14:25:03 +0100 Subject: [PATCH 340/705] BUG#40257: Please remove --loose-skip-innodb from suite/rpl/rpl_1slave_base.cnf Removed the flag that disables innodb on slave in the default configuration of replication tests. That made the explicit --innodb flag in -slave.opt files redundant, so lots of -slave.opt files could be removed. Also, -master.opt files containing reduntant --innodb flag were removed (those were redundant even without changing the default). Removing .opt files is good because .opt files cause server restarts and make tests less readable. Also fixed a bug where rpl_innodb_mixed_ddl unintentionally used myisam on slave. --- mysql-test/suite/rpl/r/rpl_innodb.result | 1 + mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result | 8 ++++---- mysql-test/suite/rpl/rpl_1slave_base.cnf | 4 +++- .../suite/rpl/t/rpl_auto_increment-slave.opt | 1 - mysql-test/suite/rpl/t/rpl_bug26395-master.opt | 1 - mysql-test/suite/rpl/t/rpl_bug26395-slave.opt | 1 - .../suite/rpl/t/rpl_deadlock_innodb-slave.opt | 2 +- .../suite/rpl/t/rpl_dual_pos_advance-slave.opt | 1 - .../suite/rpl/t/rpl_extraCol_innodb-master.opt | 1 - .../suite/rpl/t/rpl_extraCol_innodb-slave.opt | 1 - .../rpl/t/rpl_extraColmaster_innodb-master.opt | 1 - .../rpl/t/rpl_extraColmaster_innodb-slave.opt | 1 - .../suite/rpl/t/rpl_foreign_key_innodb-slave.opt | 1 - mysql-test/suite/rpl/t/rpl_idempotency-master.opt | 2 -- mysql-test/suite/rpl/t/rpl_idempotency-slave.opt | 3 +-- mysql-test/suite/rpl/t/rpl_innodb-master.opt | 2 +- mysql-test/suite/rpl/t/rpl_innodb.test | 14 ++++++++++++-- .../suite/rpl/t/rpl_innodb_bug28430-master.opt | 2 +- .../suite/rpl/t/rpl_innodb_bug28430-slave.opt | 2 +- mysql-test/suite/rpl/t/rpl_insert_id-slave.opt | 1 - mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt | 1 - mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt | 1 - .../suite/rpl/t/rpl_invoked_features-master.opt | 1 - .../suite/rpl/t/rpl_invoked_features-slave.opt | 1 - mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt | 1 - mysql-test/suite/rpl/t/rpl_read_only-slave.opt | 1 - .../suite/rpl/t/rpl_relay_space_innodb-master.opt | 1 - .../suite/rpl/t/rpl_relay_space_innodb-slave.opt | 1 - mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt | 1 - .../suite/rpl/t/rpl_row_basic_11bugs-master.opt | 2 +- .../suite/rpl/t/rpl_row_basic_11bugs-slave.opt | 1 - .../suite/rpl/t/rpl_row_basic_3innodb-slave.opt | 1 - .../suite/rpl/t/rpl_row_blob_innodb-slave.opt | 1 - .../suite/rpl/t/rpl_row_create_table-slave.opt | 1 - mysql-test/suite/rpl/t/rpl_row_func003-slave.opt | 1 - .../suite/rpl/t/rpl_row_log_innodb-slave.opt | 1 - .../suite/rpl/t/rpl_row_sp002_innodb-master.opt | 1 - .../suite/rpl/t/rpl_row_sp002_innodb-slave.opt | 1 - mysql-test/suite/rpl/t/rpl_row_sp003-master.opt | 1 - mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt | 1 - .../suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt | 1 - .../suite/rpl/t/rpl_row_sp007_innodb-slave.opt | 1 - .../rpl/t/rpl_row_tabledefs_3innodb-slave.opt | 1 - .../suite/rpl/t/rpl_slave_grp_exec-master.opt | 1 - .../suite/rpl/t/rpl_slave_grp_exec-slave.opt | 1 - mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt | 1 - mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt | 1 - 47 files changed, 26 insertions(+), 52 deletions(-) delete mode 100644 mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_bug26395-master.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_bug26395-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-master.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_idempotency-master.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_insert_id-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_invoked_features-master.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_invoked_features-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_read_only-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_row_func003-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_row_sp003-master.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_slave_grp_exec-master.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_slave_grp_exec-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt delete mode 100644 mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt diff --git a/mysql-test/suite/rpl/r/rpl_innodb.result b/mysql-test/suite/rpl/r/rpl_innodb.result index fb906dd6197..bf6c3cb8c86 100644 --- a/mysql-test/suite/rpl/r/rpl_innodb.result +++ b/mysql-test/suite/rpl/r/rpl_innodb.result @@ -43,6 +43,7 @@ CREATE TEMPORARY TABLE mysqltest1.tmp (f1 BIGINT); CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE="InnoDB"; SET AUTOCOMMIT = 0; -------- switch to slave -------- +ALTER TABLE mysqltest1.t1 ENGINE = MyISAM; SHOW CREATE TABLE mysqltest1.t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result b/mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result index 85308442fd8..fbb1e2355c3 100644 --- a/mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result +++ b/mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result @@ -77,7 +77,7 @@ t1 CREATE TABLE `t1` ( `b` char(254) DEFAULT NULL, PRIMARY KEY (`a`), KEY `index1` (`b`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( @@ -85,7 +85,7 @@ t2 CREATE TABLE `t2` ( `b` char(254) DEFAULT NULL, PRIMARY KEY (`a`), KEY `index1` (`b`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 ******************** DDL for indexes ******************** ALTER TABLE t2 ADD COLUMN d datetime; @@ -120,7 +120,7 @@ t1 CREATE TABLE `t1` ( `b` char(254) DEFAULT NULL, PRIMARY KEY (`a`), KEY `index1` (`b`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( @@ -131,7 +131,7 @@ t2 CREATE TABLE `t2` ( KEY `index1` (`b`), KEY `index2` (`d`), KEY `index3` (`a`,`d`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 ALTER TABLE t2 DROP COLUMN d; diff --git a/mysql-test/suite/rpl/rpl_1slave_base.cnf b/mysql-test/suite/rpl/rpl_1slave_base.cnf index cd902a6483f..1981d233c60 100644 --- a/mysql-test/suite/rpl/rpl_1slave_base.cnf +++ b/mysql-test/suite/rpl/rpl_1slave_base.cnf @@ -8,6 +8,8 @@ log-bin= master-bin +loose-innodb + [mysqld.2] # Run the slave.sh script before starting this process #!run-slave-sh @@ -39,7 +41,7 @@ slave-load-tmpdir= ../../tmp rpl-recovery-rank= @mysqld.2.server-id -loose-skip-innodb +loose-innodb [ENV] diff --git a/mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt b/mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt deleted file mode 100644 index 48457b17309..00000000000 --- a/mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-innodb diff --git a/mysql-test/suite/rpl/t/rpl_bug26395-master.opt b/mysql-test/suite/rpl/t/rpl_bug26395-master.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_bug26395-master.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_bug26395-slave.opt b/mysql-test/suite/rpl/t/rpl_bug26395-slave.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_bug26395-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt index c52c239a1a1..3819e7c3f7b 100644 --- a/mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt +++ b/mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt @@ -1 +1 @@ ---innodb --innodb_lock_wait_timeout=4 --slave-transaction-retries=2 --max-relay-log-size=4096 +--innodb_lock_wait_timeout=4 --slave-transaction-retries=2 --max-relay-log-size=4096 diff --git a/mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt b/mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt b/mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-master.opt b/mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-master.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-master.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-slave.opt deleted file mode 100644 index 1338b6eba04..00000000000 --- a/mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-slave.opt +++ /dev/null @@ -1 +0,0 @@ - --innodb diff --git a/mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_idempotency-master.opt b/mysql-test/suite/rpl/t/rpl_idempotency-master.opt deleted file mode 100644 index 66f581b56d0..00000000000 --- a/mysql-test/suite/rpl/t/rpl_idempotency-master.opt +++ /dev/null @@ -1,2 +0,0 @@ ---innodb - diff --git a/mysql-test/suite/rpl/t/rpl_idempotency-slave.opt b/mysql-test/suite/rpl/t/rpl_idempotency-slave.opt index 71ccf047474..03fc19ca6ae 100644 --- a/mysql-test/suite/rpl/t/rpl_idempotency-slave.opt +++ b/mysql-test/suite/rpl/t/rpl_idempotency-slave.opt @@ -1,2 +1 @@ ---slave-exec-mode=IDEMPOTENT --innodb - +--slave-exec-mode=IDEMPOTENT diff --git a/mysql-test/suite/rpl/t/rpl_innodb-master.opt b/mysql-test/suite/rpl/t/rpl_innodb-master.opt index 8636d2d8734..0eed7aaadad 100644 --- a/mysql-test/suite/rpl/t/rpl_innodb-master.opt +++ b/mysql-test/suite/rpl/t/rpl_innodb-master.opt @@ -1 +1 @@ ---innodb --innodb_autoinc_lock_mode=0 +--innodb_autoinc_lock_mode=0 diff --git a/mysql-test/suite/rpl/t/rpl_innodb.test b/mysql-test/suite/rpl/t/rpl_innodb.test index 012ecbeb2ea..64a85d27c88 100644 --- a/mysql-test/suite/rpl/t/rpl_innodb.test +++ b/mysql-test/suite/rpl/t/rpl_innodb.test @@ -74,6 +74,17 @@ SET AUTOCOMMIT = 0; sync_slave_with_master; --echo -------- switch to slave -------- connection slave; + +# We want to verify that the following transactions are written to the +# binlog, despite the transaction is rolled back. (The should be +# written to the binlog since they contain non-transactional DROP +# TEMPORARY TABLE). To see that, we use the auxiliary table t1, which +# is transactional (InnoDB) on master and MyISAM on slave. t1 should +# be transactional on master so that the insert into t1 does not cause +# the transaction to be logged. Since t1 is non-transactional on +# slave, the change will not be rolled back, so the inserted rows will +# stay in t1 and we can verify that the transaction was replicated. +ALTER TABLE mysqltest1.t1 ENGINE = MyISAM; SHOW CREATE TABLE mysqltest1.t1; --echo -------- switch to master -------- @@ -100,8 +111,7 @@ connection slave; SHOW CREATE TABLE mysqltest1.tmp; --error ER_NO_SUCH_TABLE SHOW CREATE TABLE mysqltest1.tmp2; -# has two rows here : as the default is MyISAM and -# it can't be rolled back by the master's ROLLBACK. +# t1 has two rows here: the transaction not rolled back since t1 uses MyISAM SELECT COUNT(*) FROM mysqltest1.t1; FLUSH LOGS; diff --git a/mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt b/mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt index 8636d2d8734..0eed7aaadad 100644 --- a/mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt +++ b/mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt @@ -1 +1 @@ ---innodb --innodb_autoinc_lock_mode=0 +--innodb_autoinc_lock_mode=0 diff --git a/mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt b/mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt index 8636d2d8734..0eed7aaadad 100644 --- a/mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt +++ b/mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt @@ -1 +1 @@ ---innodb --innodb_autoinc_lock_mode=0 +--innodb_autoinc_lock_mode=0 diff --git a/mysql-test/suite/rpl/t/rpl_insert_id-slave.opt b/mysql-test/suite/rpl/t/rpl_insert_id-slave.opt deleted file mode 100644 index 48457b17309..00000000000 --- a/mysql-test/suite/rpl/t/rpl_insert_id-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-innodb diff --git a/mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt b/mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt deleted file mode 100644 index 48457b17309..00000000000 --- a/mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-innodb diff --git a/mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt b/mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt deleted file mode 100644 index 48457b17309..00000000000 --- a/mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-innodb diff --git a/mysql-test/suite/rpl/t/rpl_invoked_features-master.opt b/mysql-test/suite/rpl/t/rpl_invoked_features-master.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_invoked_features-master.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_invoked_features-slave.opt b/mysql-test/suite/rpl/t/rpl_invoked_features-slave.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_invoked_features-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt b/mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt deleted file mode 100644 index 48457b17309..00000000000 --- a/mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-innodb diff --git a/mysql-test/suite/rpl/t/rpl_read_only-slave.opt b/mysql-test/suite/rpl/t/rpl_read_only-slave.opt deleted file mode 100644 index 48457b17309..00000000000 --- a/mysql-test/suite/rpl/t/rpl_read_only-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-innodb diff --git a/mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt b/mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt b/mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt index cf4319f2b40..e5b24dd9413 100644 --- a/mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt +++ b/mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt @@ -1,3 +1,2 @@ -O max_relay_log_size=16384 ---loose-innodb --log-warnings diff --git a/mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt b/mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt index ed7656c1f99..de86b63f230 100644 --- a/mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt +++ b/mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt @@ -1,2 +1,2 @@ ---binlog_ignore_db=test_ignore --loose-innodb +--binlog_ignore_db=test_ignore diff --git a/mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt b/mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt deleted file mode 100644 index 48457b17309..00000000000 --- a/mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-innodb diff --git a/mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt b/mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt deleted file mode 100644 index 48457b17309..00000000000 --- a/mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-innodb diff --git a/mysql-test/suite/rpl/t/rpl_row_func003-slave.opt b/mysql-test/suite/rpl/t/rpl_row_func003-slave.opt deleted file mode 100644 index 48457b17309..00000000000 --- a/mysql-test/suite/rpl/t/rpl_row_func003-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-innodb diff --git a/mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt b/mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_row_sp003-master.opt b/mysql-test/suite/rpl/t/rpl_row_sp003-master.opt deleted file mode 100644 index 48457b17309..00000000000 --- a/mysql-test/suite/rpl/t/rpl_row_sp003-master.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-innodb diff --git a/mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt b/mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt deleted file mode 100644 index 48457b17309..00000000000 --- a/mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-innodb diff --git a/mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt b/mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_slave_grp_exec-master.opt b/mysql-test/suite/rpl/t/rpl_slave_grp_exec-master.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_slave_grp_exec-master.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_slave_grp_exec-slave.opt b/mysql-test/suite/rpl/t/rpl_slave_grp_exec-slave.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_slave_grp_exec-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt b/mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt deleted file mode 100644 index 627becdbfb5..00000000000 --- a/mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb diff --git a/mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt b/mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt deleted file mode 100644 index 48457b17309..00000000000 --- a/mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-innodb From 450cc26b47992c71d2c69301c831a12ef7dcd7e7 Mon Sep 17 00:00:00 2001 From: Mats Kindahl Date: Wed, 29 Oct 2008 18:38:18 +0100 Subject: [PATCH 341/705] Post-merge fixes to fix test cases. --- mysql-test/extra/rpl_tests/rpl_log.test | 7 +++++-- mysql-test/r/distinct.result | 8 ++++---- mysql-test/r/log_basic.result | 2 ++ mysql-test/r/mysql_upgrade.result | 18 +++++++++--------- mysql-test/suite/federated/federated.result | 1 - mysql-test/suite/federated/federated.test | 4 ++-- .../suite/federated/federated_bug_25714.test | 3 --- mysql-test/suite/rpl/r/rpl_row_log.result | 13 +++++++++++-- .../suite/rpl/r/rpl_row_log_innodb.result | 13 +++++++++++-- mysql-test/suite/rpl/r/rpl_stm_log.result | 11 +++++++++-- .../suite/rpl/t/rpl_circular_for_4_hosts.test | 2 +- mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result | 13 +++++++++++-- mysql-test/t/distinct.test | 8 ++++---- 13 files changed, 69 insertions(+), 34 deletions(-) diff --git a/mysql-test/extra/rpl_tests/rpl_log.test b/mysql-test/extra/rpl_tests/rpl_log.test index cff6951fdcd..83b780394b9 100644 --- a/mysql-test/extra/rpl_tests/rpl_log.test +++ b/mysql-test/extra/rpl_tests/rpl_log.test @@ -126,9 +126,13 @@ DROP TABLE t3; # Bug #6880: LAST_INSERT_ID() within a statement # +# Reset binlog so that show binlog events will not show the tests +# above. +source include/master-slave-reset.inc; +connection master; + create table t1(a int auto_increment primary key, b int); insert into t1 values (NULL, 1); -reset master; set insert_id=5; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id()); source include/show_binlog_events.inc; @@ -138,4 +142,3 @@ drop table t1; # End of 4.1 tests sync_slave_with_master; -drop table t1; diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result index 6a06a9661aa..f71bbd175e3 100644 --- a/mysql-test/r/distinct.result +++ b/mysql-test/r/distinct.result @@ -653,11 +653,11 @@ DROP TABLE IF EXISTS t2; CREATE TABLE t2 (fruit_id INT NOT NULL, fruit_name varchar(20) default NULL); SELECT DISTINCT fruit_id, fruit_name INTO OUTFILE -'../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE'; -LOAD DATA INFILE '../tmp/data1.tmp' INTO TABLE t2; +'../../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE'; +LOAD DATA INFILE '../../tmp/data1.tmp' INTO TABLE t2; SELECT DISTINCT @v19:= fruit_id, @v20:= fruit_name INTO OUTFILE -'../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE'; -LOAD DATA INFILE '../tmp/data2.tmp' INTO TABLE t2; +'../../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE'; +LOAD DATA INFILE '../../tmp/data2.tmp' INTO TABLE t2; SELECT @v19, @v20; @v19 @v20 2 APPLE diff --git a/mysql-test/r/log_basic.result b/mysql-test/r/log_basic.result index 864982121e5..18a12b72437 100644 --- a/mysql-test/r/log_basic.result +++ b/mysql-test/r/log_basic.result @@ -17,3 +17,5 @@ WHERE VARIABLE_NAME='log'; VARIABLE_VALUE OFF SET @@global.log= @start_log; +Warnings: +Warning 1287 The syntax '@@log' is deprecated and will be removed in MySQL 7.0. Please use '@@general_log' instead diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result index be14e282f2a..ca887df4019 100644 --- a/mysql-test/r/mysql_upgrade.result +++ b/mysql-test/r/mysql_upgrade.result @@ -1,7 +1,7 @@ Run mysql_upgrade once -mtr.global_suppressions OK +mtr.global_supressions OK mtr.suspicious_patterns OK -mtr.test_suppressions OK +mtr.test_supressions OK mysql.columns_priv OK mysql.db OK mysql.event OK @@ -32,9 +32,9 @@ mysql.user OK Run it again - should say already completed This installation of MySQL is already upgraded to VERSION, use --force if you still need to run mysql_upgrade Force should run it regardless of wether it's been run before -mtr.global_suppressions OK +mtr.global_supressions OK mtr.suspicious_patterns OK -mtr.test_suppressions OK +mtr.test_supressions OK mysql.columns_priv OK mysql.db OK mysql.event OK @@ -65,9 +65,9 @@ mysql.user OK CREATE USER mysqltest1@'%' IDENTIFIED by 'sakila'; GRANT ALL ON *.* TO mysqltest1@'%'; Run mysql_upgrade with password protected account -mtr.global_suppressions OK +mtr.global_supressions OK mtr.suspicious_patterns OK -mtr.test_suppressions OK +mtr.test_supressions OK mysql.columns_priv OK mysql.db OK mysql.event OK @@ -97,12 +97,12 @@ mysql.time_zone_transition_type OK mysql.user OK DROP USER mysqltest1@'%'; Run mysql_upgrade with a non existing server socket -mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errno) when trying to connect +mysqlcheck: Got error: 2003: Can't connect to MySQL server on 'not_existing_host' (errno) when trying to connect FATAL ERROR: Upgrade failed set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE'; -mtr.global_suppressions OK +mtr.global_supressions OK mtr.suspicious_patterns OK -mtr.test_suppressions OK +mtr.test_supressions OK mysql.columns_priv OK mysql.db OK mysql.event OK diff --git a/mysql-test/suite/federated/federated.result b/mysql-test/suite/federated/federated.result index 6c173a4a75b..341aede679c 100644 --- a/mysql-test/suite/federated/federated.result +++ b/mysql-test/suite/federated/federated.result @@ -2133,4 +2133,3 @@ DROP TABLE IF EXISTS federated.t1; DROP DATABASE IF EXISTS federated; DROP TABLE IF EXISTS federated.t1; DROP DATABASE IF EXISTS federated; -SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT; diff --git a/mysql-test/suite/federated/federated.test b/mysql-test/suite/federated/federated.test index 72c0f237ef0..1c4c3fc2161 100644 --- a/mysql-test/suite/federated/federated.test +++ b/mysql-test/suite/federated/federated.test @@ -6,7 +6,7 @@ # should work with embedded server after mysqltest is fixed --source include/not_embedded.inc ---source include/federated.inc +--source federated.inc connection default; @@ -1936,4 +1936,4 @@ connection slave; SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT; connection default; -source include/federated_cleanup.inc; +source federated_cleanup.inc; diff --git a/mysql-test/suite/federated/federated_bug_25714.test b/mysql-test/suite/federated/federated_bug_25714.test index 0f9853ef7d2..4de04944f6a 100644 --- a/mysql-test/suite/federated/federated_bug_25714.test +++ b/mysql-test/suite/federated/federated_bug_25714.test @@ -60,6 +60,3 @@ SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT; source federated_cleanup.inc; - -connection default; -SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT; diff --git a/mysql-test/suite/rpl/r/rpl_row_log.result b/mysql-test/suite/rpl/r/rpl_row_log.result index 6c3811daa47..e3b2ad67738 100644 --- a/mysql-test/suite/rpl/r/rpl_row_log.result +++ b/mysql-test/suite/rpl/r/rpl_row_log.result @@ -288,13 +288,23 @@ ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find tar DROP TABLE t1; DROP TABLE t2; DROP TABLE t3; +stop slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +start slave; create table t1(a int auto_increment primary key, b int); insert into t1 values (NULL, 1); -reset master; set insert_id=5; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id()); show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Query # # use `test`; create table t1(a int auto_increment primary key, b int) +master-bin.000001 # Query # # use `test`; BEGIN +master-bin.000001 # Table_map # # table_id: # (test.t1) +master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F +master-bin.000001 # Query # # use `test`; COMMIT master-bin.000001 # Query # # use `test`; BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F @@ -305,4 +315,3 @@ a b 5 1 6 1 drop table t1; -drop table t1; diff --git a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result index 7c2ffdba473..0b27ed72ff8 100644 --- a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result +++ b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result @@ -288,13 +288,23 @@ ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find tar DROP TABLE t1; DROP TABLE t2; DROP TABLE t3; +stop slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +start slave; create table t1(a int auto_increment primary key, b int); insert into t1 values (NULL, 1); -reset master; set insert_id=5; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id()); show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Query # # use `test`; create table t1(a int auto_increment primary key, b int) +master-bin.000001 # Query # # use `test`; BEGIN +master-bin.000001 # Table_map # # table_id: # (test.t1) +master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F +master-bin.000001 # Query # # use `test`; COMMIT master-bin.000001 # Query # # use `test`; BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F @@ -305,4 +315,3 @@ a b 5 1 6 1 drop table t1; -drop table t1; diff --git a/mysql-test/suite/rpl/r/rpl_stm_log.result b/mysql-test/suite/rpl/r/rpl_stm_log.result index d8528ff1c44..154050e8557 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_log.result +++ b/mysql-test/suite/rpl/r/rpl_stm_log.result @@ -270,13 +270,21 @@ ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find tar DROP TABLE t1; DROP TABLE t2; DROP TABLE t3; +stop slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +start slave; create table t1(a int auto_increment primary key, b int); insert into t1 values (NULL, 1); -reset master; set insert_id=5; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id()); show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Query # # use `test`; create table t1(a int auto_increment primary key, b int) +master-bin.000001 # Intvar # # INSERT_ID=1 +master-bin.000001 # Query # # use `test`; insert into t1 values (NULL, 1) master-bin.000001 # Intvar # # LAST_INSERT_ID=1 master-bin.000001 # Intvar # # INSERT_ID=5 master-bin.000001 # Query # # use `test`; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id()) @@ -286,4 +294,3 @@ a b 5 1 6 1 drop table t1; -drop table t1; diff --git a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test index 3d90a33ac8b..a49253f90c1 100644 --- a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test +++ b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test @@ -127,7 +127,7 @@ INSERT INTO t1(b,c) VALUES('A',3); INSERT INTO t1(b,c) VALUES('B',3); --connection master_d INSERT INTO t1(b,c) VALUES('D',3); ---connection master_a +connection master_a; --sync_slave_with_master master_b --sync_slave_with_master master_d diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result index 28714fe920c..6a2e3e80a20 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result @@ -117,7 +117,6 @@ Aberdeen Abernathy aberrant aberration -include/start_slave.inc select * from t1 order by 1 asc; word Aarhus @@ -305,13 +304,23 @@ ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find tar DROP TABLE t1; DROP TABLE t2; DROP TABLE t3; +stop slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +start slave; create table t1(a int auto_increment primary key, b int); insert into t1 values (NULL, 1); -reset master; set insert_id=5; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id()); show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Query # # use `test`; create table t1(a int auto_increment primary key, b int) +master-bin.000001 # Query # # use `test`; BEGIN +master-bin.000001 # Table_map # # table_id: # (test.t1) +master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F +master-bin.000001 # Query # # use `test`; COMMIT master-bin.000001 # Query # # use `test`; BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F diff --git a/mysql-test/t/distinct.test b/mysql-test/t/distinct.test index 59bc13b3b80..a77d1136840 100644 --- a/mysql-test/t/distinct.test +++ b/mysql-test/t/distinct.test @@ -487,14 +487,14 @@ CREATE TABLE t2 (fruit_id INT NOT NULL, fruit_name varchar(20) default NULL); SELECT DISTINCT fruit_id, fruit_name INTO OUTFILE -'../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE'; -LOAD DATA INFILE '../tmp/data1.tmp' INTO TABLE t2; +'../../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE'; +LOAD DATA INFILE '../../tmp/data1.tmp' INTO TABLE t2; --error 0,1 --remove_file $MYSQLTEST_VARDIR/tmp/data1.tmp SELECT DISTINCT @v19:= fruit_id, @v20:= fruit_name INTO OUTFILE -'../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE'; -LOAD DATA INFILE '../tmp/data2.tmp' INTO TABLE t2; +'../../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE'; +LOAD DATA INFILE '../../tmp/data2.tmp' INTO TABLE t2; --remove_file $MYSQLTEST_VARDIR/tmp/data2.tmp SELECT @v19, @v20; From 2bd47af8ba52b069e6282ee8f274874b4c1afbec Mon Sep 17 00:00:00 2001 From: Mats Kindahl Date: Thu, 30 Oct 2008 14:52:04 +0100 Subject: [PATCH 342/705] Fixing result file for mysql_upgrade test. --- mysql-test/r/mysql_upgrade.result | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result index ca887df4019..c13624d8d09 100644 --- a/mysql-test/r/mysql_upgrade.result +++ b/mysql-test/r/mysql_upgrade.result @@ -1,7 +1,7 @@ Run mysql_upgrade once -mtr.global_supressions OK +mtr.global_suppressions OK mtr.suspicious_patterns OK -mtr.test_supressions OK +mtr.test_suppressions OK mysql.columns_priv OK mysql.db OK mysql.event OK @@ -32,9 +32,9 @@ mysql.user OK Run it again - should say already completed This installation of MySQL is already upgraded to VERSION, use --force if you still need to run mysql_upgrade Force should run it regardless of wether it's been run before -mtr.global_supressions OK +mtr.global_suppressions OK mtr.suspicious_patterns OK -mtr.test_supressions OK +mtr.test_suppressions OK mysql.columns_priv OK mysql.db OK mysql.event OK @@ -65,9 +65,9 @@ mysql.user OK CREATE USER mysqltest1@'%' IDENTIFIED by 'sakila'; GRANT ALL ON *.* TO mysqltest1@'%'; Run mysql_upgrade with password protected account -mtr.global_supressions OK +mtr.global_suppressions OK mtr.suspicious_patterns OK -mtr.test_supressions OK +mtr.test_suppressions OK mysql.columns_priv OK mysql.db OK mysql.event OK @@ -100,9 +100,9 @@ Run mysql_upgrade with a non existing server socket mysqlcheck: Got error: 2003: Can't connect to MySQL server on 'not_existing_host' (errno) when trying to connect FATAL ERROR: Upgrade failed set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE'; -mtr.global_supressions OK +mtr.global_suppressions OK mtr.suspicious_patterns OK -mtr.test_supressions OK +mtr.test_suppressions OK mysql.columns_priv OK mysql.db OK mysql.event OK From ef08c3af3e1fd7efb5e643baf962bbc1b27a94e0 Mon Sep 17 00:00:00 2001 From: He Zhenxing Date: Fri, 31 Oct 2008 22:11:44 +0800 Subject: [PATCH 343/705] BUG#39007 rpl_ndb.rpl_ndb_circular_2ch crashed in pushbuild According to documenation: http://dev.mysql.com/doc/refman/5.1/en/mysql-cluster-replication-issues.html When setting up circular replication for clusters with different SQL nodes in each cluster used as replication master and slave, SQL nodes must not start with --log-slave-updates option. This patch fixed the test case by remove log-slave-updates configuration from test case configuration file. --- mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf | 4 ---- mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf index 27da0af1847..b1b010ef0f3 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf @@ -3,17 +3,14 @@ [mysqld.1.1] server-id= 1 log-bin -log-slave-updates [mysqld.2.1] server-id= 1 log-bin -log-slave-updates [mysqld.1.slave] server-id= 2 log-bin -log-slave-updates skip-slave-start [mysqld.2.slave] @@ -25,7 +22,6 @@ master-user= @mysqld.2.1.#user master-connect-retry= 1 init-rpl-role= slave log-bin -log-slave-updates skip-slave-start ndb_connectstring= @mysql_cluster.slave.ndb_connectstring diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test index f8fccd28092..a6b1c8c40ed 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test @@ -6,6 +6,7 @@ ############################################################# --source include/have_ndb.inc --source include/ndb_master-slave_2ch.inc +--source include/have_binlog_format_mixed_or_row.inc --echo # Check server_id and set auto_increment_* variables From a1b607f3364b90ede60c71bd8abb49e692b85aea Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Tue, 4 Nov 2008 16:25:37 +0100 Subject: [PATCH 344/705] Made mysql-test-run.pl executable. --- mysql-test/mysql-test-run.pl | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 mysql-test/mysql-test-run.pl diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl old mode 100644 new mode 100755 From 1a175aab708fcc4261ffb8983cbe9c7b81e39785 Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Tue, 4 Nov 2008 18:07:14 +0100 Subject: [PATCH 345/705] BUG#40257: Please remove --loose-skip-innodb from suite/rpl/rpl_1slave_base.cnf Removed unnecessary server options --rpl-recovery-rank. This is obsolete and does not affect the test suite in any useful way. --- mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result | 2 +- mysql-test/suite/rpl/rpl_1slave_base.cnf | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result b/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result index 38972a4f571..08d3241c48f 100644 --- a/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result +++ b/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result @@ -14,7 +14,7 @@ n 2002 show slave hosts; Server_id Host Port Rpl_recovery_rank Master_id -2 127.0.0.1 9999 2 1 +2 127.0.0.1 9999 0 1 drop table t1; stop slave; create table t2(id int auto_increment primary key, created datetime); diff --git a/mysql-test/suite/rpl/rpl_1slave_base.cnf b/mysql-test/suite/rpl/rpl_1slave_base.cnf index 1981d233c60..23b7ded9a7d 100644 --- a/mysql-test/suite/rpl/rpl_1slave_base.cnf +++ b/mysql-test/suite/rpl/rpl_1slave_base.cnf @@ -38,9 +38,6 @@ skip-slave-start # test results will vary, thus a relative path is used. slave-load-tmpdir= ../../tmp - -rpl-recovery-rank= @mysqld.2.server-id - loose-innodb From a21f8a0e57a3d0eabf24ac8f4fccb6f563ecc3b1 Mon Sep 17 00:00:00 2001 From: "kent.boortz@sun.com" <> Date: Thu, 6 Nov 2008 19:38:19 +0100 Subject: [PATCH 346/705] Back merges from 6.0.8 - Removed some copy/paste between debug and normal build in RPM spec - Removed "mysql_upgrade_shell" from RPM build - Removed use of "grep -q" in "configure.in", not portable - Improved test to disable ABI check not to accidently run for icc Other changes - Added make file test targets 'test-bt-fast' and 'test-bt-debug-fast' - Reenabled "jp" test suite run --- Makefile.am | 21 +++++++++++-- config/ac-macros/ha_ndbcluster.m4 | 2 +- configure.in | 8 ++--- support-files/mysql.spec.sh | 51 ++++++++++++++----------------- 4 files changed, 46 insertions(+), 36 deletions(-) diff --git a/Makefile.am b/Makefile.am index c0a5334a032..26670c42305 100644 --- a/Makefile.am +++ b/Makefile.am @@ -159,6 +159,8 @@ test-bt: @PERL@ ./mysql-test-run.pl --force --comment=partitions --suite=parts -cd mysql-test ; MTR_BUILD_THREAD=auto \ @PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress + -cd mysql-test ; MTR_BUILD_THREAD=auto \ + @PERL@ ./mysql-test-run.pl --force --comment=jp --suite=jp -if [ -d mysql-test/suite/nist ] ; then \ cd mysql-test ; MTR_BUILD_THREAD=auto \ @PERL@ ./mysql-test-run.pl --comment=nist --force --suite=nist ; \ @@ -175,15 +177,28 @@ test-bt: echo "no program found for 'embedded' tests - skipped testing" ; \ fi -# Re-enable the "jp" suite when bug#28563 is fixed -# -cd mysql-test ; MTR_BUILD_THREAD=auto \ -# @PERL@ ./mysql-test-run.pl --force --comment=jp --suite=jp +test-bt-fast: + -cd mysql-test ; MTR_BUILD_THREAD=auto \ + @PERL@ ./mysql-test-run.pl --comment=ps --force --timer \ + --skip-ndbcluster --ps-protocol + -if [ -e bin/ndbd -o -e storage/ndb/src/kernel/ndbd ] ; then \ + cd mysql-test ; \ + MTR_BUILD_THREAD=auto \ + @PERL@ ./mysql-test-run.pl --comment=ndb --force --timer \ + --with-ndbcluster-only ; \ + else \ + echo "no program found for 'ndbcluster' tests - skipped testing" ; \ + fi + -cd mysql-test ; MTR_BUILD_THREAD=auto \ + @PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress test-bt-debug: -cd mysql-test ; MTR_BUILD_THREAD=auto \ @PERL@ ./mysql-test-run.pl --comment=debug --force --timer \ --skip-ndbcluster --skip-rpl --report-features +test-bt-debug-fast: + # Keep these for a while test-pl: test test-full-pl: test-full diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4 index 9df96a7750b..5ee136f2266 100644 --- a/config/ac-macros/ha_ndbcluster.m4 +++ b/config/ac-macros/ha_ndbcluster.m4 @@ -280,7 +280,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ esac # libndbclient versioning when linked with GNU ld. - if $LD --version 2>/dev/null|grep -q GNU; then + if $LD --version 2>/dev/null|grep GNU >/dev/null 2>&1 ; then NDB_LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/storage/ndb/src/libndb.ver" AC_CONFIG_FILES(storage/ndb/src/libndb.ver) fi diff --git a/configure.in b/configure.in index 63ab547f70d..c57c1efee9f 100644 --- a/configure.in +++ b/configure.in @@ -377,7 +377,7 @@ fi MYSQL_PROG_AR # libmysqlclient versioning when linked with GNU ld. -if $LD --version 2>/dev/null|grep -q GNU; then +if $LD --version 2>/dev/null| grep GNU >/dev/null 2>&1; then LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/libmysql/libmysql.ver" AC_CONFIG_FILES(libmysql/libmysql.ver) fi @@ -449,11 +449,11 @@ AC_SUBST(PERL5) # Enable the abi_check rule only if gcc is available -if expr "$CC" : ".*gcc.*" +if test "$GCC" != "yes" || expr "$CC" : ".*icc.*" then - ABI_CHECK="abi_check" -else ABI_CHECK="" +else + ABI_CHECK="abi_check" fi AC_SUBST(ABI_CHECK) diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index e7c090484b7..812b5958b91 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -279,7 +279,20 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \ --mandir=%{_mandir} \ --enable-thread-safe-client \ --with-readline \ - " + --with-innodb \ +%if %{CLUSTER_BUILD} + --with-ndbcluster \ +%else + --without-ndbcluster \ +%endif + --with-archive-storage-engine \ + --with-csv-storage-engine \ + --with-blackhole-storage-engine \ + --with-federated-storage-engine \ + --with-partition \ + --with-big-tables \ + --enable-shared \ + " make } @@ -306,6 +319,8 @@ mkdir -p $RBR%{_libdir}/mysql PATH=${MYSQL_BUILD_PATH:-/bin:/usr/bin} export PATH +# Build the Debug binary. + # Use gcc for C and C++ code (to avoid a dependency on libstdc++ and # including exceptions into the code if [ -z "$CXX" -a -z "$CC" ] @@ -333,20 +348,8 @@ CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-O[0-9]* //' -e 's/-unroll2 //' -e 's/-ip / cd mysql-debug-%{mysql_version} && CFLAGS=\"$CFLAGS\" \ CXXFLAGS=\"$CXXFLAGS\" \ -BuildMySQL "--enable-shared \ +BuildMySQL "\ --with-debug \ - --with-innodb \ -%if %{CLUSTER_BUILD} - --with-ndbcluster \ -%else - --without-ndbcluster \ -%endif - --with-archive-storage-engine \ - --with-csv-storage-engine \ - --with-blackhole-storage-engine \ - --with-federated-storage-engine \ - --with-partition \ - --with-big-tables \ --with-comment=\"MySQL Community Server - Debug (GPL)\"") # We might want to save the config log file @@ -366,20 +369,8 @@ fi (cd mysql-release-%{mysql_version} && CFLAGS=\"$CFLAGS\" \ CXXFLAGS=\"$CXXFLAGS\" \ -BuildMySQL "--enable-shared \ - --with-innodb \ -%if %{CLUSTER_BUILD} - --with-ndbcluster \ -%else - --without-ndbcluster \ -%endif - --with-archive-storage-engine \ - --with-csv-storage-engine \ - --with-blackhole-storage-engine \ - --with-federated-storage-engine \ - --with-partition \ +BuildMySQL "\ --with-embedded-server \ - --with-big-tables \ --with-comment=\"MySQL Community Server (GPL)\"") # We might want to save the config log file if test -n "$MYSQL_CONFLOG_DEST" @@ -700,7 +691,6 @@ fi %attr(755, root, root) %{_bindir}/msql2mysql %attr(755, root, root) %{_bindir}/mysql %attr(755, root, root) %{_bindir}/mysql_find_rows -%attr(755, root, root) %{_bindir}/mysql_upgrade_shell %attr(755, root, root) %{_bindir}/mysql_waitpid %attr(755, root, root) %{_bindir}/mysqlaccess %attr(755, root, root) %{_bindir}/mysqladmin @@ -840,6 +830,11 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Thu Nov 06 2008 Kent Boortz + +- Removed "mysql_upgrade_shell" +- Removed some copy/paste between debug and normal build + * Thu Nov 06 2008 Joerg Bruehe - Modify CFLAGS and CXXFLAGS such that a debug build is not optimized. From 3fb892bf790cf75f19e572d28309d7ad471a2c87 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 7 Nov 2008 16:22:53 +0100 Subject: [PATCH 347/705] WL#4189 - fix for running from bin dist --- mysql-test/mysql-test-run.pl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 20fdc6704da..59e9398d442 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1390,7 +1390,7 @@ sub find_mysqld { } return my_find_bin($mysqld_basedir, - ["sql", "libexec", "sbin"], + ["sql", "libexec", "sbin", "bin"], [@mysqld_names]); } @@ -1420,12 +1420,12 @@ sub executable_setup () { { $exe_ndbd= my_find_bin($basedir, - ["storage/ndb/src/kernel", "libexec"], + ["storage/ndb/src/kernel", "libexec", "bin"], "ndbd"); $exe_ndb_mgmd= my_find_bin($basedir, - ["storage/ndb/src/mgmsrv", "libexec"], + ["storage/ndb/src/mgmsrv", "libexec", "bin"], "ndb_mgmd"); $exe_ndb_waiter= @@ -2537,7 +2537,8 @@ sub mysql_install_db { my $bootstrap_sql_file= "$opt_vardir/tmp/bootstrap.sql"; my $path_sql= my_find_file($install_basedir, - ["mysql", "sql/share", "share", "scripts"], + ["mysql", "sql/share", "share/mysql", + "share", "scripts"], "mysql_system_tables.sql", NOT_REQUIRED); From c81061e458570846723672c942c12aa15bfef146 Mon Sep 17 00:00:00 2001 From: Joerg Bruehe Date: Fri, 7 Nov 2008 18:38:40 +0100 Subject: [PATCH 348/705] "spec" file for RPM builds: Fix yesterday's patch so that it also works for the last flag. Still part of the fix for bug#40546. --- support-files/mysql.spec.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index dc80d379b83..7bb35e6072e 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -320,8 +320,12 @@ do # We are in a subshell, so we can modify variables just for one run. if test "$servertype" != ' ' then - CFLAGS=`echo $CFLAGS | sed -e 's/-O[0-9]* //' -e 's/-unroll2 //' -e 's/-ip //'` - CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-O[0-9]* //' -e 's/-unroll2 //' -e 's/-ip //'` + CFLAGS=`echo " $CFLAGS " | \ + sed -e 's/ -O[0-9]* / /' -e 's/ -unroll2 / /' -e 's/ -ip / /' \ + -e 's/^ //' -e 's/ $//'` + CXXFLAGS=`echo " $CXXFLAGS " | \ + sed -e 's/ -O[0-9]* / /' -e 's/ -unroll2 / /' -e 's/ -ip / /' \ + -e 's/^ //' -e 's/ $//'` fi BuildMySQL "\ @@ -807,6 +811,10 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Fri Nov 07 2008 Joerg Bruehe + +- Correct yesterday's fix, so that it also works for the last flag. + * Thu Nov 06 2008 Joerg Bruehe - Modify CFLAGS and CXXFLAGS such that a debug build is not optimized. From 827bae532bbb783ae0edf595ed359d4e739c43f1 Mon Sep 17 00:00:00 2001 From: Build Team Date: Sun, 9 Nov 2008 03:14:35 +0100 Subject: [PATCH 349/705] Added the default configure COMMUNITY_SERVER and ENABLED_PROFILING to the Windows configuration file "include/config-win.h". --- include/config-win.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/config-win.h b/include/config-win.h index cc2b2767663..e0e754e5c09 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -371,6 +371,9 @@ inline double ulonglong2double(ulonglong value) #define HAVE_OPENSSL 1 #define HAVE_YASSL 1 +#define COMMUNITY_SERVER 1 +#define ENABLED_PROFILING 1 + /* Define charsets you want */ /* #undef HAVE_CHARSET_armscii8 */ /* #undef HAVE_CHARSET_ascii */ From dafbde4979c9fefb19132a46523847ae071a3085 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 10 Nov 2008 14:52:51 +0100 Subject: [PATCH 350/705] Fix DBUG_PRINT --- client/mysqltest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index f944b7b6fed..e757022f564 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -503,8 +503,8 @@ public: void open(const char* dir, const char* name, const char* ext) { DBUG_ENTER("LogFile::open"); - DBUG_PRINT("enter", ("dir: %s, name: %s", - name, dir)); + DBUG_PRINT("enter", ("dir: '%s', name: '%s'", + dir, name)); if (!name) { m_file= stdout; From 6a58dc51803fffb302993e1a6bc9160a9025cc68 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 10 Nov 2008 14:53:21 +0100 Subject: [PATCH 351/705] WL#4189 removed unused variables --- mysql-test/mysql-test-run.pl | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 59e9398d442..245b655767d 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -181,8 +181,6 @@ my $opt_callgrind; our $opt_warnings= 1; our $opt_skip_ndbcluster= 0; -our $opt_skip_ndbcluster_slave= 0; -our $opt_with_ndbcluster; my $exe_ndbd; my $exe_ndb_mgmd; @@ -731,7 +729,6 @@ sub command_line_setup { 'ssl|with-openssl' => \$opt_ssl, 'skip-ssl' => \$opt_skip_ssl, 'compress' => \$opt_compress, - 'with-ndbcluster|ndb' => \$opt_with_ndbcluster, 'vs-config' => \$opt_vs_config, # Config file to use as template for all tests @@ -743,8 +740,6 @@ sub command_line_setup { 'force' => \$opt_force, 'with-ndbcluster-only' => \&collect_option, 'skip-ndbcluster|skip-ndb' => \$opt_skip_ndbcluster, - 'skip-ndbcluster-slave|skip-ndb-slave' - => \$opt_skip_ndbcluster_slave, 'suite|suites=s' => \$opt_suites, 'skip-rpl' => \&collect_option, 'skip-test=s' => \&collect_option, @@ -2063,7 +2058,6 @@ sub check_ndbcluster_support ($) { if ($opt_skip_ndbcluster) { mtr_report(" - skipping ndbcluster"); - $opt_skip_ndbcluster_slave= $opt_skip_ndbcluster; return; } @@ -2071,7 +2065,6 @@ sub check_ndbcluster_support ($) { { mtr_report(" - skipping ndbcluster, mysqld not compiled with ndbcluster"); $opt_skip_ndbcluster= 2; - $opt_skip_ndbcluster_slave= 2; return; } @@ -4403,6 +4396,7 @@ sub start_mysqltest ($) { if ( $opt_record ) { mtr_add_arg($args, "--record"); + mtr_add_arg($args, "--result-file=%s", $tinfo->{record_file}); } @@ -4674,7 +4668,6 @@ Options to control what engine/variation to run compress Use the compressed protocol between client and server ssl Use ssl protocol between client and server skip-ssl Dont start server with support for ssl connections - ndb|with-ndbcluster Use cluster as default table type vs-config Visual Studio configuration used to create executables (default: MTR_VS_CONFIG environment variable) From 4b739dcf4516f1d073ddcd6fe66a3559b2ee56cd Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 10 Nov 2008 14:53:53 +0100 Subject: [PATCH 352/705] Bug#40193 mtr --record is currently broken in 5.1-rpl and 6.0-rpl --- mysql-test/mysql-test-run.pl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 245b655767d..05534ed9680 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4397,7 +4397,11 @@ sub start_mysqltest ($) { { mtr_add_arg($args, "--record"); - mtr_add_arg($args, "--result-file=%s", $tinfo->{record_file}); + # When recording to a non existing result file + # the name of that file is in "record_file" + if ( defined $tinfo->{'record_file'} ) { + mtr_add_arg($args, "--result-file=%s", $tinfo->{record_file}); + } } if ( $opt_client_gdb ) From 5fd1c9768abece4647345ac66ec8e1b766683821 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Mon, 10 Nov 2008 16:10:49 +0100 Subject: [PATCH 353/705] WL#4189 Use only one worker for --record --- mysql-test/mysql-test-run.pl | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 05534ed9680..415b4f646a1 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -196,6 +196,8 @@ my $opt_max_save_core= $ENV{MTR_MAX_SAVE_CORE} || 5; my $opt_max_save_datadir= $ENV{MTR_MAX_SAVE_DATADIR} || 20; my $opt_max_test_fail= $ENV{MTR_MAX_TEST_FAIL} || 10; +my $opt_parallel= $ENV{MTR_PARALLEL}; + select(STDOUT); $| = 1; # Automatically flush STDOUT @@ -211,10 +213,6 @@ sub main { # directly before it executes them, like "make test-force-pl" in RPM builds. mtr_report("Logging: $0 ", join(" ", @ARGV)); - my $opt_parallel= $ENV{MTR_PARALLEL}; - Getopt::Long::Configure("pass_through"); - GetOptions('parallel=i' => \$opt_parallel) or usage(0, "Can't read options"); - command_line_setup(); if ( $opt_gcov ) { @@ -712,6 +710,7 @@ sub set_vardir { } + sub command_line_setup { my $opt_comment; my $opt_usage; @@ -731,6 +730,9 @@ sub command_line_setup { 'compress' => \$opt_compress, 'vs-config' => \$opt_vs_config, + # Max number of parallel threads to use + 'parallel=i' => \$opt_parallel, + # Config file to use as template for all tests 'defaults-file=s' => \&collect_option, # Extra config file to append to all generated configs @@ -1043,6 +1045,11 @@ sub command_line_setup { mtr_error("Will not run in record mode without a specific test case"); } + if ( $opt_record ) { + # Use only one worker with --record + $opt_parallel= 1; + } + # -------------------------------------------------------------------------- # Embedded server flag # -------------------------------------------------------------------------- From 366adeab08308aa8431b1c2363cf02226a1ad6b9 Mon Sep 17 00:00:00 2001 From: Build Team Date: Mon, 10 Nov 2008 21:21:49 +0100 Subject: [PATCH 354/705] Added "Sun Microsystems, Inc." to copyright headers on files modified since Oct 1st --- Makefile.am | 2 +- client/mysqldump.c | 2 +- include/config-win.h | 2 +- include/hash.h | 2 +- include/thr_lock.h | 2 +- mysql-test/lib/mtr_report.pl | 2 +- mysys/hash.c | 2 +- sql/event_db_repository.cc | 2 +- sql/event_parse_data.cc | 2 +- sql/event_parse_data.h | 2 +- sql/field.cc | 2 +- sql/field.h | 2 +- sql/ha_partition.cc | 2 +- sql/ha_partition.h | 2 +- sql/handler.cc | 2 +- sql/handler.h | 2 +- sql/item.cc | 2 +- sql/item.h | 2 +- sql/item_func.cc | 2 +- sql/item_func.h | 2 +- sql/lock.cc | 2 +- sql/log.cc | 2 +- sql/log_event.cc | 2 +- sql/mysql_priv.h | 2 +- sql/mysqld.cc | 2 +- sql/opt_range.cc | 2 +- sql/partition_info.h | 2 +- sql/set_var.cc | 2 +- sql/sp_head.cc | 2 +- sql/sql_base.cc | 2 +- sql/sql_cache.cc | 2 +- sql/sql_class.cc | 2 +- sql/sql_class.h | 2 +- sql/sql_insert.cc | 2 +- sql/sql_lex.cc | 2 +- sql/sql_lex.h | 2 +- sql/sql_parse.cc | 2 +- sql/sql_partition.cc | 2 +- sql/sql_select.cc | 2 +- sql/sql_show.cc | 2 +- sql/sql_show.h | 2 +- sql/sql_table.cc | 2 +- sql/sql_union.cc | 2 +- sql/sql_update.cc | 2 +- sql/sql_yacc.yy | 2 +- sql/table.cc | 2 +- sql/table.h | 2 +- storage/blackhole/ha_blackhole.cc | 2 +- storage/blackhole/ha_blackhole.h | 2 +- 49 files changed, 49 insertions(+), 49 deletions(-) diff --git a/Makefile.am b/Makefile.am index 26670c42305..f3b9c29da1f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2000-2006 MySQL AB +# Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/client/mysqldump.c b/client/mysqldump.c index c068b2ff16e..44c53a0e4c2 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/include/config-win.h b/include/config-win.h index e0e754e5c09..c111d14a17a 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/include/hash.h b/include/hash.h index 1f094d48585..f4b82454b81 100644 --- a/include/hash.h +++ b/include/hash.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/include/thr_lock.h b/include/thr_lock.h index 77d428d1805..c7754ada299 100644 --- a/include/thr_lock.h +++ b/include/thr_lock.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl index 3c78c3ca064..d02409d4cde 100644 --- a/mysql-test/lib/mtr_report.pl +++ b/mysql-test/lib/mtr_report.pl @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (C) 2004-2006 MySQL AB +# Copyright 2004-2008 MySQL AB, 2008 Sun Microsystems, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/mysys/hash.c b/mysys/hash.c index 65a60c9e341..dd2d589e509 100644 --- a/mysys/hash.c +++ b/mysys/hash.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/event_db_repository.cc b/sql/event_db_repository.cc index c26b740d24a..9a253d74546 100644 --- a/sql/event_db_repository.cc +++ b/sql/event_db_repository.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2004-2006 MySQL AB +/* Copyright 2004-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/event_parse_data.cc b/sql/event_parse_data.cc index df419e92d0d..63ecc3006dd 100644 --- a/sql/event_parse_data.cc +++ b/sql/event_parse_data.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/event_parse_data.h b/sql/event_parse_data.h index 87a800c2078..8b42eb23937 100644 --- a/sql/event_parse_data.h +++ b/sql/event_parse_data.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/field.cc b/sql/field.cc index a03beb4e8af..8a70377920c 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/field.h b/sql/field.h index 81905cc64ae..d24dd9355b0 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 303a2c152fb..4fe143bb9ed 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 MySQL AB +/* Copyright 2005-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/ha_partition.h b/sql/ha_partition.h index 685f057dfce..8aa4c3d7d78 100644 --- a/sql/ha_partition.h +++ b/sql/ha_partition.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 MySQL AB +/* Copyright 2005-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/handler.cc b/sql/handler.cc index 035a06c6f05..e124d97d9d1 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/handler.h b/sql/handler.h index b7d4d689d40..3958748f058 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/item.cc b/sql/item.cc index 93d00c287ae..61ae78a9386 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/item.h b/sql/item.h index 00a2759a739..81ca1bccae3 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/item_func.cc b/sql/item_func.cc index d7e6fc1f8f2..9c41b70eade 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/item_func.h b/sql/item_func.h index d84abdb6e56..ede08245319 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/lock.cc b/sql/lock.cc index faddb8c586c..f36e8d605d3 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/log.cc b/sql/log.cc index fb8669a5731..a36a0c14d07 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/log_event.cc b/sql/log_event.cc index 0d03593946d..51e124227a4 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2004 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index d11f2838e3a..f07a01cc8d8 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/mysqld.cc b/sql/mysqld.cc index d59ea8eca45..57f6ae7bc40 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/opt_range.cc b/sql/opt_range.cc index f228551b586..ccf6cbf745a 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/partition_info.h b/sql/partition_info.h index 703b92305b1..415f955d5d4 100644 --- a/sql/partition_info.h +++ b/sql/partition_info.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006 MySQL AB +/* Copyright 2006-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/set_var.cc b/sql/set_var.cc index a62cafc3873..17585f17dfe 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 534cd0a7ca1..ef6cb556f4c 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2002 MySQL AB +/* Copyright 2002-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/sql_base.cc b/sql/sql_base.cc index f18ee0ec562..9038b4d4125 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 81d0d447ac1..2fca739f667 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 12b773c91d0..da24b1cf39d 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/sql_class.h b/sql/sql_class.h index f5cf31d1030..d726ce90521 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 8762d3dc8fa..ecdbcda1616 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 4ac73baa992..b2caec86db9 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 53ae984e795..a93ad4f2312 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 704c16cfdec..8a4dd1f0812 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index a45664a9767..41bbd90fabb 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2005, 2006 MySQL AB +/* Copyright 2005-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 102809f9f64..032517234c6 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/sql_show.cc b/sql/sql_show.cc index fc2c2548cc4..6cdc3b1fa99 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2004 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/sql_show.h b/sql/sql_show.h index 3baaef00a7d..fa067a46033 100644 --- a/sql/sql_show.h +++ b/sql/sql_show.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006 MySQL AB +/* Copyright 2006-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/sql_table.cc b/sql/sql_table.cc index c866fdfc173..ae30b91f7de 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2004 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 2f3282f58f6..fd3036e3d80 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 197e5290aba..ff47f5e4cd7 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 8d9b3a2d4b5..6965f43b42c 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/table.cc b/sql/table.cc index 89714e4e47e..9d06992a3a9 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sql/table.h b/sql/table.h index ccd6b60664e..38a66f9f426 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/storage/blackhole/ha_blackhole.cc b/storage/blackhole/ha_blackhole.cc index 1a1a0d02375..357496fe095 100644 --- a/storage/blackhole/ha_blackhole.cc +++ b/storage/blackhole/ha_blackhole.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 MySQL AB +/* Copyright 2005-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/storage/blackhole/ha_blackhole.h b/storage/blackhole/ha_blackhole.h index 085840cce43..289e449be10 100644 --- a/storage/blackhole/ha_blackhole.h +++ b/storage/blackhole/ha_blackhole.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 MySQL AB +/* Copyright 2005-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by From deaa2c3059e9283cf2b60e35d7dbf91b772d9b62 Mon Sep 17 00:00:00 2001 From: Mattias Jonsson Date: Wed, 12 Nov 2008 13:36:53 +0100 Subject: [PATCH 355/705] Bug#38784: Mysql server crash if table is altered with partition changes. Occurred with EXTRA_DEBUG on windows. Problem was insufficient length of a local variable that stored path names. Solution was to use the correct length. --- CMakeLists.txt | 4 ++++ sql/sql_partition.cc | 22 +++++++++++----------- win/configure.js | 1 + 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7107a112f19..2f6e1236542 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,6 +98,10 @@ IF(CYBOZU) ADD_DEFINITIONS(-DCYBOZU) ENDIF(CYBOZU) +IF(EXTRA_DEBUG) + ADD_DEFINITIONS(-D EXTRA_DEBUG) +ENDIF(EXTRA_DEBUG) + # in some places we use DBUG_OFF SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDBUG_OFF") SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DDBUG_OFF") diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 5ed64ea8fd5..8eabded623c 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -5304,8 +5304,8 @@ static bool write_log_changed_partitions(ALTER_PARTITION_PARAM_TYPE *lpt, DDL_LOG_ENTRY ddl_log_entry; partition_info *part_info= lpt->part_info; DDL_LOG_MEMORY_ENTRY *log_entry; - char tmp_path[FN_LEN]; - char normal_path[FN_LEN]; + char tmp_path[FN_REFLEN]; + char normal_path[FN_REFLEN]; List_iterator part_it(part_info->partitions); uint temp_partitions= part_info->temp_partitions.elements; uint no_elements= part_info->partitions.elements; @@ -5516,7 +5516,7 @@ static bool write_log_drop_shadow_frm(ALTER_PARTITION_PARAM_TYPE *lpt) partition_info *part_info= lpt->part_info; DDL_LOG_MEMORY_ENTRY *log_entry; DDL_LOG_MEMORY_ENTRY *exec_log_entry= NULL; - char shadow_path[FN_LEN]; + char shadow_path[FN_REFLEN]; DBUG_ENTER("write_log_drop_shadow_frm"); build_table_shadow_filename(shadow_path, sizeof(shadow_path), lpt); @@ -5559,8 +5559,8 @@ static bool write_log_rename_frm(ALTER_PARTITION_PARAM_TYPE *lpt) partition_info *part_info= lpt->part_info; DDL_LOG_MEMORY_ENTRY *log_entry; DDL_LOG_MEMORY_ENTRY *exec_log_entry= part_info->exec_log_entry; - char path[FN_LEN]; - char shadow_path[FN_LEN]; + char path[FN_REFLEN]; + char shadow_path[FN_REFLEN]; DDL_LOG_MEMORY_ENTRY *old_first_log_entry= part_info->first_log_entry; DBUG_ENTER("write_log_rename_frm"); @@ -5610,8 +5610,8 @@ static bool write_log_drop_partition(ALTER_PARTITION_PARAM_TYPE *lpt) partition_info *part_info= lpt->part_info; DDL_LOG_MEMORY_ENTRY *log_entry; DDL_LOG_MEMORY_ENTRY *exec_log_entry= part_info->exec_log_entry; - char tmp_path[FN_LEN]; - char path[FN_LEN]; + char tmp_path[FN_REFLEN]; + char path[FN_REFLEN]; uint next_entry= 0; DDL_LOG_MEMORY_ENTRY *old_first_log_entry= part_info->first_log_entry; DBUG_ENTER("write_log_drop_partition"); @@ -5669,8 +5669,8 @@ static bool write_log_add_change_partition(ALTER_PARTITION_PARAM_TYPE *lpt) partition_info *part_info= lpt->part_info; DDL_LOG_MEMORY_ENTRY *log_entry; DDL_LOG_MEMORY_ENTRY *exec_log_entry= NULL; - char tmp_path[FN_LEN]; - char path[FN_LEN]; + char tmp_path[FN_REFLEN]; + char path[FN_REFLEN]; uint next_entry= 0; DBUG_ENTER("write_log_add_change_partition"); @@ -5723,8 +5723,8 @@ static bool write_log_final_change_partition(ALTER_PARTITION_PARAM_TYPE *lpt) partition_info *part_info= lpt->part_info; DDL_LOG_MEMORY_ENTRY *log_entry; DDL_LOG_MEMORY_ENTRY *exec_log_entry= part_info->exec_log_entry; - char path[FN_LEN]; - char shadow_path[FN_LEN]; + char path[FN_REFLEN]; + char shadow_path[FN_REFLEN]; DDL_LOG_MEMORY_ENTRY *old_first_log_entry= part_info->first_log_entry; uint next_entry= 0; DBUG_ENTER("write_log_final_change_partition"); diff --git a/win/configure.js b/win/configure.js index c86ec0cf47c..ac51b15b9f0 100644 --- a/win/configure.js +++ b/win/configure.js @@ -48,6 +48,7 @@ try case "__NT__": case "CYBOZU": case "EMBED_MANIFESTS": + case "EXTRA_DEBUG": case "WITH_EMBEDDED_SERVER": configfile.WriteLine("SET (" + args.Item(i) + " TRUE)"); break; From 78a3abeceda8f1f88336ab53d5489241aa4891fa Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Thu, 13 Nov 2008 20:19:00 +0100 Subject: [PATCH 356/705] BUG#38350: Many tests don't clean up after themselves on exit. Problem: Many test cases don't clean up after themselves (fail to drop tables or fail to reset variables). This implies that: (1) check-testcase in the new mtr that currently lives in 5.1-rpl failed. (2) it may cause unexpected results in subsequent tests. Fix: make all tests clean up. Also: cleaned away unnecessary output in rpl_packet.result Also: fixed bug where rpl_log called RESET MASTER with a running slave. This is not supposed to work. Also: removed unnecessary code from rpl_stm_EE_err2 and made it verify that an error occurred. Also: removed unnecessary code from rpl_ndb_ctype_ucs2_def. --- mysql-test/extra/rpl_tests/rpl_loaddata.test | 7 +-- .../extra/rpl_tests/rpl_stm_EE_err2.test | 9 +++- .../extra/rpl_tests/rpl_truncate_helper.test | 5 +++ mysql-test/include/query_cache.inc | 1 + mysql-test/r/cache_innodb.result | 1 + mysql-test/r/innodb-autoinc-optimize.result | 2 + mysql-test/r/innodb.result | 2 + mysql-test/r/log_tables.result | 25 ++++++----- mysql-test/r/mysql_client_test.result | 2 + mysql-test/r/partition.result | 2 + mysql-test/r/status.result | 2 + .../r/binlog_auto_increment_bug33029.result | 2 + .../t/binlog_auto_increment_bug33029.test | 6 ++- mysql-test/suite/rpl/r/rpl_alter_db.result | 6 ++- mysql-test/suite/rpl/r/rpl_drop_db.result | 5 +-- mysql-test/suite/rpl/r/rpl_drop_view.result | 2 + mysql-test/suite/rpl/r/rpl_events.result | 4 +- mysql-test/suite/rpl/r/rpl_idempotency.result | 3 +- .../suite/rpl/r/rpl_ignore_table.result | 3 +- mysql-test/suite/rpl/r/rpl_loaddata.result | 5 +-- mysql-test/suite/rpl/r/rpl_packet.result | 45 +++---------------- .../suite/rpl/r/rpl_row_max_relay_size.result | 2 - mysql-test/suite/rpl/r/rpl_stm_EE_err2.result | 3 ++ .../suite/rpl/r/rpl_truncate_2myisam.result | 24 ++++++++++ .../suite/rpl/r/rpl_truncate_3innodb.result | 24 ++++++++++ mysql-test/suite/rpl/t/rpl_alter_db.test | 16 ++++--- mysql-test/suite/rpl/t/rpl_drop_db.test | 11 +++-- mysql-test/suite/rpl/t/rpl_drop_view.test | 5 +++ mysql-test/suite/rpl/t/rpl_events.test | 6 ++- mysql-test/suite/rpl/t/rpl_idempotency.test | 13 ++---- mysql-test/suite/rpl/t/rpl_ignore_table.test | 3 +- mysql-test/suite/rpl/t/rpl_packet.test | 20 ++++++--- .../suite/rpl/t/rpl_row_max_relay_size.test | 7 ++- .../suite/rpl_ndb/r/rpl_ndb_2other.result | 2 + .../rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result | 4 +- .../suite/rpl_ndb/r/rpl_ndb_multi.result | 2 + .../suite/rpl_ndb/t/rpl_ndb_2other.test | 2 + .../rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test | 11 ++--- mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test | 5 +++ mysql-test/t/innodb-autoinc-optimize.test | 3 ++ mysql-test/t/innodb.test | 2 + mysql-test/t/log_tables.test | 28 +++++++----- mysql-test/t/mysql_client_test.test | 3 ++ mysql-test/t/partition.test | 5 +++ mysql-test/t/status.test | 7 ++- 45 files changed, 223 insertions(+), 124 deletions(-) diff --git a/mysql-test/extra/rpl_tests/rpl_loaddata.test b/mysql-test/extra/rpl_tests/rpl_loaddata.test index 040d8a7aa7c..26916642cae 100644 --- a/mysql-test/extra/rpl_tests/rpl_loaddata.test +++ b/mysql-test/extra/rpl_tests/rpl_loaddata.test @@ -146,10 +146,9 @@ terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by '\n##\n' starting by '>' ignore 1 lines; connection slave; --source include/wait_for_slave_sql_to_stop.inc -drop table t2; +drop table t1, t2; connection master; -drop table t2; -drop table t1; +drop table t1, t2; # BUG#17233 LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=INNODB; @@ -157,8 +156,6 @@ CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=INNODB; --error ER_DUP_ENTRY LOAD DATA INFILE "../../std_data/words.dat" INTO TABLE t1; ---disable_warnings DROP TABLE IF EXISTS t1; ---enable_warnings # End of 4.1 tests diff --git a/mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test b/mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test index 3304a0ff46d..2c396c9a209 100644 --- a/mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test +++ b/mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test @@ -18,13 +18,18 @@ eval create table t1 (a int, unique(a)) engine=$engine_type; set sql_log_bin=0; insert into t1 values(2); set sql_log_bin=1; -save_master_pos; + --error ER_DUP_ENTRY insert into t1 values(1),(2); drop table t1; -save_master_pos; + connection slave; --source include/wait_for_slave_sql_to_stop.inc +let $error= query_get_value(SHOW SLAVE STATUS, Last_SQL_Error, 1); +let $errno= query_get_value(SHOW SLAVE STATUS, Last_SQL_Errno, 1); +--echo Error: "$error" (expected different error codes on master and slave) +--echo Errno: "$errno" (expected 0) +drop table t1; # End of 4.1 tests diff --git a/mysql-test/extra/rpl_tests/rpl_truncate_helper.test b/mysql-test/extra/rpl_tests/rpl_truncate_helper.test index 76db74acfa1..eb0729e4921 100644 --- a/mysql-test/extra/rpl_tests/rpl_truncate_helper.test +++ b/mysql-test/extra/rpl_tests/rpl_truncate_helper.test @@ -14,6 +14,9 @@ START SLAVE; --echo **** On Master **** connection master; +SET @old_session_binlog_format= @@session.binlog_format; +SET @old_global_binlog_format= @@global.binlog_format; + eval SET SESSION BINLOG_FORMAT=$format; eval SET GLOBAL BINLOG_FORMAT=$format; @@ -40,3 +43,5 @@ source include/show_binlog_events.inc; connection master; RESET MASTER; +SET @@session.binlog_format= @old_session_binlog_format; +SET @@global.binlog_format= @old_global_binlog_format; diff --git a/mysql-test/include/query_cache.inc b/mysql-test/include/query_cache.inc index fdd6bc50eae..77ea0021a5d 100644 --- a/mysql-test/include/query_cache.inc +++ b/mysql-test/include/query_cache.inc @@ -176,6 +176,7 @@ show status like "Qcache_queries_in_cache"; show status like "Qcache_hits"; # Final cleanup +eval set GLOBAL query_cache_size=$save_query_cache_size; connection default; drop table t2; disconnect connection1; diff --git a/mysql-test/r/cache_innodb.result b/mysql-test/r/cache_innodb.result index 17cfcd69ec3..f2067e967f2 100644 --- a/mysql-test/r/cache_innodb.result +++ b/mysql-test/r/cache_innodb.result @@ -218,4 +218,5 @@ Qcache_queries_in_cache 1 show status like "Qcache_hits"; Variable_name Value Qcache_hits 2 +set GLOBAL query_cache_size=1048576; drop table t2; diff --git a/mysql-test/r/innodb-autoinc-optimize.result b/mysql-test/r/innodb-autoinc-optimize.result index 2896411a42f..c6da43555b2 100644 --- a/mysql-test/r/innodb-autoinc-optimize.result +++ b/mysql-test/r/innodb-autoinc-optimize.result @@ -5,3 +5,5 @@ optimize table t1; Table Op Msg_type Msg_text test.t1 optimize note Table does not support optimize, doing recreate + analyze instead test.t1 optimize status OK +==== clean up ==== +DROP TABLE t1; diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 5f8c59b9a0c..27a79a18493 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -1781,6 +1781,7 @@ set global innodb_sync_spin_loops=20; show variables like "innodb_sync_spin_loops"; Variable_name Value innodb_sync_spin_loops 20 +SET @old_innodb_thread_concurrency= @@global.innodb_thread_concurrency; show variables like "innodb_thread_concurrency"; Variable_name Value innodb_thread_concurrency 8 @@ -1798,6 +1799,7 @@ set global innodb_thread_concurrency=16; show variables like "innodb_thread_concurrency"; Variable_name Value innodb_thread_concurrency 16 +SET @@global.innodb_thread_concurrency= @old_innodb_thread_concurrency; show variables like "innodb_concurrency_tickets"; Variable_name Value innodb_concurrency_tickets 500 diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result index 28b245a0263..376120abcda 100644 --- a/mysql-test/r/log_tables.result +++ b/mysql-test/r/log_tables.result @@ -1,3 +1,8 @@ +SET @old_general_log_state = @@global.general_log; +SET @old_log_output= @@global.log_output; +SET @old_slow_query_log= @@global.slow_query_log; +SET @old_general_log= @@global.general_log; +SET @old_long_query_time= @@session.long_query_time; use mysql; SET @saved_long_query_time = @@long_query_time; SET @saved_log_output = @@log_output; @@ -365,7 +370,6 @@ slow_log slow_log_new drop table slow_log_new, general_log_new; use test; -SET @saved_log_output= @@global.log_output; SET GLOBAL LOG_OUTPUT = 'TABLE'; SET GLOBAL general_log = 0; FLUSH LOGS; @@ -433,8 +437,8 @@ SET SESSION long_query_time =@saved_long_query_time; FLUSH LOGS; ALTER TABLE mysql.slow_log DROP COLUMN seq; ALTER TABLE mysql.slow_log ENGINE = CSV; -SET GLOBAL general_log = @saved_general_log; -SET GLOBAL slow_query_log = @saved_slow_query_log; +SET GLOBAL general_log = @old_general_log; +SET GLOBAL slow_query_log = @old_slow_query_log; drop procedure if exists proc25422_truncate_slow; drop procedure if exists proc25422_truncate_general; drop procedure if exists proc25422_alter_slow; @@ -625,8 +629,8 @@ DROP TABLE `db_17876.general_log_data`; DROP PROCEDURE IF EXISTS `db_17876.archiveSlowLog`; DROP PROCEDURE IF EXISTS `db_17876.archiveGeneralLog`; DROP DATABASE IF EXISTS `db_17876`; -SET GLOBAL general_log = @saved_general_log; -SET GLOBAL slow_query_log = @saved_slow_query_log; +SET GLOBAL general_log = @old_general_log; +SET GLOBAL slow_query_log = @old_slow_query_log; select CONNECTION_ID() into @thread_id; truncate table mysql.general_log; set global general_log = on; @@ -842,7 +846,7 @@ Query execute long_query using @lparam Execute select '000 001 002 003 004 005 006 007 008 009010 011 012 013 014 015 016 017 018 019020 021 022 023 024 025 026 027 028 029030 031 032 033 034 035 036 037 038 039040 041 042 043 044 045 046 047 048 049050 051 052 053 054 055 056 057 058 059060 061 062 063 064 065 066 067 068 069070 071 072 073 074 075 076 077 078 079080 081 082 083 084 085 086 087 088 089090 091 092 093 094 095 096 097 098 099100 101 102 103 104 105 106 107 108 109110 111 112 113 114 115 116 117 118 119120 121 122 123 124 125 126 127 128 129130 131 132 133 134 135 136 137 138 139140 141 142 143 144 145 146 147 148 149150 151 152 153 154 155 156 157 158 159160 161 162 163 164 165 166 167 168 169170 171 172 173 174 175 176 177 178 179180 181 182 183 184 185 186 187 188 189190 191 192 193 194 195 196 197 198 199200 201 202 203 204 205 206 207 208 209210 211 212 213 214 215 216 217 218 219220 221 222 223 224 225 226 227 228 229230 231 232 233 234 235 236 237 238 239240 241 242 243 244 245 246 247 248 249250 251 252 253 254 255 256 257 258 259260 261 262 263 264 265 266 267 268 269270 271 272 273 274 275 276 277 278 279280 281 282 283 284 285 286 287 288 289290 291 292 293 294 295 296 297 298 299300 301 302 303 304 305 306 307 308 309310 311 312 313 314 315 316 317 318 319320 321 322 323 324 325 326 327 328 329330 331 332 333 334 335 336 337 338 339340 341 342 343 344 345 346 347 348 349350 351 352 353 354 355 356 357 358 359360 361 362 363 364 365 366 367 368 369370 371 372 373 374 375 376 377 378 379380 381 382 383 384 385 386 387 388 389390 391 392 393 394 395 396 397 398 399400 401 402 403 404 405 406 407 408 409410 411 412 413 414 415 416 417 418 419420 421 422 423 424 425 426 427 428 429430 431 432 433 434 435 436 437 438 439440 441 442 443 444 445 446 447 448 449450 451 452 453 454 455 456 457 458 459460 461 462 463 464 465 466 467 468 469470 471 472 473 474 475 476 477 478 479480 481 482 483 484 485 486 487 488 489490 491 492 493 494 495 496 497 498 499500 501 502 503 504 505 506 507 508 509510 511 512 513 514 515 516 517 518 519520 521 522 523 524 525 526 527 528 529530 531 532 533 534 535 536 537 538 539540 541 542 543 544 545 546 547 548 549550 551 552 553 554 555 556 557 558 559560 561 562 563 564 565 566 567 568 569570 571 572 573 574 575 576 577 578 579580 581 582 583 584 585 586 587 588 589590 591 592 593 594 595 596 597 598 599600 601 602 603 604 605 606 607 608 609610 611 612 613 614 615 616 617 618 619620 621 622 623 624 625 626 627 628 629630 631 632 633 634 635 636 637 638 639640 641 642 643 644 645 646 647 648 649650 651 652 653 654 655 656 657 658 659660 661 662 663 664 665 666 667 668 669670 671 672 673 674 675 676 677 678 679680 681 682 683 684 685 686 687 688 689690 691 692 693 694 695 696 697 698 699700 701 702 703 704 705 706 707 708 709710 711 712 713 714 715 716 717 718 719720 721 722 723 724 725 726 727 728 729730 731 732 733 734 735 736 737 738 739740 741 742 743 744 745 746 747 748 749750 751 752 753 754 755 756 757 758 759760 761 762 763 764 765 766 767 768 769770 771 772 773 774 775 776 777 778 779780 781 782 783 784 785 786 787 788 789790 791 792 793 794 795 796 797 798 799800 801 802 803 804 805 806 807 808 809810 811 812 813 814 815 816 817 818 819820 821 822 823 824 825 826 827 828 829830 831 832 833 834 835 836 837 838 839840 841 842 843 844 845 846 847 848 849850 851 852 853 854 855 856 857 858 859860 861 862 863 864 865 866 867 868 869870 871 872 873 874 875 876 877 878 879880 881 882 883 884 885 886 887 888 889890 891 892 893 894 895 896 897 898 899900 901 902 903 904 905 906 907 908 909910 911 912 913 914 915 916 917 918 919920 921 922 923 924 925 926 927 928 929930 931 932 933 934 935 936 937 938 939940 941 942 943 944 945 946 947 948 949950 951 952 953 954 955 956 957 958 959960 961 962 963 964 965 966 967 968 969970 971 972 973 974 975 976 977 978 979980 981 982 983 984 985 986 987 988 989990 991 992 993 994 995 996 997 998 999' as long_query Query set global general_log = off deallocate prepare long_query; -set global general_log = @saved_general_log; +set global general_log = @old_general_log; DROP TABLE IF EXISTS log_count; DROP TABLE IF EXISTS slow_log_copy; DROP TABLE IF EXISTS general_log_copy; @@ -895,8 +899,7 @@ TIMESTAMP 1 1 SELECT SQL_NO_CACHE 'Bug#31700 - KEY', f1,f2,f3,SLEEP(1.1) FROM t1 TIMESTAMP 1 1 SELECT SQL_NO_CACHE 'Bug#31700 - PK', f1,f2,f3,SLEEP(1.1) FROM t1 WHERE f1=2 DROP TABLE t1; TRUNCATE TABLE mysql.slow_log; -SET GLOBAL log_output= @saved_log_output; -SET GLOBAL slow_query_log = @saved_slow_query_log; -SET GLOBAL general_log=@saved_general_log; -SET SESSION long_query_time =@saved_long_query_time; -SET GLOBAL LOG_OUTPUT = @saved_log_output; +SET @@session.long_query_time= @old_long_query_time; +SET @@global.log_output= @old_log_output; +SET @@global.slow_query_log= @old_slow_query_log; +SET @@global.general_log= @old_general_log; diff --git a/mysql-test/r/mysql_client_test.result b/mysql-test/r/mysql_client_test.result index 9766475a418..08d982c85e3 100644 --- a/mysql-test/r/mysql_client_test.result +++ b/mysql-test/r/mysql_client_test.result @@ -1 +1,3 @@ +SET @old_general_log= @@global.general_log; ok +SET @@global.general_log= @old_general_log; diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result index adb055dd5e5..7a62001987f 100644 --- a/mysql-test/r/partition.result +++ b/mysql-test/r/partition.result @@ -1,3 +1,4 @@ +SET @old_general_log= @@global.general_log; drop table if exists t1, t2; CREATE TABLE t1 (a INT NOT NULL, KEY(a)) PARTITION BY RANGE(a) @@ -1895,3 +1896,4 @@ count(*) 288 drop table t1; End of 5.1 tests +SET @@global.general_log= @old_general_log; diff --git a/mysql-test/r/status.result b/mysql-test/r/status.result index 1e758ce68c7..b6ac5f34f00 100644 --- a/mysql-test/r/status.result +++ b/mysql-test/r/status.result @@ -209,4 +209,6 @@ ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table ' drop database db37908; drop procedure proc37908; drop function func37908; +REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; +DROP USER mysqltest_1@localhost; set @@global.concurrent_insert= @old_concurrent_insert; diff --git a/mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result b/mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result index 68f1f0b2566..8df0568a755 100644 --- a/mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result +++ b/mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result @@ -1,3 +1,4 @@ +SET @old_relay_log_purge= @@global.relay_log_purge; change master to MASTER_HOST='dummy.localdomain', RELAY_LOG_FILE='slave-relay-bin.000001', @@ -37,3 +38,4 @@ DROP PROCEDURE IF EXISTS p2; DROP FUNCTION IF EXISTS f1; DROP TRIGGER IF EXISTS tr1; stop slave sql_thread; +SET @@global.relay_log_purge= @old_relay_log_purge; diff --git a/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test b/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test index a74de7ad3c6..f20cc33f820 100644 --- a/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test +++ b/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test @@ -17,6 +17,10 @@ source include/have_log_bin.inc; +# Need to restore this at the end; CHANGE MASTER modifies it (see the +# manual for CHANGE MASTER). +SET @old_relay_log_purge= @@global.relay_log_purge; + let $MYSQLD_DATADIR= `select @@datadir`; copy_file $MYSQL_TEST_DIR/std_data/bug33029-slave-relay-bin.000001 $MYSQLD_DATADIR/slave-relay-bin.000001; @@ -51,6 +55,6 @@ enable_warnings; remove_file $MYSQLD_DATADIR/slave-relay-bin.000001; remove_file $MYSQLD_DATADIR/slave-relay-bin.index; stop slave sql_thread; -let $slave_keep_connection=1; source include/wait_for_slave_sql_to_stop.inc; +SET @@global.relay_log_purge= @old_relay_log_purge; diff --git a/mysql-test/suite/rpl/r/rpl_alter_db.result b/mysql-test/suite/rpl/r/rpl_alter_db.result index 6edbe5d427f..60c07d0dede 100644 --- a/mysql-test/suite/rpl/r/rpl_alter_db.result +++ b/mysql-test/suite/rpl/r/rpl_alter_db.result @@ -4,5 +4,9 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -use mysql; +==== Verify that alter database does not stop replication ==== +create database temp_db; +use temp_db; alter database collate latin1_bin; +==== Clean up ==== +drop database temp_db; diff --git a/mysql-test/suite/rpl/r/rpl_drop_db.result b/mysql-test/suite/rpl/r/rpl_drop_db.result index c0efdf5290d..8825797f80d 100644 --- a/mysql-test/suite/rpl/r/rpl_drop_db.result +++ b/mysql-test/suite/rpl/r/rpl_drop_db.result @@ -31,8 +31,7 @@ use test; select * from t1; n 1234 -stop slave; -drop database mysqltest1; -drop database mysqltest1; use test; drop table t1; +drop database mysqltest1; +include/stop_slave.inc diff --git a/mysql-test/suite/rpl/r/rpl_drop_view.result b/mysql-test/suite/rpl/r/rpl_drop_view.result index ef625464881..c359011612a 100644 --- a/mysql-test/suite/rpl/r/rpl_drop_view.result +++ b/mysql-test/suite/rpl/r/rpl_drop_view.result @@ -25,3 +25,5 @@ select * from v2; ERROR 42S02: Table 'test.v2' doesn't exist select * from v3; ERROR 42S02: Table 'test.v3' doesn't exist +==== clean up ==== +drop table t1, t2, t3; diff --git a/mysql-test/suite/rpl/r/rpl_events.result b/mysql-test/suite/rpl/r/rpl_events.result index 03d9ca75a77..b797183f9d2 100644 --- a/mysql-test/suite/rpl/r/rpl_events.result +++ b/mysql-test/suite/rpl/r/rpl_events.result @@ -1,10 +1,11 @@ -set global event_scheduler=1; stop slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; +SET @old_event_scheduler = @@global.event_scheduler; +set global event_scheduler=1; set binlog_format=row; DROP EVENT IF EXISTS test.justonce; drop table if exists t1,t2; @@ -190,4 +191,5 @@ select * from t28953; END;| ALTER EVENT event1 RENAME TO event2; DROP EVENT event2; +SET @@global.event_scheduler= @old_event_scheduler; DROP TABLE t28953; diff --git a/mysql-test/suite/rpl/r/rpl_idempotency.result b/mysql-test/suite/rpl/r/rpl_idempotency.result index 0930904626b..f39d0f1f37f 100644 --- a/mysql-test/suite/rpl/r/rpl_idempotency.result +++ b/mysql-test/suite/rpl/r/rpl_idempotency.result @@ -6,6 +6,7 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; call mtr.add_suppression("Slave: Can\'t find record in \'t1\' Error_code: 1032"); call mtr.add_suppression("Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452"); +SET @old_slave_exec_mode= @@global.slave_exec_mode; CREATE TABLE t1 (a INT PRIMARY KEY); CREATE TABLE t2 (a INT); INSERT INTO t1 VALUES (-1),(-2),(-3); @@ -222,7 +223,7 @@ Last_SQL_Error 0 set global slave_exec_mode='IDEMPOTENT'; start slave sql_thread; -set global slave_exec_mode='STRICT'; +SET @@global.slave_exec_mode= @old_slave_exec_mode; set @@session.binlog_format= @save_binlog_format; drop table t1,t2,ti2,ti1; *** end of tests diff --git a/mysql-test/suite/rpl/r/rpl_ignore_table.result b/mysql-test/suite/rpl/r/rpl_ignore_table.result index cdc3f5e9579..e77be425270 100644 --- a/mysql-test/suite/rpl/r/rpl_ignore_table.result +++ b/mysql-test/suite/rpl/r/rpl_ignore_table.result @@ -116,7 +116,8 @@ show grants for mysqltest4@localhost; Grants for mysqltest4@localhost GRANT USAGE ON *.* TO 'mysqltest4'@'localhost' IDENTIFIED BY PASSWORD '*196BDEDE2AE4F84CA44C47D54D78478C7E2BD7B7' set global slave_exec_mode='IDEMPOTENT'; -drop table t1, t4, mysqltest2.t2; +drop table t1, mysqltest2.t2; +drop table t4; drop database mysqltest2; delete from mysql.user where user like "mysqltest%"; delete from mysql.db where user like "mysqltest%"; diff --git a/mysql-test/suite/rpl/r/rpl_loaddata.result b/mysql-test/suite/rpl/r/rpl_loaddata.result index 1a34638ca5c..d7a02bc84a5 100644 --- a/mysql-test/suite/rpl/r/rpl_loaddata.result +++ b/mysql-test/suite/rpl/r/rpl_loaddata.result @@ -80,9 +80,8 @@ load data infile '../../std_data/rpl_loaddata2.dat' into table t2 fields terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by '\n##\n' starting by '>' ignore 1 lines; ERROR 23000: Duplicate entry '2003-03-22' for key 'day' -drop table t2; -drop table t2; -drop table t1; +drop table t1, t2; +drop table t1, t2; CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=INNODB; LOAD DATA INFILE "../../std_data/words.dat" INTO TABLE t1; ERROR 23000: Duplicate entry 'Aarhus' for key 'PRIMARY' diff --git a/mysql-test/suite/rpl/r/rpl_packet.result b/mysql-test/suite/rpl/r/rpl_packet.result index 68173b0730c..816e0f3df62 100644 --- a/mysql-test/suite/rpl/r/rpl_packet.result +++ b/mysql-test/suite/rpl/r/rpl_packet.result @@ -31,42 +31,9 @@ include/stop_slave.inc include/start_slave.inc CREATE TABLe `t1` (`f1` LONGTEXT) ENGINE=MyISAM; INSERT INTO `t1`(`f1`) VALUES ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa2048'); -show slave status; -Slave_IO_State # -Master_Host 127.0.0.1 -Master_User root -Master_Port MASTER_MYPORT -Connect_Retry 1 -Master_Log_File master-bin.000001 -Read_Master_Log_Pos # -Relay_Log_File # -Relay_Log_Pos # -Relay_Master_Log_File master-bin.000001 -Slave_IO_Running No -Slave_SQL_Running # -Replicate_Do_DB -Replicate_Ignore_DB -Replicate_Do_Table -Replicate_Ignore_Table -Replicate_Wild_Do_Table -Replicate_Wild_Ignore_Table -Last_Errno 0 -Last_Error -Skip_Counter 0 -Exec_Master_Log_Pos # -Relay_Log_Space # -Until_Condition None -Until_Log_File -Until_Log_Pos 0 -Master_SSL_Allowed No -Master_SSL_CA_File -Master_SSL_CA_Path -Master_SSL_Cert -Master_SSL_Cipher -Master_SSL_Key -Seconds_Behind_Master # -Master_SSL_Verify_Server_Cert No -Last_IO_Errno 0 -Last_IO_Error -Last_SQL_Errno 0 -Last_SQL_Error +Slave_IO_Running = No (expect No) +==== clean up ==== +DROP TABLE t1; +SET @@global.max_allowed_packet= 1024; +SET @@global.net_buffer_length= 1024; +DROP TABLE t1; diff --git a/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result b/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result index 392f5904233..2215b34814e 100644 --- a/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result +++ b/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result @@ -1,5 +1,3 @@ -SET SESSION BINLOG_FORMAT=ROW; -SET GLOBAL BINLOG_FORMAT=ROW; stop slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; reset master; diff --git a/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result b/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result index 13aa45d8ced..e69952787fb 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result +++ b/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result @@ -11,3 +11,6 @@ set sql_log_bin=1; insert into t1 values(1),(2); ERROR 23000: Duplicate entry '2' for key 'a' drop table t1; +Error: "Query caused different errors on master and slave. Error on master: 'Duplicate entry '%-.192s' for key %d' (1062), Error on slave: 'no error' (0). Default database: 'test'. Query: 'insert into t1 values(1),(2)'" (expected different error codes on master and slave) +Errno: "0" (expected 0) +drop table t1; diff --git a/mysql-test/suite/rpl/r/rpl_truncate_2myisam.result b/mysql-test/suite/rpl/r/rpl_truncate_2myisam.result index 1ae98706975..92e13064856 100644 --- a/mysql-test/suite/rpl/r/rpl_truncate_2myisam.result +++ b/mysql-test/suite/rpl/r/rpl_truncate_2myisam.result @@ -10,6 +10,8 @@ DROP TABLE IF EXISTS t1; RESET SLAVE; START SLAVE; **** On Master **** +SET @old_session_binlog_format= @@session.binlog_format; +SET @old_global_binlog_format= @@global.binlog_format; SET SESSION BINLOG_FORMAT=STATEMENT; SET GLOBAL BINLOG_FORMAT=STATEMENT; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM; @@ -42,12 +44,16 @@ master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (2,2) master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1 master-bin.000001 # Query # # use `test`; DROP TABLE t1 RESET MASTER; +SET @@session.binlog_format= @old_session_binlog_format; +SET @@global.binlog_format= @old_global_binlog_format; STOP SLAVE; DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1; RESET SLAVE; START SLAVE; **** On Master **** +SET @old_session_binlog_format= @@session.binlog_format; +SET @old_global_binlog_format= @@global.binlog_format; SET SESSION BINLOG_FORMAT=MIXED; SET GLOBAL BINLOG_FORMAT=MIXED; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM; @@ -80,12 +86,16 @@ master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (2,2) master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1 master-bin.000001 # Query # # use `test`; DROP TABLE t1 RESET MASTER; +SET @@session.binlog_format= @old_session_binlog_format; +SET @@global.binlog_format= @old_global_binlog_format; STOP SLAVE; DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1; RESET SLAVE; START SLAVE; **** On Master **** +SET @old_session_binlog_format= @@session.binlog_format; +SET @old_global_binlog_format= @@global.binlog_format; SET SESSION BINLOG_FORMAT=ROW; SET GLOBAL BINLOG_FORMAT=ROW; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM; @@ -121,12 +131,16 @@ master-bin.000001 # Query # # use `test`; COMMIT master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1 master-bin.000001 # Query # # use `test`; DROP TABLE t1 RESET MASTER; +SET @@session.binlog_format= @old_session_binlog_format; +SET @@global.binlog_format= @old_global_binlog_format; STOP SLAVE; DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1; RESET SLAVE; START SLAVE; **** On Master **** +SET @old_session_binlog_format= @@session.binlog_format; +SET @old_global_binlog_format= @@global.binlog_format; SET SESSION BINLOG_FORMAT=STATEMENT; SET GLOBAL BINLOG_FORMAT=STATEMENT; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM; @@ -159,12 +173,16 @@ master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (2,2) master-bin.000001 # Query # # use `test`; DELETE FROM t1 master-bin.000001 # Query # # use `test`; DROP TABLE t1 RESET MASTER; +SET @@session.binlog_format= @old_session_binlog_format; +SET @@global.binlog_format= @old_global_binlog_format; STOP SLAVE; DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1; RESET SLAVE; START SLAVE; **** On Master **** +SET @old_session_binlog_format= @@session.binlog_format; +SET @old_global_binlog_format= @@global.binlog_format; SET SESSION BINLOG_FORMAT=MIXED; SET GLOBAL BINLOG_FORMAT=MIXED; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM; @@ -197,12 +215,16 @@ master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1,1), (2,2) master-bin.000001 # Query # # use `test`; DELETE FROM t1 master-bin.000001 # Query # # use `test`; DROP TABLE t1 RESET MASTER; +SET @@session.binlog_format= @old_session_binlog_format; +SET @@global.binlog_format= @old_global_binlog_format; STOP SLAVE; DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1; RESET SLAVE; START SLAVE; **** On Master **** +SET @old_session_binlog_format= @@session.binlog_format; +SET @old_global_binlog_format= @@global.binlog_format; SET SESSION BINLOG_FORMAT=ROW; SET GLOBAL BINLOG_FORMAT=ROW; CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM; @@ -242,3 +264,5 @@ master-bin.000001 # Delete_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Query # # use `test`; COMMIT master-bin.000001 # Query # # use `test`; DROP TABLE t1 RESET MASTER; +SET @@session.binlog_format= @old_session_binlog_format; +SET @@global.binlog_format= @old_global_binlog_format; diff --git a/mysql-test/suite/rpl/r/rpl_truncate_3innodb.result b/mysql-test/suite/rpl/r/rpl_truncate_3innodb.result index 728b8450314..94461c33c46 100644 --- a/mysql-test/suite/rpl/r/rpl_truncate_3innodb.result +++ b/mysql-test/suite/rpl/r/rpl_truncate_3innodb.result @@ -10,6 +10,8 @@ DROP TABLE IF EXISTS t1; RESET SLAVE; START SLAVE; **** On Master **** +SET @old_session_binlog_format= @@session.binlog_format; +SET @old_global_binlog_format= @@global.binlog_format; SET SESSION BINLOG_FORMAT=STATEMENT; SET GLOBAL BINLOG_FORMAT=STATEMENT; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB; @@ -46,12 +48,16 @@ master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1 master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Query # # use `test`; DROP TABLE t1 RESET MASTER; +SET @@session.binlog_format= @old_session_binlog_format; +SET @@global.binlog_format= @old_global_binlog_format; STOP SLAVE; DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1; RESET SLAVE; START SLAVE; **** On Master **** +SET @old_session_binlog_format= @@session.binlog_format; +SET @old_global_binlog_format= @@global.binlog_format; SET SESSION BINLOG_FORMAT=MIXED; SET GLOBAL BINLOG_FORMAT=MIXED; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB; @@ -88,12 +94,16 @@ master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1 master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Query # # use `test`; DROP TABLE t1 RESET MASTER; +SET @@session.binlog_format= @old_session_binlog_format; +SET @@global.binlog_format= @old_global_binlog_format; STOP SLAVE; DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1; RESET SLAVE; START SLAVE; **** On Master **** +SET @old_session_binlog_format= @@session.binlog_format; +SET @old_global_binlog_format= @@global.binlog_format; SET SESSION BINLOG_FORMAT=ROW; SET GLOBAL BINLOG_FORMAT=ROW; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB; @@ -131,12 +141,16 @@ master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1 master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Query # # use `test`; DROP TABLE t1 RESET MASTER; +SET @@session.binlog_format= @old_session_binlog_format; +SET @@global.binlog_format= @old_global_binlog_format; STOP SLAVE; DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1; RESET SLAVE; START SLAVE; **** On Master **** +SET @old_session_binlog_format= @@session.binlog_format; +SET @old_global_binlog_format= @@global.binlog_format; SET SESSION BINLOG_FORMAT=STATEMENT; SET GLOBAL BINLOG_FORMAT=STATEMENT; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB; @@ -173,12 +187,16 @@ master-bin.000001 # Query # # use `test`; DELETE FROM t1 master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Query # # use `test`; DROP TABLE t1 RESET MASTER; +SET @@session.binlog_format= @old_session_binlog_format; +SET @@global.binlog_format= @old_global_binlog_format; STOP SLAVE; DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1; RESET SLAVE; START SLAVE; **** On Master **** +SET @old_session_binlog_format= @@session.binlog_format; +SET @old_global_binlog_format= @@global.binlog_format; SET SESSION BINLOG_FORMAT=MIXED; SET GLOBAL BINLOG_FORMAT=MIXED; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB; @@ -215,12 +233,16 @@ master-bin.000001 # Query # # use `test`; DELETE FROM t1 master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Query # # use `test`; DROP TABLE t1 RESET MASTER; +SET @@session.binlog_format= @old_session_binlog_format; +SET @@global.binlog_format= @old_global_binlog_format; STOP SLAVE; DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1; RESET SLAVE; START SLAVE; **** On Master **** +SET @old_session_binlog_format= @@session.binlog_format; +SET @old_global_binlog_format= @@global.binlog_format; SET SESSION BINLOG_FORMAT=ROW; SET GLOBAL BINLOG_FORMAT=ROW; CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB; @@ -260,3 +282,5 @@ master-bin.000001 # Delete_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Query # # use `test`; DROP TABLE t1 RESET MASTER; +SET @@session.binlog_format= @old_session_binlog_format; +SET @@global.binlog_format= @old_global_binlog_format; diff --git a/mysql-test/suite/rpl/t/rpl_alter_db.test b/mysql-test/suite/rpl/t/rpl_alter_db.test index 5ac8a2f4018..341496350d7 100644 --- a/mysql-test/suite/rpl/t/rpl_alter_db.test +++ b/mysql-test/suite/rpl/t/rpl_alter_db.test @@ -1,10 +1,14 @@ source include/master-slave.inc; -connection master; -use mysql; # to be different from initial `test' db of mysqltest client + +--echo ==== Verify that alter database does not stop replication ==== + +create database temp_db; +use temp_db; # to be different from initial `test' db of mysqltest client alter database collate latin1_bin; -save_master_pos; - -connection slave; -sync_with_master; +sync_slave_with_master; +--echo ==== Clean up ==== +connection master; +drop database temp_db; +sync_slave_with_master; diff --git a/mysql-test/suite/rpl/t/rpl_drop_db.test b/mysql-test/suite/rpl/t/rpl_drop_db.test index 6aab1aec188..11e93e7307a 100644 --- a/mysql-test/suite/rpl/t/rpl_drop_db.test +++ b/mysql-test/suite/rpl/t/rpl_drop_db.test @@ -47,16 +47,15 @@ use test; select * from t1; #cleanup -connection slave; -stop slave; -drop database mysqltest1; - connection master; + # Remove the "extra" file created above let $MYSQLD_DATADIR= `select @@datadir`; ---remove_file $MYSQLD_DATADIR/mysqltest1/f1.txt -drop database mysqltest1; +remove_file $MYSQLD_DATADIR/mysqltest1/f1.txt; use test; drop table t1; +drop database mysqltest1; +sync_slave_with_master; +source include/stop_slave.inc; diff --git a/mysql-test/suite/rpl/t/rpl_drop_view.test b/mysql-test/suite/rpl/t/rpl_drop_view.test index 8d826b8214d..11633a0a7e8 100644 --- a/mysql-test/suite/rpl/t/rpl_drop_view.test +++ b/mysql-test/suite/rpl/t/rpl_drop_view.test @@ -29,3 +29,8 @@ select * from v1; select * from v2; --error 1146 select * from v3; + +--echo ==== clean up ==== +connection master; +drop table t1, t2, t3; +sync_slave_with_master; diff --git a/mysql-test/suite/rpl/t/rpl_events.test b/mysql-test/suite/rpl/t/rpl_events.test index 2a9cf86fe55..d06a3118389 100644 --- a/mysql-test/suite/rpl/t/rpl_events.test +++ b/mysql-test/suite/rpl/t/rpl_events.test @@ -5,11 +5,12 @@ # in both row based and statement based format # ################################################################## -set global event_scheduler=1; - --source include/not_embedded.inc --source include/master-slave.inc +SET @old_event_scheduler = @@global.event_scheduler; +set global event_scheduler=1; + let $engine_type= MyISAM; set binlog_format=row; @@ -51,5 +52,6 @@ sync_slave_with_master; # that there is no bad timing cauing it to try to access the table. connection master; +SET @@global.event_scheduler= @old_event_scheduler; DROP TABLE t28953; sync_slave_with_master; diff --git a/mysql-test/suite/rpl/t/rpl_idempotency.test b/mysql-test/suite/rpl/t/rpl_idempotency.test index 8c571fa1a5b..1946aa100ab 100644 --- a/mysql-test/suite/rpl/t/rpl_idempotency.test +++ b/mysql-test/suite/rpl/t/rpl_idempotency.test @@ -11,6 +11,8 @@ source include/have_innodb.inc; call mtr.add_suppression("Slave: Can\'t find record in \'t1\' Error_code: 1032"); call mtr.add_suppression("Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452"); +SET @old_slave_exec_mode= @@global.slave_exec_mode; + connection master; CREATE TABLE t1 (a INT PRIMARY KEY); CREATE TABLE t2 (a INT); @@ -388,7 +390,7 @@ start slave sql_thread; connection master; sync_slave_with_master; #connection slave; -set global slave_exec_mode='STRICT'; +SET @@global.slave_exec_mode= @old_slave_exec_mode; # cleanup for bug#31609 tests @@ -399,12 +401,3 @@ drop table t1,t2,ti2,ti1; --source include/master-slave-end.inc --echo *** end of tests - - - - - - - - - diff --git a/mysql-test/suite/rpl/t/rpl_ignore_table.test b/mysql-test/suite/rpl/t/rpl_ignore_table.test index 7f13b16b0de..66f96e8f4e8 100644 --- a/mysql-test/suite/rpl/t/rpl_ignore_table.test +++ b/mysql-test/suite/rpl/t/rpl_ignore_table.test @@ -127,7 +127,8 @@ show grants for mysqltest4@localhost; set global slave_exec_mode='IDEMPOTENT'; connection master; -drop table t1, t4, mysqltest2.t2; +drop table t1, mysqltest2.t2; +drop table t4; drop database mysqltest2; delete from mysql.user where user like "mysqltest%"; delete from mysql.db where user like "mysqltest%"; diff --git a/mysql-test/suite/rpl/t/rpl_packet.test b/mysql-test/suite/rpl/t/rpl_packet.test index 95293b1e7ac..aefae7563d4 100644 --- a/mysql-test/suite/rpl/t/rpl_packet.test +++ b/mysql-test/suite/rpl/t/rpl_packet.test @@ -13,6 +13,8 @@ enable_warnings; eval create database $db; connection master; +let $old_max_allowed_packet= `SELECT @@global.max_allowed_packet`; +let $old_net_buffer_length= `SELECT @@global.net_buffer_length`; SET @@global.max_allowed_packet=1024; SET @@global.net_buffer_length=1024; @@ -77,10 +79,18 @@ INSERT INTO `t1`(`f1`) VALUES ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa # The slave I/O thread must stop after trying to read the above event connection slave; ---source include/wait_for_slave_io_to_stop.inc ---replace_result $MASTER_MYPORT MASTER_MYPORT -# import is only the 11th column Slave_IO_Running ---replace_column 1 # 7 # 8 # 9 # 12 # 22 # 23 # 33 # -query_vertical show slave status; +--source include/wait_for_slave_io_to_stop.inc +let $slave_io_running= query_get_value(SHOW SLAVE STATUS, Slave_IO_Running, 1); +--echo Slave_IO_Running = $slave_io_running (expect No) + + +--echo ==== clean up ==== +connection master; +DROP TABLE t1; +eval SET @@global.max_allowed_packet= $old_max_allowed_packet; +eval SET @@global.net_buffer_length= $old_net_buffer_length; +# slave is stopped +connection slave; +DROP TABLE t1; # End of tests diff --git a/mysql-test/suite/rpl/t/rpl_row_max_relay_size.test b/mysql-test/suite/rpl/t/rpl_row_max_relay_size.test index a0be59e44a7..ea4b958ae4c 100644 --- a/mysql-test/suite/rpl/t/rpl_row_max_relay_size.test +++ b/mysql-test/suite/rpl/t/rpl_row_max_relay_size.test @@ -4,8 +4,7 @@ # Test of manual relay log rotation with FLUSH LOGS. # Requires statement logging --- source include/not_ndb_default.inc -SET SESSION BINLOG_FORMAT=ROW; -SET GLOBAL BINLOG_FORMAT=ROW; --- source extra/rpl_tests/rpl_max_relay_size.test +source include/not_ndb_default.inc; +source include/have_binlog_format_row.inc; +source extra/rpl_tests/rpl_max_relay_size.test; diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result index 84b60b599d8..28ca1ac43b9 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result @@ -8,6 +8,7 @@ SET storage_engine=ndb; === NDB -> MYISAM === +set @old_slave_exec_mode= @@global.slave_exec_mode; set @@global.slave_exec_mode= 'IDEMPOTENT'; CREATE TABLE mysql.ndb_apply_status ( server_id INT UNSIGNED NOT NULL, @@ -803,3 +804,4 @@ TRUNCATE TABLE t1; --- Do Cleanup -- DROP TABLE IF EXISTS t1; drop table mysql.ndb_apply_status; +set @@global.slave_exec_mode= @old_slave_exec_mode; diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result index 75151f45419..a6e2144f532 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result @@ -11,8 +11,6 @@ show variables like "%character_set_ser%"; Variable_name Value character_set_server ucs2 DROP TABLE IF EXISTS t1; -create table t1 (a int) ENGINE=NDB; -drop table t1; CREATE TABLE `t1` ( `nid` int(11) NOT NULL default '0', `nom` char(4) default NULL, `prenom` char(4) default NULL, @@ -25,3 +23,5 @@ nid nom prenom select * from t1 order by nid; nid nom prenom 1 XYZ1 ABC1 +==== clean up ==== +DROP TABLE t1; diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result index 2e267bf77c1..f8eb5ebdd89 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result @@ -52,4 +52,6 @@ c1 c2 c3 row3 C 3 row4 D 4 row5 E 5 +==== clean up ==== +DROP TABLE t1; STOP SLAVE; diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test index 99eb5d50364..41f91d62dec 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test @@ -25,6 +25,7 @@ remove_file $datadir/mysql/ndb_apply_status.frm; --error 0,1 remove_file $datadir/mysql/ndb_apply_status.ndb; +set @old_slave_exec_mode= @@global.slave_exec_mode; set @@global.slave_exec_mode= 'IDEMPOTENT'; CREATE TABLE mysql.ndb_apply_status ( server_id INT UNSIGNED NOT NULL, @@ -46,3 +47,4 @@ SET storage_engine=innodb; connection slave; drop table mysql.ndb_apply_status; +set @@global.slave_exec_mode= @old_slave_exec_mode; diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test index be7fd1acd2e..8d5ad334766 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test @@ -22,10 +22,7 @@ show variables like "%character_set_ser%"; --disable_warnings DROP TABLE IF EXISTS t1; --enable_warnings -create table t1 (a int) ENGINE=NDB; -drop table t1; ---connection master CREATE TABLE `t1` ( `nid` int(11) NOT NULL default '0', `nom` char(4) default NULL, `prenom` char(4) default NULL, @@ -35,8 +32,12 @@ CREATE TABLE `t1` ( `nid` int(11) NOT NULL default '0', INSERT INTO t1 VALUES(1,"XYZ1","ABC1"); select * from t1 order by nid; ---sync_slave_with_master +sync_slave_with_master; # connect to slave and ensure data it there. ---connection slave +connection slave; select * from t1 order by nid; +--echo ==== clean up ==== +connection master; +DROP TABLE t1; +sync_slave_with_master; diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test index 1ee9aaf5372..eb128cfa2ce 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test @@ -64,4 +64,9 @@ sync_slave_with_master; connection slave; SELECT * FROM t1 ORDER BY c3; +--echo ==== clean up ==== +connection server2; +DROP TABLE t1; +sync_slave_with_master; + STOP SLAVE; diff --git a/mysql-test/t/innodb-autoinc-optimize.test b/mysql-test/t/innodb-autoinc-optimize.test index c7e22a8ff40..0f0cb57f92f 100644 --- a/mysql-test/t/innodb-autoinc-optimize.test +++ b/mysql-test/t/innodb-autoinc-optimize.test @@ -14,3 +14,6 @@ insert into t1 set a = -1; # NOTE: The database needs to be shutdown and restarted (here) for # the test to work. It's included for reference only. optimize table t1; + +--echo ==== clean up ==== +DROP TABLE t1; diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index 3c2aae3cfb0..53a210e9972 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -1317,6 +1317,7 @@ set global innodb_sync_spin_loops=20; show variables like "innodb_sync_spin_loops"; # Test for innodb_thread_concurrency variable +SET @old_innodb_thread_concurrency= @@global.innodb_thread_concurrency; show variables like "innodb_thread_concurrency"; set global innodb_thread_concurrency=1001; show variables like "innodb_thread_concurrency"; @@ -1324,6 +1325,7 @@ set global innodb_thread_concurrency=0; show variables like "innodb_thread_concurrency"; set global innodb_thread_concurrency=16; show variables like "innodb_thread_concurrency"; +SET @@global.innodb_thread_concurrency= @old_innodb_thread_concurrency; # Test for innodb_concurrency_tickets variable show variables like "innodb_concurrency_tickets"; diff --git a/mysql-test/t/log_tables.test b/mysql-test/t/log_tables.test index 15bbab8fa4d..326914f09d9 100644 --- a/mysql-test/t/log_tables.test +++ b/mysql-test/t/log_tables.test @@ -7,6 +7,12 @@ # check that CSV engine was compiled in --source include/have_csv.inc +SET @old_general_log_state = @@global.general_log; +SET @old_log_output= @@global.log_output; +SET @old_slow_query_log= @@global.slow_query_log; +SET @old_general_log= @@global.general_log; +SET @old_long_query_time= @@session.long_query_time; + --disable_ps_protocol use mysql; @@ -462,7 +468,6 @@ use test; # AUTO_INCREMENT numbers) # -SET @saved_log_output= @@global.log_output; SET GLOBAL LOG_OUTPUT = 'TABLE'; ## test the general log @@ -526,8 +531,8 @@ FLUSH LOGS; ALTER TABLE mysql.slow_log DROP COLUMN seq; ALTER TABLE mysql.slow_log ENGINE = CSV; -SET GLOBAL general_log = @saved_general_log; -SET GLOBAL slow_query_log = @saved_slow_query_log; +SET GLOBAL general_log = @old_general_log; +SET GLOBAL slow_query_log = @old_slow_query_log; # # Bug#25422 (Hang with log tables) @@ -831,8 +836,8 @@ DROP PROCEDURE IF EXISTS `db_17876.archiveSlowLog`; DROP PROCEDURE IF EXISTS `db_17876.archiveGeneralLog`; DROP DATABASE IF EXISTS `db_17876`; -SET GLOBAL general_log = @saved_general_log; -SET GLOBAL slow_query_log = @saved_slow_query_log; +SET GLOBAL general_log = @old_general_log; +SET GLOBAL slow_query_log = @old_slow_query_log; # # Bug#21557 entries in the general query log truncated at 1000 characters. @@ -950,7 +955,7 @@ execute long_query using @lparam; set global general_log = off; select command_type, argument from mysql.general_log where thread_id = @thread_id; deallocate prepare long_query; -set global general_log = @saved_general_log; +set global general_log = @old_general_log; # # Bug#34306: Can't make copy of log tables when server binary log is enabled @@ -1022,9 +1027,8 @@ DROP TABLE t1; TRUNCATE TABLE mysql.slow_log; -# RESET altered system variables before exiting the test -SET GLOBAL log_output= @saved_log_output; -SET GLOBAL slow_query_log = @saved_slow_query_log; -SET GLOBAL general_log=@saved_general_log; -SET SESSION long_query_time =@saved_long_query_time; -SET GLOBAL LOG_OUTPUT = @saved_log_output; +SET @@session.long_query_time= @old_long_query_time; + +SET @@global.log_output= @old_log_output; +SET @@global.slow_query_log= @old_slow_query_log; +SET @@global.general_log= @old_general_log; diff --git a/mysql-test/t/mysql_client_test.test b/mysql-test/t/mysql_client_test.test index 7667522feaf..15c0cd4ac84 100644 --- a/mysql-test/t/mysql_client_test.test +++ b/mysql-test/t/mysql_client_test.test @@ -1,6 +1,8 @@ # This test should work in embedded server after we fix mysqltest -- source include/not_embedded.inc +SET @old_general_log= @@global.general_log; + # We run with different binaries for normal and --embedded-server # # If this test fails with "command "$MYSQL_CLIENT_TEST" failed", @@ -14,3 +16,4 @@ # End of 4.1 tests echo ok; +SET @@global.general_log= @old_general_log; diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test index e8df2b01a94..efa7c5f4263 100644 --- a/mysql-test/t/partition.test +++ b/mysql-test/t/partition.test @@ -10,6 +10,8 @@ # --source include/have_partition.inc +SET @old_general_log= @@global.general_log; + --disable_warnings drop table if exists t1, t2; --enable_warnings @@ -1898,3 +1900,6 @@ select count(*) from t1; drop table t1; --echo End of 5.1 tests + + +SET @@global.general_log= @old_general_log; diff --git a/mysql-test/t/status.test b/mysql-test/t/status.test index bc241423417..1d1531f8076 100644 --- a/mysql-test/t/status.test +++ b/mysql-test/t/status.test @@ -287,10 +287,15 @@ show procedure status where name ='proc37908' and 1 in (select f1 from db37908.t --error 1142 show function status where name ='func37908' and 1 in (select func37908()); -connection root; +connection default; +disconnect con1; +disconnect user1; +disconnect root; drop database db37908; drop procedure proc37908; drop function func37908; +REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; +DROP USER mysqltest_1@localhost; # End of 5.1 tests # Restore global concurrent_insert value. Keep in the end of the test file. From d2773d34f5efdc912ffdca2f638888ada1c66063 Mon Sep 17 00:00:00 2001 From: Magnus Svensson Date: Fri, 14 Nov 2008 09:45:32 +0100 Subject: [PATCH 357/705] WL#4189 Add full backward compatibility to mysql-test-run.pl - Add copy of mtr v1 and make it possible to run it using MTR_VERSION=1 --- mysql-test/Makefile.am | 20 +- mysql-test/lib/v1/My/Config.pm | 422 ++ mysql-test/lib/v1/mtr_cases.pl | 968 ++++ mysql-test/lib/v1/mtr_gcov.pl | 74 + mysql-test/lib/v1/mtr_gprof.pl | 64 + mysql-test/lib/v1/mtr_im.pl | 775 ++++ mysql-test/lib/v1/mtr_io.pl | 218 + mysql-test/lib/v1/mtr_match.pl | 98 + mysql-test/lib/v1/mtr_misc.pl | 312 ++ mysql-test/lib/v1/mtr_process.pl | 1142 +++++ mysql-test/lib/v1/mtr_report.pl | 598 +++ mysql-test/lib/v1/mtr_stress.pl | 191 + mysql-test/lib/v1/mtr_timer.pl | 158 + mysql-test/lib/v1/mtr_unique.pl | 178 + mysql-test/lib/v1/mysql-test-run.pl | 5393 +++++++++++++++++++++++ mysql-test/lib/v1/ndb_config_1_node.ini | 47 + mysql-test/lib/v1/ndb_config_2_node.ini | 55 + mysql-test/mysql-test-run.pl | 26 + 18 files changed, 10738 insertions(+), 1 deletion(-) create mode 100644 mysql-test/lib/v1/My/Config.pm create mode 100644 mysql-test/lib/v1/mtr_cases.pl create mode 100644 mysql-test/lib/v1/mtr_gcov.pl create mode 100644 mysql-test/lib/v1/mtr_gprof.pl create mode 100644 mysql-test/lib/v1/mtr_im.pl create mode 100644 mysql-test/lib/v1/mtr_io.pl create mode 100644 mysql-test/lib/v1/mtr_match.pl create mode 100644 mysql-test/lib/v1/mtr_misc.pl create mode 100644 mysql-test/lib/v1/mtr_process.pl create mode 100644 mysql-test/lib/v1/mtr_report.pl create mode 100644 mysql-test/lib/v1/mtr_stress.pl create mode 100644 mysql-test/lib/v1/mtr_timer.pl create mode 100644 mysql-test/lib/v1/mtr_unique.pl create mode 100755 mysql-test/lib/v1/mysql-test-run.pl create mode 100644 mysql-test/lib/v1/ndb_config_1_node.ini create mode 100644 mysql-test/lib/v1/ndb_config_2_node.ini diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 616ae633eb7..0db8ba825ca 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -24,7 +24,25 @@ test_SCRIPTS = mtr \ mysql-test-run.pl \ mysql-stress-test.pl -nobase_test_DATA = lib/mtr_cases.pm \ +nobase_test_DATA = \ + lib/v1/mysql-test-run.pl \ + lib/v1/mtr_cases.pl \ + lib/v1/mtr_io.pl \ + lib/v1/mtr_report.pl \ + lib/v1/My/Config.pm \ + lib/v1/mtr_gcov.pl \ + lib/v1/mtr_match.pl \ + lib/v1/mtr_stress.pl \ + lib/v1/ndb_config_1_node.ini \ + lib/v1/ndb_config_2_node.ini \ + lib/v1/mtr_gprof.pl \ + lib/v1/mtr_misc.pl \ + lib/v1/mtr_timer.pl \ + lib/v1/mtr_im.pl \ + lib/v1/mtr_process.pl \ + lib/v1/mtr_unique.pl \ +\ + lib/mtr_cases.pm \ lib/mtr_gcov.pl \ lib/mtr_gprof.pl \ lib/mtr_io.pl \ diff --git a/mysql-test/lib/v1/My/Config.pm b/mysql-test/lib/v1/My/Config.pm new file mode 100644 index 00000000000..5491e341ddc --- /dev/null +++ b/mysql-test/lib/v1/My/Config.pm @@ -0,0 +1,422 @@ +# -*- cperl -*- + +package My::Config::Option; + +use strict; +use warnings; + + +sub new { + my ($class, $option_name, $option_value)= @_; + my $self= bless { name => $option_name, + value => $option_value + }, $class; + return $self; +} + + +sub name { + my ($self)= @_; + return $self->{name}; +} + + +sub value { + my ($self)= @_; + return $self->{value}; +} + + +package My::Config::Group; + +use strict; +use warnings; + + +sub new { + my ($class, $group_name)= @_; + my $self= bless { name => $group_name, + options => [], + options_by_name => {}, + }, $class; + return $self; +} + + +sub insert { + my ($self, $option_name, $value, $if_not_exist)= @_; + my $option= $self->option($option_name); + if (defined($option) and !$if_not_exist) { + $option->{value}= $value; + } + else { + my $option= My::Config::Option->new($option_name, $value); + # Insert option in list + push(@{$self->{options}}, $option); + # Insert option in hash + $self->{options_by_name}->{$option_name}= $option; + } + return $option; +} + +sub remove { + my ($self, $option_name)= @_; + + # Check that option exists + my $option= $self->option($option_name); + + return undef unless defined $option; + + # Remove from the hash + delete($self->{options_by_name}->{$option_name}) or die; + + # Remove from the array + @{$self->{options}}= grep { $_->name ne $option_name } @{$self->{options}}; + + return $option; +} + + +sub options { + my ($self)= @_; + return @{$self->{options}}; +} + + +sub name { + my ($self)= @_; + return $self->{name}; +} + + +# +# Return a specific option in the group +# +sub option { + my ($self, $option_name)= @_; + + return $self->{options_by_name}->{$option_name}; +} + + +# +# Return a specific value for an option in the group +# +sub value { + my ($self, $option_name)= @_; + my $option= $self->option($option_name); + + die "No option named '$option_name' in this group" + if ! defined($option); + + return $option->value(); +} + + +package My::Config; + +use strict; +use warnings; +use IO::File; +use File::Basename; + +# +# Constructor for My::Config +# - represents a my.cnf config file +# +# Array of arrays +# +sub new { + my ($class, $path)= @_; + my $group_name= undef; + + my $self= bless { groups => [] }, $class; + my $F= IO::File->new($path, "<") + or die "Could not open '$path': $!"; + + while ( my $line= <$F> ) { + chomp($line); + + # [group] + if ( $line =~ /\[(.*)\]/ ) { + # New group found + $group_name= $1; + #print "group: $group_name\n"; + + $self->insert($group_name, undef, undef); + } + + # Magic #! comments + elsif ( $line =~ /^#\!/) { + my $magic= $line; + die "Found magic comment '$magic' outside of group" + unless $group_name; + + #print "$magic\n"; + $self->insert($group_name, $magic, undef); + } + + # Comments + elsif ( $line =~ /^#/ || $line =~ /^;/) { + # Skip comment + next; + } + + # Empty lines + elsif ( $line =~ /^$/ ) { + # Skip empty lines + next; + } + + # !include + elsif ( $line =~ /^\!include\s*(.*?)\s*$/ ) { + my $include_file_name= dirname($path)."/".$1; + # Check that the file exists + die "The include file '$include_file_name' does not exist" + unless -f $include_file_name; + + $self->append(My::Config->new($include_file_name)); + } + + #