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

merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixing

Browse Source
This commit is contained in:
Alfranio Correia
2010-06-30 20:32:05 +01:00
parent 41d832d19b e662b51eef
commit 3e82758850
23 changed files with 626 additions and 1282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/t/innodb_mysql_lock2.test
View File

@@ -12,6 +12,10 @@
# Save the initial number of concurrent sessions.
--source include/count_sessions.inc
--disable_query_log
CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
--enable_query_log
--echo #
--echo # Test how do we handle locking in various cases when
--echo # we read data from InnoDB tables.