← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Brian Aker
  • Date: 2009-11-18 06:24:48 UTC
  • mfrom: (1220.1.15 staging)
  • Revision ID: brian@gaz-20091118062448-o36lo3yv81sc6u9z
Merge Brian + Stewart

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
601
601
0 if table is unique
602
602
*/
603
603
 
604
 
TableList* unique_table(Session *session, TableList *table, TableList *table_list,
 
604
TableList* unique_table(TableList *table, TableList *table_list,
605
605
                        bool check_alias)
606
606
{
607
607
  TableList *res;
635
635
 
636
636
  for (;;)
637
637
  {
638
 
    if (((! (res= find_table_in_global_list(table_list, d_name, t_name))) &&
639
 
         (! (res= mysql_lock_have_duplicate(session, table, table_list)))) ||
 
638
    if ((! (res= find_table_in_global_list(table_list, d_name, t_name))) ||
640
639
        ((!res->table || res->table != table->table) &&
641
640
         (!check_alias || !(my_strcasecmp(files_charset_info, t_alias, res->alias))) &&
642
641
         res->select_lex && !res->select_lex->exclude_from_table_unique_test))