database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Auto-merge from mysql-next-mr.

Browse Source
This commit is contained in:
Alexander Nozdrin
2010-02-09 15:01:20 +03:00
parent 2d58a95bb9 6dd9375726
commit 043f39e060
6 changed files with 13 additions and 16 deletions
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 AC_OUTPUT
echo # The first line "Thank you ..." is checked in ./Do-compile to verify that configure
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
# ended sucessfully - don't remove it. # ended sucessfully - don't remove it.
echo
echo "Thank you for choosing MySQL!" echo "Thank you for choosing MySQL!"
echo 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_u1@localhost;
DROP USER mysqltest_u2@localhost; DROP USER mysqltest_u2@localhost;
DROP DATABASE IF EXISTS mysqltest2; DROP DATABASE mysqltest2;
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# End 6.0 test # End 6.0 test

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

@ -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 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open

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_u1@localhost;
DROP USER mysqltest_u2@localhost; DROP USER mysqltest_u2@localhost;
DROP DATABASE IF EXISTS mysqltest2; DROP DATABASE mysqltest2;
--echo --echo
--echo # ----------------------------------------------------------------- --echo # -----------------------------------------------------------------

2
mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result
View File

@ -213,7 +213,7 @@ Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # use `test`; INSERT INTO tt_1(ddl_case) VALUES (26) master-bin.000001 # Query # # use `test`; INSERT INTO tt_1(ddl_case) VALUES (26)
master-bin.000001 # Xid # # COMMIT /* XID */ 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- -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- -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-

2
mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result
View File

@ -524,7 +524,7 @@ id hex(b1) vc bc d f total y t
--- Check Update on slave --- --- Check Update on slave ---
SELECT id,hex(b1),vc,bc,d,f,total,y,t FROM t1 WHERE id = 412; 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 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 --- --- Remove a record from t1 on master ---
DELETE FROM t1 WHERE id = 42; DELETE FROM t1 WHERE id = 42;
--- Show current count on master for t1 --- --- Show current count on master for t1 ---