← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzledump.cc

  • Committer: Monty Taylor
  • Date: 2008-09-14 19:39:48 UTC
  • mfrom: (383.1.43 client-split)
  • Revision ID: monty@inaugust.com-20080914193948-ns2p0lts4qtsqx7n
Merged from client-split.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzledump.cc
1065
1065
    drizzle_options(&drizzle_connection,DRIZZLE_OPT_COMPRESS,NullS);
1066
1066
  if (opt_protocol)
1067
1067
    drizzle_options(&drizzle_connection,DRIZZLE_OPT_PROTOCOL,(char*)&opt_protocol);
1068
 
  drizzle_options(&drizzle_connection, DRIZZLE_SET_CHARSET_NAME, default_charset);
1069
1068
  if (!(drizzle= drizzle_connect(&drizzle_connection,host,user,passwd,
1070
1069
                                  NULL,opt_drizzle_port, NULL,
1071
1070
                                  0)))
1112
1111
  if (!(tmp=(char*) my_malloc(length*2+1, MYF(MY_WME))))
1113
1112
    die(EX_DRIZZLEERR, "Couldn't allocate memory");
1114
1113
 
1115
 
  drizzle_real_escape_string(&drizzle_connection, tmp, pos, length);
 
1114
  drizzle_escape_string(tmp, pos, length);
1116
1115
  fputc('\'', file);
1117
1116
  fputs(tmp, file);
1118
1117
  fputc('\'', file);
2278
2277
                else
2279
2278
                {
2280
2279
                  extended_row.append("'");
2281
 
                  drizzle_real_escape_string(&drizzle_connection,
2282
 
                                             tmp_str,
2283
 
                                             row[i],length);
 
2280
                  drizzle_escape_string(tmp_str,
 
2281
                                        row[i],length);
2284
2282
                  extended_row.append(tmp_str);
2285
2283
                  extended_row.append("'");
2286
2284
                }