diff options
author | Alexander Barkov <bar@mariadb.org> | 2014-11-03 21:45:06 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.org> | 2014-11-03 21:45:06 +0400 |
commit | 43f185e171eecdce41e71c548ce0bc2bd6969c0f (patch) | |
tree | ef2a7c8ea219bb66aeb1532eedfae9268f9f3ae1 /sql/field.cc | |
parent | a245543bc8821b15409b839197d911302fb5bfb0 (diff) | |
download | mariadb-git-43f185e171eecdce41e71c548ce0bc2bd6969c0f.tar.gz |
MDEV-5528 Command line variable to choose MariaDB-5.3 vs MySQL-5.6 temporal data formats
Diffstat (limited to 'sql/field.cc')
-rw-r--r-- | sql/field.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 411f793d613..3d5ba98c609 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -5042,7 +5042,8 @@ int Field_timestamp_with_dec::set_time() { THD *thd= get_thd(); set_notnull(); - store_TIME(thd->query_start(), thd->query_start_sec_part()); + // Avoid writing microseconds into binlog for FSP=0 + store_TIME(thd->query_start(), decimals() ? thd->query_start_sec_part() : 0); return 0; } |