Commit a6cf849e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-4.1.sysvar 

into mysql.com:/usr/home/bar/mysql-5.0


mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
parents 198550e3 17678a7b

mysql-test/r/variables.result

+6 −0
Original line number Diff line number Diff line
@@ -236,6 +236,12 @@ query_prealloc_size 8192 
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";

mysql-test/t/variables.test

+7 −0
Original line number Diff line number Diff line
@@ -130,6 +130,13 @@ set @@query_alloc_block_size=default, @@query_prealloc_size=default; 
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

sql/item_func.cc

+1 −1
Original line number Diff line number Diff line
@@ -4509,7 +4509,7 @@ Item *get_system_var(THD *thd, enum_var_type var_type, LEX_STRING name, 
      !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;

sql/set_var.cc

+2 −1
Original line number Diff line number Diff line
@@ -1715,7 +1715,8 @@ Item *sys_var::item(THD *thd, enum_var_type var_type, LEX_STRING *base) 
    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;

  }