diff options
author | Sergey Petrunya <psergey@askmonty.org> | 2010-10-10 17:18:11 +0300 |
---|---|---|
committer | Sergey Petrunya <psergey@askmonty.org> | 2010-10-10 17:18:11 +0300 |
commit | 8d73ec2d1b01ca9d3d5ca55881f10fcd7e5f0015 (patch) | |
tree | 220c965bb467b020a4db171d7803586f9ed22cea /mysql-test/r/commit_1innodb.result | |
parent | ce4b468f7e36717298c16e7bafc562c89798e453 (diff) | |
parent | e2dff1b5bdd860ae931d3ad6eb78225b81b8060a (diff) | |
download | mariadb-git-8d73ec2d1b01ca9d3d5ca55881f10fcd7e5f0015.tar.gz |
Merge 5.2->5.3
- Re-commit Monty's merge, partially fixed by Igor and SergeyP,
but still broken
Diffstat (limited to 'mysql-test/r/commit_1innodb.result')
-rw-r--r-- | mysql-test/r/commit_1innodb.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/commit_1innodb.result b/mysql-test/r/commit_1innodb.result index 51c4ac3002c..1f0b2c8019b 100644 --- a/mysql-test/r/commit_1innodb.result +++ b/mysql-test/r/commit_1innodb.result @@ -841,11 +841,11 @@ call p_verify_status_increment(2, 0, 2, 0); SUCCESS alter table t3 rename t4; -call p_verify_status_increment(2, 2, 2, 2); +call p_verify_status_increment(1, 0, 1, 0); SUCCESS rename table t4 to t3; -call p_verify_status_increment(2, 2, 2, 2); +call p_verify_status_increment(1, 0, 1, 0); SUCCESS truncate table t3; |