database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

fix failing test cases in 5.5 main suite

Browse Source
This commit is contained in:
Vladislav Vaintroub
2011-12-02 14:38:05 +01:00
parent 5beb816a7e
commit 970bc8cd0b
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/include/mysqld--help.inc
View File

@@ -47,6 +47,7 @@ perl;
s/\b4294967295\b/18446744073709551615/; s/\b4294967295\b/18446744073709551615/;
s/\b2146435072\b/9223372036853727232/; s/\b2146435072\b/9223372036853727232/;
s/\b196608\b/262144/; s/\b196608\b/262144/;
s/\b4294963200\b/18446744073709547520/;
foreach $var (@env) { s/$ENV{$var}/$var/ } foreach $var (@env) { s/$ENV{$var}/$var/ }
next if /use --skip-(use-)?symbolic-links to disable/; # for valgrind, again next if /use --skip-(use-)?symbolic-links to disable/; # for valgrind, again
next if $skip; next if $skip;

5
mysql-test/t/archive_plugin.test
View File

@@ -4,13 +4,14 @@ if (!$HA_ARCHIVE_SO) {
CREATE TABLE t1(a int) ENGINE=ARCHIVE; CREATE TABLE t1(a int) ENGINE=ARCHIVE;
DROP TABLE t1; DROP TABLE t1;
--replace_regex /\.dll/.so/
eval INSTALL PLUGIN archive SONAME '$HA_ARCHIVE_SO'; eval INSTALL PLUGIN archive SONAME '$HA_ARCHIVE_SO';
--error 1125 --error 1125
--replace_regex /\.dll/.so/
eval INSTALL PLUGIN ARCHIVE SONAME '$HA_ARCHIVE_SO'; eval INSTALL PLUGIN ARCHIVE SONAME '$HA_ARCHIVE_SO';
UNINSTALL PLUGIN archive; UNINSTALL PLUGIN archive;
--replace_regex /\.dll/.so/
eval INSTALL PLUGIN archive SONAME '$HA_ARCHIVE_SO'; eval INSTALL PLUGIN archive SONAME '$HA_ARCHIVE_SO';
CREATE TABLE t1(a int) ENGINE=ARCHIVE; CREATE TABLE t1(a int) ENGINE=ARCHIVE;

5
mysql-test/t/blackhole_plugin.test
View File

@@ -4,13 +4,14 @@ if (!$HA_BLACKHOLE_SO) {
CREATE TABLE t1(a int) ENGINE=BLACKHOLE; CREATE TABLE t1(a int) ENGINE=BLACKHOLE;
DROP TABLE t1; DROP TABLE t1;
--replace_regex /\.dll/.so/
eval INSTALL PLUGIN blackhole SONAME '$HA_BLACKHOLE_SO'; eval INSTALL PLUGIN blackhole SONAME '$HA_BLACKHOLE_SO';
--error 1125 --error 1125
--replace_regex /\.dll/.so/
eval INSTALL PLUGIN BLACKHOLE SONAME '$HA_BLACKHOLE_SO'; eval INSTALL PLUGIN BLACKHOLE SONAME '$HA_BLACKHOLE_SO';
UNINSTALL PLUGIN blackhole; UNINSTALL PLUGIN blackhole;
--replace_regex /\.dll/.so/
eval INSTALL PLUGIN blackhole SONAME '$HA_BLACKHOLE_SO'; eval INSTALL PLUGIN blackhole SONAME '$HA_BLACKHOLE_SO';
CREATE TABLE t1(a int) ENGINE=BLACKHOLE; CREATE TABLE t1(a int) ENGINE=BLACKHOLE;

2
mysql-test/t/shm.test
View File

@@ -24,7 +24,7 @@ disconnect shm_con;
# #
# Bug #24924: shared-memory-base-name that is too long causes buffer overflow # 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 # Bug #33899: Deadlock in mysql_real_query with shared memory connections