~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

Add in new show work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
72
72
 
73
73
 
74
74
 
75
 
int wild_case_compare(const CHARSET_INFO * const cs, const char *str,const char *wildstr)
 
75
int wild_case_compare(const CHARSET_INFO * const cs, const char *str, const char *wildstr)
76
76
{
77
77
  register int flag;
78
78
  while (*wildstr)
271
271
{
272
272
  message::Schema schema;
273
273
 
274
 
  if (!my_strcasecmp(system_charset_info, dbname,
275
 
                     INFORMATION_SCHEMA_NAME.c_str()))
 
274
  if (not my_strcasecmp(system_charset_info, dbname,
 
275
                        INFORMATION_SCHEMA_NAME.c_str()))
276
276
  {
277
277
    dbname= INFORMATION_SCHEMA_NAME.c_str();
278
278
  }
279
 
  else if (!my_strcasecmp(system_charset_info, dbname,
280
 
                     "data_dictionary"))
 
279
  else if (not my_strcasecmp(system_charset_info, dbname,
 
280
                             "data_dictionary"))
281
281
  {
282
282
    dbname= "data_dictionary";
283
283
  }
284
284
  else
285
285
  {
286
 
    int r= get_database_metadata(dbname, &schema);
287
 
    if(r < 0)
 
286
    int r= get_database_metadata(dbname, schema);
 
287
    if (r < 0)
288
288
      return true;
289
289
  }
290
290