diff options
| author | unknown <lars/lthalmann@dl145k.mysql.com> | 2007-06-11 09:55:34 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145k.mysql.com> | 2007-06-11 09:55:34 +0200 |
| commit | 80fa7382082b9a551ec850e8e348f37d4bf58c82 (patch) | |
| tree | 5a8c19199fffb1f696e12e1c0080cd8888907d3d /sql/mysqld.cc | |
| parent | 10a21ed042e39c8800893dbb8ba711d54daf4896 (diff) | |
| parent | 9eecc8186776d95cf5c89391f13f91c0d3634510 (diff) | |
| download | mariadb-git-80fa7382082b9a551ec850e8e348f37d4bf58c82.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
sql/field.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
mysql-test/lib/mtr_report.pl:
Manual merge
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 1fa08a1d862..7c2dd82ad41 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3307,7 +3307,7 @@ with --log-bin instead."); } else { - global_system_variables.binlog_format= BINLOG_FORMAT_UNSPEC; + global_system_variables.binlog_format= BINLOG_FORMAT_MIXED; } else if (opt_binlog_format_id == BINLOG_FORMAT_UNSPEC) |