database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

ps.result:

Browse Source 
Post-merge fixes.
sql_select.cc:
  Post-merge cleanup.


sql/sql_select.cc:
  Post-merge cleanup.
mysql-test/r/ps.result:
  Post-merge fixes.
This commit is contained in:
unknown
2004-10-21 14:46:40 -07:00
parent e367451086
commit a3212379de
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_select.cc
View File

@ -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
}
}
}