diff options
| author | unknown <timour@mysql.com> | 2005-08-12 19:27:54 +0300 |
|---|---|---|
| committer | unknown <timour@mysql.com> | 2005-08-12 19:27:54 +0300 |
| commit | 2b53b711d8c36fadf3ce123a678795876fb67be4 (patch) | |
| tree | 47cfdff5ea22001b614037779ee931abbc209636 /mysql-test/r/errors.result | |
| parent | c9415c77b5ce586b4134b91a92447fe175c4e7b2 (diff) | |
| parent | 7517d7e11298da9ce9aaea8e2e42c25a640d5be9 (diff) | |
| download | mariadb-git-2b53b711d8c36fadf3ce123a678795876fb67be4.tar.gz | |
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-2486-merge
mysql-test/r/errors.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/fulltext_order_by.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/join_nested.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/errors.test:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
mysql-test/t/fulltext_order_by.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/join_nested.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
tests/mysql_client_test.c:
Auto merged
sql/sql_insert.cc:
merge WL#2486
sql/sql_show.cc:
merge WL#2486
Diffstat (limited to 'mysql-test/r/errors.result')
| -rw-r--r-- | mysql-test/r/errors.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/errors.result b/mysql-test/r/errors.result index 9a91c088aca..0c84f24a2e4 100644 --- a/mysql-test/r/errors.result +++ b/mysql-test/r/errors.result @@ -9,9 +9,9 @@ create table t1 (a int); select count(test.t1.b) from t1; ERROR 42S22: Unknown column 'test.t1.b' in 'field list' select count(not_existing_database.t1) from t1; -ERROR 42S02: Unknown table 'not_existing_database' in field list +ERROR 42S22: Unknown column 'not_existing_database.t1' in 'field list' select count(not_existing_database.t1.a) from t1; -ERROR 42S02: Unknown table 'not_existing_database.t1' in field list +ERROR 42S22: Unknown column 'not_existing_database.t1.a' in 'field list' select count(not_existing_database.t1.a) from not_existing_database.t1; Got one of the listed errors select 1 from t1 order by 2; |