mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  devsrv-b.mysql.com:/data0/knielsen/tmp-5.1
This commit is contained in:
knielsen@devsrv-b.mysql.com 2006-07-07 20:33:46 +02:00
commit aebbf0ce00
6 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mysql-test/r/wait_timeout.result
View file

@ -1,3 +1,7 @@
select 0;
0
0
flush status;
select 1; select 1;
1 1
1 1

3
mysql-test/t/ndb_alter_table3.test
View file

@ -2,6 +2,9 @@
-- source include/have_multi_ndb.inc -- source include/have_multi_ndb.inc
-- source include/not_embedded.inc -- source include/not_embedded.inc
# BUG#20902: Test fails in statement-based binlogging mode. Remove when fixed.
-- source include/have_binlog_format_row.inc
--disable_warnings --disable_warnings
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
--enable_warnings --enable_warnings

3
mysql-test/t/ndb_autodiscover3.test
View file

@ -2,6 +2,9 @@
-- source include/have_multi_ndb.inc -- source include/have_multi_ndb.inc
-- source include/not_embedded.inc -- source include/not_embedded.inc
# BUG#20902: Test fails in statement-based binlogging mode. Remove when fixed.
-- source include/have_binlog_format_row.inc
--disable_warnings --disable_warnings
drop table if exists t1, t2; drop table if exists t1, t2;

3
mysql-test/t/ndb_dd_advance.test
View file

@ -28,6 +28,9 @@
-- source include/have_ndb.inc -- source include/have_ndb.inc
-- source include/not_embedded.inc -- source include/not_embedded.inc
# BUG#20902: Test fails in statement-based binlogging mode. Remove when fixed.
-- source include/have_binlog_format_row.inc
--disable_warnings --disable_warnings
DROP TABLE IF EXISTS test.t1; DROP TABLE IF EXISTS test.t1;
DROP TABLE IF EXISTS test.t2; DROP TABLE IF EXISTS test.t2;

3
mysql-test/t/ndb_multi.test
View file

@ -3,6 +3,9 @@
-- source include/not_embedded.inc -- source include/not_embedded.inc
-- source include/have_binlog_format_statement.inc -- source include/have_binlog_format_statement.inc
# BUG#20902: Test fails in statement-based binlogging mode. Remove when fixed.
-- source include/have_binlog_format_row.inc
--disable_warnings --disable_warnings
connection server2; connection server2;

12
mysql-test/t/wait_timeout.test
View file

@ -9,16 +9,20 @@
# Connect with another connection and reset counters # Connect with another connection and reset counters
--disable_query_log --disable_query_log
connect (wait_con,localhost,root,,test,,); connect (wait_con,localhost,root,,test,,);
flush status; # Reset counters
connection wait_con; connection wait_con;
set session wait_timeout=100; set session wait_timeout=100;
let $retries=300; let $retries=300;
let $aborted_clients = `SHOW STATUS LIKE 'aborted_clients'`;
set @aborted_clients= 0; set @aborted_clients= 0;
--enable_query_log --enable_query_log
# Disable reconnect and do the query # Disable reconnect and do the query
connection default; connection default;
# If slow host (Valgrind...), we may have already timed out here.
# So force a reconnect if necessary, using a dummy query. And issue a
# 'flush status' to reset the 'aborted_clients' counter.
--enable_reconnect
select 0;
flush status;
--disable_reconnect --disable_reconnect
select 1; select 1;
@ -46,6 +50,9 @@ connection default;
select 2; select 2;
--enable_reconnect --enable_reconnect
select 3; select 3;
# Disconnect so that we will not be confused by a future abort from this
# connection.
disconnect default
# #
# Do the same test as above on a TCP connection # Do the same test as above on a TCP connection
@ -56,7 +63,6 @@ select 3;
connection wait_con; connection wait_con;
flush status; # Reset counters flush status; # Reset counters
let $retries=300; let $retries=300;
let $aborted_clients = `SHOW STATUS LIKE 'aborted_clients'`;
set @aborted_clients= 0; set @aborted_clients= 0;
--enable_query_log --enable_query_log