← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

Merge Nathan

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzletest.cc
46
46
#include <sstream>
47
47
#include <iostream>
48
48
#include <vector>
 
49
#include <algorithm>
49
50
 
50
51
#include PCRE_HEADER
51
52
 
4191
4192
      }
4192
4193
      else if ((c == '{' &&
4193
4194
                (!my_strnncoll_simple(charset_info, (const unsigned char*) "while", 5,
4194
 
                                      (unsigned char*) buf, cmin((long)5, p - buf), 0) ||
 
4195
                                      (unsigned char*) buf, min((ptrdiff_t)5, p - buf), 0) ||
4195
4196
                 !my_strnncoll_simple(charset_info, (const unsigned char*) "if", 2,
4196
 
                                      (unsigned char*) buf, cmin((long)2, p - buf), 0))))
 
4197
                                      (unsigned char*) buf, min((ptrdiff_t)2, p - buf), 0))))
4197
4198
      {
4198
4199
        /* Only if and while commands can be terminated by { */
4199
4200
        *p++= c;