Commit 921e1cc4 authored by svoj@mysql.com/june.mysql.com's avatar svoj@mysql.com/june.mysql.com
Browse files

BUG#34289 - Incorrect NAME_CONST substitution in stored procedures 

            breaks replication

NAME_CONST() didn't replicate constant character set and collation
correctly.

With this fix NAME_CONST() inherits collation from the value argument.
parent b620694b

mysql-test/r/func_misc.result

+3 −0
Original line number Diff line number Diff line
@@ -225,4 +225,7 @@ select min(a) from t1 group by inet_ntoa(a); 
min(a)

-2

drop table t1;

SELECT NAME_CONST('var', 'value') COLLATE latin1_general_cs;

NAME_CONST('var', 'value') COLLATE latin1_general_cs

value

End of 5.0 tests

mysql-test/t/func_misc.test

+6 −0
Original line number Diff line number Diff line
@@ -237,5 +237,11 @@ insert into t1 values (-1), (-2); 
select min(a) from t1 group by inet_ntoa(a);

drop table t1;



#

# BUG#34289 - Incorrect NAME_CONST substitution in stored procedures breaks

# replication

#

SELECT NAME_CONST('var', 'value') COLLATE latin1_general_cs;



--echo End of 5.0 tests

sql/item.cc

+1 −0
Original line number Diff line number Diff line
@@ -1240,6 +1240,7 @@ bool Item_name_const::fix_fields(THD *thd, Item **ref) 
    return TRUE;

  }

  set_name(item_name->ptr(), (uint) item_name->length(), system_charset_info);

  collation.set(value_item->collation.collation, DERIVATION_IMPLICIT);

  max_length= value_item->max_length;

  decimals= value_item->decimals;

  fixed= 1;