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 | |
| 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')
| -rw-r--r-- | sql/field.cc | 4 | ||||
| -rw-r--r-- | sql/item_timefunc.cc | 2 | ||||
| -rw-r--r-- | sql/set_var.cc | 2 | ||||
| -rw-r--r-- | sql/sql_string.cc | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sql/field.cc b/sql/field.cc index 7976c8b0e3c..1887a87f044 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4602,7 +4602,7 @@ int Field_timestamp::store(double nr) /* We don't want to store invalid or fuzzy datetime values in TIMESTAMP */ if (nr < 0 || nr > LONGLONG_MAX) - nr= LONGLONG_MAX; + nr= (double)LONGLONG_MAX; tmp= number_to_datetime((longlong) floor(nr), &l_time, (thd->variables.sql_mode & MODE_NO_ZERO_DATE) | @@ -5075,7 +5075,7 @@ int Field_temporal::store(double nr) Lazy_string_double str(nr); if (nr < 0 || nr > LONGLONG_MAX) - nr= LONGLONG_MAX; + nr= (double)LONGLONG_MAX; longlong tmp= number_to_datetime((longlong) floor(nr), <ime, (TIME_FUZZY_DATE | (thd->variables.sql_mode & diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index e4a2595efed..31607d79e56 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -100,7 +100,7 @@ bool Item_func_sec_to_time::sec_to_time(my_decimal *seconds, MYSQL_TIME *ltime) my_decimal_mul(E_DEC_FATAL_ERROR, &tmp, &sub_seconds, &time_second_part_factor); (void) decimal2longlong(&tmp, &full_seconds); - ltime->second_part= full_seconds; + ltime->second_part= (ulong)full_seconds; return 0; diff --git a/sql/set_var.cc b/sql/set_var.cc index aac6746da82..4d14791a355 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -2915,7 +2915,7 @@ bool sys_var_timestamp::check(THD *thd, set_var *var) if (val < 0 || val > MY_TIME_T_MAX) { char buf[64]; - my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), "timestamp", llstr(val, buf)); + my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), "timestamp", llstr((longlong)val, buf)); return TRUE; } var->save_result.ulonglong_value= hrtime_from_time(val); 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) |