bk commit into 4.1 tree (bar:1.2379) BUG#10892

[bar]

Below is the list of changes that have just been committed into a local
4.1 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.2379 05/08/04 15:25:03 bar@stripped +3 -0
  grant.result, grant.test:
    fixing tests accordingly
  item.cc:
    Bug #10892 user variables not auto cast for comparisons
    When mixing strings with different character sets,
    and coercibility is the same, we allow conversion
    if one character set is superset for other character set.

  mysql-test/r/grant.result
    1.38 05/08/04 15:24:42 bar@stripped +3 -0
    fixing tests accordingly

  mysql-test/t/grant.test
    1.30 05/08/04 15:24:35 bar@stripped +7 -0
    fixing tests accordingly

  sql/item.cc
    1.214 05/08/04 15:23:26 bar@stripped +6 -4
    Bug #10892 user variables not auto cast for comparisons
    When mixing strings with different character sets,
    and coercibility is the same, we allow conversion
    if one character set is superset for other character set.

# 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-4.1.b10892

--- 1.213/sql/item.cc	2005-07-26 12:50:39 +05:00
+++ 1.214/sql/item.cc	2005-08-04 15:23:26 +05:00
@@ -455,14 +455,16 @@
        ; // Do nothing
     }
     else if ((flags & MY_COLL_ALLOW_SUPERSET_CONV) &&
-             derivation < dt.derivation &&
-             collation->state & MY_CS_UNICODE)
+             derivation <= dt.derivation &&
+             collation->state & MY_CS_UNICODE &&
+             !(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.derivation <= derivation &&
+             dt.collation->state & MY_CS_UNICODE &&
+             !(collation->state & MY_CS_UNICODE))
     {
       set(dt);
     }

--- 1.37/mysql-test/r/grant.result	2005-07-06 03:19:02 +05:00
+++ 1.38/mysql-test/r/grant.result	2005-08-04 15:24:42 +05:00
@@ -440,3 +440,6 @@
 flush privileges;
 delete from tables_priv where host = '' and user = 'mysqltest_1';
 flush privileges;
+set @user123="non-existent";
+select * from mysql.db where user=@user123;
+Host	Db	User	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Create_tmp_table_priv	Lock_tables_priv

--- 1.29/mysql-test/t/grant.test	2005-07-28 05:21:42 +05:00
+++ 1.30/mysql-test/t/grant.test	2005-08-04 15:24:35 +05:00
@@ -402,4 +402,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