bk commit into 5.1 tree (davi:1.2582) BUG#30632

[Davi Arnaut]

Below is the list of changes that have just been committed into a local
5.1 repository of davi. When davi does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-08-29 19:00:49-03:00, davi@stripped +2 -0
  Post-merge fixes for Bug#30632

  mysql-test/r/handler_innodb.result@stripped, 2007-08-29 19:00:46-03:00, davi@stripped +13 -0
    Post-merge: add Bug#30632 test case result

  mysql-test/r/handler_myisam.result@stripped, 2007-08-29 19:00:46-03:00, davi@stripped +2 -2
    Post-merge fix of error number

diff -Nrup a/mysql-test/r/handler_innodb.result b/mysql-test/r/handler_innodb.result
--- a/mysql-test/r/handler_innodb.result	2007-08-20 20:50:39 -03:00
+++ b/mysql-test/r/handler_innodb.result	2007-08-29 19:00:46 -03:00
@@ -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 -Nrup a/mysql-test/r/handler_myisam.result b/mysql-test/r/handler_myisam.result
--- a/mysql-test/r/handler_myisam.result	2007-08-29 18:32:14 -03:00
+++ b/mysql-test/r/handler_myisam.result	2007-08-29 19:00:46 -03:00
@@ -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;