← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.cc

  • Committer: Monty Taylor
  • Date: 2009-02-12 11:32:14 UTC
  • mto: This revision was merged to the branch mainline in revision 885.
  • Revision ID: mordred@inaugust.com-20090212113214-m454kx25in7y75bg
Fixed a failure during gperf failure.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.cc
22
22
#include <drizzled/error.h>
23
23
#include <drizzled/session.h>
24
24
#include <drizzled/sql_base.h>
25
 
#include <drizzled/hash_symbol.h>
 
25
#include <drizzled/lookup_symbol.h>
26
26
 
27
27
 
28
28
 
317
317
    tok_upper[tok_pos]=my_toupper(system_charset_info, tok[tok_pos]);
318
318
  tok_upper[tok_pos]=0;
319
319
 
320
 
  const SYMBOL *symbol= get_hash_symbol(tok_upper, len, function);
 
320
  const SYMBOL *symbol= lookup_symbol(tok_upper, len, function);
321
321
  if (symbol)
322
322
  {
323
323
    lip->yylval->symbol.symbol=symbol;
346
346
bool is_keyword(const char *name, uint32_t len)
347
347
{
348
348
  assert(len != 0);
349
 
  return get_hash_symbol(name,len,0)!=0;
 
349
  return lookup_symbol(name,len,0)!=0;
350
350
}
351
351
 
352
352
bool is_lex_native_function(const LEX_STRING *name)
353
353
{
354
354
  assert(name != NULL);
355
 
  return (get_hash_symbol(name->str, name->length, 1) != 0);
 
355
  return (lookup_symbol(name->str, name->length, 1) != 0);
356
356
}
357
357
 
358
358
/* make a copy of token before ptr and set yytoklen */