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

Merge sinisa@work.mysql.com:/home/bk/mysql-4.0

Browse Source 
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown
2001-07-01 13:27:09 +03:00
parent 2752103dba b291238171
commit cdfc04fb08
7 changed files with 54 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_select.cc
View File

@@ -385,6 +385,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
thd->fatal_error)
goto err;
thd->proc_info="preparing";
result->initialize_tables(&join);
if ((tmp=join_read_const_tables(&join)) > 0)
goto err;
if (tmp && !(select_options & SELECT_DESCRIBE))