diff options
| author | Monty <monty@mariadb.org> | 2016-10-03 18:49:44 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-10-05 01:11:08 +0300 |
| commit | af7490f95d9a0e99dafb70ae3ee5cc7cf044572e (patch) | |
| tree | 6dfa0e90d7ee6563572b080f3c6c6f56ca4dd96f /mysql-test/r/subselect4.result | |
| parent | c1125c32183042a2f7be433d2c10e499f843d82c (diff) | |
| download | mariadb-git-af7490f95d9a0e99dafb70ae3ee5cc7cf044572e.tar.gz | |
Remove end . from error messages to get them consistent
Fixed a few failing tests
Diffstat (limited to 'mysql-test/r/subselect4.result')
| -rw-r--r-- | mysql-test/r/subselect4.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/subselect4.result b/mysql-test/r/subselect4.result index 7202a6238b0..992892b8fb6 100644 --- a/mysql-test/r/subselect4.result +++ b/mysql-test/r/subselect4.result @@ -428,7 +428,7 @@ INSERT INTO `t1` VALUES (10,'00:00:00','i','i'),(11,'00:00:00','',''); set @old_optimizer_switch = @@session.optimizer_switch; SET SESSION OPTIMIZER_SWITCH = 'materialization=off,semijoin=off,loosescan=off,firstmatch=off,mrr=on,engine_condition_pushdown=on'; Warnings: -Warning 1681 'engine_condition_pushdown=on' is deprecated and will be removed in a future release. +Warning 1681 'engine_condition_pushdown=on' is deprecated and will be removed in a future release SELECT `time_nokey` G1 FROM t1 WHERE ( `varchar_nokey` , `varchar_key` ) IN ( SELECT `varchar_nokey` , `varchar_nokey` ) AND `varchar_key` >= 'c' HAVING G1 ORDER BY `pk` ; @@ -618,7 +618,7 @@ INSERT INTO t2 VALUES (9,1); set @old_icp=@@optimizer_switch; SET SESSION optimizer_switch="engine_condition_pushdown=on"; Warnings: -Warning 1681 'engine_condition_pushdown=on' is deprecated and will be removed in a future release. +Warning 1681 'engine_condition_pushdown=on' is deprecated and will be removed in a future release SELECT pk FROM t2 |