diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-22 08:42:31 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-22 08:42:31 +0300 |
| commit | cf77951fb6717f5eb87a2b4baad12a33cd155f27 (patch) | |
| tree | 487ef13a47e10adb759fe789b21f7900ad9f3bd8 /sql/table.cc | |
| parent | 1921df669712135b2b6f78c96c2aa6ae9a7399f2 (diff) | |
| parent | 592dc59d7a5f9bd80bffdd9d0f003243ff639767 (diff) | |
| download | mariadb-git-cf77951fb6717f5eb87a2b4baad12a33cd155f27.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 3ed4b355cb5..699102885c2 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2314,7 +2314,6 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write, switch (handler->real_field_type()) { case MYSQL_TYPE_TIMESTAMP2: - case MYSQL_TYPE_DATETIME2: break; case MYSQL_TYPE_LONGLONG: if (vers_can_native) |