diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-10-14 01:48:03 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-10-14 01:48:03 +0400 |
| commit | 508e75c259a88638999822cccdc66c271769a167 (patch) | |
| tree | ecbbd32491a220d9c370df77141c914ff07edb7c /mysql-test/suite/pbxt | |
| parent | 49ae85afd564e34ea3fb8df308cbafe347d76303 (diff) | |
| download | mariadb-git-508e75c259a88638999822cccdc66c271769a167.tar.gz | |
Merge MariaDB 5.2 -> MariaDB 5.3
- post-merge fixes
Diffstat (limited to 'mysql-test/suite/pbxt')
| -rw-r--r-- | mysql-test/suite/pbxt/r/join_nested.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/pbxt/r/select.result | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/suite/pbxt/r/join_nested.result b/mysql-test/suite/pbxt/r/join_nested.result index 2dda77db8c6..2be4247c97f 100644 --- a/mysql-test/suite/pbxt/r/join_nested.result +++ b/mysql-test/suite/pbxt/r/join_nested.result @@ -1487,7 +1487,7 @@ on (t1.a = t2.a); id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 10 1 SIMPLE t2 ref a a 5 test.t1.a 1 -1 SIMPLE t3 ref a a 5 test.t1.a 1 +1 SIMPLE t3 ref a a 5 test.t1.a 1 Using where drop table t1, t2, t3; CREATE TABLE t1 (id int NOT NULL PRIMARY KEY, type varchar(10)); CREATE TABLE t2 (pid int NOT NULL PRIMARY KEY, type varchar(10)); diff --git a/mysql-test/suite/pbxt/r/select.result b/mysql-test/suite/pbxt/r/select.result index 4e50661f9ba..c7601c00ee0 100644 --- a/mysql-test/suite/pbxt/r/select.result +++ b/mysql-test/suite/pbxt/r/select.result @@ -1398,7 +1398,6 @@ explain select companynr,companyname from t4 left join t2 using (companynr) wher id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t4 ALL PRIMARY NULL NULL NULL 12 Using where 1 SIMPLE t2 ALL NULL NULL NULL NULL 1199 Using where -1 SIMPLE t2 ALL NULL NULL NULL NULL 1199 explain select companynr,companyname from t4 left join t2 using (companynr) where companynr > 0 or companynr < 0; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t4 ALL PRIMARY NULL NULL NULL 12 Using where |