Commit c56d0283 authored by unknown's avatar unknown
Browse files

type_blob.result, func_system.result, func_str.result, ctype_collate.result: 

  fixing test results accordingly.
func_system.test:
  New test that illegal mix of collations does not happen anymore.
item_strfunc.h:
    safe_charset_converter() was added for system constants.
item_strfunc.cc:
  safe_charset_converter() was added for system constants.
item_func.cc, item.h, item.cc:
  Bug#8291: Illegal collation mix with USER() function.
  After discussion with PeterG and Serge, a new coercibility
  level for "system constants" was introduced, between
  COERRIBLE and IMPLICIT. Thus:
  SELECT col1 = USER() FROM t1; - is done according to col1 collation.
  SELECT 'string' = USER(); - is done according to USER() collation.
  At the same time, "nagg" and "strong" members were removed as unused.
item_create.cc:
  Version is a system constant too.


sql/item.cc:
  Bug#8291: Illegal collation mix with USER() function.
  After discussion with PeterG and Serge, a new coercibility
  level for "system constants" was introduced, between
  COERRIBLE and IMPLICIT. Thus:
  SELECT col1 = USER() FROM t1; - is done according to col1 collation.
  SELECT 'string' = USER(); - is done according to USER() collation.
  At the same time, "nagg" and "strong" members were removed as unused.
sql/item.h:
  Bug#8291: Illegal collation mix with USER() function.
  After discussion with PeterG and Serge, a new coercibility
  level for "system constants" was introduced, between
  COERRIBLE and IMPLICIT. Thus:
  SELECT col1 = USER() FROM t1; - is done according to col1 collation.
  SELECT 'string' = USER(); - is done according to USER() collation.
  At the same time, "nagg" and "strong" members were removed as unused.
sql/item_create.cc:
  Version is a system constant too.
sql/item_func.cc:
  Bug#8291: Illegal collation mix with USER() function.
  After discussion with PeterG and Serge, a new coercibility
  level for "system constants" was introduced, between
  COERRIBLE and IMPLICIT. Thus:
  SELECT col1 = USER() FROM t1; - is done according to col1 collation.
  SELECT 'string' = USER(); - is done according to USER() collation.
  At the same time, "nagg" and "strong" members were removed as unused.
sql/item_strfunc.cc:
  safe_charset_converter() was added for system constants.
sql/item_strfunc.h:
    safe_charset_converter() was added for system constants.
mysql-test/t/func_system.test:
  New test that illegal mix of collations does not happen anymore.
mysql-test/r/ctype_collate.result:
  fixing test results accordingly.
mysql-test/r/func_str.result:
  fixing test results accordingly.
mysql-test/r/func_system.result:
  fixing test results accordingly.
mysql-test/r/type_blob.result:
  fixing test results accordingly.
parent e54b545a

mysql-test/r/ctype_collate.result

+2 −2
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ Variable_name Value 
character_set_client	latin1

SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';

charset('a')	collation('a')	coercibility('a')	'a'='A'

latin1	latin1_swedish_ci	3	1

latin1	latin1_swedish_ci	4	1

explain extended SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
@@ -525,7 +525,7 @@ SHOW VARIABLES LIKE 'collation_client'; 
Variable_name	Value

SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';

charset('a')	collation('a')	coercibility('a')	'a'='A'

latin1	latin1_swedish_ci	3	1

latin1	latin1_swedish_ci	4	1

SET CHARACTER SET 'DEFAULT';

ERROR 42000: Unknown character set: 'DEFAULT'

DROP TABLE t1;

mysql-test/r/func_str.result

