Commit 27180ce9 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/opt/local/work/mysql-4.1-9379 

into  mysql.com:/opt/local/work/mysql-5.0-root


mysql-test/r/ps.result:
  Manual merge.
mysql-test/t/ps.test:
  Manual merge.
parents 061406ba c663aa89

mysql-test/r/ps.result

+19 −0
Original line number Diff line number Diff line
@@ -759,3 +759,22 @@ execute stmt using @a, @b; 
?=?

1

deallocate prepare stmt;

create table t1 (utext varchar(20) character set ucs2);

insert into t1 values ("lily");

insert into t1 values ("river");

prepare stmt from 'select utext from t1 where utext like ?';

set @param1='%%';

execute stmt using @param1;

utext

lily

river

execute stmt using @param1;

utext

lily

river

select utext from t1 where utext like '%%';

utext

lily

river

drop table t1;

deallocate prepare stmt;

mysql-test/t/ps.test

+13 −0
Original line number Diff line number Diff line
@@ -788,3 +788,16 @@ set @a='CHRISTINE '; 
set @b='CHRISTINE';

execute stmt using @a, @b;

deallocate prepare stmt;

#

# Bug#9442 Set parameter make query fail if column character set is UCS2

#

create table t1 (utext varchar(20) character set ucs2);

insert into t1 values ("lily");

insert into t1 values ("river");

prepare stmt from 'select utext from t1 where utext like ?';

set @param1='%%';

execute stmt using @param1;

execute stmt using @param1;

select utext from t1 where utext like '%%';

drop table t1;

deallocate prepare stmt;