database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

After merge fixes

Browse Source 
mysql-test/r/ctype_ucs.result:
  Fixed warning after merge
sql/field.cc:
  After merge fix
sql/item_cmpfunc.cc:
  Style & comment changes
sql/sql_yacc.yy:
  After merge fix
This commit is contained in:
unknown
2005-02-15 19:25:42 +02:00
parent e2edf02421
commit 6992c01029
4 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/field.cc
View File

@ -2452,7 +2452,7 @@ int Field_long::store(const char *from,uint len,CHARSET_INFO *cs)
from+= tmp;
end= (char*) from+len;
tmp= my_strtoll10(from, &end, &error);
tmp= cs->cset->my_strtoll10(cs, from, &end, &error);
if (error != MY_ERRNO_EDOM)
{