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

Merge bk-internal:/home/bk/mysql-5.1

Browse Source 
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam


mysql-test/t/disabled.def:
  Auto merged
This commit is contained in:
unknown
2008-05-01 13:25:38 +03:00
parent a701a84998 368542d47b
commit fefb7c6be6
10 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/t/client_xml.test
View File

@ -1,6 +1,12 @@
# Can't run with embedded server
-- source include/not_embedded.inc
# Disable concurrent inserts to avoid test failures when reading
# data from concurrent connections (insert might return before
# the data is actually in the table).
set @old_concurrent_insert= @@global.concurrent_insert;
set @@global.concurrent_insert= 0;
# Test of the xml output of the 'mysql' and 'mysqldump' clients -- makes
# sure that basic encoding issues are handled properly
create table t1 (
@ -21,3 +27,6 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
--exec $MYSQL --xml test -vv -e "select 1 limit 0"
drop table t1;
# Restore global concurrent_insert value
set @@global.concurrent_insert= @old_concurrent_insert;

1
mysql-test/t/disabled.def
View File

@ -10,7 +10,6 @@
#
##############################################################################
federated_transactions : Bug#29523 Transactions do not work
innodb_mysql : Bug#32724: innodb_mysql.test fails randomly
status : Bug#32966 main.status fails
ps_ddl : Bug#12093 2007-12-14 pending WL#4165 / WL#4166
csv_alter_table : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables

12
mysql-test/t/federated.test
View File

@ -2,6 +2,14 @@
--source include/not_embedded.inc
--source include/federated.inc
connection default;
# Disable concurrent inserts to avoid test failures when reading
# data from concurrent connections (insert might return before
# the data is actually in the table).
SET @OLD_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;
SET @@GLOBAL.CONCURRENT_INSERT= 0;
connection slave;
DROP TABLE IF EXISTS federated.t1;
CREATE TABLE federated.t1 (
@ -1857,3 +1865,7 @@ drop server 's1';
--echo End of 5.1 tests
source include/federated_cleanup.inc;
connection default;
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT;

11
mysql-test/t/federated_bug_25714.test
View File

@ -1,6 +1,13 @@
--source include/have_bug25714.inc
source include/federated.inc;
connection default;
# Disable concurrent inserts to avoid test failures when reading
# data from concurrent connections (insert might return before
# the data is actually in the table).
SET @OLD_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;
SET @@GLOBAL.CONCURRENT_INSERT= 0;
connection slave;
--disable_warnings
@ -42,6 +49,8 @@ DROP TABLE federated.t1;
connection slave;
DROP TABLE federated.t1;
source include/federated_cleanup.inc;
connection default;
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT;