database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-19 19:03:26 +03:00
Code Activity

Fix failing tests in the main suite

Browse Source
This commit is contained in:
Vladislav Vaintroub
2011-12-30 11:22:27 +01:00
parent 33a60e7fb6
commit f4f95c1723
10 changed files with 11 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,8 +6,8 @@ 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/
--error 1125
eval INSTALL PLUGIN ARCHIVE SONAME '$HA_ARCHIVE_SO';
UNINSTALL PLUGIN archive;

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

@@ -6,8 +6,8 @@ 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/
--error 1125
eval INSTALL PLUGIN BLACKHOLE SONAME '$HA_BLACKHOLE_SO';
UNINSTALL PLUGIN blackhole;

1
mysql-test/t/myisam_crash_before_flush_keys.test
View File

@@ -10,6 +10,7 @@
call mtr.add_suppression("Got an error from thread_id=.*ha_myisam.cc:");
call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table");
flush tables;
# Avoid CrashReporter popup on Mac
--source include/not_crashrep.inc

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

@@ -3,7 +3,7 @@
let $MYSQLD_DATADIR= `SELECT @@datadir`;
call mtr.add_suppression("nnoDB: Error: table `test`.`t1` .* Partition.* InnoDB internal");
call mtr.add_suppression("InnoDB: Error: table `test`.`t1` .* InnoDB internal");
--echo #
--echo # Bug#55091: Server crashes on ADD PARTITION after a failed attempt
--echo #

4
mysql-test/t/xtradb_mrr.test
View File

@@ -356,13 +356,13 @@ set @my_save_join_cache_level= @@join_cache_level;
set @my_save_join_buffer_size= @@join_buffer_size;
set join_cache_level=6;
set join_buffer_size=1536;
--disable_warnings
SELECT count(*), sum(table1.col_int_key*table2.pk)
FROM
t2 AS table1, t1 AS table2, t2 AS table3
WHERE
table3.col_varchar_nokey = table2.col_varchar_key AND table3.pk > table2.col_varchar_nokey ;
--enable_warnings
drop table t1,t2;
set join_cache_level=@my_save_join_cache_level;
set join_buffer_size=@my_save_join_buffer_size;