MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:igor Date:June 22 2006 11:19pm
Subject:bk commit into 5.0 tree (igor:1.2195)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of igor. When igor 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.2195 06/06/22 16:18:54 igor@stripped +3 -0
  Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
  into  rurik.mysql.com:/home/igor/mysql-5.0-opt

  mysql-test/t/ctype_ucs.test
    1.42 06/06/22 16:18:49 igor@stripped +14 -0
    Manual merge

  mysql-test/r/ctype_ucs.result
    1.44 06/06/22 16:18:49 igor@stripped +19 -0
    Manual merge

  sql/item_sum.cc
    1.176 06/06/22 16:15:48 igor@stripped +0 -0
    Auto merged

# 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:	igor
# Host:	rurik.mysql.com
# Root:	/home/igor/mysql-5.0-opt/RESYNC

--- 1.175/sql/item_sum.cc	2006-04-20 00:42:06 -07:00
+++ 1.176/sql/item_sum.cc	2006-06-22 16:15:48 -07:00
@@ -2102,7 +2102,6 @@
 
   if (!args[0]->null_value)
   {
-    res_str->strip_sp();
     result_field->val_str(&tmp_value);
 
     if (result_field->is_null() ||

--- 1.43/mysql-test/r/ctype_ucs.result	2006-04-17 02:57:02 -07:00
+++ 1.44/mysql-test/r/ctype_ucs.result	2006-06-22 16:18:49 -07:00
@@ -704,6 +704,32 @@
 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;
+CREATE TABLE t1 (id int, s char(5) CHARACTER SET ucs2 COLLATE ucs2_unicode_ci);
+INSERT INTO t1 VALUES (1, 'ZZZZZ'), (1, 'ZZZ'), (2, 'ZZZ'), (2, 'ZZZZZ');
+SELECT id, MIN(s) FROM t1 GROUP BY id;
+id	MIN(s)
+1	ZZZ
+2	ZZZ
+DROP TABLE t1;
 CREATE TABLE t1 (a varchar(64) character set ucs2, b decimal(10,3));
 INSERT INTO t1 VALUES ("1.1", 0), ("2.1", 0);
 update t1 set b=a;

--- 1.41/mysql-test/t/ctype_ucs.test	2006-04-17 02:57:02 -07:00
+++ 1.42/mysql-test/t/ctype_ucs.test	2006-06-22 16:18:49 -07:00
@@ -439,6 +439,32 @@
 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;
+
+#
+# Bug #20076: server crashes for a query with GROUP BY if MIN/MAX aggregation
+#             over a 'ucs2' field uses a temporary table 
+#
+
+CREATE TABLE t1 (id int, s char(5) CHARACTER SET ucs2 COLLATE ucs2_unicode_ci);
+INSERT INTO t1 VALUES (1, 'ZZZZZ'), (1, 'ZZZ'), (2, 'ZZZ'), (2, 'ZZZZZ');
+
+SELECT id, MIN(s) FROM t1 GROUP BY id;
+
+DROP TABLE t1;
 # End of 4.1 tests
 
 #
Thread
bk commit into 5.0 tree (igor:1.2195)igor23 Jun