mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
3f24932124
Collect all tables and SPs refered by a statement, and open all tables with an implicit LOCK TABLES. Do find things refered by triggers and views, we open them first (and then repeat this until nothing new is found), before doing the actual lock tables. mysql-test/r/information_schema.result: Updated result for WL#2130. mysql-test/r/lock.result: Updated result for WL#2130. mysql-test/r/sp-error.result: Updated result for WL#2130. mysql-test/r/sp.result: Updated result for WL#2130. mysql-test/r/view.result: Updated result for WL#2130. mysql-test/t/information_schema.test: Disabled one test case due to a bug involving LOCK TABLES, which shows up with WL#2130. mysql-test/t/lock.test: New error message with WL#2130. This change is under debate and might change in the future, but will do for now. mysql-test/t/sp-error.test: Updated for WL#2130. Some tests are voided when table access does work from functions. mysql-test/t/sp.test: Updated for WL#2130. mysql-test/t/view.test: Updated for WL#2130. sql/item_func.cc: We now have to set net.no_send_ok for functions too, with WL#2130. sql/share/errmsg.txt: Reused an error code since the old use was voided by WL#2130, but a new one was needed instead (similar, but more specific restriction). sql/sp.cc: Fixed error handling and collection of used tables for WL#2130. sql/sp.h: Fixed error handling and collection of used tables for WL#2130. sql/sp_head.cc: Added support functions for collecting and merging hash tables and lists of used tables from SPs and substatements, for WL#2130. sql/sp_head.h: Added support functions for collecting and merging hash tables and lists of used tables from SPs and substatements, for WL#2130. sql/sql_base.cc: Changed the way table->query_id is tested and set during with locked tables in effect. This makes some SP test cases work with WL#2130, but has a side effect on some error cases with explicit LOCK TABLES. It's still debated if this is the correct way, so it might change. sql/sql_class.h: Added flags for circumventing some interference between WL#2130 and mysql_make_view(). sql/sql_derived.cc: Added some missing initializations. (Potential bugs.) sql/sql_lex.cc: Clear the new hash tables for WL#2130. sql/sql_lex.h: Added hash tables for procedures and tables too (as for functions), for WL#2130. sql/sql_parse.cc: WL#2130: Make table accesses from stored functions work by adding an implicit LOCK TABLES around (most) executed statements. To do this, we have to go through a loop where we collect all SPs and tables in mysql_execute_statement. sql/sql_prepare.cc: Cache both functions and procedures for WL#2130. sql/sql_show.cc: Added some missing initializations. (Potential bugs.) sql/sql_view.cc: Shortcut mysql_make_view() if thd->shortcut_make_view is true during the pre-open phase for collecting tables in WL#2130. Otherwise, the similar mechanism here causes interference. sql/sql_yacc.yy: For WL#2130, added caching of procedures and disallowed LOCK/UNLOCK TABLES in SPs.
49 lines
1.7 KiB
Text
49 lines
1.7 KiB
Text
drop table if exists t1,t2;
|
|
CREATE TABLE t1 ( `id` int(11) NOT NULL default '0', `id2` int(11) NOT NULL default '0', `id3` int(11) NOT NULL default '0', `dummy1` char(30) default NULL, PRIMARY KEY (`id`,`id2`), KEY `index_id3` (`id3`)) ENGINE=MyISAM;
|
|
insert into t1 (id,id2) values (1,1),(1,2),(1,3);
|
|
LOCK TABLE t1 WRITE;
|
|
select dummy1,count(distinct id) from t1 group by dummy1;
|
|
dummy1 count(distinct id)
|
|
NULL 1
|
|
update t1 set id=-1 where id=1;
|
|
LOCK TABLE t1 READ;
|
|
update t1 set id=1 where id=1;
|
|
ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
|
|
create table t2 SELECT * from t1;
|
|
ERROR HY000: Table 't2' was not locked with LOCK TABLES
|
|
create temporary table t2 SELECT * from t1;
|
|
drop table if exists t2;
|
|
unlock tables;
|
|
create table t2 SELECT * from t1;
|
|
LOCK TABLE t1 WRITE,t2 write;
|
|
insert into t2 SELECT * from t1;
|
|
update t1 set id=1 where id=-1;
|
|
drop table t1,t2;
|
|
CREATE TABLE t1 (
|
|
index1 smallint(6) default NULL,
|
|
nr smallint(6) default NULL,
|
|
KEY index1(index1)
|
|
) ENGINE=MyISAM;
|
|
CREATE TABLE t2 (
|
|
nr smallint(6) default NULL,
|
|
name varchar(20) default NULL
|
|
) ENGINE=MyISAM;
|
|
INSERT INTO t2 VALUES (1,'item1');
|
|
INSERT INTO t2 VALUES (2,'item2');
|
|
lock tables t1 write, t2 read;
|
|
insert into t1 select 1,nr from t2 where name='item1';
|
|
insert into t1 select 2,nr from t2 where name='item2';
|
|
unlock tables;
|
|
check table t1;
|
|
Table Op Msg_type Msg_text
|
|
test.t1 check status OK
|
|
lock tables t1 write;
|
|
check table t2;
|
|
Table Op Msg_type Msg_text
|
|
test.t2 check error Table 't2' was not locked with LOCK TABLES
|
|
insert into t1 select index1,nr from t1;
|
|
ERROR 42000: INSERT command denied to user 'root'@'localhost' for column 'index1' in table 't1'
|
|
unlock tables;
|
|
lock tables t1 write, t1 as t1_alias read;
|
|
insert into t1 select index1,nr from t1 as t1_alias;
|
|
drop table t1,t2;
|