diff options
| author | unknown <kaa@polly.local> | 2006-10-12 13:39:52 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2006-10-12 13:39:52 +0400 |
| commit | 72a997c0eaea7baa1e3c4ada3e468a9df9c785e7 (patch) | |
| tree | a9ae49777a5c058daeb1655186551c867e63a791 /mysql-test/r | |
| parent | f29fb0415eb4b1c0f90f800696d8223446f0ef34 (diff) | |
| parent | ca126a2bbdf50736d2cb1909be1bde8808ba2d6c (diff) | |
| download | mariadb-git-72a997c0eaea7baa1e3c4ada3e468a9df9c785e7.tar.gz | |
Merge polly.local:/tmp/maint/bug22728/my41-bug22728
into polly.local:/home/kaa/src/maint/m41-maint--07OGk
sql/handler.cc:
Auto merged
mysql-test/r/innodb_mysql.result:
Manually merged
mysql-test/t/innodb_mysql.test:
Manually merged
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/innodb_mysql.result | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result index ee4c114087d..ba0f7c47524 100644 --- a/mysql-test/r/innodb_mysql.result +++ b/mysql-test/r/innodb_mysql.result @@ -104,3 +104,13 @@ SELECT `id1` FROM `t1` WHERE `id1` NOT IN (SELECT `id1` FROM `t2` WHERE `id2` = id1 2 DROP TABLE t1, t2; +flush status; +create table t1 (c1 int) engine=innodb; +handler t1 open; +handler t1 read first; +c1 +show /*!50002 GLOBAL */ status like 'Handler_rollback'; +Variable_name Value +Handler_rollback 0 +drop table t1; +End of 4.1 tests |