summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqld--help-notwin.result
diff options
context:
space:
mode:
authorVladislav Vaintroub <vvaintroub@mysql.com>2010-02-06 17:13:42 +0100
committerVladislav Vaintroub <vvaintroub@mysql.com>2010-02-06 17:13:42 +0100
commit7257047dcefd2f2250e629b2aa3bcd84f980cf90 (patch)
treeccd7ed37b88de38a47462ff2a6c95aec6ad8bc08 /mysql-test/r/mysqld--help-notwin.result
parent4d0b901a55e1f27cb7e5caedced1ebbb923d366b (diff)
parentb38ef2b5f7bc231b63b770c28688ee9f0109c88b (diff)
downloadmariadb-git-7257047dcefd2f2250e629b2aa3bcd84f980cf90.tar.gz
merge
Diffstat (limited to 'mysql-test/r/mysqld--help-notwin.result')
-rw-r--r--mysql-test/r/mysqld--help-notwin.result9
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result
index 4de3faf9a47..7b2f4e670c8 100644
--- a/mysql-test/r/mysqld--help-notwin.result
+++ b/mysql-test/r/mysqld--help-notwin.result
@@ -35,6 +35,14 @@ The following options may be given as the first argument:
binary log during a transaction. If you often use big,
multi-statement transactions you can increase this to get
more performance
+ --binlog-direct-non-transactional-updates
+ Causes updates to non-transactional engines using
+ statement format to be written directly to binary log.
+ Before using this option make sure that there are no
+ dependencies between transactional and non-transactional
+ tables such as in the statement INSERT INTO t_myisam
+ SELECT * FROM t_innodb; otherwise, slaves may diverge
+ from the master.
--binlog-do-db=name Tells the master it should log updates for the specified
database, and exclude all others not explicitly
mentioned.
@@ -757,6 +765,7 @@ back-log 50
big-tables FALSE
bind-address (No default value)
binlog-cache-size 32768
+binlog-direct-non-transactional-updates FALSE
binlog-format STATEMENT
binlog-row-event-max-size 1024
bulk-insert-buffer-size 8388608