diff options
| author | monty@hundin.mysql.fi <> | 2002-06-03 12:59:31 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-06-03 12:59:31 +0300 |
| commit | f0b28da6f91cf87804015b5dde4820be040c2de7 (patch) | |
| tree | be04186411dc657ef6bbcbe01267d30f2675c914 /sql/sql_string.cc | |
| parent | 3ede8f6289b53345f44aecffd70c7e291f88186b (diff) | |
| parent | 544f95c45112993df1d31d3eda859dd5e4efff89 (diff) | |
| download | mariadb-git-f0b28da6f91cf87804015b5dde4820be040c2de7.tar.gz | |
merge with 4.0
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index b8e2ba7b536..9014ca430d9 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -40,19 +40,16 @@ extern void sql_element_free(void *ptr); bool String::real_alloc(uint32 arg_length) { arg_length=ALIGN_SIZE(arg_length+1); + str_length=0; if (Alloced_length < arg_length) { free(); if (!(Ptr=(char*) my_malloc(arg_length,MYF(MY_WME)))) - { - str_length=0; return TRUE; - } Alloced_length=arg_length; alloced=1; } Ptr[0]=0; - str_length=0; return FALSE; } |