diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-05-19 19:16:17 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-05-19 19:16:17 +0200 |
| commit | f06cac336ba7a27493fc753d2bf37e87137a1cdc (patch) | |
| tree | a54fa81ccb21526e54c820e1a69c4362f248b302 /client | |
| parent | 03b33425e5a3de3fad070aa21e7fc7baf8104c81 (diff) | |
| download | mariadb-git-f06cac336ba7a27493fc753d2bf37e87137a1cdc.tar.gz | |
post review changes 2
sql/event_parse_data.cc:
don't use "not_used" variable
sql/item_timefunc.cc:
Item_temporal_func::fix_length_and_dec()
and other changes
sql/item_timefunc.h:
introducing Item_timefunc::fix_length_and_dec()
sql/share/errmsg.txt:
don't say "column X" in the error message that used not only for columns
Diffstat (limited to 'client')
| -rw-r--r-- | client/sql_string.cc | 2 | ||||
| -rw-r--r-- | client/sql_string.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/client/sql_string.cc b/client/sql_string.cc index 50fb4a5b777..10c8f261747 100644 --- a/client/sql_string.cc +++ b/client/sql_string.cc @@ -549,7 +549,7 @@ uint32 String::numchars() return str_charset->cset->numchars(str_charset, Ptr, Ptr+str_length); } -int String::charpos(int i,uint32 offset) +int String::charpos(longlong i,uint32 offset) { if (i <= 0) return i; diff --git a/client/sql_string.h b/client/sql_string.h index 84fe26a54b9..497151e7b02 100644 --- a/client/sql_string.h +++ b/client/sql_string.h @@ -269,7 +269,7 @@ public: friend int stringcmp(const String *a,const String *b); friend String *copy_if_not_alloced(String *a,String *b,uint32 arg_length); uint32 numchars(); - int charpos(int i,uint32 offset=0); + int charpos(longlong i,uint32 offset=0); int reserve(uint32 space_needed) { |