diff options
| author | bar@bar.myoffice.izhnet.ru <> | 2008-03-07 15:28:51 +0400 |
|---|---|---|
| committer | bar@bar.myoffice.izhnet.ru <> | 2008-03-07 15:28:51 +0400 |
| commit | c49eccfe71765037e68de831e9c1d7ff36b419f1 (patch) | |
| tree | 7386b6dfe3090cfee0e35ca91695bd81865142f1 /sql/item_create.cc | |
| parent | d079c2c49dd932dc22d2021fdcc0c591020166a3 (diff) | |
| parent | 86d9b5e9dc89ce9bd34d54c438f3046bafae7e4a (diff) | |
| download | mariadb-git-c49eccfe71765037e68de831e9c1d7ff36b419f1.tar.gz | |
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b27580v2
into mysql.com:/home/bar/mysql-work/mysql-5.1.b27580
Additonal after merge fix
Diffstat (limited to 'sql/item_create.cc')
| -rw-r--r-- | sql/item_create.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index 40578bef5f8..49cc33b95a7 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -4354,12 +4354,12 @@ Create_func_space::create(THD *thd, Item *arg1) if (cs->mbminlen > 1) { uint dummy_errors; - sp= new (thd->mem_root) Item_string("", 0, cs); + sp= new (thd->mem_root) Item_string("", 0, cs, DERIVATION_COERCIBLE, MY_REPERTOIRE_ASCII); sp->str_value.copy(" ", 1, &my_charset_latin1, cs, &dummy_errors); } else { - sp= new (thd->mem_root) Item_string(" ", 1, cs); + sp= new (thd->mem_root) Item_string(" ", 1, cs, DERIVATION_COERCIBLE, MY_REPERTOIRE_ASCII); } return new (thd->mem_root) Item_func_repeat(sp, arg1); |