← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.cc

  • Committer: Brian Aker
  • Date: 2008-08-12 00:57:48 UTC
  • mfrom: (287.3.26 codestyle)
  • Revision ID: brian@tangent.org-20080812005748-c0od4bnpov0bvfwn
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.cc
1039
1039
                            "drizzle>> ", MYF(0));
1040
1040
  current_prompt= my_strdup(default_prompt, MYF(0));
1041
1041
  processed_prompt= new string();
 
1042
  processed_prompt->reserve(32);
1042
1043
 
1043
1044
  prompt_counter=0;
1044
1045
 
1120
1121
           INFO_INFO,0,0);
1121
1122
 
1122
1123
  glob_buffer= new string();
 
1124
  glob_buffer->reserve(512);
 
1125
  
1123
1126
  char * output_buff= (char *)malloc(512);
1124
1127
  memset(output_buff, '\0', 512);
1125
1128
 
1856
1859
    }
1857
1860
#endif
1858
1861
        if (!*ml_comment && inchar == '\\' &&
1859
 
        !(drizzle.server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES))
 
1862
            !(*in_string && (drizzle.server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES)))
1860
1863
    {
1861
1864
      // Found possbile one character command like \c
1862
1865
 
2107
2110
 
2108
2111
  /* Converted buffer */
2109
2112
  string fixed_buffer;
 
2113
  fixed_buffer.reserve(512);
2110
2114
 
2111
2115
  /* find out how many lines we have and remove newlines */
2112
2116
  while (*ptr != '\0')
2966
2970
  DRIZZLE_FIELD   *field;
2967
2971
  bool          *num_flag;
2968
2972
  string separator;
 
2973
  
 
2974
  separator.reserve(256);
2969
2975
 
2970
2976
  num_flag=(bool*) my_malloc(sizeof(bool)*drizzle_num_fields(result),
2971
2977
                             MYF(MY_WME));