bk commit into 5.1 tree (dkatz:1.2494)

[damien]

Below is the list of changes that have just been committed into a local
5.1 repository of dkatz. When dkatz 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, 2007-06-13 16:33:41-04:00, dkatz@stripped +4 -0
  Merge damien-katzs-computer.local:/Users/dkatz/mysql50
  into  damien-katzs-computer.local:/Users/dkatz/mysql51
  MERGE: 1.1810.2944.57

  mysql-test/r/query_cache.result@stripped, 2007-06-13 16:31:12-04:00, dkatz@stripped +0 -0
    Auto merged
    MERGE: 1.65.1.16

  mysql-test/t/query_cache.test@stripped, 2007-06-13 16:31:12-04:00, dkatz@stripped +0 -0
    Auto merged
    MERGE: 1.49.1.11

  sql/item_create.cc@stripped, 2007-06-13 16:32:26-04:00, dkatz@stripped +0 -1
    C
    C
    CC
    d
    sdv
    MERGE: 1.58.1.6

  sql/sql_select.cc@stripped, 2007-06-13 16:31:12-04:00, dkatz@stripped +0 -0
    Auto merged
    MERGE: 1.312.1.219

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	dkatz
# Host:	damien-katzs-computer.local
# Root:	/Users/dkatz/mysql51/RESYNC

--- 1.89/mysql-test/r/query_cache.result	2007-05-10 08:27:52 -04:00
+++ 1.90/mysql-test/r/query_cache.result	2007-06-13 16:31:12 -04:00
@@ -1433,7 +1433,14 @@ Only MyISAM tables	support collections	1
 Function MATCH ... AGAINST()	is used to do a search	1
 Full-text search in MySQL	implements vector space model	1
 drop function change_global;
+drop table t1;
 set GLOBAL query_cache_type=default;
 set GLOBAL query_cache_limit=default;
 set GLOBAL query_cache_min_res_unit=default;
+set GLOBAL query_cache_size= default;
+set GLOBAL query_cache_size=1000000;
+create table t1 (a char);
+insert into t1 values ('c');
+a
+drop table t1;
 set GLOBAL query_cache_size= default;

--- 1.69/mysql-test/t/query_cache.test	2007-05-08 05:56:45 -04:00
+++ 1.70/mysql-test/t/query_cache.test	2007-06-13 16:31:12 -04:00
@@ -994,9 +994,33 @@ delimiter ;|
 select *, change_global() from t1;
 drop function change_global;
 
+drop table t1;
+
 set GLOBAL query_cache_type=default;
 set GLOBAL query_cache_limit=default;
 set GLOBAL query_cache_min_res_unit=default;
+set GLOBAL query_cache_size= default;
+
+
+#
+# Bug #28897  	UUID() returns non-unique values when query cache is enabled
+#
+
+set GLOBAL query_cache_size=1000000;
+
+create table t1 (a char);
+insert into t1 values ('c');
+
+let $q1= `select UUID(), a from t1`;
+let $q2= `select UUID(), a from t1`; 
+
+# disabling the logging of the query because the UUIDs are different each run.
+--disable_query_log
+eval select a  from t1 where "$q1" = "$q2";
+--enable_query_log
+
+drop table t1;
+
 set GLOBAL query_cache_size= default;
 
 # End of 5.0 tests