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

mysql-5.5.18 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2011-11-03 19:17:05 +01:00
parent 3794110f02 6814762551
commit 0e007344ea
1160 changed files with 12821 additions and 6204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/mysqld--help-notwin.result
View File

@@ -44,9 +44,6 @@ The following options may be given as the first argument:
Type of BINLOG_CHECKSUM_ALG. Include checksum for log
events in the binary log. Possible values are NONE and
CRC32; default is NONE.
--binlog-dbug-fsync-sleep=#
Extra sleep (in microseconds) to add to binlog fsync(),
for debugging
--binlog-direct-non-transactional-updates
Causes updates to non-transactional engines using
statement format to be written directly to binary log.
@@ -864,7 +861,6 @@ bind-address (No default value)
binlog-annotate-rows-events FALSE
binlog-cache-size 32768
binlog-checksum NONE
binlog-dbug-fsync-sleep 0
binlog-direct-non-transactional-updates FALSE
binlog-format STATEMENT
binlog-optimize-thread-scheduling TRUE