diff options
| author | unknown <kostja@bodhi.local> | 2007-01-12 18:06:43 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2007-01-12 18:06:43 +0300 |
| commit | b0a7bf58198f773bc139214f9f17f9a1e1a4d378 (patch) | |
| tree | d480a21e747de2914f974a9a4dcbc7945c3f30ba /sql | |
| parent | 6c42f980bdf258d64c5f2ae3472c887a0c1211a7 (diff) | |
| parent | 22c61cbaeb8fce227531de4d8865d0088c00d7da (diff) | |
| download | mariadb-git-b0a7bf58198f773bc139214f9f17f9a1e1a4d378.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into bodhi.local:/opt/local/work/mysql-4.1-runtime
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 635c6b4c6d6..2456d7fb051 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2473,8 +2473,9 @@ bool Item_func_set_user_var::update_hash(void *ptr, uint length, char *pos= (char*) entry+ ALIGN_SIZE(sizeof(user_var_entry)); if (entry->value == pos) entry->value=0; - if (!(entry->value=(char*) my_realloc(entry->value, length, - MYF(MY_ALLOW_ZERO_PTR)))) + entry->value= (char*) my_realloc(entry->value, length, + MYF(MY_ALLOW_ZERO_PTR | MY_WME)); + if (!entry->value) goto err; } } |