← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_string.cc

  • Committer: Lee Bieber
  • Date: 2010-10-29 13:35:47 UTC
  • mfrom: (1890.1.3 build)
  • Revision ID: kalebral@gmail.com-20101029133547-ehu44so1ij4cylr5
Merge Shrews - fix bug 667288: Transaction_reader reporting error about dangerously large protobuf message
Merge Monty - fix bug 667598: static plugins should be addable via plugin-add   
Merge Brian - clean up C++ warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_string.cc
117
117
  str_length=0;
118
118
  if (Alloced_length < arg_length)
119
119
  {
120
 
    free();
 
120
    if (Alloced_length > 0)
 
121
      free();
121
122
    if (!(Ptr=(char*) malloc(arg_length)))
122
123
      return true;
123
124
    Alloced_length=arg_length;