diff options
author | Monty <monty@mariadb.org> | 2018-01-07 18:03:44 +0200 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2018-01-30 21:33:55 +0200 |
commit | a7e352b54ddfaf91c92951d605cb02a4ffd2676b (patch) | |
tree | dc76f140342938ed2a0fe0e005100402762d5308 /sql/tztime.cc | |
parent | 921c5e931452301a09c84c53ffe35b81e6a1c71a (diff) | |
download | mariadb-git-a7e352b54ddfaf91c92951d605cb02a4ffd2676b.tar.gz |
Changed database, tablename and alias to be LEX_CSTRING
This was done in, among other things:
- thd->db and thd->db_length
- TABLE_LIST tablename, db, alias and schema_name
- Audit plugin database name
- lex->db
- All db and table names in Alter_table_ctx
- st_select_lex db
Other things:
- Changed a lot of functions to take const LEX_CSTRING* as argument
for db, table_name and alias. See init_one_table() as an example.
- Changed some function arguments from LEX_CSTRING to const LEX_CSTRING
- Changed some lists from LEX_STRING to LEX_CSTRING
- threads_mysql.result changed because process list_db wasn't always
correctly updated
- New append_identifier() function that takes LEX_CSTRING* as arguments
- Added new element tmp_buff to Alter_table_ctx to separate temp name
handling from temporary space
- Ensure we store the length after my_casedn_str() of table/db names
- Removed not used version of rename_table_in_stat_tables()
- Changed Natural_join_column::table_name and db_name() to never return
NULL (used for print)
- thd->get_db() now returns db as a printable string (thd->db.str or "")
Diffstat (limited to 'sql/tztime.cc')
-rw-r--r-- | sql/tztime.cc | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index 4581461f8b3..4a3119befd1 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -1476,7 +1476,7 @@ static bool time_zone_tables_exist= 1; for dynamical loading of time zone descriptions. */ -static const LEX_STRING tz_tables_names[MY_TZ_TABLES_COUNT]= +static const LEX_CSTRING tz_tables_names[MY_TZ_TABLES_COUNT]= { { C_STRING_WITH_LEN("time_zone_name")}, { C_STRING_WITH_LEN("time_zone")}, @@ -1484,11 +1484,6 @@ static const LEX_STRING tz_tables_names[MY_TZ_TABLES_COUNT]= { C_STRING_WITH_LEN("time_zone_transition")} }; -/* Name of database to which those tables belong. */ - -static const LEX_STRING tz_tables_db_name= { C_STRING_WITH_LEN("mysql")}; - - class Tz_names_entry: public Sql_alloc { public: @@ -1540,10 +1535,8 @@ tz_init_table_list(TABLE_LIST *tz_tabs) 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].alias= tz_tabs[i].table_name= tz_tables_names[i]; + tz_tabs[i].db= MYSQL_SCHEMA_NAME; tz_tabs[i].lock_type= TL_READ; if (i != MY_TZ_TABLES_COUNT - 1) @@ -1606,9 +1599,9 @@ my_tz_init(THD *org_thd, const char *default_tzname, my_bool bootstrap) THD *thd; TABLE_LIST tz_tables[1+MY_TZ_TABLES_COUNT]; TABLE *table; + const LEX_CSTRING tmp_table_name= { STRING_WITH_LEN("time_zone_leap_second") }; Tz_names_entry *tmp_tzname; my_bool return_val= 1; - char db[]= "mysql"; int res; DBUG_ENTER("my_tz_init"); @@ -1669,13 +1662,10 @@ my_tz_init(THD *org_thd, const char *default_tzname, my_bool bootstrap) leap seconds shared by all time zones. */ - thd->set_db(db, sizeof(db)-1); + thd->set_db(&MYSQL_SCHEMA_NAME); bzero((char*) &tz_tables[0], sizeof(TABLE_LIST)); - tz_tables[0].alias= tz_tables[0].table_name= - (char*)"time_zone_leap_second"; - tz_tables[0].table_name_length= 21; - tz_tables[0].db= db; - tz_tables[0].db_length= sizeof(db)-1; + tz_tables[0].alias= tz_tables[0].table_name= tmp_table_name; + tz_tables[0].db= MYSQL_SCHEMA_NAME; tz_tables[0].lock_type= TL_READ; tz_init_table_list(tz_tables+1); |