2788 Georgi Kodinov 2008-08-20
fixing a merge of 6.0-main -> 6.0-opt
modified:
sql/sql_yacc.yy
2787 Georgi Kodinov 2008-08-20 [merge]
merge of 6.0-main to 6.0-bugteam
removed:
mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt
mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt
modified:
mysql-test/suite/rpl/t/disabled.def
sql/sql_yacc.yy
2786 Georgi Kodinov 2008-08-20 [merge]
merged 5.1-bugteam to 6.0-bugteam
modified:
tests/mysql_client_test.c
2785 Georgi Kodinov 2008-08-20 [merge]
auto-merge
added:
mysql-test/suite/rpl/r/rpl_plugin_load.result
mysql-test/suite/rpl/t/rpl_plugin_load-master.opt
mysql-test/suite/rpl/t/rpl_plugin_load-slave.opt
mysql-test/suite/rpl/t/rpl_plugin_load.test
modified:
include/my_sys.h
mysql-test/r/federated.result
mysql-test/r/subselect3.result
mysql-test/t/federated.test
mysql-test/t/subselect3.test
mysys/my_static.c
sql/sql_class.cc
sql/sql_plugin.cc
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf 2008-08-15 19:58:03 +0000
+++ b/.bzr-mysql/default.conf 2008-08-19 14:14:18 +0000
@@ -1,5 +1,5 @@
[MYSQL]
-tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-bugteam/
+tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0
post_commit_to = commits@stripped
post_push_to = commits@stripped
tree_name = mysql-6.0
=== modified file 'mysql-test/r/federated.result'
--- a/mysql-test/r/federated.result 2008-08-20 01:52:25 +0000
+++ b/mysql-test/r/federated.result 2008-08-20 10:12:11 +0000
@@ -780,7 +780,6 @@ id col1 col2 col3 col4
10 10 Tenth ten TEN 1010101 1010
SELECT * FROM federated.t1 WHERE col2 LIKE 's%';
id col1 col2 col3 col4
-7 7 seven Sevenseven 77777 7777
6 6 six six Sixsix 6666 6
SELECT * FROM federated.t1 WHERE col2 LIKE 'si%';
id col1 col2 col3 col4
=== added file 'mysql-test/r/innodb_bug35220.result'
--- a/mysql-test/r/innodb_bug35220.result 1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/innodb_bug35220.result 2008-06-12 00:08:07 +0000
@@ -0,0 +1 @@
+SET storage_engine=InnoDB;
=== removed file 'mysql-test/r/innodb_bug35220.result'
--- a/mysql-test/r/innodb_bug35220.result 2008-08-08 00:25:24 +0000
+++ b/mysql-test/r/innodb_bug35220.result 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
-SET storage_engine=InnoDB;
=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def 2008-07-25 15:10:14 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def 2008-08-18 18:12:46 +0000
@@ -29,8 +29,6 @@ rpl_log_pos : Bug#8693 Te
rpl_row_basic_7ndb : BUG#33360 2007-12-19 mats rpl_ndb_idempotent fails due to null field for table on slave side
rpl_redirect : Failure is sporadic and and the test is superfluous (mats)
rpl_innodb_bug28430 : Failure on Solaris Bug #36793
-rpl_row_basic_2myisam : Bug#37879 2008-07-14 alik Disabled to make 6.0 greaner (the test fails too often)
-rpl_row_basic_3innodb : Bug#37879 2008-07-14 alik Disabled to make 6.0 greaner (the test fails too often)
rpl_heartbeat : Bug#37714 2008-07-14 alik Disabled to make 6.0 greaner (the test fails too often)
rpl_idempotency : Bug#37767 2008-07-14 alik Disabled to make 6.0 greaner (the test fails too often)
=== removed file 'mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---binlog-format=row
=== removed file 'mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---binlog-format=statement --log-slave-updates
=== removed file 'mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt'
--- a/mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt 2008-06-26 05:18:28 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---binlog-format=mixed
=== added file 'mysql-test/t/innodb_bug35220.test'
--- a/mysql-test/t/innodb_bug35220.test 1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/innodb_bug35220.test 2008-06-12 00:08:07 +0000
@@ -0,0 +1,16 @@
+#
+# Bug#35220 ALTER TABLE too picky on reserved word "foreign"
+# http://bugs.mysql.com/35220
+#
+
+-- source include/have_innodb.inc
+
+SET storage_engine=InnoDB;
+
+# we care only that the following SQL commands do not produce errors
+-- disable_query_log
+-- disable_result_log
+
+CREATE TABLE bug35220 (foreign_col INT, dummy_cant_delete_all_columns INT);
+ALTER TABLE bug35220 DROP foreign_col;
+DROP TABLE bug35220;
=== removed file 'mysql-test/t/innodb_bug35220.test'
--- a/mysql-test/t/innodb_bug35220.test 2008-08-08 00:25:24 +0000
+++ b/mysql-test/t/innodb_bug35220.test 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#
-# Bug#35220 ALTER TABLE too picky on reserved word "foreign"
-# http://bugs.mysql.com/35220
-#
-
--- source include/have_innodb.inc
-
-SET storage_engine=InnoDB;
-
-# we care only that the following SQL commands do not produce errors
--- disable_query_log
--- disable_result_log
-
-CREATE TABLE bug35220 (foreign_col INT, dummy_cant_delete_all_columns INT);
-ALTER TABLE bug35220 DROP foreign_col;
-DROP TABLE bug35220;
=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c 2008-08-15 21:14:52 +0000
+++ b/tests/mysql_client_test.c 2008-08-20 10:29:58 +0000
@@ -7874,7 +7874,7 @@ static void test_explain_bug()
else
{
verify_prepare_field(result, 6, "key_len", "", MYSQL_TYPE_VAR_STRING, "",
- "", "", 320, 0);
+ "", "", NAME_CHAR_LEN*MAX_KEY, 0);
}
verify_prepare_field(result, 7, "ref", "", MYSQL_TYPE_VAR_STRING,
| Thread |
|---|
| • bzr push into mysql-6.0 branch (kgeorge:2785 to 2788) | Georgi Kodinov | 20 Aug |
