diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-11-21 21:40:43 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-11-21 21:40:43 -0800 |
| commit | d34e46795ef2691af107b66e04639e10f6b6bdd3 (patch) | |
| tree | b23131409f5b35c4fc577e1e729abcffee51b73b /mysql-test/r/select_jcl6.result | |
| parent | 1926b83977d7ff8a1e0ec9fa8e04693f1a66eaa8 (diff) | |
| parent | 8224d95524097733cf841e84ad5687a2be2ca22b (diff) | |
| download | mariadb-git-d34e46795ef2691af107b66e04639e10f6b6bdd3.tar.gz | |
Merge 5.3->5.5
Diffstat (limited to 'mysql-test/r/select_jcl6.result')
| -rw-r--r-- | mysql-test/r/select_jcl6.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/select_jcl6.result b/mysql-test/r/select_jcl6.result index 04712c8f85e..a51f2030595 100644 --- a/mysql-test/r/select_jcl6.result +++ b/mysql-test/r/select_jcl6.result @@ -5326,7 +5326,7 @@ SELECT * FROM t1 WHERE (1=2 OR t1.pk=2) AND t1.a <> 0; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables Warnings: -Note 1003 select 2 AS `pk`,0 AS `a` from `test`.`t1` where ((0 <> 0)) +Note 1003 select 2 AS `pk`,0 AS `a` from `test`.`t1` where (0 <> 0) DROP TABLE t1; SELECT * FROM mysql.time_zone WHERE ( NOT (Use_leap_seconds <= Use_leap_seconds AND Time_zone_id != 1) |