← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

  • Committer: Brian Aker
  • Date: 2008-10-07 15:13:28 UTC
  • mfrom: (481.1.19 codestyle)
  • Revision ID: brian@tangent.org-20081007151328-m49yev7qggqmzxg1
Mergining Monty's work

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzletest.cc
39
39
#define MTEST_VERSION "3.3"
40
40
 
41
41
#include "config.h"
 
42
#include "client_priv.h"
42
43
 
43
44
#include <queue>
44
45
#include <map>
46
47
 
47
48
#include <pcrecpp.h>
48
49
 
49
 
#include "client_priv.h"
50
50
#include <mysys/hash.h>
51
51
#include <stdarg.h>
52
52
 
533
533
      str->append(quote_str, quote_len);
534
534
      cur_pos= next_pos + 1;
535
535
    }
536
 
    str->append(cur_pos, next_pos - cur_pos);
 
536
    str->append(cur_pos);
537
537
    append= va_arg(dirty_text, char *);
538
538
  }
539
539
  va_end(dirty_text);
1156
1156
  string ds_cmdline;
1157
1157
 
1158
1158
 
1159
 
  append_os_quoted(&ds_cmdline, tool_path);
 
1159
  append_os_quoted(&ds_cmdline, tool_path, NULL);
1160
1160
  ds_cmdline.append(" ");
1161
1161
 
1162
1162
  va_start(args, result);