diff options
| author | lars/lthalmann@dl145j.mysql.com <> | 2006-09-15 01:46:47 +0200 |
|---|---|---|
| committer | lars/lthalmann@dl145j.mysql.com <> | 2006-09-15 01:46:47 +0200 |
| commit | a3adcfe52d043ce05fceea00f8a205f64c37d602 (patch) | |
| tree | 113215b4a0f6b7ce13a759c6061bfdb8d210b085 /sql/mysqld.cc | |
| parent | fad645f23e20cdaf0ff7f1f79b25f1872bca761b (diff) | |
| parent | cd08de06b65590c736f5b0d3d5657a10e1c5aa8e (diff) | |
| download | mariadb-git-a3adcfe52d043ce05fceea00f8a205f64c37d602.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 445027fa368..0658c332d8e 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3120,7 +3120,11 @@ with --log-bin instead."); global_system_variables.binlog_format= BINLOG_FORMAT_ROW; else #endif +#if defined(HAVE_ROW_BASED_REPLICATION) + global_system_variables.binlog_format= BINLOG_FORMAT_MIXED; +#else global_system_variables.binlog_format= BINLOG_FORMAT_STMT; +#endif } /* Check that we have not let the format to unspecified at this point */ @@ -4885,7 +4889,13 @@ struct my_option my_long_options[] = "supports only statement-based binary logging, so only 'statement' is " "a legal value." #endif - , 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }, + , 0, 0, 0, GET_STR, REQUIRED_ARG, +#ifdef HAVE_ROW_BASED_REPLICATION + BINLOG_FORMAT_MIXED +#else + BINLOG_FORMAT_STMT +#endif + , 0, 0, 0, 0, 0 }, {"binlog-do-db", OPT_BINLOG_DO_DB, "Tells the master it should log updates for the specified database, and exclude all others not explicitly mentioned.", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, |