diff options
| author | unknown <serg@serg.mylan> | 2005-01-26 08:57:43 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-01-26 08:57:43 +0100 |
| commit | ea2795025e4172437f69e6c5819671c5b93c8aae (patch) | |
| tree | ac2e07e916d252f97c85e54366b9186714597c3d /sql/item_create.cc | |
| parent | ffc492cdd1bef9ac3fa24e453f4e5c117a1caf41 (diff) | |
| download | mariadb-git-ea2795025e4172437f69e6c5819671c5b93c8aae.tar.gz | |
innobase/include/univ.i
remove a change that broke the test
innobase/include/univ.i:
remove a change that broke the test
sql/item_create.cc:
better fix
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 99db184e71f..d959a6f393a 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -377,13 +377,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) |