summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-04-21 10:20:20 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-04-21 10:20:20 +0300
commit28f01f82e1cb682566017b52017469be7638dd49 (patch)
treed496cb0936d25973b95f6eb591508c2e493032b8 /sql/sql_show.cc
parenta3099a3b4a394da360b5c1e7ae6dc985ae2f7f2f (diff)
parent80ed136e6dd4a021b1fc9b7bd7077bf989c3d247 (diff)
downloadmariadb-git-bb-10.6-merge.tar.gz
WIP merge 10.5 to 10.6bb-10.6-merge
FIXME: Disabled tests due to upgrading libmariadb: main.mysql_client_test main.mysql_client_test_nonblock main.mysql_client_test_comp
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r--sql/sql_show.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index b1cc696e9fe..38b3d62d539 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -7061,8 +7061,7 @@ static bool store_trigger(THD *thd, Trigger *trigger,
(my_time_t)(trigger->create_time/100));
/* timestamp is with 6 digits */
timestamp.second_part= (trigger->create_time % 100) * 10000;
- ((Field_temporal_with_date*) table->field[16])->store_time_dec(&timestamp,
- 2);
+ table->field[16]->store_time_dec(&timestamp, 2);
}
sql_mode_string_representation(thd, trigger->sql_mode, &sql_mode_rep);