diff options
| author | Rohit Kalhans <rohit.kalhans@oracle.com> | 2011-10-03 16:05:52 +0530 |
|---|---|---|
| committer | Rohit Kalhans <rohit.kalhans@oracle.com> | 2011-10-03 16:05:52 +0530 |
| commit | 4c4a2599c1da355d5176f5e0d7fd612c801a0271 (patch) | |
| tree | c046401ec64fb4fbd2943c8994a2a8d09e8f4e76 /mysql-test/include | |
| parent | b91f134ae1cd67427e9dde7ab539a683bd504511 (diff) | |
| download | mariadb-git-4c4a2599c1da355d5176f5e0d7fd612c801a0271.tar.gz | |
BUG#11758262 BUG#13043055:
Fix for commit_1innodb failure on pb2.
Background: as status increment differs for an unsafe statement
when logged in stmt and row format, mtr throws a content mismatch
error.
Fix: call p_verify_status_increment with different arguments
for loging format as stmt and row/mixed and disable query log.
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/commit.inc | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/mysql-test/include/commit.inc b/mysql-test/include/commit.inc index e84ad0f940d..fdb9ef1f563 100644 --- a/mysql-test/include/commit.inc +++ b/mysql-test/include/commit.inc @@ -524,9 +524,31 @@ call p_verify_status_increment(2, 2, 2, 2); --disable_warnings update ignore t1 set a=2 where a=1; --enable_warnings -call p_verify_status_increment(2, 2, 1, 0); -commit; -call p_verify_status_increment(2, 2, 1, 0); +if (`select @@binlog_format = 'STATEMENT'`) +{ + --disable_query_log + call p_verify_status_increment(2, 2, 1, 0); + --enable_query_log +} +if (`select @@binlog_format != 'STATEMENT'`) +{ + --disable_query_log + call p_verify_status_increment(1, 0, 1, 0); + --enable_query_log +} +commit; +if (`select @@binlog_format = 'STATEMENT'`) +{ + --disable_query_log + call p_verify_status_increment(2, 2, 1, 0); + --enable_query_log +} +if (`select @@binlog_format != 'STATEMENT'`) +{ + --disable_query_log + call p_verify_status_increment(1, 0, 1, 0); + --enable_query_log +} --echo # --echo # Create a stored function that modifies a --echo # non-transactional table. Demonstrate that changes in |