← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/parser.cc

  • Committer: Mark Atwood
  • Date: 2011-11-11 18:23:18 UTC
  • mfrom: (2456.1.5 rf)
  • Revision ID: me@mark.atwood.name-20111111182318-skgcp9ce65fd2goa
merge lp:~olafvdspek/drizzle/refactor11

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/parser.cc
212
212
 
213
213
bool check_reserved_words(str_ref name)
214
214
{
215
 
  if (!my_strcasecmp(system_charset_info, name.data(), "GLOBAL") ||
216
 
      !my_strcasecmp(system_charset_info, name.data(), "LOCAL") ||
217
 
      !my_strcasecmp(system_charset_info, name.data(), "SESSION"))
218
 
    return true;
219
 
 
220
 
  return false;
 
215
  return not system_charset_info->strcasecmp(name.data(), "GLOBAL") 
 
216
    || not system_charset_info->strcasecmp(name.data(), "LOCAL")
 
217
    || not system_charset_info->strcasecmp(name.data(), "SESSION");
221
218
}
222
219
 
223
220
 
330
327
{
331
328
  TableList *table= reinterpret_cast<TableList*>(lex->current_select->table_list.first);
332
329
 
333
 
  if (schema_name.size() && my_strcasecmp(table_alias_charset, schema_name.data(), table->getSchemaName()))
 
330
  if (schema_name.size() && table_alias_charset->strcasecmp(schema_name.data(), table->getSchemaName()))
334
331
  {
335
332
    my_error(ER_WRONG_DB_NAME, MYF(0), schema_name.data());
336
333
    return false;
337
334
  }
338
335
 
339
 
  if (my_strcasecmp(table_alias_charset, table_name.data(), table->getTableName()))
 
336
  if (table_alias_charset->strcasecmp(table_name.data(), table->getTableName()))
340
337
  {
341
338
    my_error(ER_WRONG_TABLE_NAME, MYF(0), table_name.data());
342
339
    return false;