← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Lee Bieber
  • Date: 2011-01-05 01:41:02 UTC
  • mfrom: (2054.1.2 clean)
  • Revision ID: kalebral@gmail.com-20110105014102-e1sfrth1cesuwyf7
Merge Brian - Rename of the Loooongggggg   error type over to simply drizzled::error_t
Merge Brian - Cleanup of error messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
3685
3685
        }
3686
3686
      }
3687
3687
      else
 
3688
      {
3688
3689
        session->used_tables|= item->used_tables();
 
3690
      }
 
3691
 
3689
3692
      session->lex->current_select->cur_pos_in_select_list++;
3690
3693
    }
3691
3694
    /*
3705
3708
    qualified '*', and all columns were coalesced, we have to give a more
3706
3709
    meaningful message than ER_BAD_TABLE_ERROR.
3707
3710
  */
3708
 
  if (!table_name)
 
3711
  if (not table_name)
 
3712
  {
3709
3713
    my_message(ER_NO_TABLES_USED, ER(ER_NO_TABLES_USED), MYF(0));
 
3714
  }
3710
3715
  else
 
3716
  {
3711
3717
    my_error(ER_BAD_TABLE_ERROR, MYF(0), table_name);
 
3718
  }
3712
3719
 
3713
3720
  return true;
3714
3721
}