diff options
| author | unknown <serg@serg.mylan> | 2005-01-26 09:05:58 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-01-26 09:05:58 +0100 |
| commit | cb271ffec80265c1960b7d909bcb004934baeb13 (patch) | |
| tree | 57f5997331e78826375c5674e185cd8831448730 /sql/item_create.cc | |
| parent | 5afe81ae610e4c4fc85f63e6c2fe5c61d81a4f7b (diff) | |
| parent | ea2795025e4172437f69e6c5819671c5b93c8aae (diff) | |
| download | mariadb-git-cb271ffec80265c1960b7d909bcb004934baeb13.tar.gz | |
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
innobase/include/univ.i:
Auto merged
sql/item_create.cc:
Auto merged
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) |