Commit 5bbb1a69 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/local/bk/mysql-5.0 

into  mysql.com:/home/pem/work/mysql-5.0
parents 6f619804 b5d9a764

mysql-test/r/ctype_ucs.result

+19 −0
Original line number Diff line number Diff line
@@ -657,3 +657,22 @@ a b 
1.1	1.100

2.1	2.100

DROP TABLE t1;

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/r/ps.result

+0 −19
Original line number Diff line number Diff line
@@ -759,25 +759,6 @@ 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;

create table t1 (a int);

prepare stmt from "select ??";

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 '?' at line 1

mysql-test/t/ctype_ucs.test

+14 −0
Original line number Diff line number Diff line
@@ -427,3 +427,17 @@ INSERT INTO t1 VALUES ("1.1", 0), ("2.1", 0); 
update t1 set b=a;

SELECT * FROM t1;

DROP TABLE t1;



#

# 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;

mysql-test/t/ps.test

+0 −13
Original line number Diff line number Diff line
@@ -789,19 +789,6 @@ 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;

#

# Bug#11299 "prepared statement makes wrong SQL syntax in binlog which stops

# replication": check that errouneous queries with placeholders are not

# allowed