database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-28 17:15:19 +03:00
Code Activity

merge mysql-next-mr --> mysql-5.1-rpl-merge

Browse Source 
Conflicts:
  Text conflict in sql/sql_insert.cc
This commit is contained in:
Alfranio Correia
2010-01-14 16:02:55 +00:00
parent 18a8f3c8cc a6165accb3
commit b4c0c1550c
286 changed files with 27080 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/rpl/r/rpl_loaddata_m.result
View File

@@ -24,6 +24,7 @@ information_schema
mtr
mysql
mysqltest
performance_schema
test
USE test;
SHOW TABLES;

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

@@ -11,6 +11,7 @@ Database
information_schema
mtr
mysql
performance_schema
test
test_ignore
USE test;
@@ -38,6 +39,7 @@ Database
information_schema
mtr
mysql
performance_schema
test
USE test;
SHOW TABLES;