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

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2016-12-29 13:23:18 +01:00
parent 48dc7cc66e c13b501162
commit 4a5d25c338
802 changed files with 37504 additions and 15141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,5 @@
set @old_binlog_checksum=@@binlog_checksum;
set global binlog_checksum=NONE;
#####################################################################################
# The following Annotate_rows events should appear below:
# - INSERT INTO test2.t2 VALUES (1), (2), (3)