bk commit into 5.0 tree (konstantin:1.1924)

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1924 05/07/14 00:52:57 konstantin@stripped +2 -0
  Merge mysql.com:/opt/local/work/mysql-4.1-9379
  into  mysql.com:/opt/local/work/mysql-5.0-root

  mysql-test/t/ps.test
    1.46 05/07/14 00:52:49 konstantin@stripped +13 -13
    Manual merge.

  mysql-test/r/ps.result
    1.47 05/07/14 00:52:49 konstantin@stripped +19 -19
    Manual merge.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-5.0-root/RESYNC

--- 1.46/mysql-test/r/ps.result	2005-07-13 23:49:40 +04:00
+++ 1.47/mysql-test/r/ps.result	2005-07-14 00:52:49 +04:00
@@ -759,3 +759,22 @@
 ?=?
 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;

--- 1.45/mysql-test/t/ps.test	2005-07-13 23:49:40 +04:00
+++ 1.46/mysql-test/t/ps.test	2005-07-14 00:52:49 +04:00
@@ -788,3 +788,16 @@
 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;