List:Commits« Previous MessageNext Message »
From:bar Date:January 12 2006 9:08am
Subject:bk commit into 5.0 tree (bar:1.2040)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of bar. When bar 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.2040 06/01/12 13:08:49 bar@stripped +1 -0
  ctype_utf8.result:
    After merge fix:
    fixing order of results.

  mysql-test/r/ctype_utf8.result
    1.85 06/01/12 13:08:22 bar@stripped +8 -8
    After merge fix:
    fixing order of results.

# 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:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.0

--- 1.84/mysql-test/r/ctype_utf8.result	2006-01-12 11:28:16 +04:00
+++ 1.85/mysql-test/r/ctype_utf8.result	2006-01-12 13:08:22 +04:00
@@ -1058,6 +1058,14 @@
 1
 2
 drop table t1;
+CREATE TABLE t1 (t TINYTEXT CHARACTER SET utf8);
+INSERT INTO t1 VALUES(REPEAT('a', 100));
+CREATE TEMPORARY TABLE t2 SELECT COALESCE(t) AS bug FROM t1;
+SELECT LENGTH(bug) FROM t2;
+LENGTH(bug)
+100
+DROP TABLE t2;
+DROP TABLE t1;
 CREATE TABLE t1(id varchar(20) NOT NULL) DEFAULT CHARSET=utf8;
 INSERT INTO t1 VALUES ('xxx'), ('aa'), ('yyy'), ('aa');
 SELECT id FROM t1;
@@ -1167,11 +1175,3 @@
 execute my_stmt using @a;
 a	b
 drop table if exists t1;
-CREATE TABLE t1 (t TINYTEXT CHARACTER SET utf8);
-INSERT INTO t1 VALUES(REPEAT('a', 100));
-CREATE TEMPORARY TABLE t2 SELECT COALESCE(t) AS bug FROM t1;
-SELECT LENGTH(bug) FROM t2;
-LENGTH(bug)
-100
-DROP TABLE t2;
-DROP TABLE t1;
Thread
bk commit into 5.0 tree (bar:1.2040)bar12 Jan