diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-05-28 16:57:58 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-05-28 16:57:58 +0200 |
| commit | b519f2b626ebd1f3243a21dc883cefa6a26460f9 (patch) | |
| tree | faad721ece99fc071000e695861e37d45acda0e5 /sql/sql_string.cc | |
| parent | 152dfe58678af35769ca3cd66db592d129b4c08b (diff) | |
| download | mariadb-git-b519f2b626ebd1f3243a21dc883cefa6a26460f9.tar.gz | |
Fix compile errors and warnings and test errors introduced by microseconds push.
Also, change windows timespec definition to be Unix-ish - simplifies handling a lot.
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 56702a2308f..60f80fc52e8 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -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) |