bk commit into 4.1 tree (bar:1.2305) BUG#10904

[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.2305 05/06/02 16:17:44 bar@stripped +4 -0
  item_func.cc:
  set_var.cc:
  variables.result
  variables.test
  
    Bug #10904 Illegal mix of collations between a system variable and a constant
    Changing coercibility of system variables to SYSCONST,
    to be the same with USER(), DATABASE(), etc.

  mysql-test/t/variables.test
    1.47 05/06/02 16:16:37 bar@stripped +7 -0

  mysql-test/r/variables.result
    1.59 05/06/02 16:16:36 bar@stripped +6 -0

  sql/set_var.cc
    1.167 05/06/02 16:16:31 bar@stripped +2 -1

  sql/item_func.cc
    1.249 05/06/02 16:14:55 bar@stripped +1 -1
    Bug #10904 Illegal mix of collations between a system variable and a constant
    Changing coercibility of system variables to SYSCONST
    To be the same with USER(), DATABASE(), etc.

# 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.sysvar

--- 1.248/sql/item_func.cc	2005-06-02 05:57:14 +05:00
+++ 1.249/sql/item_func.cc	2005-06-02 16:14:55 +05:00
@@ -3369,7 +3369,7 @@
       !my_strcasecmp(system_charset_info, name.str, "VERSION"))
     return new Item_string("@@VERSION", server_version,
 			   (uint) strlen(server_version),
-			   system_charset_info);
+			   system_charset_info, DERIVATION_SYSCONST);
 
   Item *item;
   sys_var *var;

--- 1.58/mysql-test/r/variables.result	2005-04-02 05:41:49 +05:00
+++ 1.59/mysql-test/r/variables.result	2005-06-02 16:16:36 +05:00
@@ -210,6 +210,12 @@
 range_alloc_block_size	2048
 transaction_alloc_block_size	8192
 transaction_prealloc_size	4096
+SELECT @@version LIKE 'non-existent';
+@@version LIKE 'non-existent'
+0
+SELECT @@version_compile_os LIKE 'non-existent';
+@@version_compile_os LIKE 'non-existent'
+0
 set big_tables=OFFF;
 ERROR 42000: Variable 'big_tables' can't be set to the value of 'OFFF'
 set big_tables="OFFF";

--- 1.46/mysql-test/t/variables.test	2005-04-02 05:41:50 +05:00
+++ 1.47/mysql-test/t/variables.test	2005-06-02 16:16:37 +05:00
@@ -115,6 +115,13 @@
 set transaction_alloc_block_size=default, @@transaction_prealloc_size=default;
 show variables like '%alloc%';
 
+#
+# Bug #10904 Illegal mix of collations between
+# a system variable and a constant
+#
+SELECT @@version LIKE 'non-existent';
+SELECT @@version_compile_os LIKE 'non-existent';
+
 # The following should give errors
 
 --error 1231

--- 1.166/sql/set_var.cc	2005-06-02 05:23:53 +05:00
+++ 1.167/sql/set_var.cc	2005-06-02 16:16:31 +05:00
@@ -1606,7 +1606,8 @@
     Item_string *tmp;
     pthread_mutex_lock(&LOCK_global_system_variables);
     char *str= (char*) value_ptr(thd, var_type, base);
-    tmp= new Item_string(str, strlen(str), system_charset_info);
+    tmp= new Item_string(str, strlen(str),
+                         system_charset_info, DERIVATION_SYSCONST);
     pthread_mutex_unlock(&LOCK_global_system_variables);
     return tmp;
   }