bk commit into 5.0 tree (bar:1.1961)

[bar]

Below is the list of changes that have just been committed into a local
5.0 repository of bar. When bar 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.1961 05/08/08 16:36:17 bar@stripped +3 -0
  Merge mysql.com:/usr/home/bar/mysql-4.1.b10892
  into  mysql.com:/usr/home/bar/mysql-5.0

  mysql-test/r/grant.result
    1.42 05/08/08 16:36:05 bar@stripped +0 -3
    using local copy

  sql/item.cc
    1.161 05/08/08 16:31:52 bar@stripped +0 -2
    Auto merged

  mysql-test/t/grant.test
    1.33 05/08/08 16:31:52 bar@stripped +0 -0
    Auto merged

# 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:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.0/RESYNC

--- 1.160/sql/item.cc	2005-07-29 07:06:31 +05:00
+++ 1.161/sql/item.cc	2005-08-08 16:31:52 +05:00
@@ -1016,14 +1016,18 @@
        ; // Do nothing
     }
     else if ((flags & MY_COLL_ALLOW_SUPERSET_CONV) &&
-             derivation < dt.derivation &&
-             collation->state & MY_CS_UNICODE)
+             collation->state & MY_CS_UNICODE &&
+             (derivation < dt.derivation ||
+             (derivation == dt.derivation &&
+             !(dt.collation->state & MY_CS_UNICODE))))
     {
       // Do nothing
     }
     else if ((flags & MY_COLL_ALLOW_SUPERSET_CONV) &&
-             dt.derivation < derivation &&
-             dt.collation->state & MY_CS_UNICODE)
+             dt.collation->state & MY_CS_UNICODE &&
+             (dt.derivation < derivation ||
+              (dt.derivation == derivation &&
+             !(collation->state & MY_CS_UNICODE))))
     {
       set(dt);
     }

--- 1.32/mysql-test/t/grant.test	2005-07-28 18:12:34 +05:00
+++ 1.33/mysql-test/t/grant.test	2005-08-08 16:31:52 +05:00
@@ -480,4 +480,11 @@
 delete from tables_priv where host = '' and user = 'mysqltest_1';
 flush privileges;
 
+#
+# Bug #10892 user variables not auto cast for comparisons
+# Check that we don't get illegal mix of collations
+#
+set @user123="non-existent";
+select * from mysql.db where user=@user123;
+
 # End of 4.1 tests