diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-08-13 13:35:36 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-08-13 13:35:36 +0200 |
| commit | fcf87600a2d7ae03f7bda16c2f16cdec980d2a56 (patch) | |
| tree | 0dd158f601c1b38f1b5e80eab137cd406c4499cb /mysql-test/r/variables.result | |
| parent | a6617eb341c9598f1247e8ddc5c66b7bec55129d (diff) | |
| download | mariadb-git-fcf87600a2d7ae03f7bda16c2f16cdec980d2a56.tar.gz | |
MDEV-4865 Change related to --log option/variable was merged partially
Complete the merge of magne.mahre@oracle.com-20101102115354-vxcaxminmzglzalk
(WL#5185 Remove deprecated 5.1 features)
Diffstat (limited to 'mysql-test/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 417ac0158ce..f206ec37146 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -561,11 +561,9 @@ select @@sql_auto_is_null; @@sql_auto_is_null 0 set sql_big_selects=1; -set sql_big_tables=1; set sql_buffer_result=1; set sql_log_bin=1; set sql_log_off=1; -set sql_low_priority_updates=1; set sql_quote_show_create=1; set sql_safe_updates=1; set sql_select_limit=1; @@ -761,9 +759,6 @@ select ifnull(@@character_set_results,"really null"); ifnull(@@character_set_results,"really null") really null set names latin1; -select @@have_innodb; -@@have_innodb -# *** Various tests with LC_TIME_NAMES *** LC_TIME_NAMES: testing case insensitivity set @@lc_time_names='ru_ru'; |