diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-11-21 00:02:24 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-11-21 00:02:24 +0100 |
| commit | 82f56328eab4d844d1903398cc764793262d2734 (patch) | |
| tree | 54c2855b3d18ecd70ee911957d011cec4d007cc9 /sql/item_strfunc.cc | |
| parent | 4e2973b48effee11d2b7f2ec99e2f448b494f2e6 (diff) | |
| download | mariadb-git-82f56328eab4d844d1903398cc764793262d2734.tar.gz | |
after merge fixes:
* adjust viossl.c to take account the new code
(SSL_get_error is used now, cannot simply remap it)
* remove unnecessary version check
* update the test to 10.0
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 402dbef00b7..32a19341895 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -3274,18 +3274,6 @@ String *Item_func_lpad::val_str(String *str) res->set_charset(&my_charset_bin); pad->set_charset(&my_charset_bin); } -#if MARIADB_VERSION_ID < 1000000 - /* - Well-formedness is handled on a higher level in 10.0, - no needs to check it here again. - */ else - { - // This will chop off any trailing illegal characters from pad. - String *well_formed_pad= args[2]->check_well_formed_result(pad, false); - if (!well_formed_pad) - goto err; - } -#endif res_char_length= res->numchars(); |