diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-26 12:02:07 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-26 12:02:07 +0300 |
| commit | 97a4a3872e5037b8db1e8c27152740190330ab9c (patch) | |
| tree | 4ac50bc687f7f1e55f4d4ff25e8a96555501e2bf /sql/sql_show.cc | |
| parent | 8f8f2aea93835899345454f87768fd649749e29c (diff) | |
| parent | 1e08e08ccb8896c1f0d2f673c16f5b92cdf7dc46 (diff) | |
| download | mariadb-git-97a4a3872e5037b8db1e8c27152740190330ab9c.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 452690f3237..1e32e8b2925 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -9669,11 +9669,6 @@ int finalize_schema_table(st_plugin_int *plugin) DBUG_RETURN(0); } -/* - This is used to create a timestamp field -*/ - -MYSQL_TIME zero_time={ 0,0,0,0,0,0,0,0, MYSQL_TIMESTAMP_TIME }; /** Output trigger information (SHOW CREATE TRIGGER) to the client. @@ -9758,8 +9753,9 @@ static bool show_create_trigger_impl(THD *thd, Trigger *trigger) MY_CS_NAME_SIZE), mem_root); + static const Datetime zero_datetime(Datetime::zero()); Item_datetime_literal *tmp= (new (mem_root) - Item_datetime_literal(thd, &zero_time, 2)); + Item_datetime_literal(thd, &zero_datetime, 2)); tmp->set_name(thd, Lex_cstring(STRING_WITH_LEN("Created"))); fields.push_back(tmp, mem_root); |