Commit b72e3110 authored by unknown's avatar unknown
Browse files

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  moonbone.local:/mnt/gentoo64/work/25122-bug-5.0-opt-mysql


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
parents a0684ef2 1437a9c5

sql/mysql_priv.h

+2 −1
Original line number Diff line number Diff line
@@ -1066,7 +1066,8 @@ TABLE_LIST *find_table_in_list(TABLE_LIST *table, 
                               st_table_list *TABLE_LIST::*link,

                               const char *db_name,

                               const char *table_name);

TABLE_LIST *unique_table(THD *thd, TABLE_LIST *table, TABLE_LIST *table_list);

TABLE_LIST *unique_table(THD *thd, TABLE_LIST *table, TABLE_LIST *table_list,

                         bool check_alias);

TABLE **find_temporary_table(THD *thd, const char *db, const char *table_name);

bool close_temporary_table(THD *thd, const char *db, const char *table_name);

void close_temporary(TABLE *table, bool delete_table);

sql/sql_base.cc

+7 −2
Original line number Diff line number Diff line
@@ -796,6 +796,7 @@ TABLE_LIST *find_table_in_list(TABLE_LIST *table, 
    thd                   thread handle

    table                 table which should be checked

    table_list            list of tables

    check_alias           whether to check tables' aliases



  NOTE: to exclude derived tables from check we use following mechanism:

    a) during derived table processing set THD::derived_tables_processing
@@ -823,10 +824,11 @@ TABLE_LIST *find_table_in_list(TABLE_LIST *table, 
    0 if table is unique

*/



TABLE_LIST* unique_table(THD *thd, TABLE_LIST *table, TABLE_LIST *table_list)

TABLE_LIST* unique_table(THD *thd, TABLE_LIST *table, TABLE_LIST *table_list,

                         bool check_alias)

{

  TABLE_LIST *res;

  const char *d_name, *t_name;

  const char *d_name, *t_name, *t_alias;

  DBUG_ENTER("unique_table");

  DBUG_PRINT("enter", ("table alias: %s", table->alias));
@@ -854,6 +856,7 @@ TABLE_LIST* unique_table(THD *thd, TABLE_LIST *table, TABLE_LIST *table_list) 
  }

  d_name= table->db;

  t_name= table->table_name;

  t_alias= table->alias;



  DBUG_PRINT("info", ("real table: %s.%s", d_name, t_name));

  for (;;)
@@ -861,6 +864,8 @@ TABLE_LIST* unique_table(THD *thd, TABLE_LIST *table, TABLE_LIST *table_list) 
    if (((! (res= find_table_in_global_list(table_list, d_name, t_name))) &&

         (! (res= mysql_lock_have_duplicate(thd, table, table_list)))) ||

        ((!res->table || res->table != table->table) &&

         (!check_alias || !(lower_case_table_names ?

          strcasecmp(t_alias, res->alias) : strcmp(t_alias, res->alias))) &&

         res->select_lex && !res->select_lex->exclude_from_table_unique_test &&

         !res->prelocking_placeholder))

      break;

sql/sql_delete.cc

+2 −2
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ bool mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds) 
  }

  {

    TABLE_LIST *duplicate;

    if ((duplicate= unique_table(thd, table_list, table_list->next_global)))

    if ((duplicate= unique_table(thd, table_list, table_list->next_global, 0)))

    {

      update_non_unique_table_error(table_list, "DELETE", duplicate);

      DBUG_RETURN(TRUE);
@@ -468,7 +468,7 @@ bool mysql_multi_delete_prepare(THD *thd) 
    {

      TABLE_LIST *duplicate;

      if ((duplicate= unique_table(thd, target_tbl->correspondent_table,

                                   lex->query_tables)))

                                   lex->query_tables, 0)))

      {

        update_non_unique_table_error(target_tbl->correspondent_table,

                                      "DELETE", duplicate);

sql/sql_insert.cc

+2 −2
Original line number Diff line number Diff line
@@ -1043,7 +1043,7 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list, 
  {

    Item *fake_conds= 0;

    TABLE_LIST *duplicate;

    if ((duplicate= unique_table(thd, table_list, table_list->next_global)))

    if ((duplicate= unique_table(thd, table_list, table_list->next_global, 1)))

    {

      update_non_unique_table_error(table_list, "INSERT", duplicate);

      DBUG_RETURN(TRUE);
@@ -2423,7 +2423,7 @@ select_insert::prepare(List<Item> &values, SELECT_LEX_UNIT *u) 
    query

  */

  if (!(lex->current_select->options & OPTION_BUFFER_RESULT) &&

      unique_table(thd, table_list, table_list->next_global))

      unique_table(thd, table_list, table_list->next_global, 0))

  {

    /* Using same table for INSERT and SELECT */

    lex->current_select->options|= OPTION_BUFFER_RESULT;

sql/sql_load.cc

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, 
    table is marked to be 'used for insert' in which case we should never

    mark this table as as 'const table' (ie, one that has only one row).

  */

  if (unique_table(thd, table_list, table_list->next_global))

  if (unique_table(thd, table_list, table_list->next_global, 0))

  {

    my_error(ER_UPDATE_TABLE_USED, MYF(0), table_list->table_name);

    DBUG_RETURN(TRUE);