diff options
| author | Mattias Jonsson <mattias.jonsson@sun.com> | 2008-12-15 14:37:38 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2008-12-15 14:37:38 +0100 |
| commit | 55f1722ca41f11316da760ee2cca1721e6578a40 (patch) | |
| tree | 5f2daec3fc38a954aac375eba7ffdd16b1ea2e6c /mysql-test | |
| parent | ac6e835572204cb399c99e55a15cd1e679e22710 (diff) | |
| download | mariadb-git-55f1722ca41f11316da760ee2cca1721e6578a40.tar.gz | |
Fix for mysql-5.1-performance-version, transaction information
removed from SHOW ENGINE InnoDB STATUS
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/partition_innodb.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/partition_innodb.test | 12 |
2 files changed, 8 insertions, 10 deletions
diff --git a/mysql-test/r/partition_innodb.result b/mysql-test/r/partition_innodb.result index ad4d08e89ff..af277e5ce40 100644 --- a/mysql-test/r/partition_innodb.result +++ b/mysql-test/r/partition_innodb.result @@ -11,13 +11,7 @@ SET @old_tx_isolation := @@session.tx_isolation; SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED; SET autocommit = 0; UPDATE t1 SET DATA = data*2 WHERE id = 3; -SHOW ENGINE InnoDB STATUS; -Type Name Status -InnoDB 2 lock struct(s) 1 row lock(s) UPDATE t1 SET data = data*2 WHERE data = 2; -SHOW ENGINE InnoDB STATUS; -Type Name Status -InnoDB 6 lock struct(s) 2 row lock(s) SET @@session.tx_isolation = @old_tx_isolation; DROP TABLE t1; # Bug#37721, test of ORDER BY on PK and WHERE on INDEX diff --git a/mysql-test/t/partition_innodb.test b/mysql-test/t/partition_innodb.test index 2abbceffbb0..c6bf0af0b6f 100644 --- a/mysql-test/t/partition_innodb.test +++ b/mysql-test/t/partition_innodb.test @@ -25,17 +25,21 @@ SET autocommit = 0; UPDATE t1 SET DATA = data*2 WHERE id = 3; +# SHOW ENGINE InnoDB STATUS does not show transaction info in +# PERFORMANCE-VERSION # grouping/referencing in replace_regex is very slow on long strings, # removing all before/after the interesting row before grouping/referencing ---replace_regex /.*---TRANSACTION [0-9]+ [0-9]+, .*, OS thread id [0-9]+// /MySQL thread id [0-9]+, query id [0-9]+ .*// /.*([0-9]+ lock struct\(s\)), heap size [0-9]+, ([0-9]+ row lock\(s\)).*/\1 \2/ -SHOW ENGINE InnoDB STATUS; +#--replace_regex /.*---TRANSACTION [0-9]+ [0-9]+, .*, OS thread id [0-9]+// /MySQL thread id [0-9]+, query id [0-9]+ .*// /.*([0-9]+) lock struct\(s\), heap size [0-9]+, ([0-9]+) row lock\(s\).*/\1 lock struct(s) \2 row lock(s)/ +#SHOW ENGINE InnoDB STATUS; UPDATE t1 SET data = data*2 WHERE data = 2; +# SHOW ENGINE InnoDB STATUS does not show transaction info in +# PERFORMANCE-VERSION # grouping/referencing in replace_regex is very slow on long strings, # removing all before/after the interesting row before grouping/referencing ---replace_regex /.*---TRANSACTION [0-9]+ [0-9]+, .*, OS thread id [0-9]+// /MySQL thread id [0-9]+, query id [0-9]+ .*// /.*([0-9]+ lock struct\(s\)), heap size [0-9]+, ([0-9]+ row lock\(s\)).*/\1 \2/ -SHOW ENGINE InnoDB STATUS; +#--replace_regex /.*---TRANSACTION [0-9]+ [0-9]+, .*, OS thread id [0-9]+// /MySQL thread id [0-9]+, query id [0-9]+ .*// /.*([0-9]+ lock struct\(s\)), heap size [0-9]+, ([0-9]+ row lock\(s\)).*/\1 \2/ +#SHOW ENGINE InnoDB STATUS; SET @@session.tx_isolation = @old_tx_isolation; |