summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <davi@moksha.local>2007-08-29 19:00:49 -0300
committerunknown <davi@moksha.local>2007-08-29 19:00:49 -0300
commitbad0b628c8058741508d2f4de00b77c65c6c92cb (patch)
tree2c1e27983ed18d41e7a7a3ee8f6520c87eca6a2d
parent30678bc067ee0b1658281619cb701ecbf7a1da4e (diff)
downloadmariadb-git-bad0b628c8058741508d2f4de00b77c65c6c92cb.tar.gz
Post-merge fixes for Bug#30632
mysql-test/r/handler_innodb.result: Post-merge: add Bug#30632 test case result mysql-test/r/handler_myisam.result: Post-merge fix of error number
-rw-r--r--mysql-test/r/handler_innodb.result13
-rw-r--r--mysql-test/r/handler_myisam.result4
2 files changed, 15 insertions, 2 deletions
diff --git a/mysql-test/r/handler_innodb.result b/mysql-test/r/handler_innodb.result
index 81d1e26f8d0..98b8922bc5f 100644
--- a/mysql-test/r/handler_innodb.result
+++ b/mysql-test/r/handler_innodb.result
@@ -522,3 +522,16 @@ handler t1 open;
ERROR HY000: Table storage engine for 't1' doesn't have this option
--> client 1
drop table t1;
+drop table if exists t1;
+create table t1 (a int);
+handler t1 open as t1_alias;
+handler t1_alias read a next;
+ERROR 42000: Key 'a' doesn't exist in table 't1_alias'
+handler t1_alias READ a next where inexistent > 0;
+ERROR 42S22: Unknown column 'inexistent' in 'field list'
+handler t1_alias read a next;
+ERROR 42000: Key 'a' doesn't exist in table 't1_alias'
+handler t1_alias READ a next where inexistent > 0;
+ERROR 42S22: Unknown column 'inexistent' in 'field list'
+handler t1_alias close;
+drop table t1;
diff --git a/mysql-test/r/handler_myisam.result b/mysql-test/r/handler_myisam.result
index 5a9b2824232..464b775b795 100644
--- a/mysql-test/r/handler_myisam.result
+++ b/mysql-test/r/handler_myisam.result
@@ -526,11 +526,11 @@ drop table if exists t1;
create table t1 (a int);
handler t1 open as t1_alias;
handler t1_alias read a next;
-ERROR HY000: Key 'a' doesn't exist in table 't1_alias'
+ERROR 42000: Key 'a' doesn't exist in table 't1_alias'
handler t1_alias READ a next where inexistent > 0;
ERROR 42S22: Unknown column 'inexistent' in 'field list'
handler t1_alias read a next;
-ERROR HY000: Key 'a' doesn't exist in table 't1_alias'
+ERROR 42000: Key 'a' doesn't exist in table 't1_alias'
handler t1_alias READ a next where inexistent > 0;
ERROR 42S22: Unknown column 'inexistent' in 'field list'
handler t1_alias close;