Below is the list of changes that have just been committed into a local
5.1 repository of thek. When thek does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2008-01-07 21:06:18+01:00, thek@adventure.(none) +4 -0
Fixed test layout error.
mysql-test/r/query_cache.result@stripped, 2008-01-07 21:06:14+01:00, thek@adventure.(none) +0 -24
Moved test which requires debug binaries to a new file.
mysql-test/r/query_cache_debug.result@stripped, 2008-01-07 21:06:14+01:00, thek@adventure.(none) +24 -0
Moved test which requires debug binaries to a new file.
mysql-test/r/query_cache_debug.result@stripped, 2008-01-07 21:06:14+01:00, thek@adventure.(none) +0 -0
mysql-test/t/query_cache.test@stripped, 2008-01-07 21:06:14+01:00, thek@adventure.(none) +0 -42
Moved test which requires debug binaries to a new file.
mysql-test/t/query_cache_debug.test@stripped, 2008-01-07 21:06:14+01:00, thek@adventure.(none) +45 -0
Moved test which requires debug binaries to a new file.
mysql-test/t/query_cache_debug.test@stripped, 2008-01-07 21:06:14+01:00, thek@adventure.(none) +0 -0
diff -Nrup a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
--- a/mysql-test/r/query_cache.result 2008-01-03 15:36:45 +01:00
+++ b/mysql-test/r/query_cache.result 2008-01-07 21:06:14 +01:00
@@ -1669,28 +1669,4 @@ SELECT 1 FROM t1 GROUP BY
1
1
DROP TABLE t1;
-flush status;
-set query_cache_type=DEMAND;
-set global query_cache_size= 1024*1024*512;
-drop table if exists t1;
-create table t1 (a varchar(100));
-insert into t1 values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
-Activate debug hook and attempt to retrieve the statement from the cache.
-set session debug='+d,wait_in_query_cache_insert';
-select SQL_CACHE * from t1;;
-On a second connection; clear the query cache.
-show status like 'Qcache_queries_in_cache';
-Variable_name Value
-Qcache_queries_in_cache 1
-set global query_cache_size= 0;;
-Signal the debug hook to release the lock.
-select id from information_schema.processlist where state='wait_in_query_cache_insert' into @thread_id;
-kill query @thread_id;
-Show query cache status.
-show status like 'Qcache_queries_in_cache';
-Variable_name Value
-Qcache_queries_in_cache 1
-set global query_cache_size= 0;
-use test;
-drop table t1;
End of 5.1 tests
diff -Nrup a/mysql-test/r/query_cache_debug.result b/mysql-test/r/query_cache_debug.result
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/r/query_cache_debug.result 2008-01-07 21:06:14 +01:00
@@ -0,0 +1,24 @@
+flush status;
+set query_cache_type=DEMAND;
+set global query_cache_size= 1024*1024*512;
+drop table if exists t1;
+create table t1 (a varchar(100));
+insert into t1 values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
+Activate debug hook and attempt to retrieve the statement from the cache.
+set session debug='+d,wait_in_query_cache_insert';
+select SQL_CACHE * from t1;;
+On a second connection; clear the query cache.
+show status like 'Qcache_queries_in_cache';
+Variable_name Value
+Qcache_queries_in_cache 1
+set global query_cache_size= 0;;
+Signal the debug hook to release the lock.
+select id from information_schema.processlist where state='wait_in_query_cache_insert' into @thread_id;
+kill query @thread_id;
+Show query cache status.
+show status like 'Qcache_queries_in_cache';
+Variable_name Value
+Qcache_queries_in_cache 1
+set global query_cache_size= 0;
+use test;
+drop table t1;
diff -Nrup a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test
--- a/mysql-test/t/query_cache.test 2008-01-03 15:36:45 +01:00
+++ b/mysql-test/t/query_cache.test 2008-01-07 21:06:14 +01:00
@@ -1316,47 +1316,5 @@ SELECT 1 FROM t1 GROUP BY
(SELECT LAST_INSERT_ID() FROM t1 ORDER BY MIN(a) ASC LIMIT 1);
DROP TABLE t1;
-#
-# Bug #30887 Server crashes on SET GLOBAL query_cache_size=0
-#
-flush status;
-set query_cache_type=DEMAND;
-set global query_cache_size= 1024*1024*512;
---disable_warnings
-drop table if exists t1;
---enable_warnings
-create table t1 (a varchar(100));
-insert into t1 values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
-connect (bug30887con1, localhost, root, ,test);
-connect (bug30887con2, localhost, root, ,test);
-
-connection bug30887con1;
---echo Activate debug hook and attempt to retrieve the statement from the cache.
-set session debug='+d,wait_in_query_cache_insert';
---send select SQL_CACHE * from t1;
-
-connection default;
-let $wait_condition= select count(*)= 1 from information_schema.processlist where state= 'wait_in_query_cache_insert';
---source include/wait_condition.inc
-
-connection bug30887con2;
---echo On a second connection; clear the query cache.
-show status like 'Qcache_queries_in_cache';
---send set global query_cache_size= 0;
-
-connection default;
---echo Signal the debug hook to release the lock.
-select id from information_schema.processlist where state='wait_in_query_cache_insert' into @thread_id;
-kill query @thread_id;
-
---echo Show query cache status.
-show status like 'Qcache_queries_in_cache';
-
-disconnect bug30887con1;
-disconnect bug30887con2;
-set global query_cache_size= 0;
-use test;
-drop table t1;
-
--echo End of 5.1 tests
diff -Nrup a/mysql-test/t/query_cache_debug.test b/mysql-test/t/query_cache_debug.test
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/t/query_cache_debug.test 2008-01-07 21:06:14 +01:00
@@ -0,0 +1,45 @@
+--source include/have_query_cache.inc
+--source include/have_debug.inc
+
+#
+# Bug #30887 Server crashes on SET GLOBAL query_cache_size=0
+#
+flush status;
+set query_cache_type=DEMAND;
+set global query_cache_size= 1024*1024*512;
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+create table t1 (a varchar(100));
+insert into t1 values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
+connect (bug30887con1, localhost, root, ,test);
+connect (bug30887con2, localhost, root, ,test);
+
+connection bug30887con1;
+--echo Activate debug hook and attempt to retrieve the statement from the cache.
+set session debug='+d,wait_in_query_cache_insert';
+--send select SQL_CACHE * from t1;
+
+connection default;
+let $wait_condition= select count(*)= 1 from information_schema.processlist where state= 'wait_in_query_cache_insert';
+--source include/wait_condition.inc
+
+connection bug30887con2;
+--echo On a second connection; clear the query cache.
+show status like 'Qcache_queries_in_cache';
+--send set global query_cache_size= 0;
+
+connection default;
+--echo Signal the debug hook to release the lock.
+select id from information_schema.processlist where state='wait_in_query_cache_insert' into @thread_id;
+kill query @thread_id;
+
+--echo Show query cache status.
+show status like 'Qcache_queries_in_cache';
+
+disconnect bug30887con1;
+disconnect bug30887con2;
+set global query_cache_size= 0;
+use test;
+drop table t1;
+
| Thread |
|---|
| • bk commit into 5.1 tree (thek:1.2655) | kpettersson | 7 Jan |
