← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

  • Committer: Olaf van der Spek
  • Date: 2011-07-07 13:41:07 UTC
  • mto: This revision was merged to the branch mainline in revision 2385.
  • Revision ID: olafvdspek@gmail.com-20110707134107-6mi7pauiatxtf4oe
Rename strmake to strdup (standard name)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
425
425
        push_warning_printf(&getSession(), DRIZZLE_ERROR::WARN_LEVEL_WARN, ER_REMOVED_SPACES, ER(ER_REMOVED_SPACES), str + length - orig_len);
426
426
    }
427
427
  }
428
 
  name= memory::sql_strmake(str, length);
 
428
  name= memory::sql_strdup(str, length);
429
429
}
430
430
 
431
431
bool Item::eq(const Item *item, bool) const
1431
1431
      if (item->null_value)
1432
1432
        new_item= new Item_null(name);
1433
1433
      else
1434
 
        new_item= new Item_string(name, memory::sql_strmake(result->ptr(), result->length()), result->length(), result->charset());
 
1434
        new_item= new Item_string(name, memory::sql_strdup(result->ptr(), result->length()), result->length(), result->charset());
1435
1435
      break;
1436
1436
    }
1437
1437
  case INT_RESULT: