From 15728d0721c88799f759db5f2fd97baa2d9d1d4b Mon Sep 17 00:00:00 2001 From: Joerg Bruehe Date: Mon, 8 Feb 2010 21:10:37 +0100 Subject: [PATCH 1/2] 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 | 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 0d9f6bccd3d633425a7861cbcb851596af8ac7e1 Mon Sep 17 00:00:00 2001 From: Alexander Nozdrin Date: Tue, 9 Feb 2010 13:10:36 +0300 Subject: [PATCH 2/2] 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