List:Commits« Previous MessageNext Message »
From:konstantin Date:January 16 2006 10:22pm
Subject:bk commit into 5.0 tree (konstantin:1.2030)
View as plain text  
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

  1.2030 06/01/17 01:22:01 konstantin@stripped +1 -0
  A post-merge fix.

    1.38 06/01/17 01:21:56 konstantin@stripped +0 -14
    A post-merge fix.

# 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

--- 1.37/mysql-test/t/ctype_ucs.test	2006-01-17 01:17:33 +03:00
+++ 1.38/mysql-test/t/ctype_ucs.test	2006-01-17 01:21:56 +03:00
@@ -429,20 +429,6 @@
 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
bk commit into 5.0 tree (konstantin:1.2030)konstantin16 Jan