diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-05-19 19:01:46 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-05-19 19:01:46 +0200 |
| commit | 8ddcd0cda8e6e90a58e9ea64f0f3773ea0037f0b (patch) | |
| tree | 4765748aeb7aafb09e259e1a355e28c11819e9c0 /sql/field.h | |
| parent | 5346cb8d2745acd660b301092458e231c9f53319 (diff) | |
| download | mariadb-git-8ddcd0cda8e6e90a58e9ea64f0f3773ea0037f0b.tar.gz | |
post-review changes 1
include/my_time.h:
remove duplicate defines.
cast to ulonglong to avoid overflow
sql/field.cc:
perform sign extension when reading packed TIME values
sql/item_cmpfunc.cc:
when converting a string to a date for the purpose of comparing it with another date,
we should ignore strict sql mode.
sql/item_timefunc.cc:
better error message
sql/item_timefunc.h:
limit decimals appropriately
sql/share/errmsg.txt:
don't refer to an object as a "column" in error messages that are used not only for columns.
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/field.h b/sql/field.h index d5d5ad32744..75cf3858e6f 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1234,7 +1234,7 @@ public: dec(dec_arg) { DBUG_ASSERT(dec); - DBUG_ASSERT(dec <= MAX_SEC_PART_DIGITS); + DBUG_ASSERT(dec <= TIME_SECOND_PART_DIGITS); } void sql_type(String &str) const; long get_timestamp(ulong *sec_part) const; @@ -1407,7 +1407,7 @@ public: dec(dec_arg) { DBUG_ASSERT(dec); - DBUG_ASSERT(dec <= MAX_SEC_PART_DIGITS); + DBUG_ASSERT(dec <= TIME_SECOND_PART_DIGITS); } enum ha_base_keytype key_type() const { return HA_KEYTYPE_BINARY; } uint decimals() const { return dec; } @@ -1476,7 +1476,7 @@ public: field_name_arg, cs), dec(dec_arg) { DBUG_ASSERT(dec); - DBUG_ASSERT(dec <= MAX_SEC_PART_DIGITS); + DBUG_ASSERT(dec <= TIME_SECOND_PART_DIGITS); } enum ha_base_keytype key_type() const { return HA_KEYTYPE_BINARY; } int store_decimal(const my_decimal *d); |