database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge with 5.1

Browse Source
This commit is contained in:
Michael Widenius
2010-04-08 12:52:53 +03:00
parent a91e89dec6 04ff96f789
commit db1d83a5cc
22 changed files with 91 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/pbxt/r/multi_statement.result
View File

@ -47,5 +47,5 @@ i
3
show status like 'Slow_queries'||||
Variable_name Value
Slow_queries 0
Slow_queries 3
drop table t1||||

3
mysql-test/suite/pbxt/t/multi_statement-master.opt Normal file
View File

@ -0,0 +1,3 @@
--slow-query-log
--slow-query-log-file=slow.log
--log-queries-not-using-indexes

2
mysql-test/suite/pbxt/t/status.test
View File

@ -30,7 +30,7 @@ connection con1;
--send
update t1 set n = 3;
connection con2;
sleep 0.5;
sleep 5;
unlock tables;
connection con1;
reap;