mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Auto-merge from mysql-next-mr.

Browse source
This commit is contained in:
Alexander Nozdrin 2010-02-09 13:40:08 +03:00
commit 7dc5666c6b
4 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
configure.in
View file

@ -3150,17 +3150,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

2
mysql-test/suite/ndb/r/ndb_dd_ddl.result
View file

@ -308,7 +308,7 @@ ENGINE = NDB;
DROP USER mysqltest_u1@localhost;
DROP USER mysqltest_u2@localhost;
DROP DATABASE IF EXISTS mysqltest2;
DROP DATABASE mysqltest2;
# -----------------------------------------------------------------
# End 6.0 test

4
mysql-test/suite/ndb/t/disabled.def
View file

@ -10,7 +10,9 @@
#
##############################################################################
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
ndb_alter_table3 : Bug#45621 2009-06-10 alik A few test files are disabled due to WL#4284

2
mysql-test/suite/ndb/t/ndb_dd_ddl.test
View file

@ -462,7 +462,7 @@ ENGINE = NDB;
DROP USER mysqltest_u1@localhost;
DROP USER mysqltest_u2@localhost;
DROP DATABASE IF EXISTS mysqltest2;
DROP DATABASE mysqltest2;
--echo
--echo # -----------------------------------------------------------------