List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:December 17 2010 11:29am
Subject:bzr commit into mysql-trunk-bugfixing branch (Georgi.Kodinov:3443)
View as plain text  
#At file:///Users/kgeorge/mysql/work/merge-trunk-bugfixing/ based on revid:georgi.kodinov@stripped

 3443 Georgi Kodinov	2010-12-17 [merge]
      merge

    modified:
      mysql-test/t/ctype_utf8.test
      mysql-test/t/func_misc.test
      mysql-test/t/partition_innodb.test
=== modified file 'mysql-test/t/ctype_utf8.test'
--- a/mysql-test/t/ctype_utf8.test	2010-12-16 19:28:42 +0000
+++ b/mysql-test/t/ctype_utf8.test	2010-12-17 11:28:59 +0000
@@ -1478,6 +1478,7 @@ SELECT HEX(INSERT(_utf8 0xD18FD18E, 2, 1
 
 --echo End of 5.1 tests
 
+
 --echo Start of 5.4 tests
 
 #

=== modified file 'mysql-test/t/func_misc.test'
--- a/mysql-test/t/func_misc.test	2010-12-16 19:28:42 +0000
+++ b/mysql-test/t/func_misc.test	2010-12-17 11:28:59 +0000
@@ -536,6 +536,7 @@ SELECT 1 from t1 HAVING NAME_CONST('', a
 
 DROP TABLE t1;
 
+
 --echo #
 --echo # End of 5.5 tests
 --echo #

=== modified file 'mysql-test/t/partition_innodb.test'
--- a/mysql-test/t/partition_innodb.test	2010-12-16 19:28:42 +0000
+++ b/mysql-test/t/partition_innodb.test	2010-12-17 11:28:59 +0000
@@ -11,6 +11,7 @@ let $MYSQLD_DATADIR= `SELECT @@datadir`;
 --echo #
 --echo # Bug#56287: crash when using Partition datetime in sub in query
 --echo #
+
 CREATE TABLE t1
 (c1 bigint(20) unsigned NOT NULL AUTO_INCREMENT,
  c2 varchar(40) not null default '',
@@ -591,6 +592,7 @@ INSERT INTO t1 VALUES (1,1), (2,2);
 SELECT * FROM t1 WHERE i1 = ( SELECT i1 FROM t1 WHERE f1=0 LIMIT 1 );
 
 DROP TABLE t1;
+
 --enable_parsing
 
 --echo #

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).
Thread
bzr commit into mysql-trunk-bugfixing branch (Georgi.Kodinov:3443) Georgi Kodinov17 Dec