diff options
| author | Alexander Barkov <bar@mariadb.org> | 2014-09-04 08:50:06 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2014-09-04 08:50:06 +0400 |
| commit | 58eb51d1cfb50058ce52dda5ef95fb7f2144467d (patch) | |
| tree | d232bc58d654228a2ddcefe0eb60382c5cc3ad6f /sql/item_create.cc | |
| parent | 1e66871713b7196daf1e9416823d57d5bbac85a1 (diff) | |
| download | mariadb-git-58eb51d1cfb50058ce52dda5ef95fb7f2144467d.tar.gz | |
MDEV-6044 MySQL BUG#12735829 - SPACE() FUNCTION WARNING REFERS TO REPEAT() IN ER_WARN_ALLOWED_PACKET_OVERFLOWED
Merged from 5.6
Diffstat (limited to 'sql/item_create.cc')
| -rw-r--r-- | sql/item_create.cc | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index 35716937f12..fa8249c3321 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -5235,26 +5235,7 @@ Create_func_space Create_func_space::s_singleton; Item* Create_func_space::create_1_arg(THD *thd, Item *arg1) { - /** - TODO: Fix Bug#23637 - The parsed item tree should not depend on - <code>thd->variables.collation_connection</code>. - */ - CHARSET_INFO *cs= thd->variables.collation_connection; - Item_string *sp; - - if (cs->mbminlen > 1) - { - uint dummy_errors; - sp= new (thd->mem_root) Item_string("", 0, cs, DERIVATION_COERCIBLE, MY_REPERTOIRE_ASCII); - sp->copy_value(" ", 1, &my_charset_latin1, cs, &dummy_errors); - } - else - { - sp= new (thd->mem_root) Item_string(" ", 1, cs, DERIVATION_COERCIBLE, MY_REPERTOIRE_ASCII); - } - - return new (thd->mem_root) Item_func_repeat(sp, arg1); + return new (thd->mem_root) Item_func_space(arg1); } |