Commit 19948e8a authored by unknown's avatar unknown
Browse files

sql_base.cc: 

  Post fix for bug#25122.


sql/sql_base.cc:
  Post fix for bug#25122.
parent b72e3110

sql/sql_base.cc

+2 −1
Original line number Diff line number Diff line
@@ -865,7 +865,8 @@ TABLE_LIST* unique_table(THD *thd, TABLE_LIST *table, TABLE_LIST *table_list, 
         (! (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))) &&

          my_strcasecmp(files_charset_info, t_alias, res->alias) :

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

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

         !res->prelocking_placeholder))

      break;