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/set_var.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/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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); |