diff options
| author | serg@serg.mylan <> | 2005-01-26 09:05:58 +0100 |
|---|---|---|
| committer | serg@serg.mylan <> | 2005-01-26 09:05:58 +0100 |
| commit | d8f35cec21f5450ecff1e54729aafdaa40fed4a9 (patch) | |
| tree | 57f5997331e78826375c5674e185cd8831448730 /sql/item_create.cc | |
| parent | 76f3d6f0020f691109707e3937d24f521f66b853 (diff) | |
| parent | 7084b494c44eb2d815652640381c8930981dc435 (diff) | |
| download | mariadb-git-d8f35cec21f5450ecff1e54729aafdaa40fed4a9.tar.gz | |
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
Diffstat (limited to 'sql/item_create.cc')
| -rw-r--r-- | sql/item_create.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index 8a5aeb6c9b7..9fb44658dd5 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -370,13 +370,14 @@ Item *create_func_space(Item *a) { uint dummy_errors; sp= new Item_string("",0,cs); - sp->str_value.copy(" ", 1, &my_charset_latin1, cs, &dummy_errors); + if (sp) + sp->str_value.copy(" ", 1, &my_charset_latin1, cs, &dummy_errors); } else { sp= new Item_string(" ",1,cs); } - return new Item_func_repeat(sp, a); + return sp ? new Item_func_repeat(sp, a) : 0; } Item *create_func_soundex(Item* a) |