List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:December 17 2010 11:30am
Subject:bzr push into mysql-trunk-bugfixing branch (Georgi.Kodinov:3442 to 3443)
View as plain text  
 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
 3442 Georgi Kodinov	2010-12-17 [merge]
      merge

    added:
      mysql-test/r/order_by_sortkey.result
      mysql-test/t/order_by_sortkey.test
      sql/bounded_queue.h
      sql/filesort_utils.cc
      sql/filesort_utils.h
      unittest/gunit/bounded_queue-t.cc
    modified:
      libmysqld/CMakeLists.txt
      mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
      mysql-test/include/order_by.inc
      mysql-test/include/select.inc
      mysql-test/r/explain.result
      mysql-test/r/group_by.result
      mysql-test/r/myisam_mrr.result
      mysql-test/r/myisam_mrr_cost.result
      mysql-test/r/myisam_mrr_cost_icp.result
      mysql-test/r/myisam_mrr_icp.result
      mysql-test/r/myisam_mrr_none.result
      mysql-test/r/order_by_icp_mrr.result
      mysql-test/r/order_by_none.result
      mysql-test/r/select_icp_mrr.result
      mysql-test/r/select_none.result
      mysql-test/r/subselect_innodb.result
      mysql-test/suite/rpl/r/rpl_manual_change_index_file.result
      mysql-test/suite/rpl/t/rpl_manual_change_index_file.test
      mysql-test/t/group_by.test
      mysql-test/t/subselect_innodb.test
      mysys/CMakeLists.txt
      mysys/queues.c
      sql/CMakeLists.txt
      sql/filesort.cc
      sql/filesort.h
      sql/item_subselect.cc
      sql/rpl_master.cc
      sql/sql_const.h
      sql/sql_delete.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_sort.h
      sql/sql_table.cc
      sql/sql_update.cc
      sql/uniques.cc
      unittest/gunit/CMakeLists.txt
=== 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: useless for push emails).
Thread
bzr push into mysql-trunk-bugfixing branch (Georgi.Kodinov:3442 to 3443) Georgi Kodinov17 Dec