diff options
| author | unknown <df@pippilotta.erinye.com> | 2007-11-28 19:49:29 +0100 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2007-11-28 19:49:29 +0100 |
| commit | 9b6dc66ede4f939ad123f4a18a0a883f529d4963 (patch) | |
| tree | 4f47aa2b6f09e1699ea25d02dee1b3ca0f3c9255 /mysql-test/r/innodb_mysql.result | |
| parent | a24bfb485c8f443ae2ea6a13d4f1131baa6ddfdb (diff) | |
| parent | df722475e7e8bcfb8c86939eba63cbc640518c5a (diff) | |
| download | mariadb-git-9b6dc66ede4f939ad123f4a18a0a883f529d4963.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
client/mysql.cc:
Auto merged
configure.in:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'mysql-test/r/innodb_mysql.result')
| -rw-r--r-- | mysql-test/r/innodb_mysql.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result index c80aa7fee05..029cd049a13 100644 --- a/mysql-test/r/innodb_mysql.result +++ b/mysql-test/r/innodb_mysql.result @@ -391,6 +391,7 @@ id select_type table type possible_keys key key_len ref rows Extra SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5'; name dept DROP TABLE t1; +drop table if exists t1; show variables like 'innodb_rollback_on_timeout'; Variable_name Value innodb_rollback_on_timeout OFF @@ -453,6 +454,7 @@ tes 1234 drop table test; set global query_cache_type=@save_qcache_type; set global query_cache_size=@save_qcache_size; +drop table if exists t1; show variables like 'innodb_rollback_on_timeout'; Variable_name Value innodb_rollback_on_timeout OFF @@ -777,6 +779,7 @@ EXPLAIN SELECT SQL_BIG_RESULT b, SUM(c) FROM t1 GROUP BY b; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 128 Using filesort DROP TABLE t1; +drop table if exists t1; show variables like 'innodb_rollback_on_timeout'; Variable_name Value innodb_rollback_on_timeout OFF |