← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/typelib.cc

  • Committer: Mark Atwood
  • Date: 2011-05-09 00:03:05 UTC
  • mfrom: (2281.4.17 prune2)
  • Revision ID: me@mark.atwood.name-20110509000305-dilr9ms7n7p1dmnk
merge lp:~olafvdspek/drizzle/prune remove tztime

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/typelib.cc
72
72
 
73
73
int TYPELIB::find_type(const char *x, e_find_options full_name) const
74
74
{
75
 
  assert(full_name & 2);
 
75
  assert(full_name & e_dont_complete);
76
76
  return find_type(const_cast<char*>(x), full_name);
77
77
}
78
78
 
108
108
    return 0;
109
109
  if (find != 1 || (full_name & e_match_full))
110
110
    return -1;
111
 
  if (!(full_name & 2))
 
111
  if (!(full_name & e_dont_complete))
112
112
    strcpy(x, type_names[findpos]);
113
113
  return findpos + 1;
114
114
} /* find_type */