diff options
| author | igor@rurik.mysql.com <> | 2004-10-21 14:46:40 -0700 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2004-10-21 14:46:40 -0700 |
| commit | dd44a4b4d41b417b7e97e4e32dee9fbbe7a61558 (patch) | |
| tree | 02668f91d6ab5cc4013e9b0f3e53d76fda3c9ee6 | |
| parent | c7d5642b7e9d6dd5e9eda6dce7da2b3506679d32 (diff) | |
| download | mariadb-git-dd44a4b4d41b417b7e97e4e32dee9fbbe7a61558.tar.gz | |
ps.result:
Post-merge fixes.
sql_select.cc:
Post-merge cleanup.
| -rw-r--r-- | mysql-test/r/ps.result | 12 | ||||
| -rw-r--r-- | sql/sql_select.cc | 5 |
2 files changed, 8 insertions, 9 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index 321b8894796..380800604d6 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -159,24 +159,24 @@ id select_type table type possible_keys key key_len ref rows Extra 6 DERIVED NULL NULL NULL NULL NULL NULL NULL no matching row in const table 5 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found 4 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found -3 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found +3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables +2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables execute stmt1 ; id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables 6 DERIVED NULL NULL NULL NULL NULL NULL NULL no matching row in const table 5 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found 4 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found -3 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found +3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables +2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables explain SELECT (SELECT SUM(c1 + c12 + 0.0) FROM t2 where (t1.c2 - 0e-3) = t2.c2 GROUP BY t1.c15 LIMIT 1) as scalar_s, exists (select 1.0e+0 from t2 where t2.c3 * 9.0000000000 = t1.c4) as exists_s, c5 * 4 in (select c6 + 0.3e+1 from t2) as in_s, (c7 - 4, c8 - 4) in (select c9 + 4.0, c10 + 40e-1 from t2) as in_row_s FROM t1, (select c25 x, c32 y from t2) tt WHERE x * 1 = c25; id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables 6 DERIVED NULL NULL NULL NULL NULL NULL NULL no matching row in const table 5 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found 4 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found -3 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found +3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables +2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables deallocate prepare stmt1; drop tables t1,t2; set @arg00=1; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index e1f15bc1c04..9ba191a3f3a 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -5136,8 +5136,7 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) { table_map used_tables; if (cond) /* Because of QUICK_GROUP_MIN_MAX_SELECT */ - { /* there may be a select without a cond. */ - + { /* there may be a select without a cond. */ if (join->tables > 1) cond->update_used_tables(); // Tablenr may have changed if (join->const_tables == join->tables && @@ -5173,7 +5172,7 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) if (const_cond && !const_cond->val_int()) { DBUG_PRINT("info",("Found impossible WHERE condition")); - DBUG_RETURN(1); // Impossible const condition + DBUG_RETURN(1); // Impossible const condition } } } |