diff options
| author | igor@rurik.mysql.com <> | 2006-06-01 16:51:19 -0700 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2006-06-01 16:51:19 -0700 |
| commit | 3043d29b1f7da7fa19f59cd0d9a3d7e8f2b69777 (patch) | |
| tree | 593f6e1b44d5a156aa92fe0833ac7054de9393aa | |
| parent | f2719e88336c9135764860ffeac322c0450bf4a0 (diff) | |
| download | mariadb-git-3043d29b1f7da7fa19f59cd0d9a3d7e8f2b69777.tar.gz | |
Post-merge fixes
| -rw-r--r-- | mysql-test/r/ssl.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/ssl_compress.result | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/ssl.result b/mysql-test/r/ssl.result index bb7297d6807..cd8bf52139e 100644 --- a/mysql-test/r/ssl.result +++ b/mysql-test/r/ssl.result @@ -145,9 +145,9 @@ explain select fld3 from t2 use index (fld1,fld3) where fld3 = 'honeysuckle'; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 ref fld3 fld3 30 const 1 Using where; Using index explain select fld3 from t2 ignore index (fld3,not_used); -ERROR 42000: Key column 'not_used' doesn't exist in table +ERROR HY000: Key 'not_used' doesn't exist in table 't2' explain select fld3 from t2 use index (not_used); -ERROR 42000: Key column 'not_used' doesn't exist in table +ERROR HY000: Key 'not_used' doesn't exist in table 't2' select t2.fld3 from t2 where fld3 >= 'honeysuckle' and fld3 <= 'honoring' order by fld3; fld3 honeysuckle diff --git a/mysql-test/r/ssl_compress.result b/mysql-test/r/ssl_compress.result index 9c1cf4b0ec3..78e83dabdd5 100644 --- a/mysql-test/r/ssl_compress.result +++ b/mysql-test/r/ssl_compress.result @@ -148,9 +148,9 @@ explain select fld3 from t2 use index (fld1,fld3) where fld3 = 'honeysuckle'; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 ref fld3 fld3 30 const 1 Using where; Using index explain select fld3 from t2 ignore index (fld3,not_used); -ERROR 42000: Key column 'not_used' doesn't exist in table +ERROR HY000: Key 'not_used' doesn't exist in table 't2' explain select fld3 from t2 use index (not_used); -ERROR 42000: Key column 'not_used' doesn't exist in table +ERROR HY000: Key 'not_used' doesn't exist in table 't2' select t2.fld3 from t2 where fld3 >= 'honeysuckle' and fld3 <= 'honoring' order by fld3; fld3 honeysuckle |