database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/bk/work-multi-5.0


mysql-test/r/view.result:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown
2005-04-01 13:02:29 +03:00
parent ec6ce01565 daddf263e5
commit 8af8c53040
15 changed files with 561 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_select.cc
View File

@ -316,6 +316,13 @@ JOIN::prepare(Item ***rref_pointer_array,
join_list= &select_lex->top_join_list;
union_part= (unit_arg->first_select()->next_select() != 0);
/*
If we have already executed SELECT, then it have not sense to prevent
its table from update (see unique_table())
*/
if (thd->derived_tables_processing)
select_lex->exclude_from_table_unique_test= TRUE;
/* Check that all tables, fields, conds and order are ok */
if ((!(select_options & OPTION_SETUP_TABLES_DONE) &&
@ -1157,7 +1164,7 @@ JOIN::exec()
{
int tmp_error;
DBUG_ENTER("JOIN::exec");
error= 0;
if (procedure)
{