diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-30 23:09:31 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-30 23:09:31 +0300 |
| commit | 2b90de942c9a23a584393a905f6df7016168a9c0 (patch) | |
| tree | 81e219c792bb0ac78dac1e4685f956c765599271 /mysql-test/r/variables.result | |
| parent | 2b8f00a9c061ad43aadcf43335884fce38ab3fa0 (diff) | |
| parent | 6ee51dc7ef7945c6a860222ca14140a147f7884d (diff) | |
| download | mariadb-git-2b90de942c9a23a584393a905f6df7016168a9c0.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- sql/event_db_repository.cc
- sql/events.cc
- sql/sp.cc
- sql/sql_acl.cc
- sql/sql_udf.cc
Diffstat (limited to 'mysql-test/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index a8737419aa1..a8437961117 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -571,7 +571,7 @@ set sql_log_bin=1; set sql_log_off=1; set sql_log_update=1; Warnings: -Note 1315 The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored +Note 1315 The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored. This option will be removed in MySQL 5.6. set sql_low_priority_updates=1; set sql_quote_show_create=1; set sql_safe_updates=1; |