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

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/binlog/r/binlog_database.result
View File

@ -124,4 +124,5 @@ Database
information_schema
mtr
mysql
performance_schema
test