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/suite/perfschema | |
| 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/suite/perfschema')
| -rw-r--r-- | mysql-test/suite/perfschema/r/short_option_1.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/perfschema/t/short_option_1.test | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/mysql-test/suite/perfschema/r/short_option_1.result b/mysql-test/suite/perfschema/r/short_option_1.result index d97ece1f67a..45f7d989d8e 100644 --- a/mysql-test/suite/perfschema/r/short_option_1.result +++ b/mysql-test/suite/perfschema/r/short_option_1.result @@ -13,9 +13,6 @@ utf8 show variables like 'character_set_system'; Variable_name Value character_set_system utf8 -show variables like 'log'; -Variable_name Value -log ON show variables like 'general_log'; Variable_name Value general_log ON diff --git a/mysql-test/suite/perfschema/t/short_option_1.test b/mysql-test/suite/perfschema/t/short_option_1.test index b94d1685867..ff62a392cfa 100644 --- a/mysql-test/suite/perfschema/t/short_option_1.test +++ b/mysql-test/suite/perfschema/t/short_option_1.test @@ -11,7 +11,6 @@ show variables like 'sql_mode'; select @@character_set_server; show variables like 'character_set_system'; -show variables like 'log'; show variables like 'general_log'; show variables like 'new'; |