bk commit into 4.1 tree (jimw:1.2220)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw 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
  1.2220 05/04/29 08:46:03 jimw@stripped +2 -0
  Manually resolve merge

  mysql-test/t/query_cache.test
    1.41 05/04/29 08:46:00 jimw@stripped +0 -0
    Resolve merge

  mysql-test/r/query_cache.result
    1.54 05/04/29 08:46:00 jimw@stripped +0 -0
    Resolve merge

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-clean/RESYNC

--- 1.53/mysql-test/r/query_cache.result	2005-03-31 19:17:42 -08:00
+++ 1.54/mysql-test/r/query_cache.result	2005-04-29 08:46:00 -07:00
@@ -299,6 +299,8 @@
 UNIX_TIMESTAMP()
 select USER() from t1;
 USER()
+select CURRENT_USER() from t1;
+CURRENT_USER()
 select benchmark(1,1) from t1;
 benchmark(1,1)
 explain extended select benchmark(1,1) from t1;

--- 1.40/mysql-test/t/query_cache.test	2005-03-31 19:17:42 -08:00
+++ 1.41/mysql-test/t/query_cache.test	2005-04-29 08:46:00 -07:00
@@ -184,6 +184,7 @@
 select RAND() from t1;
 select UNIX_TIMESTAMP() from t1;
 select USER() from t1;
+select CURRENT_USER() from t1;
 select benchmark(1,1) from t1;
 explain extended select benchmark(1,1) from t1;
 show status like "Qcache_queries_in_cache";