mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-30 04:05:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

after merge fixes:

Browse source 
* 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
This commit is contained in:
Sergei Golubchik 2014-11-21 00:02:24 +01:00
commit 82f56328ea
4 changed files with 12 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sql/item_strfunc.cc
View file

@ -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();