mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
0ea47f3ed4
The problem was that some facilities (like CONVERT_TZ() function or server HELP statement) may require implicit access to some tables in 'mysql' database. This access was done by ordinary means of adding such tables to the list of tables the query is going to open. However, if we issued LOCK TABLES before that, we would get "table was not locked" error trying to open such implicit tables. The solution is to treat certain tables as MySQL system tables, like we already do for mysql.proc. Such tables may be opened for reading at any moment regardless of any locks in effect. The cost of this is that system table may be locked for writing only together with other system tables, it is disallowed to lock system tables for writing and have any other lock on any other table. After this patch the following tables are treated as MySQL system tables: mysql.help_category mysql.help_keyword mysql.help_relation mysql.help_topic mysql.proc (it already was) mysql.time_zone mysql.time_zone_leap_second mysql.time_zone_name mysql.time_zone_transition mysql.time_zone_transition_type These tables are now opened with open_system_tables_for_read() and closed with close_system_tables(), or one table may be opened with open_system_table_for_update() and closed with close_thread_tables() (the latter is used for mysql.proc table, which is updated as part of normal MySQL server operation). These functions may be used when some tables were opened and locked already. NOTE: online update of time zone tables is not possible during replication, because there's no time zone cache flush neither on LOCK TABLES, nor on FLUSH TABLES, so the master may serve stale time zone data from cache, while on slave updated data will be loaded from the time zone tables. mysql-test/r/help.result: Update result. mysql-test/r/lock.result: Update result. mysql-test/r/sp-error.result: Update result. mysql-test/r/timezone2.result: Add result for bug#9953: CONVERT_TZ requires mysql.time_zone_name to be locked. mysql-test/r/view.result: Update result: use table t3 rather than utilize MySQL system table. mysql-test/t/help.test: Test that we can use HELP even under LOCK TABLES. mysql-test/t/lock.test: Test LOCK TABLE on system tables. mysql-test/t/timezone2.test: Add test case for bug#9953: CONVERT_TZ requires mysql.time_zone_name to be locked. mysql-test/t/view.test: Update test: use table t3 rather that utilize MySQL system table. sql/handler.h: Fix comment for 'count' parameter of check_if_locking_is_allowed(). Add 'current' and 'system_count' parameters. sql/item_create.cc: We no longer have LEX::add_time_zone_tables_to_query_tables(). sql/item_timefunc.cc: We no longer have LEX::time_zone_tables_used, so Item_func_convert_tz::fix_fields() became the same as base Item_date_func::fix_fields(). my_tz_find() no longer takes table list, but takes THD pointer now. sql/item_timefunc.h: Remove dead field and method. sql/lock.cc: Pass values for 'current' and 'system_count' to check_if_locking_is_allowed(). sql/log_event.cc: We no longer have my_tz_find_with_opening_tz_tables(), its functions is performed by my_tz_find(). sql/mysql_priv.h: Add functions to work with MySQL system tables. sql/set_var.cc: my_tz_find() no longer takes table list, but takes THD pointer now. sql/sp.cc: Remove close_proc_table(). Use close_system_tables() instead. Use open_system_tables_for_read() and open_system_table_for_update(). sql/sp.h: Remove close_proc_table() declaration. sql/sql_base.cc: Add implementation of open_system_tables_for_read(), close_system_tables(), open_system_table_for_update(). sql/sql_help.cc: Operate on MySQL system tables mysql.help_* with open_system_tables_for_read() and close_system_tables() to allow the usage of HELP statement under LOCK TABLES. sql/sql_lex.cc: Remove LEX::time_zone_tables_used and LEX::add_time_zone_tables_to_query_tables() which are no longer used. sql/sql_lex.h: Remove LEX::time_zone_tables_used and LEX::add_time_zone_tables_to_query_tables() which are no longer used. sql/sql_parse.cc: Remove references to LEX::time_zone_tables_used and my_tz_check_n_skip_implicit_tables() which are no longer used. sql/sql_show.cc: Use close_system_tables() instead of removed close_proc_table(). sql/sql_view.cc: LEX::time_zone_tables_used is no longer there. sql/sql_yacc.yy: LEX::add_time_zone_tables_to_query_tables() is no longer there. sql/table.cc: Add more tables that should be treated as MySQL system tables. sql/share/errmsg.txt: Change the error message, as now we allow write-locking of several system tables if not mixed with ordinary tables. sql/tztime.cc: Do not add time zone tables to the list of query tables in tz_init_table_list(). Remove fake_time_zone_tables_list and my_tz_get_tables_list(). In my_tz_init(), open mysql.time_zone_leap_second with simple_open_n_lock_tables(), but pass time zone name to my_tz_find(), which will open and close time zone tables as necessary. In tz_load_from_open_tables() do not call table->use_all_columns(), as this was already done in open_system_tables_for_read(). my_tz_find() takes THD pointer instead of table list, and calls open_system_tables_for_read() and close_system_tables() as necessary. Remove my_tz_find_with_opening_tz_tables(). sql/tztime.h: Remove declarations of my_tz_get_table_list(), my_tz_find_with_opening_tz_tables(), fake_time_zone_tables_list, definition of my_tz_check_n_skip_implicit_tables(). Update prototype for my_tz_find(). storage/csv/ha_tina.cc: Add new parameters to check_if_locking_is_allowed(). storage/csv/ha_tina.h: Add new parameters to check_if_locking_is_allowed(). storage/myisam/ha_myisam.cc: Add new parameters to check_if_locking_is_allowed(). In this function we count system tables. If there are system tables, but there are also non-system tables, we report an error. storage/myisam/ha_myisam.h: Add new parameters to check_if_locking_is_allowed().
138 lines
5.5 KiB
Text
138 lines
5.5 KiB
Text
# category: topic: keyword:
|
|
#
|
|
# impossible_category_1
|
|
# impossible_function_1
|
|
# impossible_function_5
|
|
# impossible_function_2
|
|
# impossible_function_1
|
|
# impossible_category_2
|
|
# impossible_function_3
|
|
# impossible_function_6
|
|
# impossible_function_4
|
|
# impossible_function_6
|
|
# impossible_category_3
|
|
# impossible_function_7
|
|
|
|
insert into mysql.help_category(help_category_id,name)values(1,'impossible_category_1');
|
|
select @category1_id:= 1;
|
|
insert into mysql.help_category(help_category_id,name)values(2,'impossible_category_2');
|
|
select @category2_id:= 2;
|
|
insert into mysql.help_category(help_category_id,name,parent_category_id)values(3,'impossible_category_3',@category2_id);
|
|
select @category3_id:= 3;
|
|
|
|
insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(1,'impossible_function_1',@category1_id,'description of \n impossible_function1\n','example of \n impossible_function1');
|
|
select @topic1_id:= 1;
|
|
insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(2,'impossible_function_2',@category1_id,'description of \n impossible_function2\n','example of \n impossible_function2');
|
|
select @topic2_id:= 2;
|
|
insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(3,'impossible_function_3',@category2_id,'description of \n impossible_function3\n','example of \n impossible_function3');
|
|
select @topic3_id:= 3;
|
|
insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(4,'impossible_function_4',@category2_id,'description of \n impossible_function4\n','example of \n impossible_function4');
|
|
select @topic4_id:= 4;
|
|
insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(5,'impossible_function_7',@category3_id,'description of \n impossible_function5\n','example of \n impossible_function7');
|
|
select @topic5_id:= 5;
|
|
|
|
insert into mysql.help_keyword(help_keyword_id,name)values(1,'impossible_function_1');
|
|
select @keyword1_id:= 1;
|
|
insert into mysql.help_keyword(help_keyword_id,name)values(2,'impossible_function_5');
|
|
select @keyword2_id:= 2;
|
|
insert into mysql.help_keyword(help_keyword_id,name)values(3,'impossible_function_6');
|
|
select @keyword3_id:= 3;
|
|
|
|
insert into mysql.help_relation(help_keyword_id,help_topic_id)values(@keyword1_id,@topic2_id);
|
|
insert into mysql.help_relation(help_keyword_id,help_topic_id)values(@keyword2_id,@topic1_id);
|
|
insert into mysql.help_relation(help_keyword_id,help_topic_id)values(@keyword3_id,@topic3_id);
|
|
insert into mysql.help_relation(help_keyword_id,help_topic_id)values(@keyword3_id,@topic4_id);
|
|
|
|
##############
|
|
help 'function_of_my_dream';
|
|
help '%possible_f%';
|
|
help 'impossible_func%';
|
|
help 'impossible_category%';
|
|
help 'impossible_%';
|
|
|
|
help '%function_1';
|
|
help '%function_2';
|
|
help '%function_3';
|
|
help '%function_4';
|
|
help '%function_5';
|
|
help '%function_6';
|
|
help '%function_7';
|
|
|
|
help '%category_2';
|
|
help 'impossible_function_1';
|
|
help 'impossible_category_1';
|
|
##############
|
|
|
|
--disable_warnings
|
|
alter table mysql.help_relation engine=innodb;
|
|
alter table mysql.help_keyword engine=innodb;
|
|
alter table mysql.help_topic engine=innodb;
|
|
alter table mysql.help_category engine=innodb;
|
|
--enable_warnings
|
|
|
|
##############
|
|
help 'function_of_my_dream';
|
|
help '%possible_f%';
|
|
help 'impossible_func%';
|
|
help 'impossible_category%';
|
|
help 'impossible_%';
|
|
|
|
help '%function_1';
|
|
help '%function_2';
|
|
help '%function_3';
|
|
help '%function_4';
|
|
help '%function_5';
|
|
help '%function_6';
|
|
help '%function_7';
|
|
|
|
help '%category_2';
|
|
help 'impossible_function_1';
|
|
help 'impossible_category_1';
|
|
##############
|
|
|
|
alter table mysql.help_relation engine=myisam;
|
|
alter table mysql.help_keyword engine=myisam;
|
|
alter table mysql.help_topic engine=myisam;
|
|
alter table mysql.help_category engine=myisam;
|
|
|
|
delete from mysql.help_topic where help_topic_id=@topic1_id;
|
|
delete from mysql.help_topic where help_topic_id=@topic2_id;
|
|
delete from mysql.help_topic where help_topic_id=@topic3_id;
|
|
delete from mysql.help_topic where help_topic_id=@topic4_id;
|
|
delete from mysql.help_topic where help_topic_id=@topic5_id;
|
|
|
|
delete from mysql.help_category where help_category_id=@category3_id;
|
|
delete from mysql.help_category where help_category_id=@category2_id;
|
|
delete from mysql.help_category where help_category_id=@category1_id;
|
|
|
|
delete from mysql.help_keyword where help_keyword_id=@keyword1_id;
|
|
delete from mysql.help_keyword where help_keyword_id=@keyword2_id;
|
|
delete from mysql.help_keyword where help_keyword_id=@keyword3_id;
|
|
|
|
delete from mysql.help_relation where help_keyword_id=@keyword1_id and help_topic_id=@topic2_id;
|
|
delete from mysql.help_relation where help_keyword_id=@keyword2_id and help_topic_id=@topic1_id;
|
|
delete from mysql.help_relation where help_keyword_id=@keyword3_id and help_topic_id=@topic3_id;
|
|
delete from mysql.help_relation where help_keyword_id=@keyword3_id and help_topic_id=@topic4_id;
|
|
|
|
--echo End of 4.1 tests.
|
|
|
|
#
|
|
# Test that we can use HELP even under LOCK TABLES. See bug#9953:
|
|
# CONVERT_TZ requires mysql.time_zone_name to be locked.
|
|
#
|
|
--disable_warnings
|
|
DROP TABLE IF EXISTS t1;
|
|
--enable_warnings
|
|
|
|
CREATE TABLE t1 (i INT);
|
|
|
|
LOCK TABLES t1 WRITE;
|
|
|
|
HELP no_such_topic;
|
|
|
|
UNLOCK TABLES;
|
|
|
|
DROP TABLE t1;
|
|
|
|
|
|
--echo End of 5.1 tests.
|