database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

5.3->5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2011-11-22 18:04:38 +01:00
parent af32b02c06 42221abaed
commit d2755a2c9c
394 changed files with 17631 additions and 3357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/binlog/r/binlog_row_annotate.result
View File

@@ -427,7 +427,7 @@ ROLLBACK /* added by mysqlbinlog */;
/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
#
#####################################################################################
# mysqlbinlog --skip-annotate-rows-events
# mysqlbinlog --skip-annotate-row-events
# No Annotates should appear in this output
#####################################################################################
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
@@ -1013,7 +1013,7 @@ ROLLBACK /* added by mysqlbinlog */;
/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
#
#####################################################################################
# mysqlbinlog --read-from-remote-server --skip-annotate-rows-events
# mysqlbinlog --read-from-remote-server --skip-annotate-row-events
# No Annotates should appear in this output
#####################################################################################
/*!40019 SET @@session.max_insert_delayed_threads=0*/;