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

Fix compile errors and warnings and test errors introduced by microseconds push.

Browse Source 
Also, change windows timespec definition to be Unix-ish - simplifies handling a lot.
This commit is contained in:
Vladislav Vaintroub
2011-05-28 16:57:58 +02:00
parent 152dfe5867
commit b519f2b626
12 changed files with 31 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_string.cc
View File

@ -580,8 +580,8 @@ uint32 String::numchars()
int String::charpos(longlong i,uint32 offset)
{
if (i <= 0)
return i;
return str_charset->cset->charpos(str_charset,Ptr+offset,Ptr+str_length,i);
return (int)i;
return (int)str_charset->cset->charpos(str_charset,Ptr+offset,Ptr+str_length,(size_t)i);
}
int String::strstr(const String &s,uint32 offset)