diff options
| author | Georgi Kodinov <kgeorge@mysql.com> | 2008-10-03 15:24:19 +0300 |
|---|---|---|
| committer | Georgi Kodinov <kgeorge@mysql.com> | 2008-10-03 15:24:19 +0300 |
| commit | 19256b96e8a90112195f1882cf6003a61b09cae1 (patch) | |
| tree | 475c967f30a6c9a881e506a8d4c8e44ef6b09674 /sql/mysqld.cc | |
| parent | 6037e8ec49572eae3a0a079f6b818caf0f96ab1b (diff) | |
| download | mariadb-git-19256b96e8a90112195f1882cf6003a61b09cae1.tar.gz | |
Bug #39812: Make statement replication default for 5.1 (to match 5.0)
Make STMT replication default for 5.1.
Add a default of MIXED into the config files
Fix the tests that needed MIXED replication mode.
mysql-test/include/mix1.inc:
Bug #39812: Fix the tests that needed MIXED replication mode.
mysql-test/r/innodb-semi-consistent.result:
Bug #39812: Fix the tests that needed MIXED replication mode.
mysql-test/r/innodb.result:
Bug #39812: Fix the tests that needed MIXED replication mode.
mysql-test/r/innodb_mysql.result:
Bug #39812: Fix the tests that needed MIXED replication mode.
mysql-test/r/tx_isolation_func.result:
Bug #39812: Fix the tests that needed MIXED replication mode.
mysql-test/t/innodb-semi-consistent.test:
Bug #39812: Fix the tests that needed MIXED replication mode.
mysql-test/t/innodb.test:
Bug #39812: Fix the tests that needed MIXED replication mode.
mysql-test/t/tx_isolation_func.test:
Bug #39812: Fix the tests that needed MIXED replication mode.
sql/mysqld.cc:
Bug #39812: Make STMT replication default for 5.1.
support-files/my-huge.cnf.sh:
Bug #39812: Add a default of MIXED into the config files
support-files/my-innodb-heavy-4G.cnf.sh:
Bug #39812: Add a default of MIXED into the config files
support-files/my-large.cnf.sh:
Bug #39812: Add a default of MIXED into the config files
support-files/my-medium.cnf.sh:
Bug #39812: Add a default of MIXED into the config files
support-files/my-small.cnf.sh:
Bug #39812: Add a default of MIXED into the config files
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index dcf1ee0188a..679d6d5e8fc 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3753,23 +3753,25 @@ with --log-bin instead."); unireg_abort(1); } if (!opt_bin_log) - if (opt_binlog_format_id != BINLOG_FORMAT_UNSPEC) { - sql_print_error("You need to use --log-bin to make " - "--binlog-format work."); - unireg_abort(1); - } + if (opt_binlog_format_id != BINLOG_FORMAT_UNSPEC) + { + sql_print_error("You need to use --log-bin to make " + "--binlog-format work."); + unireg_abort(1); + } else - { - global_system_variables.binlog_format= BINLOG_FORMAT_MIXED; + { + global_system_variables.binlog_format= BINLOG_FORMAT_STMT; } + } else if (opt_binlog_format_id == BINLOG_FORMAT_UNSPEC) - global_system_variables.binlog_format= BINLOG_FORMAT_MIXED; + global_system_variables.binlog_format= BINLOG_FORMAT_STMT; else { DBUG_ASSERT(global_system_variables.binlog_format != BINLOG_FORMAT_UNSPEC); - } + } /* Check that we have not let the format to unspecified at this point */ DBUG_ASSERT((uint)global_system_variables.binlog_format <= |