Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
d5db6457
Commit
d5db6457
authored
Feb 09, 2010
by
Luis Soares
Browse files
Options
Browse Files
Download
Plain Diff
Automerge from mysql-next-mr.
parents
f7ebf268
68ac1c9c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
16 deletions
+13
-16
configure.in
configure.in
+6
-11
mysql-test/suite/ndb/r/ndb_dd_ddl.result
mysql-test/suite/ndb/r/ndb_dd_ddl.result
+1
-1
mysql-test/suite/ndb/t/disabled.def
mysql-test/suite/ndb/t/disabled.def
+3
-1
mysql-test/suite/ndb/t/ndb_dd_ddl.test
mysql-test/suite/ndb/t/ndb_dd_ddl.test
+1
-1
mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result
mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result
+1
-1
mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result
+1
-1
No files found.
configure.in
View file @
d5db6457
...
@@ -3150,17 +3150,12 @@ AC_CONFIG_COMMANDS_POST(ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' C
...
@@ -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
mysql-test/suite/ndb/r/ndb_dd_ddl.result
View file @
d5db6457
...
@@ -308,7 +308,7 @@ ENGINE = NDB;
...
@@ -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
...
...
mysql-test/suite/ndb/t/disabled.def
View file @
d5db6457
...
@@ -10,6 +10,8 @@
...
@@ -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
mysql-test/suite/ndb/t/ndb_dd_ddl.test
View file @
d5db6457
...
@@ -462,7 +462,7 @@ ENGINE = NDB;
...
@@ -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
# -----------------------------------------------------------------
...
...
mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result
View file @
d5db6457
...
@@ -213,7 +213,7 @@ Log_name Pos Event_type Server_id End_log_pos Info
...
@@ -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-
...
...
mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result
View file @
d5db6457
...
@@ -524,7 +524,7 @@ id hex(b1) vc bc d f total y t
...
@@ -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 ---
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment