diff options
| author | unknown <kroki/tomash@moonlight.home> | 2007-01-09 12:40:34 +0300 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.home> | 2007-01-09 12:40:34 +0300 |
| commit | 19b95ca2062ece8aafdc562f65f26222e4abb026 (patch) | |
| tree | 69a173730fca614ca5aebc884db4421b5e512d80 /sql | |
| parent | d501b2dd3966d4f236b46a3b3bb7b89929e25716 (diff) | |
| parent | beac4a6f8a1326f30a2bc96a5eb3aa9d437de614 (diff) | |
| download | mariadb-git-19b95ca2062ece8aafdc562f65f26222e4abb026.tar.gz | |
Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-4.1-bug23443
into moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug23443
heap/hp_write.c:
Auto merged
sql/item_func.cc:
Auto merged
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 6bbb199a52b..f06f6951ce9 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3663,8 +3663,9 @@ update_hash(user_var_entry *entry, bool set_null, 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) return 1; } } |