← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

  • Committer: Lee Bieber
  • Date: 2011-04-17 02:05:51 UTC
  • mfrom: (2279.1.3 build)
  • Revision ID: kalebral@gmail.com-20110417020551-59m0hx1p10b0up1x
Merge Joe - 760367: DATA_DICTIONARY.CUMULATIVE_USER_STATS.CONNECTED_TIME_SEC reports bogus results
Merge Olaf - Refactor Catalog Cache
Merge Olaf - Delete unused functions

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzletest.cc
4405
4405
        end++;
4406
4406
      save= *end;
4407
4407
      *end= 0;
4408
 
      type= command_typelib.find_type(start, 1+2);
 
4408
      type= command_typelib.find_type(start, TYPELIB::e_default);
4409
4409
      if (type)
4410
4410
        warning_msg("Embedded drizzletest command '--%s' detected in "
4411
4411
                    "query '%s' was this intentional? ",
5263
5263
 
5264
5264
  save= command->query[command->first_word_len];
5265
5265
  command->query[command->first_word_len]= 0;
5266
 
  type= command_typelib.find_type(command->query, 1+2);
 
5266
  type= command_typelib.find_type(command->query, TYPELIB::e_default);
5267
5267
  command->query[command->first_word_len]= save;
5268
5268
  if (type > 0)
5269
5269
  {
5307
5307
        */
5308
5308
        save= command->query[command->first_word_len-1];
5309
5309
        command->query[command->first_word_len-1]= 0;
5310
 
        if (command_typelib.find_type(command->query, 1+2) > 0)
 
5310
        if (command_typelib.find_type(command->query, TYPELIB::e_default) > 0)
5311
5311
          die("Extra delimiter \";\" found");
5312
5312
        command->query[command->first_word_len-1]= save;
5313
5313