From a84aa37830261f635925819ea9613046e13177e4 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 29 Sep 2009 21:02:48 +0200 Subject: [PATCH 01/25] Fix running test suite from installed directory rather than source directory. Fix trivial typo in BUILD/* scripts. BUILD/SETUP.sh: Fix typo. mysql-test/mysql-test-run.pl: Fix mysql-test-run.pl to be able to find plugins used in testing also when running the test suite from an installed mysqld package. --- BUILD/SETUP.sh | 2 +- mysql-test/mysql-test-run.pl | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 8892e1793f1..84abf2a461b 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -173,7 +173,7 @@ local_infile_configs="--enable-local-infile" max_no_embedded_configs="$SSL_LIBRARY --with-plugins=max" max_no_ndb_configs="$SSL_LIBRARY --with-plugins=max-no-ndb --with-embedded-server --with-libevent" -max_configs="$SSL_LIBRARY --with-plugins=max --with-embedded-server -with-libevent" +max_configs="$SSL_LIBRARY --with-plugins=max --with-embedded-server --with-libevent" # Disable NDB in maria max builds max_configs=$max_no_ndb_configs diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index d80ea16e6a3..c73545bc568 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1886,7 +1886,8 @@ sub environment_setup { # -------------------------------------------------------------------------- my $lib_udf_example= mtr_file_exists(vs_config_dirs('sql', 'udf_example.dll'), - "$basedir/sql/.libs/udf_example.so",); + "$basedir/sql/.libs/udf_example.so", + "$basedir/lib/mysql/plugin/udf_example.so",); if ( $lib_udf_example ) { @@ -1913,7 +1914,8 @@ sub environment_setup { } my $lib_example_plugin= mtr_file_exists(vs_config_dirs('storage/example',$plugin_filename), - "$basedir/storage/example/.libs/".$plugin_filename); + "$basedir/storage/example/.libs/".$plugin_filename, + "$basedir/lib/mysql/plugin/".$plugin_filename); $ENV{'EXAMPLE_PLUGIN'}= ($lib_example_plugin ? basename($lib_example_plugin) : ""); $ENV{'EXAMPLE_PLUGIN_OPT'}= "--plugin-dir=". @@ -1928,7 +1930,8 @@ sub environment_setup { # ---------------------------------------------------- my $lib_simple_parser= mtr_file_exists(vs_config_dirs('plugin/fulltext', 'mypluglib.dll'), - "$basedir/plugin/fulltext/.libs/mypluglib.so",); + "$basedir/plugin/fulltext/.libs/mypluglib.so", + "$basedir/lib/mysql/plugin/mypluglib.so",); $ENV{'SIMPLE_PARSER'}= ($lib_simple_parser ? basename($lib_simple_parser) : ""); From d8aa3dbd343841b61110844e38c1114e14c230ec Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 29 Sep 2009 22:19:43 +0200 Subject: [PATCH 02/25] Fix race in test of times shown in SHOW FULL PROCESSLIST. (These are by their nature difficult to test reliably due to differences in timing). --- mysql-test/r/information_schema.result | 2 +- mysql-test/t/information_schema.test | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index bf09258efe9..65378b62521 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -1385,7 +1385,7 @@ who other connection here SELECT IF(`time` > 0, 'OK', `time`) AS time_low, IF(`time` < 1000, 'OK', `time`) AS time_high, -IF(time_ms > 900, 'OK', time_ms) AS time_ms_low, +IF(time_ms > 1500, 'OK', time_ms) AS time_ms_low, IF(time_ms < 1000000, 'OK', time_ms) AS time_ms_high FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID=@tid; diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test index a19d97ffeb2..aa9915bf5c9 100644 --- a/mysql-test/t/information_schema.test +++ b/mysql-test/t/information_schema.test @@ -1105,13 +1105,13 @@ connect (pslistcon,localhost,root,,test); let $ID= `select connection_id()`; SELECT 'other connection here' AS who; connection default; -sleep 1; +sleep 2; --disable_query_log eval SET @tid=$ID; --enable_query_log SELECT IF(`time` > 0, 'OK', `time`) AS time_low, IF(`time` < 1000, 'OK', `time`) AS time_high, - IF(time_ms > 900, 'OK', time_ms) AS time_ms_low, + IF(time_ms > 1500, 'OK', time_ms) AS time_ms_low, IF(time_ms < 1000000, 'OK', time_ms) AS time_ms_high FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID=@tid; From e4ee17b4a878ccb9b069e2f0b993f87d138e275a Mon Sep 17 00:00:00 2001 From: Peter Lieverdink Date: Wed, 30 Sep 2009 08:50:10 +1000 Subject: [PATCH 03/25] Look for libreadline in the light location on *both* tests. --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 4705d4a343a..8c13896e431 100644 --- a/configure.in +++ b/configure.in @@ -2697,7 +2697,7 @@ case $SYSTEM_TYPE in fi # if there is no readline, but we want to build with readline, we fail - if [test "$want_to_use_readline" = "yes"] && [test ! -d "./cmd-line-utils/readline"] + if [test "$want_to_use_readline" = "yes"] && [test ! -d "$srcdir/cmd-line-utils/readline"] then AC_MSG_ERROR([This commercially licensed MySQL source package can't be built with libreadline. Please use --with-libedit to use From 9f3e98b7aeb913d066c211b732cbb5e0817244c5 Mon Sep 17 00:00:00 2001 From: Peter Lieverdink Date: Wed, 30 Sep 2009 09:00:57 +1000 Subject: [PATCH 04/25] Make sure to use the correct location for config.h when generating event-config.h --- extra/libevent/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extra/libevent/Makefile.am b/extra/libevent/Makefile.am index cb006bf24f2..702c07c6eeb 100644 --- a/extra/libevent/Makefile.am +++ b/extra/libevent/Makefile.am @@ -22,7 +22,7 @@ include_HEADERS = event.h evutil.h event-config.h BUILT_SOURCES = event-config.h -event-config.h: $(top_srcdir)/include/config.h +event-config.h: $(top_builddir)/include/config.h echo '/* event-config.h' > $@ echo ' * Generated by autoconf; post-processed by libevent.' >> $@ echo ' * Do not edit this file.' >> $@ @@ -33,7 +33,7 @@ event-config.h: $(top_srcdir)/include/config.h sed -e 's/#define /#define _EVENT_/' \ -e 's/#undef /#undef _EVENT_/' \ - -e 's/#ifndef /#ifndef _EVENT_/' < $(top_srcdir)/include/config.h >> $@ + -e 's/#ifndef /#ifndef _EVENT_/' < $(top_builddir)/include/config.h >> $@ echo "#endif" >> $@ AM_CPPFLAGS = -Icompat -I$(top_srcdir)/include From 157fa0bb8d7e8b80b38a5fa41b0865d4f299d9e6 Mon Sep 17 00:00:00 2001 From: Peter Lieverdink Date: Wed, 30 Sep 2009 09:36:15 +1000 Subject: [PATCH 05/25] Used the correct path to the bundled libevent includes. --- config/ac-macros/libevent.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ac-macros/libevent.m4 b/config/ac-macros/libevent.m4 index fde47b6aea1..58ba2d6ebde 100644 --- a/config/ac-macros/libevent.m4 +++ b/config/ac-macros/libevent.m4 @@ -13,7 +13,7 @@ AC_DEFUN([MYSQL_USE_BUNDLED_LIBEVENT], [ AC_SUBST([libevent_dir]) libevent_libs="\$(top_builddir)/extra/libevent/libevent.a" - libevent_includes="-I\$(top_builddir)/extra/libevent" + libevent_includes="-I\$(top_srcdir)/extra/libevent" libevent_test_option="--mysqld=--thread-handling=pool-of-threads" AC_SUBST(libevent_libs) AC_SUBST(libevent_includes) From 0f502cc5d9d21f06fdc87d3d9a60151a4bc603df Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 30 Sep 2009 08:35:31 +0200 Subject: [PATCH 06/25] Apply patch from Bug#46010. This is needed to fix failures seen in Buildbot (main.ctype_gbk_binlog). Problem is that some tests did not RESET MASTER, causing them to pick up random binlog files depending on prior tests. --- mysql-test/r/ctype_gbk_binlog.result | 1 + mysql-test/r/mysqlbinlog-cp932.result | 2 +- mysql-test/suite/binlog/r/binlog_incident.result | 1 + mysql-test/suite/binlog/r/binlog_tmp_table.result | 1 + mysql-test/suite/binlog/t/binlog_incident.test | 3 ++- mysql-test/suite/binlog/t/binlog_tmp_table.test | 1 + mysql-test/t/ctype_gbk_binlog.test | 1 + mysql-test/t/mysqlbinlog-cp932.test | 5 +++-- 8 files changed, 11 insertions(+), 4 deletions(-) diff --git a/mysql-test/r/ctype_gbk_binlog.result b/mysql-test/r/ctype_gbk_binlog.result index a49e170ff19..df927af9a6b 100644 --- a/mysql-test/r/ctype_gbk_binlog.result +++ b/mysql-test/r/ctype_gbk_binlog.result @@ -1,3 +1,4 @@ +RESET MASTER; SET NAMES gbk; CREATE TABLE t1 ( f1 BLOB diff --git a/mysql-test/r/mysqlbinlog-cp932.result b/mysql-test/r/mysqlbinlog-cp932.result index 1640a3b1642..cbf6159516a 100644 --- a/mysql-test/r/mysqlbinlog-cp932.result +++ b/mysql-test/r/mysqlbinlog-cp932.result @@ -1,4 +1,4 @@ -flush logs; +RESET MASTER; create table t3 (f text character set utf8); create table t4 (f text character set cp932); flush logs; diff --git a/mysql-test/suite/binlog/r/binlog_incident.result b/mysql-test/suite/binlog/r/binlog_incident.result index d8b0357b8c4..7a555743723 100644 --- a/mysql-test/suite/binlog/r/binlog_incident.result +++ b/mysql-test/suite/binlog/r/binlog_incident.result @@ -1,3 +1,4 @@ +RESET MASTER; CREATE TABLE t1 (a INT); INSERT INTO t1 VALUES (1),(2),(3); SELECT * FROM t1; diff --git a/mysql-test/suite/binlog/r/binlog_tmp_table.result b/mysql-test/suite/binlog/r/binlog_tmp_table.result index e4928432324..14b1963ffd9 100644 --- a/mysql-test/suite/binlog/r/binlog_tmp_table.result +++ b/mysql-test/suite/binlog/r/binlog_tmp_table.result @@ -1,3 +1,4 @@ +RESET MASTER; create table foo (a int); flush logs; create temporary table tmp1_foo like foo; diff --git a/mysql-test/suite/binlog/t/binlog_incident.test b/mysql-test/suite/binlog/t/binlog_incident.test index 208c7f24df2..901ac49ea24 100644 --- a/mysql-test/suite/binlog/t/binlog_incident.test +++ b/mysql-test/suite/binlog/t/binlog_incident.test @@ -6,6 +6,7 @@ source include/have_log_bin.inc; source include/have_debug.inc; let $MYSQLD_DATADIR= `select @@datadir`; +RESET MASTER; CREATE TABLE t1 (a INT); @@ -24,4 +25,4 @@ exec $MYSQL_BINLOG --start-position=106 $MYSQLD_DATADIR/master-bin.000001 >$MYSQ eval SELECT cont LIKE '%RELOAD DATABASE; # Shall generate syntax error%' AS `Contain RELOAD DATABASE` FROM (SELECT load_file('$MYSQLTEST_VARDIR/tmp/binlog_incident-bug44442.sql') AS cont) AS tbl; --enable_query_log -remove_file $MYSQLTEST_VARDIR/tmp/binlog_incident-bug44442.sql; \ No newline at end of file +remove_file $MYSQLTEST_VARDIR/tmp/binlog_incident-bug44442.sql; diff --git a/mysql-test/suite/binlog/t/binlog_tmp_table.test b/mysql-test/suite/binlog/t/binlog_tmp_table.test index 6947959a5e0..54af8a8cb68 100644 --- a/mysql-test/suite/binlog/t/binlog_tmp_table.test +++ b/mysql-test/suite/binlog/t/binlog_tmp_table.test @@ -30,6 +30,7 @@ source include/have_binlog_format_mixed_or_statement.inc; connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,); connect (master1,127.0.0.1,root,,test,$MASTER_MYPORT,); +RESET MASTER; create table foo (a int); diff --git a/mysql-test/t/ctype_gbk_binlog.test b/mysql-test/t/ctype_gbk_binlog.test index a8f653d1b1e..e4c1bee19af 100644 --- a/mysql-test/t/ctype_gbk_binlog.test +++ b/mysql-test/t/ctype_gbk_binlog.test @@ -1,6 +1,7 @@ -- source include/have_binlog_format_mixed_or_statement.inc -- source include/have_gbk.inc +RESET MASTER; SET NAMES gbk; --character_set gbk diff --git a/mysql-test/t/mysqlbinlog-cp932.test b/mysql-test/t/mysqlbinlog-cp932.test index a7055bfc8ca..2a210bea0e0 100644 --- a/mysql-test/t/mysqlbinlog-cp932.test +++ b/mysql-test/t/mysqlbinlog-cp932.test @@ -5,8 +5,9 @@ -- source include/have_cp932.inc -- source include/have_log_bin.inc +RESET MASTER; + # Bug#16217 (mysql client did not know how not switch its internal charset) -flush logs; create table t3 (f text character set utf8); create table t4 (f text character set cp932); --exec $MYSQL --default-character-set=utf8 test -e "insert into t3 values(_utf8'ソ')" @@ -14,7 +15,7 @@ create table t4 (f text character set cp932); flush logs; rename table t3 to t03, t4 to t04; let $MYSQLD_DATADIR= `select @@datadir`; ---exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000002 | $MYSQL --default-character-set=utf8 +--exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000001 | $MYSQL --default-character-set=utf8 # original and recovered data must be equal select HEX(f) from t03; select HEX(f) from t3; From cadcc55baba072496995bb073a6be82ef30d2589 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 30 Sep 2009 09:25:12 +0200 Subject: [PATCH 07/25] Completely disable the innodb plugin. Don't ever build it, and don't include it in source tarballs. (we keep the sources in bzr to not get conflicts on every upstream change). --- storage/innodb_plugin/{plug.in => plug.in.disabled} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename storage/innodb_plugin/{plug.in => plug.in.disabled} (100%) diff --git a/storage/innodb_plugin/plug.in b/storage/innodb_plugin/plug.in.disabled similarity index 100% rename from storage/innodb_plugin/plug.in rename to storage/innodb_plugin/plug.in.disabled From 7bf7a4371232a85740280403f288d2acec5a0cae Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 30 Sep 2009 14:45:03 +0200 Subject: [PATCH 08/25] Add environment variable MTR_EXTRA_OPTIONS to influence `make test*` targets. This allows to eg use --mem or --parallel for better performance on big boxes. --- Makefile.am | 69 ++++++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/Makefile.am b/Makefile.am index 255af6dd392..a2231876677 100644 --- a/Makefile.am +++ b/Makefile.am @@ -81,6 +81,9 @@ tags: # environment variable MTR_BUILD_THREAD. The script "mysql-test-run" # will then calculate the various port numbers it needs from this, # making sure each user use different ports. +# +# Set MTR_EXTRA_OPTIONS to add custom options for mysql-test-run, +# like MTR_EXTRA_OPTIONS"--parallel=3 --mem". test-unit: cd unittest; $(MAKE) test @@ -90,29 +93,29 @@ test-unit-big: test-ps: cd mysql-test ; \ - @PERL@ ./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=mixed + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) $(force) --ps-protocol --mysqld=--binlog-format=mixed test-nr: cd mysql-test ; \ - @PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=row + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) $(force) --mysqld=--binlog-format=row test-pr: cd mysql-test ; \ - @PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol --mysqld=--binlog-format=row #@libevent_test_option@ + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) $(force) $(mem) --ps-protocol --mysqld=--binlog-format=row #@libevent_test_option@ test-ns: cd mysql-test ; \ - @PERL@ ./mysql-test-run.pl $(force) $(mem) --mysqld=--binlog-format=mixed + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) $(force) $(mem) --mysqld=--binlog-format=mixed test-binlog-statement: cd mysql-test ; \ - @PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) $(force) --mysqld=--binlog-format=statement # This code is duplicated in "test-bt", see the Changeset comment of 2007-Dec-07 test-embedded: if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \ cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \ + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --comment=embedded --force --timer \ --embedded-server --skip-rpl --skip-ndbcluster ; \ else \ echo "no program found for 'embedded' tests - skipped testing" ; \ @@ -120,14 +123,14 @@ test-embedded: test-reprepare: cd mysql-test ; \ - @PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol \ + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) $(force) $(mem) --ps-protocol \ --mysqld=--debug=+d,reprepare_each_statement test: test-ns test-pr smoke: cd mysql-test ; \ - @PERL@ ./mysql-test-run.pl --do-test=s + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --do-test=s test-full: test test-nr test-ps @@ -143,43 +146,43 @@ test-force-mem: test-bt: -cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --comment=normal --force --timer \ + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --comment=normal --force --timer \ --skip-ndbcluster --report-features -cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --comment=ps --force --timer \ + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --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+rpl_ndb+ps --force --timer \ + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --comment=ndb+rpl_ndb+ps --force --timer \ --ps-protocol --mysqld=--binlog-format=row --suite=ndb,rpl_ndb ; \ MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --comment=ndb --force --timer \ + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --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=funcs1+ps --ps-protocol --reorder --suite=funcs_1 + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --force --comment=funcs1+ps --ps-protocol --reorder --suite=funcs_1 -cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2 + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --force --comment=funcs2 --suite=funcs_2 -cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --force --comment=partitions --suite=parts + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --force --comment=partitions --suite=parts -cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --force --comment=stress --suite=stress -cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --force --comment=jp --suite=jp + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --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 ; \ + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --comment=nist --force --suite=nist ; \ fi -if [ -d mysql-test/suite/nist ] ; then \ cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --comment=nist+ps --force --suite=nist --ps-protocol ; \ + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --comment=nist+ps --force --suite=nist --ps-protocol ; \ fi -if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \ cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \ + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --comment=embedded --force --timer \ --embedded-server --skip-rpl --skip-ndbcluster ; \ else \ echo "no program found for 'embedded' tests - skipped testing" ; \ @@ -187,22 +190,22 @@ test-bt: test-bt-fast: -cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --comment=ps --force --timer \ + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --comment=ps --force --timer \ --skip-ndbcluster --ps-protocol --report-features -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 \ + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --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 + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --force --comment=stress --suite=stress test-bt-debug: -cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --comment=debug --force --timer \ + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --comment=debug --force --timer \ --skip-ndbcluster --skip-rpl --report-features test-bt-debug-fast: @@ -216,32 +219,32 @@ test-force-full-pl: test-force-full test-ext-funcs: cd mysql-test ; \ - @PERL@ ./mysql-test-run.pl --force --reorder --suite=funcs_1 ; \ - @PERL@ ./mysql-test-run.pl --force --suite=funcs_2 + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --force --reorder --suite=funcs_1 ; \ + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --force --suite=funcs_2 test-ext-rpl: cd mysql-test ; \ - @PERL@ ./mysql-test-run.pl --force --suite=rpl + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --force --suite=rpl test-ext-partitions: cd mysql-test ; \ - @PERL@ ./mysql-test-run.pl --force --suite=parts + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --force --suite=parts test-ext-jp: cd mysql-test ; \ - @PERL@ ./mysql-test-run.pl --force --suite=jp + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --force --suite=jp test-ext-stress: cd mysql-test ; \ - @PERL@ ./mysql-test-run.pl --force --big-test --suite=stress + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --force --big-test --suite=stress test-ext: test-ext-funcs test-ext-rpl test-ext-partitions test-ext-jp test-ext-stress test-fast: cd mysql-test ; \ - @PERL@ ./mysql-test-run.pl $(subset) --force --skip-ndb --skip-innodb --skip-im --skip-rpl ; \ - @PERL@ ./mysql-test-run.pl $(subset) --force --suite=funcs_1 --do-test=myisam ; \ - @PERL@ ./mysql-test-run.pl $(subset) --force --suite=stress --do-test=ddl_myisam + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) $(subset) --force --skip-ndb --skip-innodb --skip-im --skip-rpl ; \ + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) $(subset) --force --suite=funcs_1 --do-test=myisam ; \ + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) $(subset) --force --suite=stress --do-test=ddl_myisam test-fast-view: $(MAKE) subset=--view-protocol test-fast From 016ea0c5e38d0f4dcfdeb0993c0e35eeef96de28 Mon Sep 17 00:00:00 2001 From: Sergey Petrunya Date: Thu, 1 Oct 2009 14:46:59 +0400 Subject: [PATCH 09/25] Fix embedded server windows build: add opt_table_elimination.cc to list of files --- libmysqld/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 0d61460ad58..1ef8f21f752 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -112,6 +112,7 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/item_xmlfunc.cc ../sql/key.cc ../sql/lock.cc ../sql/log.cc ../sql/log_event.cc ../sql/mf_iocache.cc ../sql/my_decimal.cc ../sql/net_serv.cc ../sql/opt_range.cc ../sql/opt_sum.cc + ../sql/opt_table_elimination.cc ../sql/parse_file.cc ../sql/procedure.cc ../sql/protocol.cc ../sql/records.cc ../sql/repl_failsafe.cc ../sql/rpl_filter.cc ../sql/rpl_record.cc From b883abd675b51ad8af5dba2e47666ade4574bc8a Mon Sep 17 00:00:00 2001 From: Sergey Petrunya Date: Fri, 2 Oct 2009 01:27:39 +0400 Subject: [PATCH 10/25] Temporary solution: skip PBXT (like we do e.g. for --skip-innodb) in embedded server, as it doesn't work there. sql/sql_plugin.cc: Temporary solution: skip PBXT (like we do e.g. for --skip-innodb) in embedded server, as it doesn't work there. --- sql/sql_plugin.cc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index fa19d7188bf..3a2756d070a 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -1168,6 +1168,22 @@ int plugin_init(int *argc, char **argv, int flags) !my_strnncoll(&my_charset_latin1, (const uchar*) plugin->name, 6, (const uchar*) "InnoDB", 6)) continue; +#ifdef EMBEDDED_LIBRARY + /* + MariaDB: disable PBXT in embedded server. We do this for two reasons + - PBXT currently doesn't work in embedded server (see + https://bugs.launchpad.net/maria/+bug/439889) + - Embedded server is supposed to be "leaner" and our current + understanding of that is "without PBXT". At the same time, we want + regular server to be with PBXT, and since we don't support compiling + embedded server with different options than the regular server, + the only way was to disable PBXT from here. + */ + if (!my_strnncoll(&my_charset_latin1, (const uchar*) plugin->name, + 4, (const uchar*) "PBXT", 4)) + continue; + +#endif bzero(&tmp, sizeof(tmp)); tmp.plugin= plugin; tmp.name.str= (char *)plugin->name; From 0e90c848265cca7364f36eb511a4492815fc714f Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 2 Oct 2009 11:40:03 +0200 Subject: [PATCH 11/25] Add a simple way to robustly get the name of the generated source tarball, so as to not to have to rely on fragile regexp-parsing of configure.in. --- Makefile.am | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile.am b/Makefile.am index a2231876677..55d4794d0d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,6 +60,11 @@ dist-hook: --srcdir=$(top_srcdir) storage/myisam/myisamchk --silent --fast $(distdir)/win/data/mysql/*.MYI +# Simple target to allow scripts etc. to get the name of the source +# tarball easily. +show-dist-name: + @echo "$(PACKAGE)-$(VERSION)" + all-local: @ABI_CHECK@ tags: From ef639e9d2cf12613e6c611345e230aa80858ff5d Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 2 Oct 2009 14:53:05 +0200 Subject: [PATCH 12/25] Add missing windows files to `make dist`. --- win/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/win/Makefile.am b/win/Makefile.am index e5813010740..3ade0f85bfc 100644 --- a/win/Makefile.am +++ b/win/Makefile.am @@ -16,7 +16,8 @@ ## Process this file with automake to create Makefile.in EXTRA_DIST = build-vs71.bat build-vs8.bat build-vs8_x64.bat build-vs9.bat \ build-vs9_x64.bat configure.js README mysql_manifest.cmake \ - create_manifest.js create_def_file.js + create_manifest.js create_def_file.js build-nmake.bat \ + build-nmake-x64.bat # Don't update the files from bitkeeper %::SCCS/s.% From e60a48b011c07ab3dbbaf99e102d7239027636ff Mon Sep 17 00:00:00 2001 From: Sergey Petrunya Date: Sat, 3 Oct 2009 22:56:54 +0400 Subject: [PATCH 13/25] Fix mysql-test-run --embedded: - Don't run testcase for BUG#45632 with embedded server. --- mysql-test/r/variables_debug.result | 15 -------- .../r/variables_debug_notembedded.result | 15 ++++++++ mysql-test/t/variables_debug.test | 28 --------------- mysql-test/t/variables_debug_notembedded.test | 34 +++++++++++++++++++ 4 files changed, 49 insertions(+), 43 deletions(-) create mode 100644 mysql-test/r/variables_debug_notembedded.result create mode 100644 mysql-test/t/variables_debug_notembedded.test diff --git a/mysql-test/r/variables_debug.result b/mysql-test/r/variables_debug.result index 3e2764ef06e..9cd133dddb1 100644 --- a/mysql-test/r/variables_debug.result +++ b/mysql-test/r/variables_debug.result @@ -10,18 +10,3 @@ set debug= '-P'; select @@debug; @@debug T -set session debug="t"; -show session variables like 'debug'; -Variable_name Value -debug t -set session debug="t"; -show session variables like 'debug'; -Variable_name Value -debug t -set session debug="d:t"; -show session variables like 'debug'; -Variable_name Value -debug d:t -show session variables like 'debug'; -Variable_name Value -debug t diff --git a/mysql-test/r/variables_debug_notembedded.result b/mysql-test/r/variables_debug_notembedded.result new file mode 100644 index 00000000000..410bbddda2d --- /dev/null +++ b/mysql-test/r/variables_debug_notembedded.result @@ -0,0 +1,15 @@ +set session debug="t"; +show session variables like 'debug'; +Variable_name Value +debug t +set session debug="t"; +show session variables like 'debug'; +Variable_name Value +debug t +set session debug="d:t"; +show session variables like 'debug'; +Variable_name Value +debug d:t +show session variables like 'debug'; +Variable_name Value +debug t diff --git a/mysql-test/t/variables_debug.test b/mysql-test/t/variables_debug.test index 8ba79f3fc54..7dcaf246803 100644 --- a/mysql-test/t/variables_debug.test +++ b/mysql-test/t/variables_debug.test @@ -10,31 +10,3 @@ set debug= '+P'; select @@debug; set debug= '-P'; select @@debug; - -# -# Checks that assigning variable 'debug' in one session has no influence on -# other session. (BUG#45632 of bugs.mysql.com) -# -connect(con1,localhost,root,,test,,); -connect(con2,localhost,root,,test,,); - -# makes output independant of current debug status -connection con1; -set session debug="t"; -show session variables like 'debug'; -connection con2; -set session debug="t"; -show session variables like 'debug'; - -# checks influence one session debug variable on another -connection con1; -set session debug="d:t"; -show session variables like 'debug'; -connection con2; -show session variables like 'debug'; - -disconnect con1; -disconnect con2; - -connection default; - diff --git a/mysql-test/t/variables_debug_notembedded.test b/mysql-test/t/variables_debug_notembedded.test new file mode 100644 index 00000000000..2d6b53b16ab --- /dev/null +++ b/mysql-test/t/variables_debug_notembedded.test @@ -0,0 +1,34 @@ +# +# Checks that assigning variable 'debug' in one session has no influence on +# other session. (BUG#45632 of bugs.mysql.com) +# +# (this will not work with embedded server because mysqltest_embedded uses the +# same thread for all connections) +# +--source include/have_debug.inc +--source include/not_embedded.inc + +connect(con1,localhost,root,,test,,); +connect(con2,localhost,root,,test,,); + +# makes output independant of current debug status +connection con1; +set session debug="t"; +show session variables like 'debug'; +connection con2; +set session debug="t"; +show session variables like 'debug'; + +# checks influence one session debug variable on another +connection con1; +set session debug="d:t"; +show session variables like 'debug'; +connection con2; +show session variables like 'debug'; + +disconnect con1; +disconnect con2; + +connection default; + + From 22a9f9b243f1144ea4e58c353109e5aa4cfca50e Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 3 Oct 2009 21:12:24 +0200 Subject: [PATCH 14/25] Fix merge-big.test to properly restore debug settings. Otherwise following tests go crazy in the log, writing gigabytes of data and causing havoc. --- mysql-test/r/merge-big.result | 3 ++- mysql-test/t/merge-big.test | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/merge-big.result b/mysql-test/r/merge-big.result index 967c550e42a..b75c70f986f 100644 --- a/mysql-test/r/merge-big.result +++ b/mysql-test/r/merge-big.result @@ -7,6 +7,7 @@ drop table if exists t1,t2,t3,t4,t5,t6; CREATE TABLE t1 (c1 INT) ENGINE= MyISAM; LOCK TABLE t1 WRITE; # connection con1 +SET @orig_debug=@@debug; SET GLOBAL debug="+d,sleep_open_and_lock_after_open"; INSERT INTO t1 VALUES (1); # connection default @@ -21,6 +22,6 @@ SELECT * FROM t1; c1 UNLOCK TABLES; # connection con1 -SET GLOBAL debug="-d,sleep_open_and_lock_after_open"; +SET GLOBAL debug=@orig_debug; # connection default DROP TABLE t1; diff --git a/mysql-test/t/merge-big.test b/mysql-test/t/merge-big.test index 62af9f22299..d39c2973688 100644 --- a/mysql-test/t/merge-big.test +++ b/mysql-test/t/merge-big.test @@ -43,6 +43,7 @@ LOCK TABLE t1 WRITE; --echo # connection con1 connect (con1,localhost,root,,); let $con1_id= `SELECT CONNECTION_ID()`; + SET @orig_debug=@@debug; SET GLOBAL debug="+d,sleep_open_and_lock_after_open"; send INSERT INTO t1 VALUES (1); --echo # connection default @@ -74,7 +75,7 @@ UNLOCK TABLES; --echo # connection con1 connection con1; reap; - SET GLOBAL debug="-d,sleep_open_and_lock_after_open"; + SET GLOBAL debug=@orig_debug; disconnect con1; --echo # connection default connection default; From d1ad1bdc0fb4f1150c1363013e2ab4700c0bf570 Mon Sep 17 00:00:00 2001 From: Sergey Petrunya Date: Sat, 3 Oct 2009 23:24:13 +0400 Subject: [PATCH 15/25] Fix embedded build on Windows: contents of storage/xtradb think they are 'innobase'. --- CMakeLists.txt | 4 ++++ libmysqld/CMakeLists.txt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index edc0dff8310..cccd42205b1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -233,6 +233,9 @@ FOREACH(SUBDIR ${STORAGE_SUBDIRS}) # where appropriate. STRING (REGEX MATCH "MYSQL_STORAGE_ENGINE.[a-z]*" PLUGIN_NAME ${PLUGIN_FILE_CONTENT}) STRING (REGEX REPLACE "MYSQL_STORAGE_ENGINE.(.*)" "\\1" PLUGIN_NAME ${PLUGIN_NAME}) + + # Also remember this "xtradb"/"innobase" name discrepancy for libmysqld/CMakeLists.txt: + SET (plugin_dir_${PLUGIN_NAME} ${DIRNAME}) IF(MYSQL_PLUGIN_MANDATORY) SET(WITH_${ENGINE}_STORAGE_ENGINE TRUE) @@ -245,6 +248,7 @@ FOREACH(SUBDIR ${STORAGE_SUBDIRS}) ELSE(WITH_${ENGINE}_STORAGE_ENGINE AND MYSQL_PLUGIN_STATIC) SET(ENGINE_BUILD_TYPE "NONE") ENDIF(WITH_${ENGINE}_STORAGE_ENGINE AND MYSQL_PLUGIN_STATIC) + IF (ENGINE_BUILD_TYPE STREQUAL "STATIC") SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_${PLUGIN_NAME}_plugin") SET (MYSQLD_STATIC_ENGINE_LIBS ${MYSQLD_STATIC_ENGINE_LIBS} ${PLUGIN_NAME}) diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 1ef8f21f752..f69f6d26c6d 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -88,10 +88,10 @@ FOREACH(rpath ${VIO_SOURCES}) ENDFOREACH(rpath) FOREACH (ENGINE_LIB ${MYSQLD_STATIC_ENGINE_LIBS}) - INCLUDE(${CMAKE_SOURCE_DIR}/storage/${ENGINE_LIB}/CMakeLists.txt) + INCLUDE(${CMAKE_SOURCE_DIR}/storage/${plugin_dir_${ENGINE_LIB}}/CMakeLists.txt) STRING(TOUPPER ${ENGINE_LIB} ENGINE_LIB_UPPER) FOREACH(rpath ${${ENGINE_LIB_UPPER}_SOURCES}) - SET(LIB_SOURCES ${LIB_SOURCES} ${CMAKE_SOURCE_DIR}/storage/${ENGINE_LIB}/${rpath}) + SET(LIB_SOURCES ${LIB_SOURCES} ${CMAKE_SOURCE_DIR}/storage/${plugin_dir_${ENGINE_LIB}}/${rpath}) ENDFOREACH(rpath) ENDFOREACH(ENGINE_LIB) From 59f80387ba98547878469511fa93745be30f8138 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 3 Oct 2009 22:13:58 +0200 Subject: [PATCH 16/25] Fix some compiler warnings cause by GCC bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29478 storage/maria/ma_blockrec.c: GCC warns about const vs. non-const despite cast (but it is in any case cleaner to avoid the cast completely) support-files/compiler_warnings.supp: Silence a wrong compiler warning caused by GCC bug. --- storage/maria/ma_blockrec.c | 10 +++++----- support-files/compiler_warnings.supp | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/storage/maria/ma_blockrec.c b/storage/maria/ma_blockrec.c index 0ac73f89776..694c8b7b5ff 100644 --- a/storage/maria/ma_blockrec.c +++ b/storage/maria/ma_blockrec.c @@ -5448,7 +5448,7 @@ static size_t fill_insert_undo_parts(MARIA_HA *info, const uchar *record, Store total blob length to make buffer allocation easier during UNDO */ log_parts->str= info->length_buff; - log_parts->length= (uint) (ma_store_length((uchar *) log_parts->str, + log_parts->length= (uint) (ma_store_length(info->length_buff, info->cur_row.blob_length) - (uchar*) log_parts->str); row_length+= log_parts->length; @@ -5592,7 +5592,7 @@ static size_t fill_update_undo_parts(MARIA_HA *info, const uchar *oldrec, MARIA_SHARE *share= info->s; MARIA_COLUMNDEF *column, *end_column; MARIA_ROW *old_row= &info->cur_row, *new_row= &info->new_row; - uchar *field_data, *start_field_data; + uchar *field_data, *start_field_data, *length_str; uchar *old_field_lengths= old_row->field_lengths; uchar *new_field_lengths= new_row->field_lengths; size_t row_length= 0; @@ -5749,9 +5749,9 @@ static size_t fill_update_undo_parts(MARIA_HA *info, const uchar *oldrec, /* Store length of field length data before the field/field_lengths */ field_lengths= (uint) (field_data - start_field_data); - start_log_parts->str= ((start_field_data - - ma_calc_length_for_store_length(field_lengths))); - ma_store_length((uchar*)start_log_parts->str, field_lengths); + length_str= start_field_data - ma_calc_length_for_store_length(field_lengths); + start_log_parts->str= length_str; + ma_store_length(length_str, field_lengths); start_log_parts->length= (size_t) (field_data - start_log_parts->str); row_length+= start_log_parts->length; DBUG_RETURN(row_length); diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index 535b8666ec1..9f3048ad996 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -109,3 +109,6 @@ ma_packrec.c : .*result of 32-bit shift implicitly converted to 64 bits.* : 550- # .* : .*no matching operator delete found; memory will not be freed if initialization throws an exception.* ctype-simple.c : .*unary minus operator applied to unsigned type, result still unsigned.* + +# Wrong warning due to GCC bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29478 +regexec\.c : .*passing argument 3 of.*matcher.* discards qualifiers from pointer target type.* From 02c33646b31d9b468dcefec721f4a5343bae5fc8 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 4 Oct 2009 01:20:51 +0200 Subject: [PATCH 17/25] Test suite fixes: - Don't omit the @@debug variable from testcase check, since it can cause real problems. - Fix some bad merges by reverting to be identical to MySQL 5.1. mysql-test/include/mtr_check.sql: Don't omit the @@debug variable from testcase check, since it can cause real problems. mysql-test/r/mysqlbinlog_row_big.result: Fix incorrect merge. mysql-test/r/variables-big.result: Fix incorrect merge, by reverting to MySQL 5.1 version. mysql-test/t/mysqlbinlog_row_big.test: Fix incorrect merge. mysql-test/t/variables-big.test: Fix incorrect merge, by reverting to MySQL 5.1 version. --- mysql-test/include/mtr_check.sql | 2 +- mysql-test/r/mysqlbinlog_row_big.result | 6 ---- mysql-test/r/variables-big.result | 40 ++++++++++++------------- mysql-test/t/mysqlbinlog_row_big.test | 15 ---------- mysql-test/t/variables-big.test | 37 ++++++++++++----------- 5 files changed, 40 insertions(+), 60 deletions(-) diff --git a/mysql-test/include/mtr_check.sql b/mysql-test/include/mtr_check.sql index ea1435d750c..798b0774849 100644 --- a/mysql-test/include/mtr_check.sql +++ b/mysql-test/include/mtr_check.sql @@ -12,7 +12,7 @@ BEGIN -- Dump all global variables except those -- that are supposed to change SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES - WHERE variable_name != 'timestamp' AND variable_name != "debug" + WHERE variable_name != 'timestamp' AND variable_name != 'INNODB_IBUF_MAX_SIZE' ORDER BY variable_name; diff --git a/mysql-test/r/mysqlbinlog_row_big.result b/mysql-test/r/mysqlbinlog_row_big.result index 57105d46fbd..46fa0dc79cd 100644 --- a/mysql-test/r/mysqlbinlog_row_big.result +++ b/mysql-test/r/mysqlbinlog_row_big.result @@ -1,9 +1,4 @@ # -# We need big packets. -# -SET @old_global_max_allowed_packet=@@global.max_allowed_packet; -SET @@global.max_allowed_packet= 1024*1024*1024; -# # Preparatory cleanup. # DROP TABLE IF EXISTS t1; @@ -104,5 +99,4 @@ FLUSH LOGS; # reset variable value to pass testcase checks SET @@global.max_allowed_packet = 1048576; DROP TABLE t1; -SET @@global.max_allowed_packet=@old_global_max_allowed_packet; remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_big_1.out diff --git a/mysql-test/r/variables-big.result b/mysql-test/r/variables-big.result index 2c178999a2c..960fc6d22f4 100644 --- a/mysql-test/r/variables-big.result +++ b/mysql-test/r/variables-big.result @@ -1,20 +1,20 @@ -set session transaction_prealloc_size=1024*1024*1024*1; -select @pid_temp = (select ID from information_schema.processlist) as 'TRUE'; -TRUE -1 -set session transaction_prealloc_size=1024*1024*1024*2; -select @pid_temp = (select ID from information_schema.processlist) as 'TRUE'; -TRUE -1 -set session transaction_prealloc_size=1024*1024*1024*3; -select @pid_temp = (select ID from information_schema.processlist) as 'TRUE'; -TRUE -1 -set session transaction_prealloc_size=1024*1024*1024*4; -select @pid_temp = (select ID from information_schema.processlist) as 'TRUE'; -TRUE -1 -set session transaction_prealloc_size=1024*1024*1024*5; -select @pid_temp = (select ID from information_schema.processlist) as 'TRUE'; -TRUE -1 +SET SESSION transaction_prealloc_size=1024*1024*1024*1; +SHOW PROCESSLIST; +Id User Host db Command Time State Info + root localhost test Query