← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/sql_string.h

Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/sql_string.h
111
111
 
112
112
  void set(String &str,uint32 offset,uint32 arg_length)
113
113
  {
114
 
    DBUG_ASSERT(&str != this);
 
114
    assert(&str != this);
115
115
    free();
116
116
    Ptr=(char*) str.ptr()+offset; str_length=arg_length; alloced=0;
117
117
    if (str.Alloced_length)
217
217
        It is forbidden to do assignments like 
218
218
        some_string = substring_of_that_string
219
219
       */
220
 
      DBUG_ASSERT(!s.uses_buffer_owned_by(this));
 
220
      assert(!s.uses_buffer_owned_by(this));
221
221
      free();
222
222
      Ptr=s.Ptr ; str_length=s.str_length ; Alloced_length=s.Alloced_length;
223
223
      alloced=0;