diff options
| author | unknown <kroki/tomash@moonlight.home> | 2007-01-09 12:39:05 +0300 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.home> | 2007-01-09 12:39:05 +0300 |
| commit | beac4a6f8a1326f30a2bc96a5eb3aa9d437de614 (patch) | |
| tree | 1bc7138a113da366360423ab7830eb19d97ba99e /sql | |
| parent | c6d317831ab8ccbef3685a5f03ca8c2cfa4d92f0 (diff) | |
| parent | 4fe1561f980c052f8bebd1c38e1fac6c3291fa7a (diff) | |
| download | mariadb-git-beac4a6f8a1326f30a2bc96a5eb3aa9d437de614.tar.gz | |
Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-4.0-bug23443
into moonlight.home:/home/tomash/src/mysql_ab/mysql-4.1-bug23443
heap/hp_block.c:
Auto merged
sql/item_func.cc:
Auto merged
heap/hp_write.c:
Manual merge.
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 1af49179aee..d4b7af68c3b 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2468,8 +2468,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; } } |