From 72da6b3185be2047260b837d33c9455c994efe03 Mon Sep 17 00:00:00 2001 From: Joerg Bruehe Date: Mon, 8 Feb 2010 21:10:37 +0100 Subject: [PATCH 1/3] Bug#50950 Obsolete reference to www.mysql.com in message printed at end of configure New text for the success message of "configure". configure.in: The message must be changed to drop the "www.mysql.com" URL. --- configure.in | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/configure.in b/configure.in index c2ee247397a..d7e5e32eaed 100644 --- a/configure.in +++ b/configure.in @@ -3141,17 +3141,12 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h) AC_OUTPUT -echo -echo "MySQL has a Web site at http://www.mysql.com/ which carries details on the" -echo "latest release, upcoming features, and other information to make your" -echo "work or play with MySQL more productive. There you can also find" -echo "information about mailing lists for MySQL discussion." -echo -echo "Remember to check the platform specific part of the reference manual for" -echo "hints about installing MySQL on your platform. Also have a look at the" -echo "files in the Docs directory." -echo -# The following text is checked in ./Do-compile to verify that configure +# The first line "Thank you ..." is checked in ./Do-compile to verify that configure # ended sucessfully - don't remove it. +echo echo "Thank you for choosing MySQL!" echo +echo "Remember to check the platform specific part of the reference manual" +echo "for hints about installing MySQL on your platform." +echo "Also have a look at the files in the Docs directory." +echo From 06ce01bace01d64dc62d5cb1ebf1345335efa8ff Mon Sep 17 00:00:00 2001 From: Alexander Nozdrin Date: Tue, 9 Feb 2010 13:10:36 +0300 Subject: [PATCH 2/3] Fix ndb_dd_ddl.test: drop created database after use. --- mysql-test/suite/ndb/r/ndb_dd_ddl.result | 1 + mysql-test/suite/ndb/t/ndb_dd_ddl.test | 2 ++ 2 files changed, 3 insertions(+) diff --git a/mysql-test/suite/ndb/r/ndb_dd_ddl.result b/mysql-test/suite/ndb/r/ndb_dd_ddl.result index 9714a89c2ab..35516efb48c 100644 --- a/mysql-test/suite/ndb/r/ndb_dd_ddl.result +++ b/mysql-test/suite/ndb/r/ndb_dd_ddl.result @@ -308,6 +308,7 @@ ENGINE = NDB; DROP USER mysqltest_u1@localhost; DROP USER mysqltest_u2@localhost; +DROP DATABASE mysqltest2; # ----------------------------------------------------------------- # End 6.0 test diff --git a/mysql-test/suite/ndb/t/ndb_dd_ddl.test b/mysql-test/suite/ndb/t/ndb_dd_ddl.test index e8db0730687..679c07ff0e3 100644 --- a/mysql-test/suite/ndb/t/ndb_dd_ddl.test +++ b/mysql-test/suite/ndb/t/ndb_dd_ddl.test @@ -463,6 +463,8 @@ ENGINE = NDB; DROP USER mysqltest_u1@localhost; DROP USER mysqltest_u2@localhost; +DROP DATABASE mysqltest2; + --echo --echo # ----------------------------------------------------------------- --echo # End 6.0 test From 6dd93757263fd219fcbd3d1ed100a681ecbc7c92 Mon Sep 17 00:00:00 2001 From: Alexander Nozdrin Date: Tue, 9 Feb 2010 13:16:01 +0300 Subject: [PATCH 3/3] 1. Disable ndb_condition_pushdown.test due to Bug 49746. 2. Update test result files. --- mysql-test/suite/ndb/t/disabled.def | 4 +++- mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result | 2 +- mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/ndb/t/disabled.def b/mysql-test/suite/ndb/t/disabled.def index 0fc9a5d3ad6..65b6b9ed135 100644 --- a/mysql-test/suite/ndb/t/disabled.def +++ b/mysql-test/suite/ndb/t/disabled.def @@ -10,6 +10,8 @@ # ############################################################################## -ndb_partition_error2 : Bug#40989 ndb_partition_error2 needs maintenance +ndb_partition_error2 : Bug#40989 ndb_partition_error2 needs maintenance +ndb_condition_pushdown : Bug#49746 2010-02-08 alik ndb_condition_pushdown fails in mysql-next-mr + # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open diff --git a/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result b/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result index fd0b962b106..0df07959146 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result +++ b/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result @@ -213,7 +213,7 @@ Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; INSERT INTO tt_1(ddl_case) VALUES (26) master-bin.000001 # Xid # # COMMIT /* XID */ -master-bin.000001 # Query # # use `test`; ALTER DEFINER=`root`@`localhost` EVENT evt COMMENT 'evt' +master-bin.000001 # Query # # use `test`; ALTER EVENT evt COMMENT 'evt' -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e- -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b- diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result index 467a9435104..c906f00bd40 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result @@ -524,7 +524,7 @@ id hex(b1) vc bc d f total y t --- Check Update on slave --- SELECT id,hex(b1),vc,bc,d,f,total,y,t FROM t1 WHERE id = 412; id hex(b1) vc bc d f total y t -412 1 Testing MySQL databases is a cool Must make it bug free for the customer 654321.4321 15.21 0 1965 2005-11-14 +412 0 Testing MySQL databases is a cool Must make it bug free for the customer 654321.4321 15.21 0 1965 2006-02-22 --- Remove a record from t1 on master --- DELETE FROM t1 WHERE id = 42; --- Show current count on master for t1 ---