← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/hash_symbol.h

Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/hash_symbol.h
31
31
  const SYMBOL* ret_sym= NULL;
32
32
  if (function)
33
33
  {
34
 
    ret_sym= Function_hash::in_word_set(s, len);
 
34
    ret_sym= function_hash::in_word_set(s, len);
35
35
    if (ret_sym && ret_sym->tok)
36
36
      return ret_sym;
37
37
  }
38
 
  ret_sym= Symbol_hash::in_word_set(s, len);
 
38
  ret_sym= symbol_hash::in_word_set(s, len);
39
39
  if (ret_sym && ret_sym->tok)
40
40
    return ret_sym;
41
41
  return NULL;