diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-02-11 14:40:35 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-02-11 14:40:35 +0100 |
| commit | 646d1ec83a57d9a5b380079afc3612c1d9acadd5 (patch) | |
| tree | b46ec54915361f3baa221bcd01b4308a55c59c48 /sql/sys_vars.ic | |
| parent | c1eaa385ffb44bdf6264d2cc4b4cc0e10284c88a (diff) | |
| parent | 58b70dc13630d2f2f0244359d6351085d70fd5dd (diff) | |
| download | mariadb-git-646d1ec83a57d9a5b380079afc3612c1d9acadd5.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/sys_vars.ic')
| -rw-r--r-- | sql/sys_vars.ic | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sys_vars.ic b/sql/sys_vars.ic index e983347f4ce..f33f469b160 100644 --- a/sql/sys_vars.ic +++ b/sql/sys_vars.ic @@ -2634,7 +2634,6 @@ public: if (!Sys_var_enum::do_check(thd, var)) return false; MYSQL_TIME ltime; - // FIXME: please resolve both conflicts to "old" and remove this comment Datetime::Options opt(TIME_CONV_NONE | TIME_NO_ZERO_IN_DATE | TIME_NO_ZERO_DATE, thd); |