diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-09 20:25:17 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-09 20:25:17 +0300 |
| commit | 4b85061e09ae3ec67948f9814700f69934138e99 (patch) | |
| tree | 3d08aedf7c53e39b75d6859d96b362a46e9854d4 | |
| parent | 0888e40fa316b040cb43f6fad112a0cdcd443155 (diff) | |
| parent | 06ce01bace01d64dc62d5cb1ebf1345335efa8ff (diff) | |
| download | mariadb-git-4b85061e09ae3ec67948f9814700f69934138e99.tar.gz | |
Auto-merge from mysql-trunk.
| -rw-r--r-- | configure.in | 17 | ||||
| -rw-r--r-- | mysql-test/suite/ndb/r/ndb_dd_ddl.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/ndb/t/ndb_dd_ddl.test | 2 |
3 files changed, 9 insertions, 11 deletions
diff --git a/configure.in b/configure.in index 53c5724e434..e50f2897781 100644 --- a/configure.in +++ b/configure.in @@ -2952,17 +2952,12 @@ AC_CONFIG_COMMANDS_POST(ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' C 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 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 |