Commit 8264d83d authored by unknown's avatar unknown
Browse files

ps.result, ctype_ucs.result, ctype_ucs.test, ps.test: 

  Bug #6351 make test failure "Unknown character set"
  UCS2 related tests were moved into ctype_ucs.


mysql-test/t/ps.test:
  Bug #6351 make test failure "Unknown character set"
  UCS2 related tests were moved into ctype_ucs.
  Bug #6351 make test failure "Unknown character set"
  UCS2 related tests were moved into ctype_ucs.
mysql-test/t/ctype_ucs.test:
  Bug #6351 make test failure "Unknown character set"
  UCS2 related tests were moved into ctype_ucs.
mysql-test/r/ctype_ucs.result:
  Bug #6351 make test failure "Unknown character set"
  UCS2 related tests were moved into ctype_ucs.
mysql-test/r/ps.result:
  Bug #6351 make test failure "Unknown character set"
  UCS2 related tests were moved into ctype_ucs.
parent 85941cf5

mysql-test/r/ctype_ucs.result

+7 −0
Original line number Diff line number Diff line
@@ -480,3 +480,10 @@ a 0061 
b	0062

c	0063

drop table t1;

set @ivar= 1234;

set @str1 = 'select ?';

set @str2 = convert(@str1 using ucs2);

prepare stmt1 from @str2;

execute stmt1 using @ivar;

?

1234

mysql-test/r/ps.result

+0 −6
Original line number Diff line number Diff line
@@ -106,12 +106,6 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp 
set @fvar= 123.4567;

prepare stmt1 from @fvar;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '123.4567' at line 1

set @str1 = 'select ?';

set @str2 = convert(@str1 using ucs2);

prepare stmt1 from @str2;

execute stmt1 using @ivar;

?

1234

drop table t1,t2;

PREPARE stmt1 FROM "select _utf8 'A' collate utf8_bin = ?";

set @var='A';

mysql-test/t/ctype_ucs.test

+8 −0
Original line number Diff line number Diff line
@@ -315,3 +315,11 @@ alter table t1 modify a char(5); 
select a, hex(a) from t1;

drop table t1;



#

# Check prepare statement from an UCS2 string

#

set @ivar= 1234;

set @str1 = 'select ?';

set @str2 = convert(@str1 using ucs2);

prepare stmt1 from @str2;

execute stmt1 using @ivar;

mysql-test/t/ps.test

+0 −4
Original line number Diff line number Diff line
@@ -110,10 +110,6 @@ set @fvar= 123.4567; 
--error 1064

prepare stmt1 from @fvar;



set @str1 = 'select ?';

set @str2 = convert(@str1 using ucs2);

prepare stmt1 from @str2;

execute stmt1 using @ivar;

drop table t1,t2;



#