diff options
author | unknown <monty@mysql.com> | 2004-10-27 19:52:41 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-10-27 19:52:41 +0300 |
commit | e646f8f2d19fbfd24c8cc4ce62322691e88d12d1 (patch) | |
tree | d9b411a738093cebf4896002805fdc91ca117fb1 /mysql-test/r/query_cache.result | |
parent | 55833fb49bf8570ee11d4b85b143a9a3975733fa (diff) | |
parent | 3bdd7e77fdb66acb4d051dec2b1c4fd136a49f9c (diff) | |
download | mariadb-git-e646f8f2d19fbfd24c8cc4ce62322691e88d12d1.tar.gz |
Merge with 4.0
BitKeeper/deleted/.del-innodb-lock-master.opt~f76a4a1999728f87:
Auto merged
innobase/include/trx0sys.h:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/trx/trx0purge.c:
Auto merged
innobase/trx/trx0rseg.c:
Auto merged
mysql-test/r/innodb-lock.result:
Auto merged
mysql-test/t/innodb-lock.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/mysqld.cc:
Use local version during merge
Diffstat (limited to 'mysql-test/r/query_cache.result')
-rw-r--r-- | mysql-test/r/query_cache.result | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result index d68da39b19f..9f61b029391 100644 --- a/mysql-test/r/query_cache.result +++ b/mysql-test/r/query_cache.result @@ -791,6 +791,19 @@ Qcache_queries_in_cache 1 unlock table; drop table t1,t2; set query_cache_wlock_invalidate=default; +CREATE TABLE t1 (id INT PRIMARY KEY); +insert into t1 values (1),(2),(3); +select * from t1; +id +1 +2 +3 +create temporary table t1 (a int not null auto_increment +primary key); +select * from t1; +a +drop table t1; +drop table t1; SET NAMES koi8r; CREATE TABLE t1 (a char(1) character set koi8r); INSERT INTO t1 VALUES (_koi8r'á'),(_koi8r'Á'); |