mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 02:51:44 +01:00
4fed177276
into neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316 mysql-test/mysql-test-run.pl: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/r/type_newdecimal.result: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/create_select_tmp.test: Auto merged mysql-test/t/drop.test: Auto merged mysql-test/t/flush.test: Auto merged mysql-test/t/handler.test: Auto merged mysql-test/t/innodb-deadlock.test: Auto merged mysql-test/t/innodb-lock.test: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/kill.test: Auto merged mysql-test/t/ndb_autodiscover2.test: Auto merged mysql-test/t/rpl000001.test: Auto merged mysql-test/t/rpl_EE_error.test: Auto merged mysql-test/t/rpl_change_master.test: Auto merged mysql-test/t/rpl_deadlock.test: Auto merged mysql-test/t/rpl_drop.test: Auto merged mysql-test/t/rpl_drop_temp.test: Auto merged mysql-test/t/rpl_error_ignored_table.test: Auto merged mysql-test/t/rpl_flush_log_loop.test: Auto merged mysql-test/t/rpl_insert_id.test: Auto merged mysql-test/t/rpl_loaddata.test: Auto merged mysql-test/t/rpl_rotate_logs.test: Auto merged mysql-test/t/rpl_sp.test: Auto merged mysql-test/t/rpl_until.test: Auto merged mysql-test/t/strict.test: Auto merged mysql-test/t/type_newdecimal.test: Auto merged client/mysqltest.c: Merge with --parsing-disabled mysql-test/t/mysqltest.test: Manual merge
61 lines
1.3 KiB
Text
61 lines
1.3 KiB
Text
# This test doesn't work with the embedded version as this code
|
|
# assumes that one query is running while we are doing queries on
|
|
# a second connection.
|
|
# This would work if mysqltest run would be threaded and handle each
|
|
# connection in a separate thread.
|
|
#
|
|
-- source include/not_embedded.inc
|
|
|
|
connect (con1, localhost, root,,);
|
|
connect (con2, localhost, root,,);
|
|
|
|
#remember id of con1
|
|
connection con1;
|
|
--disable_warnings
|
|
drop table if exists t1;
|
|
--enable_warnings
|
|
|
|
--disable_reconnect
|
|
create table t1 (kill_id int);
|
|
insert into t1 values(connection_id());
|
|
|
|
#kill con1
|
|
connection con2;
|
|
select ((@id := kill_id) - kill_id) from t1;
|
|
kill @id;
|
|
|
|
connection con1;
|
|
|
|
# this statement should fail
|
|
--error 2006,2013
|
|
select 1;
|
|
--enable_reconnect
|
|
# this should work, and we should have a new connection_id()
|
|
select ((@id := kill_id) - kill_id) from t1;
|
|
select @id != connection_id();
|
|
|
|
#make sure the server is still alive
|
|
connection con2;
|
|
select 4;
|
|
drop table t1;
|
|
|
|
# End of 4.1 tests
|
|
|
|
#
|
|
# test of blocking of sending ERROR after OK or EOF
|
|
#
|
|
connection con1;
|
|
select get_lock("a", 10);
|
|
connection con2;
|
|
let $ID= `select connection_id()`;
|
|
send select get_lock("a", 10);
|
|
real_sleep 2;
|
|
connection con1;
|
|
disable_query_log;
|
|
eval kill query $ID;
|
|
enable_query_log;
|
|
connection con2;
|
|
reap;
|
|
select 1;
|
|
connection con1;
|
|
select RELEASE_LOCK("a");
|