+31 −31
Original line number Diff line number Diff line
@@ -464,97 +464,97 @@ select _latin1'B' COLLATE latin1_general_ci in (_latin1'a',_latin1'b' COLLATE la 
ERROR HY000: Illegal mix of collations (latin1_general_ci,EXPLICIT), (latin1_swedish_ci,COERCIBLE), (latin1_bin,EXPLICIT) for operation ' IN '

select collation(bin(130)), coercibility(bin(130));

collation(bin(130))	coercibility(bin(130))

latin1_swedish_ci	3

latin1_swedish_ci	4

select collation(oct(130)), coercibility(oct(130));

collation(oct(130))	coercibility(oct(130))

latin1_swedish_ci	3

latin1_swedish_ci	4

select collation(conv(130,16,10)), coercibility(conv(130,16,10));

collation(conv(130,16,10))	coercibility(conv(130,16,10))

latin1_swedish_ci	3

latin1_swedish_ci	4

select collation(hex(130)), coercibility(hex(130));

collation(hex(130))	coercibility(hex(130))

latin1_swedish_ci	3

latin1_swedish_ci	4

select collation(char(130)), coercibility(hex(130));

collation(char(130))	coercibility(hex(130))

latin1_swedish_ci	3

latin1_swedish_ci	4

select collation(format(130,10)), coercibility(format(130,10));

collation(format(130,10))	coercibility(format(130,10))

latin1_swedish_ci	3

latin1_swedish_ci	4

select collation(lcase(_latin2'a')), coercibility(lcase(_latin2'a'));

collation(lcase(_latin2'a'))	coercibility(lcase(_latin2'a'))

latin2_general_ci	3

latin2_general_ci	4

select collation(ucase(_latin2'a')), coercibility(ucase(_latin2'a'));

collation(ucase(_latin2'a'))	coercibility(ucase(_latin2'a'))

latin2_general_ci	3

latin2_general_ci	4

select collation(left(_latin2'a',1)), coercibility(left(_latin2'a',1));

collation(left(_latin2'a',1))	coercibility(left(_latin2'a',1))

latin2_general_ci	3

latin2_general_ci	4

select collation(right(_latin2'a',1)), coercibility(right(_latin2'a',1));

collation(right(_latin2'a',1))	coercibility(right(_latin2'a',1))

latin2_general_ci	3

latin2_general_ci	4

select collation(substring(_latin2'a',1,1)), coercibility(substring(_latin2'a',1,1));

collation(substring(_latin2'a',1,1))	coercibility(substring(_latin2'a',1,1))

latin2_general_ci	3

latin2_general_ci	4

select collation(concat(_latin2'a',_latin2'b')), coercibility(concat(_latin2'a',_latin2'b'));

collation(concat(_latin2'a',_latin2'b'))	coercibility(concat(_latin2'a',_latin2'b'))

latin2_general_ci	3

latin2_general_ci	4

select collation(lpad(_latin2'a',4,_latin2'b')), coercibility(lpad(_latin2'a',4,_latin2'b'));

collation(lpad(_latin2'a',4,_latin2'b'))	coercibility(lpad(_latin2'a',4,_latin2'b'))

latin2_general_ci	3

latin2_general_ci	4

select collation(rpad(_latin2'a',4,_latin2'b')), coercibility(rpad(_latin2'a',4,_latin2'b'));

collation(rpad(_latin2'a',4,_latin2'b'))	coercibility(rpad(_latin2'a',4,_latin2'b'))

latin2_general_ci	3

latin2_general_ci	4

select collation(concat_ws(_latin2'a',_latin2'b')), coercibility(concat_ws(_latin2'a',_latin2'b'));

collation(concat_ws(_latin2'a',_latin2'b'))	coercibility(concat_ws(_latin2'a',_latin2'b'))

latin2_general_ci	3

latin2_general_ci	4

select collation(make_set(255,_latin2'a',_latin2'b',_latin2'c')), coercibility(make_set(255,_latin2'a',_latin2'b',_latin2'c'));

collation(make_set(255,_latin2'a',_latin2'b',_latin2'c'))	coercibility(make_set(255,_latin2'a',_latin2'b',_latin2'c'))

latin2_general_ci	3

latin2_general_ci	4

select collation(export_set(255,_latin2'y',_latin2'n',_latin2' ')), coercibility(export_set(255,_latin2'y',_latin2'n',_latin2' '));

collation(export_set(255,_latin2'y',_latin2'n',_latin2' '))	coercibility(export_set(255,_latin2'y',_latin2'n',_latin2' '))

binary	3

binary	4

select collation(trim(_latin2' a ')), coercibility(trim(_latin2' a '));

collation(trim(_latin2' a '))	coercibility(trim(_latin2' a '))

latin2_general_ci	3

latin2_general_ci	4

select collation(ltrim(_latin2' a ')), coercibility(ltrim(_latin2' a '));

collation(ltrim(_latin2' a '))	coercibility(ltrim(_latin2' a '))

latin2_general_ci	3

latin2_general_ci	4

select collation(rtrim(_latin2' a ')), coercibility(rtrim(_latin2' a '));

collation(rtrim(_latin2' a '))	coercibility(rtrim(_latin2' a '))

latin2_general_ci	3

latin2_general_ci	4

select collation(trim(LEADING _latin2' ' FROM _latin2'a')), coercibility(trim(LEADING _latin2'a' FROM _latin2'a'));

collation(trim(LEADING _latin2' ' FROM _latin2'a'))	coercibility(trim(LEADING _latin2'a' FROM _latin2'a'))

latin2_general_ci	3

latin2_general_ci	4

select collation(trim(TRAILING _latin2' ' FROM _latin2'a')), coercibility(trim(TRAILING _latin2'a' FROM _latin2'a'));

collation(trim(TRAILING _latin2' ' FROM _latin2'a'))	coercibility(trim(TRAILING _latin2'a' FROM _latin2'a'))

latin2_general_ci	3

latin2_general_ci	4

select collation(trim(BOTH _latin2' ' FROM _latin2'a')), coercibility(trim(BOTH _latin2'a' FROM _latin2'a'));

collation(trim(BOTH _latin2' ' FROM _latin2'a'))	coercibility(trim(BOTH _latin2'a' FROM _latin2'a'))

latin2_general_ci	3

latin2_general_ci	4

select collation(repeat(_latin2'a',10)), coercibility(repeat(_latin2'a',10));

collation(repeat(_latin2'a',10))	coercibility(repeat(_latin2'a',10))

latin2_general_ci	3

latin2_general_ci	4

select collation(reverse(_latin2'ab')), coercibility(reverse(_latin2'ab'));

collation(reverse(_latin2'ab'))	coercibility(reverse(_latin2'ab'))

latin2_general_ci	3

latin2_general_ci	4

select collation(quote(_latin2'ab')), coercibility(quote(_latin2'ab'));

collation(quote(_latin2'ab'))	coercibility(quote(_latin2'ab'))

latin2_general_ci	3

latin2_general_ci	4

select collation(soundex(_latin2'ab')), coercibility(soundex(_latin2'ab'));

collation(soundex(_latin2'ab'))	coercibility(soundex(_latin2'ab'))

latin2_general_ci	3

latin2_general_ci	4

select collation(substring(_latin2'ab',1)), coercibility(substring(_latin2'ab',1));

collation(substring(_latin2'ab',1))	coercibility(substring(_latin2'ab',1))

latin2_general_ci	3

latin2_general_ci	4

select collation(insert(_latin2'abcd',2,3,_latin2'ef')), coercibility(insert(_latin2'abcd',2,3,_latin2'ef'));

collation(insert(_latin2'abcd',2,3,_latin2'ef'))	coercibility(insert(_latin2'abcd',2,3,_latin2'ef'))

latin2_general_ci	3

latin2_general_ci	4

select collation(replace(_latin2'abcd',_latin2'b',_latin2'B')), coercibility(replace(_latin2'abcd',_latin2'b',_latin2'B'));

collation(replace(_latin2'abcd',_latin2'b',_latin2'B'))	coercibility(replace(_latin2'abcd',_latin2'b',_latin2'B'))

latin2_general_ci	3

latin2_general_ci	4

select collation(encode('abcd','ab')), coercibility(encode('abcd','ab'));

collation(encode('abcd','ab'))	coercibility(encode('abcd','ab'))

binary	3

binary	4

create table t1 

select

bin(130),

mysql-test/r/func_system.result

+8 −0
Original line number Diff line number Diff line
@@ -68,3 +68,11 @@ drop table t1; 
select TRUE,FALSE,NULL;

TRUE	FALSE	NULL

1	0	NULL

create table t1 (a char(10)) character set latin1;

select * from t1 where a=version();

a

select * from t1 where a=database();

a

select * from t1 where a=user();

a

drop table t1;

mysql-test/r/type_blob.result

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ charset(load_file('../../std_data/words.dat')), 
collation(load_file('../../std_data/words.dat')),

coercibility(load_file('../../std_data/words.dat'));

charset(load_file('../../std_data/words.dat'))	collation(load_file('../../std_data/words.dat'))	coercibility(load_file('../../std_data/words.dat'))

binary	binary	3

binary	binary	4

explain extended select 

charset(load_file('../../std_data/words.dat')),

collation(load_file('../../std_data/words.dat')),

mysql-test/t/func_system.test

+9 −0
Original line number Diff line number Diff line
@@ -30,3 +30,12 @@ show create table t1; 
drop table t1;



select TRUE,FALSE,NULL;



#

# Bug#8291 Illegal collation mix with USER() function

#

create table t1 (a char(10)) character set latin1;

select * from t1 where a=version();

select * from t1 where a=database();

select * from t1 where a=user();

drop table t1;