diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-08-27 14:36:38 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-08-27 14:36:38 +0300 |
| commit | 8a6f8201bec9b8b5c338cd7f5a9d3e42ab8b1457 (patch) | |
| tree | 580538f16974ea7d0c8ebf343e76e523efdb91cf /mysql-test | |
| parent | 8e8e4fe059a8cebc4f8446f2b6cdcc810bdff9e0 (diff) | |
| parent | 76438bd1bb07979badbd05048b7bb4a1b9fb333a (diff) | |
| download | mariadb-git-8a6f8201bec9b8b5c338cd7f5a9d3e42ab8b1457.tar.gz | |
merge fixes
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/symlink.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/union.result | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result index 216fb4d6124..4469ca36941 100644 --- a/mysql-test/r/symlink.result +++ b/mysql-test/r/symlink.result @@ -46,8 +46,6 @@ alter table t8 rename t7; rename table t7 to t9; drop table t1; Got one of the listed errors -Warnings: -Note 1008 Can't drop database 'test_mysqltest'; database doesn't exist Got one of the listed errors Got one of the listed errors Got one of the listed errors diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result index 396eba7197b..fc72f55172b 100644 --- a/mysql-test/r/union.result +++ b/mysql-test/r/union.result @@ -103,7 +103,7 @@ a b 2 b select found_rows(); found_rows() -6 +8 explain select a,b from t1 union all select a,b from t2; id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t1 ALL NULL NULL NULL NULL 4 |