diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-15 20:00:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-15 21:00:41 +0100 |
| commit | 0508d327aef520d3131ff8a85ed610337149fffc (patch) | |
| tree | 7e04769f49b4aded9053adcad442fe00eb487d98 /sql/tztime.cc | |
| parent | bb8c82c66abddf796e8d44f817518e5ab38ae6e4 (diff) | |
| parent | 34db9958e28c325b0f708f78b7ff029de810d5ea (diff) | |
| download | mariadb-git-0508d327aef520d3131ff8a85ed610337149fffc.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index 82160231b03..1167ea18e7e 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -1537,16 +1537,11 @@ my_offset_tzs_get_key(Time_zone_offset *entry, static void tz_init_table_list(TABLE_LIST *tz_tabs) { - bzero(tz_tabs, sizeof(TABLE_LIST) * MY_TZ_TABLES_COUNT); - for (int i= 0; i < MY_TZ_TABLES_COUNT; i++) { - tz_tabs[i].alias= tz_tabs[i].table_name= tz_tables_names[i].str; - tz_tabs[i].table_name_length= tz_tables_names[i].length; - tz_tabs[i].db= tz_tables_db_name.str; - tz_tabs[i].db_length= tz_tables_db_name.length; - tz_tabs[i].lock_type= TL_READ; - + tz_tabs[i].init_one_table(tz_tables_db_name.str, tz_tables_db_name.length, + tz_tables_names[i].str, tz_tables_names[i].length, + NULL, TL_READ); if (i != MY_TZ_TABLES_COUNT - 1) tz_tabs[i].next_global= tz_tabs[i].next_local= &tz_tabs[i+1]; if (i != 0) |