diff options
| -rw-r--r-- | mysql-test/include/mysqld--help.inc | 1 | ||||
| -rw-r--r-- | mysql-test/t/archive_plugin.test | 5 | ||||
| -rw-r--r-- | mysql-test/t/blackhole_plugin.test | 5 | ||||
| -rw-r--r-- | mysql-test/t/shm.test | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/mysql-test/include/mysqld--help.inc b/mysql-test/include/mysqld--help.inc index 346a3a7cb18..107f80ba125 100644 --- a/mysql-test/include/mysqld--help.inc +++ b/mysql-test/include/mysqld--help.inc @@ -47,6 +47,7 @@ perl; s/\b4294967295\b/18446744073709551615/; s/\b2146435072\b/9223372036853727232/; s/\b196608\b/262144/; + s/\b4294963200\b/18446744073709547520/; foreach $var (@env) { s/$ENV{$var}/$var/ } next if /use --skip-(use-)?symbolic-links to disable/; # for valgrind, again next if $skip; diff --git a/mysql-test/t/archive_plugin.test b/mysql-test/t/archive_plugin.test index b1126ab0c87..2c04ac2a6ce 100644 --- a/mysql-test/t/archive_plugin.test +++ b/mysql-test/t/archive_plugin.test @@ -4,13 +4,14 @@ if (!$HA_ARCHIVE_SO) { CREATE TABLE t1(a int) ENGINE=ARCHIVE; DROP TABLE t1; - +--replace_regex /\.dll/.so/ eval INSTALL PLUGIN archive SONAME '$HA_ARCHIVE_SO'; --error 1125 +--replace_regex /\.dll/.so/ eval INSTALL PLUGIN ARCHIVE SONAME '$HA_ARCHIVE_SO'; UNINSTALL PLUGIN archive; - +--replace_regex /\.dll/.so/ eval INSTALL PLUGIN archive SONAME '$HA_ARCHIVE_SO'; CREATE TABLE t1(a int) ENGINE=ARCHIVE; diff --git a/mysql-test/t/blackhole_plugin.test b/mysql-test/t/blackhole_plugin.test index e598c3f1b11..ac6c3ecddd0 100644 --- a/mysql-test/t/blackhole_plugin.test +++ b/mysql-test/t/blackhole_plugin.test @@ -4,13 +4,14 @@ if (!$HA_BLACKHOLE_SO) { CREATE TABLE t1(a int) ENGINE=BLACKHOLE; DROP TABLE t1; - +--replace_regex /\.dll/.so/ eval INSTALL PLUGIN blackhole SONAME '$HA_BLACKHOLE_SO'; --error 1125 +--replace_regex /\.dll/.so/ eval INSTALL PLUGIN BLACKHOLE SONAME '$HA_BLACKHOLE_SO'; UNINSTALL PLUGIN blackhole; - +--replace_regex /\.dll/.so/ eval INSTALL PLUGIN blackhole SONAME '$HA_BLACKHOLE_SO'; CREATE TABLE t1(a int) ENGINE=BLACKHOLE; diff --git a/mysql-test/t/shm.test b/mysql-test/t/shm.test index 4c765c43c1b..346ce49476e 100644 --- a/mysql-test/t/shm.test +++ b/mysql-test/t/shm.test @@ -24,7 +24,7 @@ disconnect shm_con; # # Bug #24924: shared-memory-base-name that is too long causes buffer overflow # ---exec $MYSQLADMIN --no-defaults --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ping +--exec $MYSQLADMIN --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ping # # Bug #33899: Deadlock in mysql_real_query with shared memory connections |