bk commit into 4.1 tree (konstantin:1.2485) BUG#13337

[konstantin]

Below is the list of changes that have just been committed into a local
4.1 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.2485 06/01/17 01:03:03 konstantin@stripped +4 -0
  A fix for Bug#13337 "ps test fails if configure wo/ usc2"

  mysql-test/t/ps.test
    1.46 06/01/17 01:02:57 konstantin@stripped +0 -13
    Fix Bug#13337 (move the test that uses UCS character set to 
    ctype_ucs)

  mysql-test/t/ctype_ucs.test
    1.27 06/01/17 01:02:57 konstantin@stripped +14 -0
    Fix Bug#13337 (move the test that uses UCS character set to 
    ctype_ucs)

  mysql-test/r/ps.result
    1.45 06/01/17 01:02:57 konstantin@stripped +0 -19
    Test results changed (Bug#13337)

  mysql-test/r/ctype_ucs.result
    1.28 06/01/17 01:02:57 konstantin@stripped +19 -0
    Test results changed (Bug#13337)

# 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-4.1-root

--- 1.27/mysql-test/r/ctype_ucs.result	2005-12-27 20:15:25 +03:00
+++ 1.28/mysql-test/r/ctype_ucs.result	2006-01-17 01:02:57 +03:00
@@ -684,3 +684,22 @@
 f1
 a
 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;

--- 1.26/mysql-test/t/ctype_ucs.test	2005-12-27 20:14:51 +03:00
+++ 1.27/mysql-test/t/ctype_ucs.test	2006-01-17 01:02:57 +03:00
@@ -427,4 +427,18 @@
 create index t1f1 on t1(f1);
 select f1 from t1 where f1 like 'a%';
 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;
 # End of 4.1 tests

--- 1.44/mysql-test/r/ps.result	2006-01-14 04:55:00 +03:00
+++ 1.45/mysql-test/r/ps.result	2006-01-17 01:02:57 +03:00
@@ -639,25 +639,6 @@
 ?=?
 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

--- 1.45/mysql-test/t/ps.test	2006-01-14 04:55:00 +03:00
+++ 1.46/mysql-test/t/ps.test	2006-01-17 01:02:57 +03:00
@@ -665,19 +665,6 @@
 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