mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/51
This commit is contained in:
29
mysql-test/r/log_tables-big.result
Normal file
29
mysql-test/r/log_tables-big.result
Normal file
@ -0,0 +1,29 @@
|
||||
set session long_query_time=10;
|
||||
select get_lock('bug27638', 1);
|
||||
get_lock('bug27638', 1)
|
||||
1
|
||||
set session long_query_time=1;
|
||||
truncate table mysql.slow_log;
|
||||
select get_lock('bug27638', 2);
|
||||
get_lock('bug27638', 2)
|
||||
0
|
||||
select if (query_time between '00:00:01' and '00:00:10', 'OK', 'WRONG') as qt, sql_text from mysql.slow_log;
|
||||
qt sql_text
|
||||
OK select get_lock('bug27638', 2)
|
||||
truncate table mysql.slow_log;
|
||||
select get_lock('bug27638', 60);
|
||||
get_lock('bug27638', 60)
|
||||
0
|
||||
select if (query_time between '00:00:59' and '00:01:10', 'OK', 'WRONG') as qt, sql_text from mysql.slow_log;
|
||||
qt sql_text
|
||||
OK select get_lock('bug27638', 60)
|
||||
truncate table mysql.slow_log;
|
||||
select get_lock('bug27638', 101);
|
||||
get_lock('bug27638', 101)
|
||||
0
|
||||
select if (query_time between '00:01:40' and '00:01:50', 'OK', 'WRONG') as qt, sql_text from mysql.slow_log;
|
||||
qt sql_text
|
||||
OK select get_lock('bug27638', 101)
|
||||
select release_lock('bug27638');
|
||||
release_lock('bug27638')
|
||||
1
|
1
mysql-test/t/log_tables-big-master.opt
Normal file
1
mysql-test/t/log_tables-big-master.opt
Normal file
@ -0,0 +1 @@
|
||||
--log-slow-queries
|
35
mysql-test/t/log_tables-big.test
Normal file
35
mysql-test/t/log_tables-big.test
Normal file
@ -0,0 +1,35 @@
|
||||
# this test needs multithreaded mysqltest
|
||||
-- source include/not_embedded.inc
|
||||
|
||||
# Test sleeps for long times
|
||||
--source include/big_test.inc
|
||||
|
||||
# check that CSV engine was compiled in
|
||||
--source include/have_csv.inc
|
||||
|
||||
connect (con1,localhost,root,,);
|
||||
connect (con2,localhost,root,,);
|
||||
|
||||
#
|
||||
# Bug #27638: slow logging to CSV table inserts bad query_time and lock_time values
|
||||
#
|
||||
connection con1;
|
||||
set session long_query_time=10;
|
||||
select get_lock('bug27638', 1);
|
||||
connection con2;
|
||||
set session long_query_time=1;
|
||||
truncate table mysql.slow_log;
|
||||
select get_lock('bug27638', 2);
|
||||
select if (query_time between '00:00:01' and '00:00:10', 'OK', 'WRONG') as qt, sql_text from mysql.slow_log;
|
||||
truncate table mysql.slow_log;
|
||||
select get_lock('bug27638', 60);
|
||||
select if (query_time between '00:00:59' and '00:01:10', 'OK', 'WRONG') as qt, sql_text from mysql.slow_log;
|
||||
truncate table mysql.slow_log;
|
||||
select get_lock('bug27638', 101);
|
||||
select if (query_time between '00:01:40' and '00:01:50', 'OK', 'WRONG') as qt, sql_text from mysql.slow_log;
|
||||
connection con1;
|
||||
select release_lock('bug27638');
|
||||
connection default;
|
||||
|
||||
disconnect con1;
|
||||
disconnect con2;
|
Reference in New Issue
Block a user