← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Brian Aker
  • Date: 2011-01-04 22:27:38 UTC
  • mfrom: (2041.3.16 session-fix)
  • mto: This revision was merged to the branch mainline in revision 2055.
  • Revision ID: brian@tangent.org-20110104222738-4r3hrsxrlbuildrg
Merge in cleanup of error messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
1422
1422
    1   error   ; In this case the error messege is sent to the client
1423
1423
*/
1424
1424
 
1425
 
bool check_simple_select()
 
1425
bool check_simple_select(Session::pointer session)
1426
1426
{
1427
 
  Session *session= current_session;
1428
1427
  LEX *lex= session->lex;
1429
1428
  if (lex->current_select != &lex->select_lex)
1430
1429
  {
1607
1606
}
1608
1607
 
1609
1608
 
1610
 
bool check_identifier_name(LEX_STRING *str, uint32_t err_code,
 
1609
bool check_identifier_name(LEX_STRING *str, drizzled_error_code err_code,
1611
1610
                           uint32_t max_char_length,
1612
1611
                           const char *param_for_err_msg)
1613
1612
{
1633
1632
 
1634
1633
  switch (err_code)
1635
1634
  {
1636
 
  case 0:
 
1635
  case EE_OK:
1637
1636
    break;
1638
1637
  case ER_WRONG_STRING_LENGTH:
1639
1638
    my_error(err_code, MYF(0), str->str, param_for_err_msg, max_char_length);
1645
1644
    assert(0);
1646
1645
    break;
1647
1646
  }
 
1647
 
1648
1648
  return true;
1649
1649
}
1650
1650