diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-08-02 02:22:31 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-08-02 02:22:31 -0600 |
| commit | c7419debba007918f6317ccf844ae333031fcff5 (patch) | |
| tree | 3c815f60241d30c32d0c3d887db177e83005e33a /mysql-test/r/show_check.result | |
| parent | 48eb7f8c857493ca7d30da4b78b279e4938f8c83 (diff) | |
| download | mariadb-git-c7419debba007918f6317ccf844ae333031fcff5.tar.gz | |
Post-merge fix. Update some test results, and add an InnoDB-only
compatibility hook, thd_mark_transaction_to_rollback().
mysql-test/r/ps.result:
Post-merge fix. Changes for WL 3984 (Revise locking
of mysql.general_log and mysql.slow_log) cause some test
result differences.
mysql-test/r/show_check.result:
Post-merge fix. Changes for WL 3984 (Revise locking
of mysql.general_log and mysql.slow_log) cause some test
result differences.
sql/sql_class.cc:
Post-merge fix, add InnoDB compatibility hook (defined for
InnoDB only), thd_mark_transaction_to_rollback().
storage/innobase/handler/ha_innodb.cc:
Post-merge fix, add InnoDB compatibility hook (defined for
InnoDB only), thd_mark_transaction_to_rollback().
storage/innobase/handler/ha_innodb.h:
Post-merge fix, add InnoDB compatibility hook (defined for
InnoDB only), thd_mark_transaction_to_rollback().
Diffstat (limited to 'mysql-test/r/show_check.result')
| -rw-r--r-- | mysql-test/r/show_check.result | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index 669043b5656..1a34dd84dd7 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -256,9 +256,8 @@ create table t1(n int); insert into t1 values (1); show open tables; Database Table In_use Name_locked -mysql general_log 0 0 -mysql slow_log 0 0 test t1 0 0 +mysql general_log 0 0 drop table t1; create table t1 (a int not null, b VARCHAR(10), INDEX (b) ) AVG_ROW_LENGTH=10 CHECKSUM=1 COMMENT="test" ENGINE=MYISAM MIN_ROWS=10 MAX_ROWS=100 PACK_KEYS=1 DELAY_KEY_WRITE=1 ROW_FORMAT=fixed; show create table t1; @@ -685,9 +684,8 @@ Database Table In_use Name_locked mysql db 0 0 mysql time_zone 0 0 mysql general_log 0 0 -mysql slow_log 0 0 -mysql user 0 0 mysql proc 0 0 +mysql user 0 0 mysql time_zone_name 0 0 SHOW OPEN TABLES FROM mysql LIKE 'u%'; Database Table In_use Name_locked @@ -702,7 +700,6 @@ SHOW OPEN TABLES LIKE '%o%'; Database Table In_use Name_locked mysql time_zone 0 0 mysql general_log 0 0 -mysql slow_log 0 0 mysql proc 0 0 mysql time_zone_name 0 0 FLUSH TABLES; |