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

Merged BUG#12574820 from 5.1 to 5.5

Browse Source 
Two conflicts resolved manually:
Text conflict in sql/log.cc
Text conflict in sql/mysqld.cc
This commit is contained in:
Sven Sandberg
2011-05-26 12:56:17 +02:00
parent 9d42d36e7e de3776819c
commit add86aaddc
4 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/binlog/r/binlog_reset_master.result Normal file
View File

@ -0,0 +1 @@
RESET MASTER;