2007-12-15 01:46:24 +01:00
|
|
|
#
|
|
|
|
# Testing the behavior of 'PREPARE', 'DDL', 'EXECUTE' scenarios
|
|
|
|
#
|
|
|
|
# Background:
|
|
|
|
# In a statement like "select * from t1", t1 can be:
|
|
|
|
# - nothing (the table does not exist)
|
|
|
|
# - a real table
|
|
|
|
# - a temporary table
|
|
|
|
# - a view
|
|
|
|
#
|
|
|
|
# Changing the nature of "t1" between a PREPARE and an EXECUTE
|
|
|
|
# can invalidate the internal state of a prepared statement, so that,
|
|
|
|
# during the execute, the server should:
|
|
|
|
# - detect state changes and fail to execute a statement,
|
|
|
|
# instead of crashing the server or returning wrong results
|
|
|
|
# - "RE-PREPARE" the statement to restore a valid internal state.
|
|
|
|
#
|
|
|
|
# Also, changing the physical structure of "t1", by:
|
|
|
|
# - changing the definition of t1 itself (DDL on tables, views)
|
|
|
|
# - changing TRIGGERs associated with a table
|
|
|
|
# - changing PROCEDURE, FUNCTION referenced by a TRIGGER body,
|
|
|
|
# - changing PROCEDURE, FUNCTION referenced by a VIEW body,
|
|
|
|
# impacts the internal structure of a prepared statement, and should
|
|
|
|
# cause the same verifications at execute time to be performed.
|
|
|
|
#
|
|
|
|
# This test provided in this file cover the different state transitions
|
|
|
|
# between a PREPARE and an EXECUTE, and are organized as follows:
|
|
|
|
# - Part 1: NOTHING -> TABLE
|
|
|
|
# - Part 2: NOTHING -> TEMPORARY TABLE
|
|
|
|
# - Part 3: NOTHING -> VIEW
|
|
|
|
# - Part 4: TABLE -> NOTHING
|
|
|
|
# - Part 5: TABLE -> TABLE (DDL)
|
|
|
|
# - Part 6: TABLE -> TABLE (TRIGGER)
|
|
|
|
# - Part 7: TABLE -> TABLE (TRIGGER dependencies)
|
|
|
|
# - Part 8: TABLE -> TEMPORARY TABLE
|
|
|
|
# - Part 9: TABLE -> VIEW
|
|
|
|
# - Part 10: TEMPORARY TABLE -> NOTHING
|
|
|
|
# - Part 11: TEMPORARY TABLE -> TABLE
|
|
|
|
# - Part 12: TEMPORARY TABLE -> TEMPORARY TABLE (DDL)
|
|
|
|
# - Part 13: TEMPORARY TABLE -> VIEW
|
|
|
|
# - Part 14: VIEW -> NOTHING
|
|
|
|
# - Part 15: VIEW -> TABLE
|
|
|
|
# - Part 16: VIEW -> TEMPORARY TABLE
|
|
|
|
# - Part 17: VIEW -> VIEW (DDL)
|
|
|
|
# - Part 18: VIEW -> VIEW (VIEW dependencies)
|
|
|
|
# - Part 19: Special tables (INFORMATION_SCHEMA)
|
|
|
|
# - Part 20: Special tables (log tables)
|
|
|
|
# - Part 21: Special tables (system tables)
|
|
|
|
# - Part 22: Special tables (views temp tables)
|
2008-04-07 11:35:42 +02:00
|
|
|
# - Part 23: Special statements
|
|
|
|
# - Part 24: Testing the strength of TABLE_SHARE version
|
|
|
|
--disable_warnings
|
|
|
|
drop temporary table if exists t1, t2, t3;
|
|
|
|
drop table if exists t1, t2, t3;
|
|
|
|
drop procedure if exists p_verify_reprepare_count;
|
|
|
|
drop procedure if exists p1;
|
|
|
|
drop function if exists f1;
|
|
|
|
drop view if exists v1, v2;
|
|
|
|
--enable_warnings
|
|
|
|
|
2010-10-27 10:41:45 +02:00
|
|
|
# Avoid selecting from a huge table possibly left over from previous tests,
|
|
|
|
# as this really hurts --valgrind testing.
|
|
|
|
TRUNCATE TABLE mysql.general_log;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
delimiter |;
|
|
|
|
create procedure p_verify_reprepare_count(expected int)
|
|
|
|
begin
|
|
|
|
declare old_reprepare_count int default @reprepare_count;
|
|
|
|
|
|
|
|
select variable_value from
|
|
|
|
information_schema.session_status where
|
|
|
|
variable_name='com_stmt_reprepare'
|
|
|
|
into @reprepare_count;
|
|
|
|
|
|
|
|
if old_reprepare_count + expected <> @reprepare_count then
|
|
|
|
select concat("Expected: ", expected,
|
|
|
|
", actual: ", @reprepare_count - old_reprepare_count)
|
|
|
|
as "ERROR";
|
|
|
|
else
|
|
|
|
select '' as "SUCCESS";
|
|
|
|
end if;
|
|
|
|
end|
|
|
|
|
delimiter ;|
|
|
|
|
set @reprepare_count= 0;
|
|
|
|
flush status;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 1: NOTHING -> TABLE transitions
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
|
|
|
# can not be tested since prepare failed
|
|
|
|
--error ER_NO_SUCH_TABLE
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "select * from t1";
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 2: NOTHING -> TEMPORARY TABLE transitions
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
|
|
|
# can not be tested
|
|
|
|
|
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 3: NOTHING -> VIEW transitions
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
|
|
|
# can not be tested
|
|
|
|
|
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 4: TABLE -> NOTHING transitions
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
2008-04-18 21:18:53 +02:00
|
|
|
--echo # Test 4-a: select ... from <table>
|
2008-04-07 11:35:42 +02:00
|
|
|
create table t1 (a int);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "select * from t1";
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop table t1;
|
2007-12-15 01:46:24 +01:00
|
|
|
--error ER_NO_SUCH_TABLE
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
--error ER_NO_SUCH_TABLE
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-18 21:18:53 +02:00
|
|
|
--echo # Test 4-b: TABLE -> NOTHING by renaming the table
|
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from "select * from t1";
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
|
|
|
|
rename table t1 to t2;
|
|
|
|
--error ER_NO_SUCH_TABLE
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
--error ER_NO_SUCH_TABLE
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
|
|
|
|
deallocate prepare stmt;
|
|
|
|
drop table t2;
|
|
|
|
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 5: TABLE -> TABLE (DDL) transitions
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create table t1 (a int);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "select a from t1";
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
alter table t1 add column (b int);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-18 21:18:53 +02:00
|
|
|
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 6: TABLE -> TABLE (TRIGGER) transitions
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Test 6-a: adding a relevant trigger
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create table t1 (a int);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "insert into t1 (a) value (?)";
|
2007-12-15 01:46:24 +01:00
|
|
|
set @val=1;
|
|
|
|
execute stmt using @val;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
# Relevant trigger: execute should reprepare
|
2008-04-07 11:35:42 +02:00
|
|
|
create trigger t1_bi before insert on t1 for each row
|
|
|
|
set @message= new.a;
|
|
|
|
|
|
|
|
set @val=2;
|
|
|
|
execute stmt using @val;
|
|
|
|
call p_verify_reprepare_count(1);
|
|
|
|
select @message;
|
2007-12-15 01:46:24 +01:00
|
|
|
set @val=3;
|
|
|
|
execute stmt using @val;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
select @message;
|
2008-04-07 11:35:42 +02:00
|
|
|
|
|
|
|
prepare stmt from "insert into t1 (a) value (?)";
|
2007-12-15 01:46:24 +01:00
|
|
|
set @val=4;
|
|
|
|
execute stmt using @val;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
select @message;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Test 6-b: adding an irrelevant trigger
|
|
|
|
|
|
|
|
# Unrelated trigger: reprepare may or may not happen, implementation dependent
|
|
|
|
create trigger t1_bd before delete on t1 for each row
|
|
|
|
set @message= old.a;
|
2008-04-17 14:31:43 +02:00
|
|
|
|
2007-12-15 01:46:24 +01:00
|
|
|
set @val=5;
|
|
|
|
execute stmt using @val;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
select @message;
|
|
|
|
set @val=6;
|
|
|
|
execute stmt using @val;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
select @message;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "insert into t1 (a) value (?)";
|
2007-12-15 01:46:24 +01:00
|
|
|
set @val=7;
|
|
|
|
execute stmt using @val;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
select @message;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Test 6-c: changing a relevant trigger
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
# Relevant trigger: execute should reprepare
|
2008-04-07 11:35:42 +02:00
|
|
|
drop trigger t1_bi;
|
|
|
|
create trigger t1_bi before insert on t1 for each row
|
|
|
|
set @message= concat("new trigger: ", new.a);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
set @val=8;
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt using @val;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
select @message;
|
2008-04-07 11:35:42 +02:00
|
|
|
set @val=9;
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt using @val;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
select @message;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "insert into t1 (a) value (?)";
|
|
|
|
set @val=10;
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt using @val;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
select @message;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Test 6-d: changing an irrelevant trigger
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
# Unrelated trigger: reprepare may or may not happen, implementation dependent
|
|
|
|
drop trigger t1_bd;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
set @val=11;
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt using @val;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
select @message;
|
|
|
|
|
2008-04-17 14:31:43 +02:00
|
|
|
--echo Test 6-e: removing a relevant trigger
|
2008-04-07 11:35:42 +02:00
|
|
|
|
|
|
|
drop trigger t1_bi;
|
|
|
|
|
|
|
|
set @val=12;
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt using @val;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
select @message;
|
2008-04-07 11:35:42 +02:00
|
|
|
set @val=13;
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt using @val;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
select @message;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "insert into t1 (a) value (?)";
|
|
|
|
set @val=14;
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt using @val;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
select @message;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
select * from t1 order by a;
|
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 7: TABLE -> TABLE (TRIGGER dependencies) transitions
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Test 7-a: dependent PROCEDURE has changed
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
create table t1 (a int);
|
|
|
|
create trigger t1_ai after insert on t1 for each row
|
|
|
|
call p1(new.a);
|
|
|
|
create procedure p1(a int) begin end;
|
|
|
|
prepare stmt from "insert into t1 (a) values (?)";
|
|
|
|
set @var= 1;
|
|
|
|
execute stmt using @var;
|
|
|
|
drop procedure p1;
|
|
|
|
create procedure p1 (a int) begin end;
|
|
|
|
set @var= 2;
|
|
|
|
execute stmt using @var;
|
|
|
|
--echo # Cleanup
|
|
|
|
drop procedure p1;
|
Apply and review:
3655 Jon Olav Hauglid 2009-10-19
Bug #30977 Concurrent statement using stored function and DROP FUNCTION
breaks SBR
Bug #48246 assert in close_thread_table
Implement a fix for:
Bug #41804 purge stored procedure cache causes mysterious hang for many
minutes
Bug #49972 Crash in prepared statements
The problem was that concurrent execution of DML statements that
use stored functions and DDL statements that drop/modify the same
function might result in incorrect binary log in statement (and
mixed) mode and therefore break replication.
This patch fixes the problem by introducing metadata locking for
stored procedures and functions. This is similar to what is done
in Bug#25144 for views. Procedures and functions now are
locked using metadata locks until the transaction is either
committed or rolled back. This prevents other statements from
modifying the procedure/function while it is being executed. This
provides commit ordering - guaranteeing serializability across
multiple transactions and thus fixes the reported binlog problem.
Note that we do not take locks for top-level CALLs. This means
that procedures called directly are not protected from changes by
simultaneous DDL operations so they are executed at the state they
had at the time of the CALL. By not taking locks for top-level
CALLs, we still allow transactions to be started inside
procedures.
This patch also changes stored procedure cache invalidation.
Upon a change of cache version, we no longer invalidate the entire
cache, but only those routines which we use, only when a statement
is executed that uses them.
This patch also changes the logic of prepared statement validation.
A stored procedure used by a prepared statement is now validated
only once a metadata lock has been acquired. A version mismatch
causes a flush of the obsolete routine from the cache and
statement reprepare.
Incompatible changes:
1) ER_LOCK_DEADLOCK is reported for a transaction trying to access
a procedure/function that is locked by a DDL operation in
another connection.
2) Procedure/function DDL operations are now prohibited in LOCK
TABLES mode as exclusive locks must be taken all at once and
LOCK TABLES provides no way to specifiy procedures/functions to
be locked.
Test cases have been added to sp-lock.test and rpl_sp.test.
Work on this bug has very much been a team effort and this patch
includes and is based on contributions from Davi Arnaut, Dmitry
Lenev, Magne Mæhre and Konstantin Osipov.
mysql-test/r/ps_ddl.result:
Update results (Bug#30977).
mysql-test/r/ps_ddl1.result:
Update results (Bug#30977).
mysql-test/r/sp-error.result:
Update results (Bug#30977).
mysql-test/r/sp-lock.result:
Update results (Bug#30977).
mysql-test/suite/rpl/r/rpl_sp.result:
Update results (Bug#30977).
mysql-test/suite/rpl/t/rpl_sp.test:
Add a test case for Bug#30977.
mysql-test/t/ps_ddl.test:
Update comments. We no longer re-prepare a prepared statement
when a stored procedure used in top-level CALL is changed.
mysql-test/t/ps_ddl1.test:
Modifying stored procedure p1 no longer invalidates prepared
statement "call p1" -- we can re-use the prepared statement
without invalidation.
mysql-test/t/sp-error.test:
Use a constant for an error value.
mysql-test/t/sp-lock.test:
Add test coverage for Bug#30977.
sql/lock.cc:
Implement lock_routine_name() - a way to acquire an
exclusive metadata lock (ex- name-lock) on
stored procedure/function.
sql/sp.cc:
Change semantics of sp_cache_routine() -- now it has an option
to make sure that the routine that is cached is up to date (has
the latest sp cache version).
Add sp_cache_invalidate() to sp_drop_routine(), where it was
missing (a bug!).
Acquire metadata locks for SP DDL (ALTER/CREATE/DROP). This is
the core of the fix for Bug#30977.
Since caching and cache invalidation scheme was changed, make
sure we don't invalidate the SP cache in the middle of a stored
routine execution. At the same time, make sure we don't access
stale data due to lack of invalidation.
For that, change ALTER FUNCTION/PROCEDURE to not use the cache,
and SHOW PROCEDURE CODE/SHOW CREATE PROCEDURE/FUNCTION to always
read an up to date version of the routine from the cache.
sql/sp.h:
Add a helper wrapper around sp_cache_routine().
sql/sp_cache.cc:
Implement new sp_cache_version() and sp_cache_flush_obsolete().
Now we flush stale routines individually, rather than all at once.
sql/sp_cache.h:
Update signatures of sp_cache_version() and sp_cache_flush_obsolete().
sql/sp_head.cc:
Add a default initialization of sp_head::m_sp_cache_version.
Remove a redundant sp_head::create().
sql/sp_head.h:
Add m_sp_cache_version to sp_head class - we now
keep track of every routine in the stored procedure cache, rather than
of the entire cache.
sql/sql_base.cc:
Implement prelocking for stored routines. Validate stored
routines after they were locked.
Flush obsolete routines upon next access, one by one, not all at once
(Bug#41804).
Style fixes.
sql/sql_class.h:
Rename a Open_table_context method.
sql/sql_parse.cc:
Make sure stored procedures DDL commits the active transaction
(issues an implicit commit before and after).
Remove sp_head::create(), a pure redundancy.
Move the semantical check during alter routine inside sp_update_routine() code in order to:
- avoid using SP cache during update, it may be obsolete.
- speed up and simplify the update procedure.
Remove sp_cache_flush_obsolete() calls, we no longer flush the entire
cache, ever, stale routines are flushed before next use, one at a time.
sql/sql_prepare.cc:
Move routine metadata validation to open_and_process_routine().
Fix Bug#49972 (don't swap flags at reprepare).
Reset Sroutine_hash_entries in reinit_stmt_before_use().
Remove SP cache invalidation, it's now done by open_tables().
sql/sql_show.cc:
Fix a warning: remove an unused label.
sql/sql_table.cc:
Reset mdl_request.ticket for tickets acquired for routines inlined
through a view, in CHECK TABLE statement, to satisfy an MDL assert.
sql/sql_update.cc:
Move the cleanup of "translation items" to close_tables_for_reopen(),
since it's needed in all cases when we back off, not just
the back-off in multi-update. This fixes a bug when the server
would crash on attempt to back off when opening tables
for a statement that uses information_schema tables.
2009-12-29 13:19:05 +01:00
|
|
|
call p_verify_reprepare_count(1);
|
2008-04-07 11:35:42 +02:00
|
|
|
|
|
|
|
--echo # Test 7-b: dependent FUNCTION has changed
|
|
|
|
--echo #
|
2008-07-03 21:41:22 +02:00
|
|
|
--echo # Note, this scenario is supported, subject of Bug#12093
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo #
|
|
|
|
drop trigger t1_ai;
|
|
|
|
create trigger t1_ai after insert on t1 for each row
|
|
|
|
select f1(new.a+1) into @var;
|
|
|
|
create function f1 (a int) returns int return a;
|
|
|
|
prepare stmt from "insert into t1(a) values (?)";
|
|
|
|
set @var=3;
|
|
|
|
execute stmt using @var;
|
|
|
|
select @var;
|
|
|
|
drop function f1;
|
|
|
|
create function f1 (a int) returns int return 0;
|
|
|
|
execute stmt using @var;
|
2008-07-03 21:41:22 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2008-04-07 11:35:42 +02:00
|
|
|
drop function f1;
|
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Test 7-c: dependent VIEW has changed
|
|
|
|
--echo #
|
|
|
|
--echo # Note, this scenario is not functioning correctly, see
|
|
|
|
--echo # Bug#33255 Trigger using views and view ddl : corrupted triggers
|
|
|
|
--echo # and Bug #33000 Triggers do not detect changes in meta-data.
|
|
|
|
--echo #
|
|
|
|
drop trigger t1_ai;
|
|
|
|
create table t2 (a int unique);
|
|
|
|
create table t3 (a int unique);
|
|
|
|
create view v1 as select a from t2;
|
|
|
|
create trigger t1_ai after insert on t1 for each row
|
|
|
|
insert into v1 (a) values (new.a);
|
|
|
|
|
|
|
|
--echo # Demonstrate that the same bug is present
|
|
|
|
--echo # without prepared statements
|
|
|
|
insert into t1 (a) values (5);
|
|
|
|
select * from t2;
|
|
|
|
select * from t3;
|
|
|
|
drop view v1;
|
|
|
|
create view v1 as select a from t3;
|
|
|
|
--error ER_NO_SUCH_TABLE
|
|
|
|
insert into t1 (a) values (6);
|
|
|
|
flush table t1;
|
|
|
|
insert into t1 (a) values (6);
|
|
|
|
select * from t2;
|
|
|
|
select * from t3;
|
|
|
|
|
|
|
|
prepare stmt from "insert into t1 (a) values (?)";
|
|
|
|
set @var=7;
|
|
|
|
execute stmt using @var;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
select * from t3;
|
|
|
|
select * from t2;
|
|
|
|
drop view v1;
|
|
|
|
create view v1 as select a from t2;
|
|
|
|
set @var=8;
|
2008-07-03 21:41:22 +02:00
|
|
|
--echo # XXX: bug, the SQL statement in the trigger is still
|
|
|
|
--echo # pointing at table 't3', since the view was expanded
|
|
|
|
--echo # at first statement execution.
|
Apply and review:
3655 Jon Olav Hauglid 2009-10-19
Bug #30977 Concurrent statement using stored function and DROP FUNCTION
breaks SBR
Bug #48246 assert in close_thread_table
Implement a fix for:
Bug #41804 purge stored procedure cache causes mysterious hang for many
minutes
Bug #49972 Crash in prepared statements
The problem was that concurrent execution of DML statements that
use stored functions and DDL statements that drop/modify the same
function might result in incorrect binary log in statement (and
mixed) mode and therefore break replication.
This patch fixes the problem by introducing metadata locking for
stored procedures and functions. This is similar to what is done
in Bug#25144 for views. Procedures and functions now are
locked using metadata locks until the transaction is either
committed or rolled back. This prevents other statements from
modifying the procedure/function while it is being executed. This
provides commit ordering - guaranteeing serializability across
multiple transactions and thus fixes the reported binlog problem.
Note that we do not take locks for top-level CALLs. This means
that procedures called directly are not protected from changes by
simultaneous DDL operations so they are executed at the state they
had at the time of the CALL. By not taking locks for top-level
CALLs, we still allow transactions to be started inside
procedures.
This patch also changes stored procedure cache invalidation.
Upon a change of cache version, we no longer invalidate the entire
cache, but only those routines which we use, only when a statement
is executed that uses them.
This patch also changes the logic of prepared statement validation.
A stored procedure used by a prepared statement is now validated
only once a metadata lock has been acquired. A version mismatch
causes a flush of the obsolete routine from the cache and
statement reprepare.
Incompatible changes:
1) ER_LOCK_DEADLOCK is reported for a transaction trying to access
a procedure/function that is locked by a DDL operation in
another connection.
2) Procedure/function DDL operations are now prohibited in LOCK
TABLES mode as exclusive locks must be taken all at once and
LOCK TABLES provides no way to specifiy procedures/functions to
be locked.
Test cases have been added to sp-lock.test and rpl_sp.test.
Work on this bug has very much been a team effort and this patch
includes and is based on contributions from Davi Arnaut, Dmitry
Lenev, Magne Mæhre and Konstantin Osipov.
mysql-test/r/ps_ddl.result:
Update results (Bug#30977).
mysql-test/r/ps_ddl1.result:
Update results (Bug#30977).
mysql-test/r/sp-error.result:
Update results (Bug#30977).
mysql-test/r/sp-lock.result:
Update results (Bug#30977).
mysql-test/suite/rpl/r/rpl_sp.result:
Update results (Bug#30977).
mysql-test/suite/rpl/t/rpl_sp.test:
Add a test case for Bug#30977.
mysql-test/t/ps_ddl.test:
Update comments. We no longer re-prepare a prepared statement
when a stored procedure used in top-level CALL is changed.
mysql-test/t/ps_ddl1.test:
Modifying stored procedure p1 no longer invalidates prepared
statement "call p1" -- we can re-use the prepared statement
without invalidation.
mysql-test/t/sp-error.test:
Use a constant for an error value.
mysql-test/t/sp-lock.test:
Add test coverage for Bug#30977.
sql/lock.cc:
Implement lock_routine_name() - a way to acquire an
exclusive metadata lock (ex- name-lock) on
stored procedure/function.
sql/sp.cc:
Change semantics of sp_cache_routine() -- now it has an option
to make sure that the routine that is cached is up to date (has
the latest sp cache version).
Add sp_cache_invalidate() to sp_drop_routine(), where it was
missing (a bug!).
Acquire metadata locks for SP DDL (ALTER/CREATE/DROP). This is
the core of the fix for Bug#30977.
Since caching and cache invalidation scheme was changed, make
sure we don't invalidate the SP cache in the middle of a stored
routine execution. At the same time, make sure we don't access
stale data due to lack of invalidation.
For that, change ALTER FUNCTION/PROCEDURE to not use the cache,
and SHOW PROCEDURE CODE/SHOW CREATE PROCEDURE/FUNCTION to always
read an up to date version of the routine from the cache.
sql/sp.h:
Add a helper wrapper around sp_cache_routine().
sql/sp_cache.cc:
Implement new sp_cache_version() and sp_cache_flush_obsolete().
Now we flush stale routines individually, rather than all at once.
sql/sp_cache.h:
Update signatures of sp_cache_version() and sp_cache_flush_obsolete().
sql/sp_head.cc:
Add a default initialization of sp_head::m_sp_cache_version.
Remove a redundant sp_head::create().
sql/sp_head.h:
Add m_sp_cache_version to sp_head class - we now
keep track of every routine in the stored procedure cache, rather than
of the entire cache.
sql/sql_base.cc:
Implement prelocking for stored routines. Validate stored
routines after they were locked.
Flush obsolete routines upon next access, one by one, not all at once
(Bug#41804).
Style fixes.
sql/sql_class.h:
Rename a Open_table_context method.
sql/sql_parse.cc:
Make sure stored procedures DDL commits the active transaction
(issues an implicit commit before and after).
Remove sp_head::create(), a pure redundancy.
Move the semantical check during alter routine inside sp_update_routine() code in order to:
- avoid using SP cache during update, it may be obsolete.
- speed up and simplify the update procedure.
Remove sp_cache_flush_obsolete() calls, we no longer flush the entire
cache, ever, stale routines are flushed before next use, one at a time.
sql/sql_prepare.cc:
Move routine metadata validation to open_and_process_routine().
Fix Bug#49972 (don't swap flags at reprepare).
Reset Sroutine_hash_entries in reinit_stmt_before_use().
Remove SP cache invalidation, it's now done by open_tables().
sql/sql_show.cc:
Fix a warning: remove an unused label.
sql/sql_table.cc:
Reset mdl_request.ticket for tickets acquired for routines inlined
through a view, in CHECK TABLE statement, to satisfy an MDL assert.
sql/sql_update.cc:
Move the cleanup of "translation items" to close_tables_for_reopen(),
since it's needed in all cases when we back off, not just
the back-off in multi-update. This fixes a bug when the server
would crash on attempt to back off when opening tables
for a statement that uses information_schema tables.
2009-12-29 13:19:05 +01:00
|
|
|
--echo # Since the view definition is inlined in the statement
|
|
|
|
--echo # at prepare, changing the view definition does not cause
|
|
|
|
--echo # repreparation.
|
2008-07-03 21:41:22 +02:00
|
|
|
--echo # Repreparation of the main statement doesn't cause repreparation
|
|
|
|
--echo # of trigger statements.
|
2008-04-07 11:35:42 +02:00
|
|
|
execute stmt using @var;
|
Apply and review:
3655 Jon Olav Hauglid 2009-10-19
Bug #30977 Concurrent statement using stored function and DROP FUNCTION
breaks SBR
Bug #48246 assert in close_thread_table
Implement a fix for:
Bug #41804 purge stored procedure cache causes mysterious hang for many
minutes
Bug #49972 Crash in prepared statements
The problem was that concurrent execution of DML statements that
use stored functions and DDL statements that drop/modify the same
function might result in incorrect binary log in statement (and
mixed) mode and therefore break replication.
This patch fixes the problem by introducing metadata locking for
stored procedures and functions. This is similar to what is done
in Bug#25144 for views. Procedures and functions now are
locked using metadata locks until the transaction is either
committed or rolled back. This prevents other statements from
modifying the procedure/function while it is being executed. This
provides commit ordering - guaranteeing serializability across
multiple transactions and thus fixes the reported binlog problem.
Note that we do not take locks for top-level CALLs. This means
that procedures called directly are not protected from changes by
simultaneous DDL operations so they are executed at the state they
had at the time of the CALL. By not taking locks for top-level
CALLs, we still allow transactions to be started inside
procedures.
This patch also changes stored procedure cache invalidation.
Upon a change of cache version, we no longer invalidate the entire
cache, but only those routines which we use, only when a statement
is executed that uses them.
This patch also changes the logic of prepared statement validation.
A stored procedure used by a prepared statement is now validated
only once a metadata lock has been acquired. A version mismatch
causes a flush of the obsolete routine from the cache and
statement reprepare.
Incompatible changes:
1) ER_LOCK_DEADLOCK is reported for a transaction trying to access
a procedure/function that is locked by a DDL operation in
another connection.
2) Procedure/function DDL operations are now prohibited in LOCK
TABLES mode as exclusive locks must be taken all at once and
LOCK TABLES provides no way to specifiy procedures/functions to
be locked.
Test cases have been added to sp-lock.test and rpl_sp.test.
Work on this bug has very much been a team effort and this patch
includes and is based on contributions from Davi Arnaut, Dmitry
Lenev, Magne Mæhre and Konstantin Osipov.
mysql-test/r/ps_ddl.result:
Update results (Bug#30977).
mysql-test/r/ps_ddl1.result:
Update results (Bug#30977).
mysql-test/r/sp-error.result:
Update results (Bug#30977).
mysql-test/r/sp-lock.result:
Update results (Bug#30977).
mysql-test/suite/rpl/r/rpl_sp.result:
Update results (Bug#30977).
mysql-test/suite/rpl/t/rpl_sp.test:
Add a test case for Bug#30977.
mysql-test/t/ps_ddl.test:
Update comments. We no longer re-prepare a prepared statement
when a stored procedure used in top-level CALL is changed.
mysql-test/t/ps_ddl1.test:
Modifying stored procedure p1 no longer invalidates prepared
statement "call p1" -- we can re-use the prepared statement
without invalidation.
mysql-test/t/sp-error.test:
Use a constant for an error value.
mysql-test/t/sp-lock.test:
Add test coverage for Bug#30977.
sql/lock.cc:
Implement lock_routine_name() - a way to acquire an
exclusive metadata lock (ex- name-lock) on
stored procedure/function.
sql/sp.cc:
Change semantics of sp_cache_routine() -- now it has an option
to make sure that the routine that is cached is up to date (has
the latest sp cache version).
Add sp_cache_invalidate() to sp_drop_routine(), where it was
missing (a bug!).
Acquire metadata locks for SP DDL (ALTER/CREATE/DROP). This is
the core of the fix for Bug#30977.
Since caching and cache invalidation scheme was changed, make
sure we don't invalidate the SP cache in the middle of a stored
routine execution. At the same time, make sure we don't access
stale data due to lack of invalidation.
For that, change ALTER FUNCTION/PROCEDURE to not use the cache,
and SHOW PROCEDURE CODE/SHOW CREATE PROCEDURE/FUNCTION to always
read an up to date version of the routine from the cache.
sql/sp.h:
Add a helper wrapper around sp_cache_routine().
sql/sp_cache.cc:
Implement new sp_cache_version() and sp_cache_flush_obsolete().
Now we flush stale routines individually, rather than all at once.
sql/sp_cache.h:
Update signatures of sp_cache_version() and sp_cache_flush_obsolete().
sql/sp_head.cc:
Add a default initialization of sp_head::m_sp_cache_version.
Remove a redundant sp_head::create().
sql/sp_head.h:
Add m_sp_cache_version to sp_head class - we now
keep track of every routine in the stored procedure cache, rather than
of the entire cache.
sql/sql_base.cc:
Implement prelocking for stored routines. Validate stored
routines after they were locked.
Flush obsolete routines upon next access, one by one, not all at once
(Bug#41804).
Style fixes.
sql/sql_class.h:
Rename a Open_table_context method.
sql/sql_parse.cc:
Make sure stored procedures DDL commits the active transaction
(issues an implicit commit before and after).
Remove sp_head::create(), a pure redundancy.
Move the semantical check during alter routine inside sp_update_routine() code in order to:
- avoid using SP cache during update, it may be obsolete.
- speed up and simplify the update procedure.
Remove sp_cache_flush_obsolete() calls, we no longer flush the entire
cache, ever, stale routines are flushed before next use, one at a time.
sql/sql_prepare.cc:
Move routine metadata validation to open_and_process_routine().
Fix Bug#49972 (don't swap flags at reprepare).
Reset Sroutine_hash_entries in reinit_stmt_before_use().
Remove SP cache invalidation, it's now done by open_tables().
sql/sql_show.cc:
Fix a warning: remove an unused label.
sql/sql_table.cc:
Reset mdl_request.ticket for tickets acquired for routines inlined
through a view, in CHECK TABLE statement, to satisfy an MDL assert.
sql/sql_update.cc:
Move the cleanup of "translation items" to close_tables_for_reopen(),
since it's needed in all cases when we back off, not just
the back-off in multi-update. This fixes a bug when the server
would crash on attempt to back off when opening tables
for a statement that uses information_schema tables.
2009-12-29 13:19:05 +01:00
|
|
|
call p_verify_reprepare_count(0);
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo #
|
|
|
|
--echo # Sic: the insert went into t3, even though the view now
|
|
|
|
--echo # points at t2. This is because neither the merged view
|
2008-04-17 14:31:43 +02:00
|
|
|
--echo # nor its prelocking list are affected by view DDL
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # The binary log is of course wrong, since it is not
|
|
|
|
--echo # using prepared statements
|
|
|
|
--echo #
|
|
|
|
select * from t2;
|
|
|
|
select * from t3;
|
|
|
|
flush table t1;
|
|
|
|
set @var=9;
|
|
|
|
execute stmt using @var;
|
|
|
|
call p_verify_reprepare_count(1);
|
|
|
|
select * from t2;
|
|
|
|
select * from t3;
|
|
|
|
drop view v1;
|
|
|
|
drop table t1,t2,t3;
|
|
|
|
|
|
|
|
--echo # Test 7-d: dependent TABLE has changed
|
|
|
|
create table t1 (a int);
|
|
|
|
create trigger t1_ai after insert on t1 for each row
|
|
|
|
insert into t2 (a) values (new.a);
|
|
|
|
create table t2 (a int);
|
|
|
|
|
|
|
|
prepare stmt from "insert into t1 (a) values (?)";
|
|
|
|
set @var=1;
|
|
|
|
execute stmt using @var;
|
|
|
|
alter table t2 add column comment varchar(255);
|
|
|
|
set @var=2;
|
|
|
|
--echo # Since the dependent table is tracked in the prelocked
|
|
|
|
--echo # list of the prepared statement, invalidation happens
|
|
|
|
--echo # and the statement is re-prepared. This is an unnecessary
|
2008-04-17 14:31:43 +02:00
|
|
|
--echo # side effect, since the statement that *is* dependent
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # on t2 definition is inside the trigger, and it is currently
|
|
|
|
--echo # not reprepared (see the previous test case).
|
|
|
|
execute stmt using @var;
|
|
|
|
call p_verify_reprepare_count(1);
|
|
|
|
select * from t1;
|
|
|
|
select * from t2;
|
|
|
|
drop table t1,t2;
|
|
|
|
|
|
|
|
--echo # Test 7-e: dependent TABLE TRIGGER has changed
|
|
|
|
create table t1 (a int);
|
2008-04-17 14:31:43 +02:00
|
|
|
create trigger t1_ai after insert on t1 for each row
|
2008-04-07 11:35:42 +02:00
|
|
|
insert into t2 (a) values (new.a);
|
|
|
|
create table t2 (a int unique);
|
|
|
|
create trigger t2_ai after insert on t2 for each row
|
|
|
|
insert into t3 (a) values (new.a);
|
|
|
|
create table t3 (a int unique);
|
|
|
|
create table t4 (a int unique);
|
|
|
|
|
|
|
|
insert into t1 (a) values (1);
|
|
|
|
select * from t1 join t2 on (t1.a=t2.a) join t3 on (t2.a=t3.a);
|
|
|
|
drop trigger t2_ai;
|
|
|
|
create trigger t2_ai after insert on t2 for each row
|
|
|
|
insert into t4 (a) values (new.a);
|
|
|
|
insert into t1 (a) values (2);
|
|
|
|
select * from t1 join t2 on (t1.a=t2.a) join t4 on (t2.a=t4.a);
|
|
|
|
|
|
|
|
prepare stmt from "insert into t1 (a) values (?)";
|
|
|
|
set @var=3;
|
|
|
|
execute stmt using @var;
|
|
|
|
select * from t1 join t2 on (t1.a=t2.a) join t4 on (t2.a=t4.a);
|
|
|
|
drop trigger t2_ai;
|
|
|
|
create trigger t2_ai after insert on t2 for each row
|
|
|
|
insert into t3 (a) values (new.a);
|
|
|
|
set @var=4;
|
|
|
|
execute stmt using @var;
|
|
|
|
call p_verify_reprepare_count(1);
|
|
|
|
select * from t1 join t2 on (t1.a=t2.a) join t3 on (t2.a=t3.a);
|
|
|
|
select * from t1 join t2 on (t1.a=t2.a) join t4 on (t2.a=t4.a);
|
|
|
|
|
|
|
|
drop table t1, t2, t3, t4;
|
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 8: TABLE -> TEMPORARY TABLE transitions
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
2008-04-18 21:18:53 +02:00
|
|
|
--echo # Test 8-a: base table used recreated as temporary table
|
2008-04-07 11:35:42 +02:00
|
|
|
create table t1 (a int);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "select * from t1";
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop table t1;
|
|
|
|
create temporary table t1 (a int);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-18 21:18:53 +02:00
|
|
|
--echo # Test 8-b: temporary table has precedence over base table with same name
|
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from 'select count(*) from t1';
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
|
|
|
|
create temporary table t1 AS SELECT 1;
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(1);
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
|
|
|
|
deallocate prepare stmt;
|
|
|
|
drop temporary table t1;
|
|
|
|
drop table t1;
|
|
|
|
|
|
|
|
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 9: TABLE -> VIEW transitions
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create table t1 (a int);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "select * from t1";
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop table t1;
|
|
|
|
create table t2 (a int);
|
|
|
|
create view t1 as select * from t2;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop view t1;
|
|
|
|
drop table t2;
|
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 10: TEMPORARY TABLE -> NOTHING transitions
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create temporary table t1 (a int);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "select * from t1";
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop temporary table t1;
|
2007-12-15 01:46:24 +01:00
|
|
|
--error ER_NO_SUCH_TABLE
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 11: TEMPORARY TABLE -> TABLE transitions
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
2008-04-18 21:18:53 +02:00
|
|
|
--echo # Test 11-a: temporary table replaced by base table
|
2008-04-07 11:35:42 +02:00
|
|
|
create table t1 (a int);
|
|
|
|
insert into t1 (a) value (1);
|
|
|
|
create temporary table t1 (a int);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "select * from t1";
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop temporary table t1;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
select * from t1;
|
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-18 21:18:53 +02:00
|
|
|
|
|
|
|
--echo # Test 11-b: temporary table has precedence over base table with same name
|
|
|
|
--echo # temporary table disappears
|
|
|
|
create table t1 (a int);
|
|
|
|
create temporary table t1 as select 1 as a;
|
|
|
|
prepare stmt from "select count(*) from t1";
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
|
|
|
|
drop temporary table t1;
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(1);
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
|
|
|
|
deallocate prepare stmt;
|
|
|
|
drop table t1;
|
|
|
|
|
|
|
|
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 12: TEMPORARY TABLE -> TEMPORARY TABLE (DDL) transitions
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create temporary table t1 (a int);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "select a from t1";
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop temporary table t1;
|
|
|
|
create temporary table t1 (a int, b int);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
select * from t1;
|
|
|
|
drop temporary table t1;
|
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 13: TEMPORARY TABLE -> VIEW transitions
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create temporary table t1 (a int);
|
|
|
|
create table t2 (a int);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "select * from t1";
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop temporary table t1;
|
|
|
|
create view t1 as select * from t2;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop view t1;
|
|
|
|
drop table t2;
|
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 14: VIEW -> NOTHING transitions
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create table t2 (a int);
|
|
|
|
create view t1 as select * from t2;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "select * from t1";
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
drop view t1;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--error ER_NO_SUCH_TABLE
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
--error ER_NO_SUCH_TABLE
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop table t2;
|
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 15: VIEW -> TABLE transitions
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create table t2 (a int);
|
|
|
|
create view t1 as select * from t2;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "select * from t1";
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop view t1;
|
|
|
|
create table t1 (a int);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop table t2;
|
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 16: VIEW -> TEMPORARY TABLE transitions
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
2009-12-10 13:37:18 +01:00
|
|
|
--echo #
|
|
|
|
--echo # Test 1: Merged view
|
|
|
|
--echo #
|
2008-04-07 11:35:42 +02:00
|
|
|
create table t2 (a int);
|
|
|
|
insert into t2 (a) values (1);
|
|
|
|
create view t1 as select * from t2;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "select * from t1";
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create temporary table t1 (a int);
|
2009-12-10 13:37:18 +01:00
|
|
|
# t1 still refers to the view - no reprepare has been done.
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2009-12-10 13:37:18 +01:00
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
|
|
|
|
drop view t1;
|
|
|
|
# t1 still refers to the, now deleted, view - no reprepare has been done.
|
|
|
|
--error ER_NO_SUCH_TABLE
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
|
|
|
|
drop table t2;
|
|
|
|
drop temporary table t1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # Test 2: Materialized view
|
|
|
|
--echo #
|
|
|
|
create table t2 (a int);
|
|
|
|
insert into t2 (a) values (1);
|
|
|
|
create algorithm = temptable view t1 as select * from t2;
|
|
|
|
|
|
|
|
prepare stmt from "select * from t1";
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
|
|
|
|
create temporary table t1 (a int);
|
|
|
|
# t1 still refers to the view - no reprepare has been done.
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop view t1;
|
2009-12-10 13:37:18 +01:00
|
|
|
# t1 still refers to the, now deleted, view - no reprepare has been done.
|
|
|
|
--error ER_NO_SUCH_TABLE
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop table t2;
|
|
|
|
drop temporary table t1;
|
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2009-12-10 13:37:18 +01:00
|
|
|
--echo #
|
|
|
|
--echo # Test 3: View referencing an Information schema table
|
|
|
|
--echo #
|
|
|
|
create view t1 as select table_name from information_schema.views;
|
|
|
|
|
|
|
|
prepare stmt from "select * from t1";
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
|
|
|
|
create temporary table t1 (a int);
|
|
|
|
# t1 has been substituted with a reference to the IS table
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
|
|
|
|
drop view t1;
|
2011-10-19 21:45:18 +02:00
|
|
|
--error 1146
|
2009-12-10 13:37:18 +01:00
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
|
|
|
|
drop temporary table t1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 17: VIEW -> VIEW (DDL) transitions
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create table t2 (a int);
|
|
|
|
insert into t2 values (10), (20), (30);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create view t1 as select a, 2*a as b, 3*a as c from t2;
|
|
|
|
select * from t1;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "select * from t1";
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop view t1;
|
|
|
|
create view t1 as select a, 2*a as b, 5*a as c from t2;
|
|
|
|
select * from t1;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Currently a different result from conventional statements.
|
|
|
|
--echo # A view is inlined once at prepare, later on view DDL
|
|
|
|
--echo # does not affect prepared statement and it is not re-prepared.
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
--echo # This is reported in Bug#36002 Prepared statements: if a view
|
|
|
|
--echo # used in a statement is replaced, bad data
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
flush table t2;
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop table t2;
|
|
|
|
drop view t1;
|
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 18: VIEW -> VIEW (VIEW dependencies) transitions
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Part 18a: dependent function has changed
|
|
|
|
create table t1 (a int);
|
|
|
|
insert into t1 (a) values (1), (2), (3);
|
|
|
|
create function f1() returns int return (select max(a) from t1);
|
|
|
|
create view v1 as select f1();
|
|
|
|
prepare stmt from "select * from v1";
|
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
drop function f1;
|
|
|
|
create function f1() returns int return 2;
|
2008-07-03 21:41:22 +02:00
|
|
|
--echo # XXX: Used to be another manifestation of Bug#12093.
|
|
|
|
--echo # We only used to get a different error
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # message because the non-existing procedure error is masked
|
|
|
|
--echo # by the view.
|
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
2008-07-03 21:41:22 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Part 18b: dependent procedure has changed (referred to via a function)
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create table t2 (a int);
|
|
|
|
insert into t2 (a) values (4), (5), (6);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop function f1;
|
|
|
|
delimiter |;
|
|
|
|
create function f1() returns int
|
|
|
|
begin
|
|
|
|
declare x int;
|
|
|
|
call p1(x);
|
|
|
|
return x;
|
|
|
|
end|
|
|
|
|
delimiter ;|
|
|
|
|
create procedure p1(out x int) select max(a) from t1 into x;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "select * from v1";
|
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
drop procedure p1;
|
|
|
|
create procedure p1(out x int) select max(a) from t2 into x;
|
2008-07-03 21:41:22 +02:00
|
|
|
--echo # XXX: used to be a bug. The prelocked list was not invalidated
|
|
|
|
--echo # and we kept opening table t1, whereas the procedure
|
2008-04-17 14:31:43 +02:00
|
|
|
--echo # is now referring to table t2
|
2008-04-07 11:35:42 +02:00
|
|
|
execute stmt;
|
2008-07-03 21:41:22 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2008-04-07 11:35:42 +02:00
|
|
|
flush table t1;
|
|
|
|
execute stmt;
|
2009-12-01 20:13:01 +01:00
|
|
|
call p_verify_reprepare_count(0);
|
2008-04-07 11:35:42 +02:00
|
|
|
execute stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Test 18-c: dependent VIEW has changed
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop view v1;
|
|
|
|
create view v2 as select a from t1;
|
|
|
|
create view v1 as select * from v2;
|
|
|
|
prepare stmt from "select * from v1";
|
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
drop view v2;
|
|
|
|
create view v2 as select a from t2;
|
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
flush table t1;
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(1);
|
|
|
|
execute stmt;
|
|
|
|
--echo # Test 18-d: dependent TABLE has changed
|
2008-04-17 14:31:43 +02:00
|
|
|
drop view v2;
|
2008-04-07 11:35:42 +02:00
|
|
|
create table v2 as select * from t1;
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(1);
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
drop table v2;
|
|
|
|
create table v2 (a int unique) as select * from t2;
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(1);
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Test 18-e: dependent TABLE trigger has changed
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "insert into v1 (a) values (?)";
|
|
|
|
set @var= 7;
|
|
|
|
execute stmt using @var;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
create trigger v2_bi before insert on v2 for each row set @message="v2_bi";
|
|
|
|
set @var=8;
|
|
|
|
execute stmt using @var;
|
|
|
|
call p_verify_reprepare_count(1);
|
|
|
|
select @message;
|
|
|
|
drop trigger v2_bi;
|
|
|
|
set @message=null;
|
|
|
|
set @var=9;
|
|
|
|
execute stmt using @var;
|
|
|
|
call p_verify_reprepare_count(1);
|
|
|
|
select @message;
|
|
|
|
create trigger v2_bi after insert on v2 for each row set @message="v2_ai";
|
|
|
|
set @var= 10;
|
|
|
|
execute stmt using @var;
|
|
|
|
call p_verify_reprepare_count(1);
|
|
|
|
select @message;
|
|
|
|
select * from v1;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Cleanup
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1, t2, v1, v2;
|
|
|
|
drop view if exists v1, v2;
|
|
|
|
drop function f1;
|
|
|
|
drop procedure p1;
|
|
|
|
--enable_warnings
|
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 19: Special tables (INFORMATION_SCHEMA)
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
|
|
|
# Using a temporary table internally should not confuse the prepared
|
|
|
|
# statement code, and should not raise ER_PS_INVALIDATED errors
|
|
|
|
prepare stmt from
|
2008-04-07 11:35:42 +02:00
|
|
|
"select ROUTINE_SCHEMA, ROUTINE_NAME, ROUTINE_TYPE
|
2007-12-15 01:46:24 +01:00
|
|
|
from INFORMATION_SCHEMA.ROUTINES where
|
2008-04-07 11:35:42 +02:00
|
|
|
routine_name='p1'";
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create procedure p1() select "hi there";
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop procedure p1;
|
|
|
|
create procedure p1() select "hi there, again";
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop procedure p1;
|
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 20: Special tables (log tables)
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
|
|
|
prepare stmt from
|
2008-04-07 11:35:42 +02:00
|
|
|
"select * from mysql.general_log where argument='IMPOSSIBLE QUERY STRING'";
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--disable_result_log
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
--enable_result_log
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 21: Special tables (system tables)
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
|
|
|
prepare stmt from
|
2008-04-07 11:35:42 +02:00
|
|
|
"select type, db, name from mysql.proc where name='p1'";
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create procedure p1() select "hi there";
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop procedure p1;
|
|
|
|
create procedure p1() select "hi there, again";
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop procedure p1;
|
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 22: Special tables (views temp tables)
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create table t1 (a int);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create algorithm=temptable view v1 as select a*a as a2 from t1;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Using a temporary table internally should not confuse the prepared
|
|
|
|
--echo # statement code, and should not raise ER_PS_INVALIDATED errors
|
|
|
|
show create view v1;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "select * from v1";
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
insert into t1 values (1), (2), (3);
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
insert into t1 values (4), (5), (6);
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop table t1;
|
|
|
|
drop view v1;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 23: Special statements
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # SQLCOM_ALTER_TABLE:
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create table t1 (a int);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "alter table t1 add column b int";
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop table t1;
|
|
|
|
create table t1 (a1 int, a2 int);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-17 14:31:43 +02:00
|
|
|
--echo # t1 has changed, and it's does not lead to reprepare
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
alter table t1 drop column b;
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
alter table t1 drop column b;
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop table t1;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # SQLCOM_REPAIR:
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create table t1 (a int);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
insert into t1 values (1), (2), (3);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "repair table t1";
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
execute stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop table t1;
|
|
|
|
create table t1 (a1 int, a2 int);
|
|
|
|
insert into t1 values (1, 10), (2, 20), (3, 30);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-17 14:31:43 +02:00
|
|
|
--echo # t1 has changed, and it's does not lead to reprepare
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
alter table t1 add column b varchar(50) default NULL;
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
alter table t1 drop column b;
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # SQLCOM_ANALYZE:
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "analyze table t1";
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop table t1;
|
|
|
|
create table t1 (a1 int, a2 int);
|
|
|
|
insert into t1 values (1, 10), (2, 20), (3, 30);
|
|
|
|
--echo # t1 has changed, and it's not a problem
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
alter table t1 add column b varchar(50) default NULL;
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
alter table t1 drop column b;
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # SQLCOM_OPTIMIZE:
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "optimize table t1";
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop table t1;
|
|
|
|
create table t1 (a1 int, a2 int);
|
|
|
|
insert into t1 values (1, 10), (2, 20), (3, 30);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # t1 has changed, and it's not a problem
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
alter table t1 add column b varchar(50) default NULL;
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
alter table t1 drop column b;
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop table t1;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # SQLCOM_SHOW_CREATE_PROC:
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "show create procedure p1";
|
2007-12-15 01:46:24 +01:00
|
|
|
--error ER_SP_DOES_NOT_EXIST
|
|
|
|
execute stmt;
|
|
|
|
--error ER_SP_DOES_NOT_EXIST
|
|
|
|
execute stmt;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create procedure p1() begin end;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--disable_result_log
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
--enable_result_log
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop procedure p1;
|
|
|
|
create procedure p1(x int, y int) begin end;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--disable_result_log
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
--enable_result_log
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop procedure p1;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--error ER_SP_DOES_NOT_EXIST
|
|
|
|
execute stmt;
|
|
|
|
--error ER_SP_DOES_NOT_EXIST
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # SQLCOM_SHOW_CREATE_FUNC:
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "show create function f1";
|
2007-12-15 01:46:24 +01:00
|
|
|
--error ER_SP_DOES_NOT_EXIST
|
|
|
|
execute stmt;
|
|
|
|
--error ER_SP_DOES_NOT_EXIST
|
|
|
|
execute stmt;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create function f1() returns int return 0;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--disable_result_log
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
--enable_result_log
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop function f1;
|
|
|
|
create function f1(x int, y int) returns int return x+y;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--disable_result_log
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
--enable_result_log
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop function f1;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--error ER_SP_DOES_NOT_EXIST
|
|
|
|
execute stmt;
|
|
|
|
--error ER_SP_DOES_NOT_EXIST
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # SQLCOM_SHOW_CREATE_TRIGGER:
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create table t1 (a int);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "show create trigger t1_bi";
|
2007-12-15 01:46:24 +01:00
|
|
|
--error ER_TRG_DOES_NOT_EXIST
|
|
|
|
execute stmt;
|
|
|
|
--error ER_TRG_DOES_NOT_EXIST
|
|
|
|
execute stmt;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create trigger t1_bi before insert on t1 for each row set @message= "t1_bi";
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--disable_result_log
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
--enable_result_log
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop trigger t1_bi;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create trigger t1_bi before insert on t1 for each row set @message= "t1_bi (2)";
|
|
|
|
|
|
|
|
--disable_result_log
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
--enable_result_log
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop trigger t1_bi;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--error ER_TRG_DOES_NOT_EXIST
|
|
|
|
execute stmt;
|
|
|
|
--error ER_TRG_DOES_NOT_EXIST
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--echo =====================================================================
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo Part 24: Testing the strength of TABLE_SHARE version
|
2007-12-15 01:46:24 +01:00
|
|
|
--echo =====================================================================
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Test 24-a: number of columns
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create table t1 (a int);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "select a from t1";
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
alter table t1 add column b varchar(50) default NULL;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Test 24-b: column name
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
alter table t1 change b c int;
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Test 24-c: column type
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
alter table t1 change a a varchar(10);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Test 24-d: column type length
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
alter table t1 change a a varchar(20);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Test 24-e: column NULL property
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
alter table t1 change a a varchar(20) NOT NULL;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Test 24-f: column DEFAULT
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
alter table t1 change c c int DEFAULT 20;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Test 24-g: number of keys
|
|
|
|
create unique index t1_a_idx on t1 (a);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Test 24-h: changing index uniqueness
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
drop index t1_a_idx on t1;
|
|
|
|
create index t1_a_idx on t1 (a);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Cleanup
|
|
|
|
drop table t1;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--echo =====================================================================
|
|
|
|
--echo Testing reported bugs
|
|
|
|
--echo =====================================================================
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo #
|
|
|
|
--echo # Bug#27420 A combination of PS and view operations cause
|
|
|
|
--echo # error + assertion on shutdown
|
|
|
|
--echo #
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t_27420_100;
|
|
|
|
drop table if exists t_27420_101;
|
|
|
|
drop view if exists v_27420;
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
create table t_27420_100(a int);
|
|
|
|
insert into t_27420_100 values (1), (2);
|
|
|
|
|
|
|
|
create table t_27420_101(a int);
|
|
|
|
insert into t_27420_101 values (1), (2);
|
|
|
|
|
|
|
|
create view v_27420 as select t_27420_100.a X, t_27420_101.a Y
|
|
|
|
from t_27420_100, t_27420_101
|
|
|
|
where t_27420_100.a=t_27420_101.a;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
prepare stmt from "select * from v_27420";
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
drop view v_27420;
|
|
|
|
create table v_27420(X int, Y int);
|
|
|
|
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
drop table v_27420;
|
|
|
|
# passes in 5.0, fails in 5.1, should pass
|
|
|
|
create table v_27420 (a int, b int, filler char(200));
|
|
|
|
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
drop table t_27420_100;
|
|
|
|
drop table t_27420_101;
|
|
|
|
drop table v_27420;
|
2008-04-07 11:35:42 +02:00
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo #
|
|
|
|
--echo # Bug#27430 Crash in subquery code when in PS and table DDL changed
|
|
|
|
--echo # after PREPARE
|
|
|
|
--echo #
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t_27430_1;
|
|
|
|
drop table if exists t_27430_2;
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
create table t_27430_1 (a int not null, oref int not null, key(a));
|
|
|
|
insert into t_27430_1 values
|
|
|
|
(1, 1),
|
|
|
|
(1, 1234),
|
|
|
|
(2, 3),
|
|
|
|
(2, 1234),
|
|
|
|
(3, 1234);
|
|
|
|
|
|
|
|
create table t_27430_2 (a int not null, oref int not null);
|
|
|
|
insert into t_27430_2 values
|
|
|
|
(1, 1),
|
|
|
|
(2, 2),
|
|
|
|
(1234, 3),
|
|
|
|
(1234, 4);
|
|
|
|
|
2008-04-17 14:31:43 +02:00
|
|
|
prepare stmt from
|
2008-04-07 11:35:42 +02:00
|
|
|
"select oref, a, a in (select a from t_27430_1 where oref=t_27430_2.oref) Z from t_27430_2";
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-17 14:31:43 +02:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
drop table t_27430_1, t_27430_2;
|
|
|
|
|
|
|
|
create table t_27430_1 (a int, oref int, key(a));
|
2008-04-17 14:31:43 +02:00
|
|
|
insert into t_27430_1 values
|
2007-12-15 01:46:24 +01:00
|
|
|
(1, 1),
|
|
|
|
(1, NULL),
|
|
|
|
(2, 3),
|
|
|
|
(2, NULL),
|
|
|
|
(3, NULL);
|
|
|
|
|
|
|
|
create table t_27430_2 (a int, oref int);
|
|
|
|
insert into t_27430_2 values
|
|
|
|
(1, 1),
|
|
|
|
(2,2),
|
|
|
|
(NULL, 3),
|
|
|
|
(NULL, 4);
|
|
|
|
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
drop table t_27430_1;
|
|
|
|
drop table t_27430_2;
|
2008-04-07 11:35:42 +02:00
|
|
|
deallocate prepare stmt;
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo #
|
|
|
|
--echo # Bug#27690 Re-execution of prepared statement after table
|
|
|
|
--echo # was replaced with a view crashes
|
|
|
|
--echo #
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t_27690_1;
|
|
|
|
drop view if exists v_27690_1;
|
|
|
|
drop table if exists v_27690_2;
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
create table t_27690_1 (a int, b int);
|
|
|
|
insert into t_27690_1 values (1,1),(2,2);
|
|
|
|
|
|
|
|
create table v_27690_1 as select * from t_27690_1;
|
|
|
|
create table v_27690_2 as select * from t_27690_1;
|
|
|
|
|
2008-04-17 14:31:43 +02:00
|
|
|
prepare stmt from "select * from v_27690_1, v_27690_2";
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
|
|
|
|
|
|
|
drop table v_27690_1;
|
|
|
|
|
|
|
|
--error ER_NO_SUCH_TABLE
|
|
|
|
execute stmt;
|
|
|
|
|
|
|
|
--error ER_NO_SUCH_TABLE
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
create view v_27690_1 as select A.a, A.b from t_27690_1 A, t_27690_1 B;
|
|
|
|
|
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(1);
|
2007-12-15 01:46:24 +01:00
|
|
|
execute stmt;
|
2008-04-07 11:35:42 +02:00
|
|
|
call p_verify_reprepare_count(0);
|
2007-12-15 01:46:24 +01:00
|
|
|
|
|
|
|
drop table t_27690_1;
|
|
|
|
drop view v_27690_1;
|
|
|
|
drop table v_27690_2;
|
2008-04-07 11:35:42 +02:00
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #=====================================================================
|
|
|
|
--echo #
|
|
|
|
--echo # Bug#21294 Executing a prepared statement that executes
|
|
|
|
--echo # a stored function which was recreat
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
create function f1() returns int return 10;
|
|
|
|
|
|
|
|
prepare stmt from "select f1()";
|
|
|
|
execute stmt;
|
|
|
|
|
|
|
|
drop function f1;
|
|
|
|
create function f1() returns int return 10;
|
|
|
|
|
|
|
|
# might pass or fail, implementation dependent
|
|
|
|
execute stmt;
|
|
|
|
|
|
|
|
drop function f1;
|
|
|
|
create function f1() returns int return 20;
|
|
|
|
|
|
|
|
execute stmt;
|
2008-07-03 21:41:22 +02:00
|
|
|
call p_verify_reprepare_count(2);
|
2008-04-07 11:35:42 +02:00
|
|
|
|
|
|
|
drop function f1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # Bug#12093 SP not found on second PS execution if another thread drops
|
|
|
|
--echo # other SP in between
|
|
|
|
--echo #
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t_12093;
|
|
|
|
drop function if exists f_12093;
|
|
|
|
drop function if exists f_12093_unrelated;
|
|
|
|
drop procedure if exists p_12093;
|
2008-08-13 21:42:21 +02:00
|
|
|
drop view if exists v_12093_unrelated;
|
2008-04-07 11:35:42 +02:00
|
|
|
--enable_warnings
|
2007-12-15 01:46:24 +01:00
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
create table t_12093 (a int);
|
|
|
|
create function f_12093() returns int return (select count(*) from t_12093);
|
|
|
|
create procedure p_12093(a int) select * from t_12093;
|
|
|
|
|
|
|
|
create function f_12093_unrelated() returns int return 2;
|
|
|
|
create procedure p_12093_unrelated() begin end;
|
2008-08-13 21:42:21 +02:00
|
|
|
create view v_12093_unrelated as select * from t_12093;
|
2008-04-07 11:35:42 +02:00
|
|
|
|
|
|
|
connect (con1,localhost,root,,);
|
|
|
|
connection default;
|
|
|
|
|
2008-08-13 21:42:21 +02:00
|
|
|
let $my_drop = drop function f_12093_unrelated;
|
|
|
|
--source include/ps_ddl_1.inc
|
|
|
|
#
|
|
|
|
let $my_drop = drop procedure p_12093_unrelated;
|
|
|
|
--source include/ps_ddl_1.inc
|
|
|
|
#
|
|
|
|
# A reprepare of stmt_sf and stmt_sp is necessary because there is no
|
|
|
|
# information about views within the table definition cache.
|
|
|
|
let $my_drop = drop view v_12093_unrelated;
|
|
|
|
--source include/ps_ddl_1.inc
|
2008-04-07 11:35:42 +02:00
|
|
|
|
2008-08-13 21:42:21 +02:00
|
|
|
call p_verify_reprepare_count(6);
|
2008-04-07 11:35:42 +02:00
|
|
|
|
|
|
|
disconnect con1;
|
|
|
|
drop table t_12093;
|
|
|
|
drop function f_12093;
|
|
|
|
drop procedure p_12093;
|
|
|
|
deallocate prepare stmt_sf;
|
|
|
|
deallocate prepare stmt_sp;
|
|
|
|
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
|
|
|
|
--echo =====================================================================
|
2008-04-17 14:31:43 +02:00
|
|
|
--echo Ensure that metadata validation is performed for every type of
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
--echo SQL statement where it is needed.
|
|
|
|
--echo =====================================================================
|
2008-04-18 21:18:53 +02:00
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_SELECT
|
|
|
|
--echo #
|
|
|
|
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from "select 1 as res from dual where (1) in (select * from t1)";
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
call p_verify_reprepare_count(1);
|
2008-04-18 21:18:53 +02:00
|
|
|
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_CREATE_TABLE
|
|
|
|
--echo #
|
2008-04-18 21:18:53 +02:00
|
|
|
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
drop table if exists t2;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from 'create table t2 as select * from t1';
|
|
|
|
execute stmt;
|
|
|
|
drop table t2;
|
|
|
|
execute stmt;
|
|
|
|
drop table t2;
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
2008-04-18 21:18:53 +02:00
|
|
|
# Base table with name of table to be created exists
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
--error ER_TABLE_EXISTS_ERROR
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(1);
|
|
|
|
--error ER_TABLE_EXISTS_ERROR
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
drop table t2;
|
2008-04-18 21:18:53 +02:00
|
|
|
# Temporary table with name of table to be created exists
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
create temporary table t2 (a int);
|
2010-01-16 08:44:24 +01:00
|
|
|
# Temporary table and base table are not in the same name space.
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
execute stmt;
|
2010-02-06 11:28:06 +01:00
|
|
|
call p_verify_reprepare_count(0);
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
--error ER_TABLE_EXISTS_ERROR
|
|
|
|
execute stmt;
|
2010-01-16 08:44:24 +01:00
|
|
|
call p_verify_reprepare_count(1);
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
drop temporary table t2;
|
2010-01-16 08:44:24 +01:00
|
|
|
--error ER_TABLE_EXISTS_ERROR
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
execute stmt;
|
Initial import of WL#3726 "DDL locking for all metadata objects".
Backport of:
------------------------------------------------------------
revno: 2630.4.1
committer: Dmitry Lenev <dlenev@mysql.com>
branch nick: mysql-6.0-3726-w
timestamp: Fri 2008-05-23 17:54:03 +0400
message:
WL#3726 "DDL locking for all metadata objects".
After review fixes in progress.
------------------------------------------------------------
This is the first patch in series. It transforms the metadata
locking subsystem to use a dedicated module (mdl.h,cc). No
significant changes in the locking protocol.
The import passes the test suite with the exception of
deprecated/removed 6.0 features, and MERGE tables. The latter
are subject to a fix by WL#4144.
Unfortunately, the original changeset comments got lost in a merge,
thus this import has its own (largely insufficient) comments.
This patch fixes Bug#25144 "replication / binlog with view breaks".
Warning: this patch introduces an incompatible change:
Under LOCK TABLES, it's no longer possible to FLUSH a table that
was not locked for WRITE.
Under LOCK TABLES, it's no longer possible to DROP a table or
VIEW that was not locked for WRITE.
******
Backport of:
------------------------------------------------------------
revno: 2630.4.2
committer: Dmitry Lenev <dlenev@mysql.com>
branch nick: mysql-6.0-3726-w
timestamp: Sat 2008-05-24 14:03:45 +0400
message:
WL#3726 "DDL locking for all metadata objects".
After review fixes in progress.
******
Backport of:
------------------------------------------------------------
revno: 2630.4.3
committer: Dmitry Lenev <dlenev@mysql.com>
branch nick: mysql-6.0-3726-w
timestamp: Sat 2008-05-24 14:08:51 +0400
message:
WL#3726 "DDL locking for all metadata objects"
Fixed failing Windows builds by adding mdl.cc to the lists
of files needed to build server/libmysqld on Windows.
******
Backport of:
------------------------------------------------------------
revno: 2630.4.4
committer: Dmitry Lenev <dlenev@mysql.com>
branch nick: mysql-6.0-3726-w
timestamp: Sat 2008-05-24 21:57:58 +0400
message:
WL#3726 "DDL locking for all metadata objects".
Fix for assert failures in kill.test which occured when one
tried to kill ALTER TABLE statement on merge table while it
was waiting in wait_while_table_is_used() for other connections
to close this table.
These assert failures stemmed from the fact that cleanup code
in this case assumed that temporary table representing new
version of table was open with adding to THD::temporary_tables
list while code which were opening this temporary table wasn't
always fulfilling this.
This patch changes code that opens new version of table to
always do this linking in. It also streamlines cleanup process
for cases when error occurs while we have new version of table
open.
******
WL#3726 "DDL locking for all metadata objects"
Add libmysqld/mdl.cc to .bzrignore.
******
Backport of:
------------------------------------------------------------
revno: 2630.4.6
committer: Dmitry Lenev <dlenev@mysql.com>
branch nick: mysql-6.0-3726-w
timestamp: Sun 2008-05-25 00:33:22 +0400
message:
WL#3726 "DDL locking for all metadata objects".
Addition to the fix of assert failures in kill.test caused by
changes for this worklog.
Make sure we close the new table only once.
.bzrignore:
Add libmysqld/mdl.cc
libmysqld/CMakeLists.txt:
Added mdl.cc to the list of files needed for building of libmysqld.
libmysqld/Makefile.am:
Added files implementing new meta-data locking subsystem to the server.
mysql-test/include/handler.inc:
Use separate connection for waiting while threads performing DDL
operations conflicting with open HANDLER tables reach blocked
state. This is required because now we check and close tables open
by HANDLER statements in this connection conflicting with DDL in
another each time open_tables() is called and thus select from I_S
which is used for waiting will unblock DDL operations if issued
from connection with open HANDLERs.
mysql-test/r/create.result:
Adjusted test case after change in implementation of CREATE TABLE
... SELECT. We no longer have special check in open_table() which
catches the case when we select from the table created. Instead we
rely on unique_table() call which happens after opening and
locking all tables.
mysql-test/r/flush.result:
FLUSH TABLES WITH READ LOCK can no longer happen under LOCK
TABLES. Updated test accordingly.
mysql-test/r/flush_table.result:
Under LOCK TABLES we no longer allow to do FLUSH TABLES for tables
locked for read. Updated test accordingly.
mysql-test/r/handler_innodb.result:
Use separate connection for waiting while threads performing DDL
operations conflicting with open HANDLER tables reach blocked
state. This is required because now we check and close tables open
by HANDLER statements in this connection conflicting with DDL in
another each time open_tables() is called and thus select from I_S
which is used for waiting will unblock DDL operations if issued
from connection with open HANDLERs.
mysql-test/r/handler_myisam.result:
Use separate connection for waiting while threads performing DDL
operations conflicting with open HANDLER tables reach blocked
state. This is required because now we check and close tables open
by HANDLER statements in this connection conflicting with DDL in
another each time open_tables() is called and thus select from I_S
which is used for waiting will unblock DDL operations if issued
from connection with open HANDLERs.
mysql-test/r/information_schema.result:
Additional test for WL#3726 "DDL locking for all metadata
objects". Check that we use high-priority metadata lock requests
when filling I_S tables.
Rearrange tests to match 6.0 better (fewer merge conflicts).
mysql-test/r/kill.result:
Added tests checking that DDL and DML statements waiting for
metadata locks can be interrupted by KILL command.
mysql-test/r/lock.result:
One no longer is allowed to do DROP VIEW under LOCK TABLES even if
this view is locked by LOCK TABLES. The problem is that in such
situation write locks on view are not mutually exclusive so
upgrading metadata lock which is required for dropping of view
will lead to deadlock.
mysql-test/r/partition_column_prune.result:
Update results (same results in 6.0), WL#3726
mysql-test/r/partition_pruning.result:
Update results (same results in 6.0), WL#3726
mysql-test/r/ps_ddl.result:
We no longer invalidate prepared CREATE TABLE ... SELECT statement
if target table changes. This is OK since it is not strictly
necessary.
The first change is wrong, is caused by FLUSH TABLE
now flushing all unused tables. This is a regression that
Dmitri fixed in 6.0 in a follow up patch.
mysql-test/r/sp.result:
Under LOCK TABLES we no longer allow accessing views which were
not explicitly locked. To access view we need to obtain metadata
lock on it and doing this under LOCK TABLES may lead to deadlocks.
mysql-test/r/view.result:
One no longer is allowed to do DROP VIEW under LOCK TABLES even if
this view is locked by LOCK TABLES. The problem is that in such
situation even "write locks" on view are not mutually exclusive so
upgrading metadata lock which is required for dropping of view
will lead to deadlock
mysql-test/r/view_grant.result:
ALTER VIEW implementation was changed to open a view only after
checking that user which does alter has appropriate privileges on
it. This means that in case when user's privileges are
insufficient for this we won't check that new view definer is the
same as original one or user performing alter has SUPER privilege.
Adjusted test case accordingly.
mysql-test/r/view_multi.result:
Added test case for bug#25144 "replication / binlog with view
breaks".
mysql-test/suite/rpl/t/disabled.def:
Disable test for deprecated features (they don't work with new MDL).
mysql-test/t/create.test:
Adjusted test case after change in implementation of CREATE TABLE
... SELECT. We no longer have special check in open_table() which
catches the case when we select from the table created. Instead we
rely on unique_table() call which happens after opening and
locking all tables.
mysql-test/t/disabled.def:
Disable merge.test, subject of WL#4144
mysql-test/t/flush.test:
FLUSH TABLES WITH READ LOCK can no longer happen under LOCK
TABLES. Updated test accordingly.
mysql-test/t/flush_table.test:
Under LOCK TABLES we no longer allow to do FLUSH TABLES for tables
locked for read. Updated test accordingly.
mysql-test/t/information_schema.test:
Additional test for WL#3726 "DDL locking for all metadata
objects". Check that we use high-priority metadata lock requests
when filling I_S tables.
Rearrange the results for easier merges with 6.0.
mysql-test/t/kill.test:
Added tests checking that DDL and DML statements waiting for
metadata locks can be interrupted by KILL command.
mysql-test/t/lock.test:
One no longer is allowed to do DROP VIEW under LOCK TABLES even if
this view is locked by LOCK TABLES. The problem is that in such
situation write locks on view are not mutually exclusive so
upgrading metadata lock which is required for dropping of view
will lead to deadlock.
mysql-test/t/lock_multi.test:
Adjusted test case to the changes of status in various places
caused by change in implementation FLUSH TABLES WITH READ LOCK,
which is now takes global metadata lock before flushing tables and
therefore waits on at these places.
mysql-test/t/ps_ddl.test:
We no longer invalidate prepared CREATE TABLE ... SELECT statement
if target table changes. This is OK since it is not strictly
necessary.
The first change is wrong, is caused by FLUSH TABLE
now flushing all unused tables. This is a regression that
Dmitri fixed in 6.0 in a follow up patch.
mysql-test/t/sp.test:
Under LOCK TABLES we no longer allow accessing views which were
not explicitly locked. To access view we need to obtain metadata
lock on it and doing this under LOCK TABLES may lead to deadlocks.
mysql-test/t/trigger_notembedded.test:
Adjusted test case to the changes of status in various places
caused by change in implementation FLUSH TABLES WITH READ LOCK,
which is now takes global metadata lock before flushing tables and
therefore waits on at these places.
mysql-test/t/view.test:
One no longer is allowed to do DROP VIEW under LOCK TABLES even if
this view is locked by LOCK TABLES. The problem is that in such
situation even "write locks" on view are not mutually exclusive so
upgrading metadata lock which is required for dropping of view
will lead to deadlock.
mysql-test/t/view_grant.test:
ALTER VIEW implementation was changed to open a view only after
checking that user which does alter has appropriate privileges on
it. This means that in case when user's privileges are
insufficient for this we won't check that new view definer is the
same as original one or user performing alter has SUPER privilege.
Adjusted test case accordingly.
mysql-test/t/view_multi.test:
Added test case for bug#25144 "replication / binlog with view
breaks".
sql/CMakeLists.txt:
Added mdl.cc to the list of files needed for building of server.
sql/Makefile.am:
Added files implementing new meta-data locking subsystem to the
server.
sql/event_db_repository.cc:
Allocate metadata lock requests objects (MDL_LOCK) on execution
memory root in cases when TABLE_LIST objects is also allocated
there or on stack.
sql/ha_ndbcluster.cc:
Adjusted code to work nicely with new metadata locking subsystem.
close_cached_tables() no longer has wait_for_placeholder argument.
Instead of relying on this parameter and related behavior FLUSH
TABLES WITH READ LOCK now takes global shared metadata lock.
sql/ha_ndbcluster_binlog.cc:
Adjusted code to work with new metadata locking subsystem.
close_cached_tables() no longer has wait_for_placeholder argument.
Instead of relying on this parameter and related behavior FLUSH
TABLES WITH READ LOCK now takes global shared metadata lock.
sql/handler.cc:
update_frm_version():
Directly update TABLE_SHARE::mysql_version member instead of
going through all TABLE instances for this table (old code was a
legacy from pre-table-definition-cache days).
sql/lock.cc:
Use new metadata locking subsystem. Threw away most of functions
related to name locking as now one is supposed to use metadata
locking API instead. In lock_global_read_lock() and
unlock_global_read_lock() in order to avoid problems with global
read lock sneaking in at the moment when we perform FLUSH TABLES
or ALTER TABLE under LOCK TABLES and when tables being reopened
are protected only by metadata locks we also have to take global
shared meta data lock.
sql/log_event.cc:
Adjusted code to work with new metadata locking subsystem. For
tables open by slave thread for applying RBR events allocate
memory for lock request object in the same chunk of memory as
TABLE_LIST objects for them. In order to ensure that we keep these
objects around until tables are open always close tables before
calling Relay_log_info::clear_tables_to_lock(). Use new auxiliary
Relay_log_info::slave_close_thread_tables() method to enforce
this.
sql/log_event_old.cc:
Adjusted code to work with new metadata locking subsystem. Since
for tables open by slave thread for applying RBR events memory for
lock request object is allocated in the same chunk of memory as
TABLE_LIST objects for them we have to ensure that we keep these
objects around until tables are open. To ensure this we always
close tables before calling
Relay_log_info::clear_tables_to_lock(). To enfore this we use
new auxiliary Relay_log_info::slave_close_thread_tables()
method.
sql/mdl.cc:
Implemented new metadata locking subsystem and API described in
WL3726 "DDL locking for all metadata objects".
sql/mdl.h:
Implemented new metadata locking subsystem and API described in
WL3726 "DDL locking for all metadata objects".
sql/mysql_priv.h:
- close_thread_tables()/close_tables_for_reopen() now has one more
argument which indicates that metadata locks should be released
but not removed from the context in order to be used later in
mdl_wait_for_locks() and tdc_wait_for_old_version().
- close_cached_table() routine is no longer public.
- Thread waiting in wait_while_table_is_used() can be now killed
so this function returns boolean to make caller aware of such
situation.
- We no longer have table cache as separate entity instead used
and unused TABLE instances are linked to TABLE_SHARE objects in
table definition cache.
- Now third argument of open_table() is also used for requesting
table repair or auto-discovery of table's new definition. So its
type was changed from bool to enum.
- Added tdc_open_view() function for opening view by getting its
definition from disk (and table cache in future).
- reopen_name_locked_table() no longer needs "link_in" argument as
now we have exclusive metadata locks instead of dummy TABLE
instances when this function is called.
- find_locked_table() now takes head of list of TABLE instances
instead of always scanning through THD::open_tables list. Also
added find_write_locked_table() auxiliary.
- reopen_tables(), close_cached_tables() no longer have
mark_share_as_old and wait_for_placeholder arguments. Instead of
relying on this parameters and related behavior FLUSH TABLES
WITH READ LOCK now takes global shared metadata lock.
- We no longer need drop_locked_tables() and
abort_locked_tables().
- mysql_ha_rm_tables() now always assume that LOCK_open is not
acquired by caller.
- Added notify_thread_having_shared_lock() callback invoked by
metadata locking subsystem when acquiring an exclusive lock, for
each thread that has a conflicting shared metadata lock.
- Introduced expel_table_from_cache() as replacement for
remove_table_from_cache() (the main difference is that this new
function assumes that caller follows metadata locking protocol
and never waits).
- Threw away most of functions related to name locking. One should
use new metadata locking subsystem and API instead.
sql/mysqld.cc:
Got rid of call initializing/deinitializing table cache since now
it is embedded into table definition cache. Added calls for
initializing/ deinitializing metadata locking subsystem.
sql/rpl_rli.cc:
Introduced auxiliary Relay_log_info::slave_close_thread_tables()
method which is used for enforcing that we always close tables
open for RBR before deallocating TABLE_LIST elements and MDL_LOCK
objects for them.
sql/rpl_rli.h:
Introduced auxiliary Relay_log_info::slave_close_thread_tables()
method which is used for enforcing that we always close tables
open for RBR before deallocating TABLE_LIST elements and MDL_LOCK
objects for them.
sql/set_var.cc:
close_cached_tables() no longer has wait_for_placeholder argument.
Instead of relying on this parameter and related behavior FLUSH
TABLES WITH READ LOCK now takes global shared metadata lock.
sql/sp_head.cc:
For tables added to the statement's table list by prelocking
algorithm we allocate these objects either on the same memory as
corresponding table list elements or on THD::locked_tables_root
(if we are building table list for LOCK TABLES).
sql/sql_acl.cc:
Allocate metadata lock requests objects (MDL_LOCK) on execution
memory root in cases when we use stack TABLE_LIST objects to open
tables. Got rid of redundant code by using unlock_locked_tables()
function.
sql/sql_base.cc:
Changed code to use new MDL subsystem. Got rid of separate table
cache. Now used and unused TABLE instances are linked to the
TABLE_SHAREs in table definition cache.
check_unused():
Adjusted code to the fact that we no longer have separate table
cache. Removed dead code.
table_def_free():
Free TABLE instances referenced from TABLE_SHARE objects before
destroying table definition cache.
get_table_share():
Added assert which ensures that noone will be able to access
table (and its share) without acquiring some kind of metadata
lock first.
close_handle_and_leave_table_as_lock():
Adjusted code to the fact that TABLE instances now are linked to
list in TABLE_SHARE.
list_open_tables():
Changed this function to use table definition cache instead of
table cache.
free_cache_entry():
Unlink freed TABLE elements from the list of all TABLE instances
for the table in TABLE_SHARE.
kill_delayed_thread_for_table():
Added auxiliary for killing delayed insert threads for
particular table.
close_cached_tables():
Got rid of wait_for_refresh argument as we now rely on global
shared metadata lock to prevent FLUSH WITH READ LOCK sneaking in
when we are reopening tables. Heavily reworked this function to
use new MDL code and not to rely on separate table cache entity.
close_open_tables():
We no longer have separate table cache.
close_thread_tables():
Release metadata locks after closing all tables. Added skip_mdl
argument which allows us not to remove metadata lock requests
from the context in case when we are going to use this requests
later in mdl_wait_for_locks() and tdc_wait_for_old_versions().
close_thread_table()/close_table_for_reopen():
Since we no longer have separate table cache and all TABLE
instances are linked to TABLE_SHARE objects in table definition
cache we have to link/unlink TABLE object to/from appropriate
lists in the share.
name_lock_locked_table():
Moved redundant code to find_write_locked_table() function and
adjusted code to the fact that wait_while_table_is_used() can
now return with an error if our thread is killed.
reopen_table_entry():
We no longer need "link_in" argument as with MDL we no longer
call this function with dummy TABLE object pre-allocated and
added to the THD::open_tables. Also now we add newly-open TABLE
instance to the list of share's used TABLE instances.
table_cache_insert_placeholder():
Got rid of name-locking legacy.
lock_table_name_if_not_cached():
Moved to sql_table.cc the only place where it is used. It was
also reimplemented using new MDL API.
open_table():
- Reworked this function to use new MDL subsystem.
- Changed code to deal with table definition cache directly
instead of going through separate table cache.
- Now third argument is also used for requesting table repair
or auto-discovery of table's new definition. So its type was
changed from bool to enum.
find_locked_table()/find_write_locked_table():
Accept head of list of TABLE objects as first argument and use
this list instead of always searching in THD::open_tables list.
Also added auxiliary for finding write-locked locked tables.
reopen_table():
Adjusted function to work with new MDL subsystem and to properly
manuipulate with lists of used/unused TABLE instaces in
TABLE_SHARE.
reopen_tables():
Removed mark_share_as_old parameter. Instead of relying on it
and related behavior FLUSH TABLES WITH READ LOCK now takes
global shared metadata lock. Changed code after removing
separate table cache.
drop_locked_tables()/abort_locked_tables():
Got rid of functions which are no longer needed.
unlock_locked_tables():
Moved this function from sql_parse.cc and changed it to release
memory which was used for allocating metadata lock requests for
tables open and locked by LOCK TABLES.
tdc_open_view():
Intoduced function for opening a view by getting its definition
from disk (and table cache in future).
reopen_table_entry():
Introduced function for opening table definitions while holding
exclusive metatadata lock on it.
open_unireg_entry():
Got rid of this function. Most of its functionality is relocated
to open_table() and open_table_fini() functions, and some of it
to reopen_table_entry() and tdc_open_view(). Also code
resposible for auto-repair and auto-discovery of tables was
moved to separate function.
open_table_entry_fini():
Introduced function which contains common actions which finalize
process of TABLE object creation.
auto_repair_table():
Moved code responsible for auto-repair of table being opened
here.
handle_failed_open_table_attempt()
Moved code responsible for handling failing attempt to open
table to one place (retry due to lock conflict/old version,
auto-discovery and repair).
open_tables():
- Flush open HANDLER tables if they have old version of if there
is conflicting metadata lock against them (before this moment
we had this code in open_table()).
- When we open view which should be processed via derived table
on the second execution of prepared statement or stored
routine we still should call open_table() for it in order to
obtain metadata lock on it and prepare its security context.
- In cases when we discover that some special handling of
failure to open table is needed call
handle_failed_open_table_attempt() which handles all such
scenarios.
open_ltable():
Handling of various special scenarios of failure to open a table
was moved to separate handle_failed_open_table_attempt()
function.
remove_db_from_cache():
Removed this function as it is no longer used.
notify_thread_having_shared_lock():
Added callback which is invoked by MDL subsystem when acquiring
an exclusive lock, for each thread that has a conflicting shared
metadata lock.
expel_table_from_cache():
Introduced function for removing unused TABLE instances. Unlike
remove_table_from_cache() it relies on caller following MDL
protocol and having appropriate locks when calling it and thus
does not do any waiting if table is still in use.
tdc_wait_for_old_version():
Added function which allows open_tables() to wait in cases when
we discover that we should back-off due to presence of old
version of table.
abort_and_upgrade_lock():
Use new MDL calls.
mysql_wait_completed_table():
Got rid of unused function.
open_system_tables_for_read/for_update()/performance_schema_table():
Allocate MDL_LOCK objects on execution memory root in cases when
TABLE_LIST objects for corresponding tables is allocated on
stack.
close_performance_schema_table():
Release metadata locks after closing tables.
******
Use I_P_List for free/used tables list in the table share.
sql/sql_binlog.cc:
Use Relay_log_info::slave_close_thread_tables() method to enforce
that we always close tables open for RBR before deallocating
TABLE_LIST elements and MDL_LOCK objects for them.
sql/sql_class.cc:
Added meta-data locking contexts as part of Open_tables_state
context. Also introduced THD::locked_tables_root memory root
which is to be used for allocating MDL_LOCK objects for tables in
LOCK TABLES statement (end of lifetime for such objects is UNLOCK
TABLES so we can't use statement or execution root for them).
sql/sql_class.h:
Added meta-data locking contexts as part of Open_tables_state
context. Also introduced THD::locked_tables_root memory root
which is to be used for allocating MDL_LOCK objects for tables in
LOCK TABLES statement (end of lifetime for such objects is UNLOCK
TABLES so we can't use statement or execution root for them).
Note: handler_mdl_context and locked_tables_root and
mdl_el_root will be removed by subsequent patches.
sql/sql_db.cc:
mysql_rm_db() does not really need to call remove_db_from_cache()
as it drops each table in the database using
mysql_rm_table_part2(), which performs all necessary operations on
table (definition) cache.
sql/sql_delete.cc:
Use the new metadata locking API for TRUNCATE.
sql/sql_handler.cc:
Changed HANDLER implementation to use new metadata locking
subsystem. Note that MDL_LOCK objects for HANDLER tables are
allocated in the same chunk of heap memory as TABLE_LIST object
for those tables.
sql/sql_insert.cc:
mysql_insert():
find_locked_table() now takes head of list of TABLE object as
its argument instead of always scanning through THD::open_tables
list.
handle_delayed_insert():
Allocate metadata lock request object for table open by delayed
insert thread on execution memroot. create_table_from_items():
We no longer allocate dummy TABLE objects for tables being
created if they don't exist. As consequence
reopen_name_locked_table() no longer has link_in argument.
open_table() now has one more argument which is not relevant for
temporary tables.
sql/sql_parse.cc:
- Moved unlock_locked_tables() routine to sql_base.cc and made
available it in other files. Got rid of some redundant code by
using this function.
- Replaced boolean TABLE_LIST::create member with enum
open_table_type member.
- Use special memory root for allocating MDL_LOCK objects for
tables open and locked by LOCK TABLES (these object should live
till UNLOCK TABLES so we can't allocate them on statement nor
execution memory root). Also properly set metadata lock
upgradability attribure for those tables.
- Under LOCK TABLES it is no longer allowed to flush tables which
are not write-locked as this breaks metadata locking protocol
and thus potentially might lead to deadlock.
- Added auxiliary adjust_mdl_locks_upgradability() function.
sql/sql_partition.cc:
Adjusted code to the fact that reopen_tables() no longer has
"mark_share_as_old" argument. Got rid of comments which are no
longer true.
sql/sql_plist.h:
Added I_P_List template class for parametrized intrusive doubly
linked lists and I_P_List_iterator for corresponding iterator.
Unlike for I_List<> list elements of such list can participate in
several lists. Unlike List<> such lists are doubly-linked and
intrusive.
sql/sql_plugin.cc:
Allocate metadata lock requests objects (MDL_LOCK) on execution
memory root in cases when we use stack TABLE_LIST objects to open
tables.
sql/sql_prepare.cc:
Replaced boolean TABLE_LIST::create member with enum
open_table_type member. This allows easily handle situation in
which instead of opening the table we want only to take exclusive
metadata lock on it.
sql/sql_rename.cc:
Use new metadata locking subsystem in implementation of RENAME
TABLE.
sql/sql_servers.cc:
Allocate metadata lock requests objects (MDL_LOCK) on execution
memory root in cases when we use stack TABLE_LIST objects to open
tables. Got rid of redundant code by using unlock_locked_tables()
function.
sql/sql_show.cc:
Acquire shared metadata lock when we are getting information for
I_S table directly from TABLE_SHARE without doing full-blown table
open. We use high priority lock request in this situation in
order to avoid deadlocks.
Also allocate metadata lock requests objects (MDL_LOCK) on
execution memory root in cases when TABLE_LIST objects are also
allocated there
sql/sql_table.cc:
mysql_rm_table():
Removed comment which is no longer relevant.
mysql_rm_table_part2():
Now caller of mysql_ha_rm_tables() should not own LOCK_open.
Adjusted code to use new metadata locking subsystem instead of
name-locks.
lock_table_name_if_not_cached():
Moved this function from sql_base.cc to this file and
reimplemented it using metadata locking API.
mysql_create_table():
Adjusted code to use new MDL API.
wait_while_table_is_used():
Changed function to use new MDL subsystem. Made thread waiting
in it killable (this also led to introduction of return value so
caller can distinguish successful executions from situations
when waiting was aborted).
close_cached_tables():
Thread waiting in this function is killable now. As result it
has return value for distinguishing between succes and failure.
Got rid of redundant boradcast_refresh() call.
prepare_for_repair():
Use MDL subsystem instead of name-locks.
mysql_admin_table():
mysql_ha_rm_tables() now always assumes that caller doesn't own
LOCK_open.
mysql_repair_table():
We should mark all elements of table list as requiring
upgradable metadata locks.
mysql_create_table_like():
Use new MDL subsystem instead of name-locks.
create_temporary_tables():
We don't need to obtain metadata locks when creating temporary
table.
mysql_fast_or_online_alter_table():
Thread waiting in wait_while_table_is_used() is now killable.
mysql_alter_table():
Adjusted code to work with new MDL subsystem and to the fact
that threads waiting in what_while_table_is_used() and
close_cached_table() are now killable.
sql/sql_test.cc:
We no longer have separate table cache. TABLE instances are now
associated with/linked to TABLE_SHARE objects in table definition
cache.
sql/sql_trigger.cc:
Adjusted code to work with new metadata locking subsystem. Also
reopen_tables() no longer has mark_share_as_old argument (Instead
of relying on this parameter and related behavior FLUSH TABLES
WITH READ LOCK now takes global shared metadata lock).
sql/sql_udf.cc:
Allocate metadata lock requests objects (MDL_LOCK) on execution
memory root in cases when we use stack TABLE_LIST objects to open
tables.
sql/sql_update.cc:
Adjusted code to work with new meta-data locking subsystem.
sql/sql_view.cc:
Added proper meta-data locking to implementations of
CREATE/ALTER/DROP VIEW statements. Now we obtain exclusive
meta-data lock on a view before creating/ changing/dropping it.
This ensures that all concurrent statements that use this view
will finish before our statement will proceed and therefore we
will get correct order of statements in the binary log.
Also ensure that TABLE_LIST::mdl_upgradable attribute is properly
propagated for underlying tables of view.
sql/table.cc:
Added auxiliary alloc_mdl_locks() function for allocating metadata
lock request objects for all elements of table list.
sql/table.h:
TABLE_SHARE:
Got rid of unused members. Introduced members for storing lists
of used and unused TABLE objects for this share.
TABLE:
Added members for linking TABLE objects into per-share lists of
used and unused TABLE instances. Added member for holding
pointer to metadata lock for this table.
TABLE_LIST:
Replaced boolean TABLE_LIST::create member with enum
open_table_type member. This allows easily handle situation in
which instead of opening the table we want only to take
exclusive meta-data lock on it (we need this in order to handle
ALTER VIEW and CREATE VIEW statements).
Introduced new mdl_upgradable member for marking elements of
table list for which we need to take upgradable shared metadata
lock instead of plain shared metadata lock. Added pointer for
holding pointer to MDL_LOCK for the table.
Added auxiliary alloc_mdl_locks() function for allocating metadata
lock requests objects for all elements of table list. Added
auxiliary set_all_mdl_upgradable() function for marking all
elements in table list as requiring upgradable metadata locks.
storage/myisammrg/ha_myisammrg.cc:
Allocate MDL_LOCK objects for underlying tables of MERGE table.
To be reworked once Ingo pushes his patch for WL4144.
2009-11-30 16:55:03 +01:00
|
|
|
call p_verify_reprepare_count(0);
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
drop table t2;
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
drop table t2;
|
2008-04-18 21:18:53 +02:00
|
|
|
# View with name of table to be created exists
|
|
|
|
# Attention:
|
|
|
|
# We cannot print the error message because it contains a random filename.
|
|
|
|
# Example: 1050: Table '<some_path>/var/tmp/#sql_6979_0' already exists
|
|
|
|
# Therefore we mangle it via
|
|
|
|
# "--error ER_TABLE_EXISTS_ERROR,9999" (9999 is currently not used)
|
|
|
|
# to "Got one of the listed errors".
|
|
|
|
create view t2 as select 1;
|
|
|
|
--error ER_TABLE_EXISTS_ERROR,9999
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(1);
|
|
|
|
--error ER_TABLE_EXISTS_ERROR,9999
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
drop view t2;
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
drop table t1;
|
2008-04-18 21:18:53 +02:00
|
|
|
# Table to be used recreated (drop,create) with different layout
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
create table t1 (x varchar(20));
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(1);
|
|
|
|
select * from t2;
|
|
|
|
drop table t2;
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
drop table t2;
|
2008-04-18 21:18:53 +02:00
|
|
|
# Table to be used has a modified (alter table) layout
|
|
|
|
alter table t1 add column y decimal(10,3);
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(1);
|
|
|
|
select * from t2;
|
|
|
|
drop table t2;
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
create table t1 (a int);
|
|
|
|
insert into t1 (a) values (1);
|
|
|
|
prepare stmt from "create temporary table if not exists t2 as select * from t1";
|
|
|
|
execute stmt;
|
|
|
|
drop table t2;
|
|
|
|
execute stmt;
|
2009-12-10 11:53:20 +01:00
|
|
|
call p_verify_reprepare_count(0);
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
execute stmt;
|
2009-12-10 11:53:20 +01:00
|
|
|
call p_verify_reprepare_count(1);
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
select * from t2;
|
|
|
|
execute stmt;
|
2009-12-10 11:53:20 +01:00
|
|
|
call p_verify_reprepare_count(0);
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
select * from t2;
|
|
|
|
drop table t2;
|
|
|
|
create temporary table t2 (a varchar(10));
|
|
|
|
execute stmt;
|
|
|
|
select * from t2;
|
2009-12-10 11:53:20 +01:00
|
|
|
call p_verify_reprepare_count(1);
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(1);
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
drop table t1;
|
2008-04-18 21:18:53 +02:00
|
|
|
drop temporary table t2;
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
drop table t2;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
2008-04-18 21:18:53 +02:00
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from "create table t2 like t1";
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
drop table t2;
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
drop table t2;
|
|
|
|
# Table to be used does not exist
|
|
|
|
drop table t1;
|
|
|
|
--error ER_NO_SUCH_TABLE
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
--error ER_NO_SUCH_TABLE
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
# Table to be used recreated (drop,create) with different layout
|
|
|
|
create table t1 (x char(17));
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(1);
|
|
|
|
drop table t2;
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
drop table t2;
|
|
|
|
# Table to be used has a modified (alter table) layout
|
|
|
|
alter table t1 add column y time;
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(1);
|
|
|
|
select * from t2;
|
|
|
|
drop table t2;
|
|
|
|
execute stmt;
|
|
|
|
call p_verify_reprepare_count(0);
|
|
|
|
drop table t1;
|
|
|
|
drop table t2;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_UPDATE
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1, t2;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
create table t2 (a int);
|
|
|
|
prepare stmt from "update t2 set a=a+1 where (1) in (select * from t1)";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1, t2;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_INSERT
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1, t2;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
create table t2 (a int);
|
|
|
|
prepare stmt from "insert into t2 set a=((1) in (select * from t1))";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
|
|
|
|
drop table t1, t2;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_INSERT_SELECT
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1, t2;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
create table t2 (a int);
|
|
|
|
prepare stmt from "insert into t2 select * from t1";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1, t2;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_REPLACE
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1, t2;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
create table t2 (a int);
|
|
|
|
prepare stmt from "replace t2 set a=((1) in (select * from t1))";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1, t2;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_REPLACE_SELECT
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1, t2;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
create table t2 (a int);
|
|
|
|
prepare stmt from "replace t2 select * from t1";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1, t2;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_DELETE
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1, t2;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
create table t2 (a int);
|
|
|
|
prepare stmt from "delete from t2 where (1) in (select * from t1)";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1, t2;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_DELETE_MULTI
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1, t2, t3;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
create table t2 (a int);
|
|
|
|
create table t3 (a int);
|
|
|
|
prepare stmt from "delete t2, t3 from t2, t3 where (1) in (select * from t1)";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1, t2, t3;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_UPDATE_MULTI
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1, t2, t3;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
create table t2 (a int);
|
|
|
|
create table t3 (a int);
|
|
|
|
prepare stmt from "update t2, t3 set t3.a=t2.a, t2.a=null where (1) in (select * from t1)";
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1, t2, t3;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
--echo # Intermediate results: 8 SQLCOMs tested, 8 automatic reprepares
|
|
|
|
call p_verify_reprepare_count(8);
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_LOAD
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a varchar(20));
|
|
|
|
--error ER_UNSUPPORTED_PS
|
|
|
|
prepare stmt from "load data infile '../std_data_ln/words.dat' into table t1";
|
|
|
|
drop table t1;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_SHOW_DATABASES
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from "show databases where (1) in (select * from t1)";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_SHOW_TABLES
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from "show tables where (1) in (select * from t1)";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_SHOW_FIELDS
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from "show fields from t1 where (1) in (select * from t1)";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_SHOW_KEYS
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from "show keys from t1 where (1) in (select * from t1)";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_SHOW_VARIABLES
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from "show variables where (1) in (select * from t1)";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_SHOW_STATUS
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from "show status where (1) in (select * from t1)";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
2008-04-17 14:31:43 +02:00
|
|
|
--echo # SQLCOM_SHOW_ENGINE_STATUS, SQLCOM_SHOW_ENGINE_LOGS,
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
--echo # SQLCOM_SHOW_ENGINE_MUTEX, SQLCOM_SHOW_PROCESSLIST
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--echo # Currently can not have a where clause, need to be covered
|
2008-04-17 14:31:43 +02:00
|
|
|
--echo # with tests
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
--error ER_PARSE_ERROR
|
|
|
|
prepare stmt from "show engine all status where (1) in (select * from t1)";
|
|
|
|
--error ER_PARSE_ERROR
|
|
|
|
prepare stmt from "show engine all logs where (1) in (select * from t1)";
|
|
|
|
--error ER_PARSE_ERROR
|
|
|
|
prepare stmt from "show engine all mutex where (1) in (select * from t1)";
|
|
|
|
--error ER_PARSE_ERROR
|
|
|
|
prepare stmt from "show processlist where (1) in (select * from t1)";
|
|
|
|
drop table t1;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_SHOW_CHARSETS
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from "show charset where (1) in (select * from t1)";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_SHOW_COLLATIONS
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from "show collation where (1) in (select * from t1)";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_SHOW_TABLE_STATUS
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from "show table status where (1) in (select * from t1)";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_SHOW_TRIGGERS
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from "show triggers where (1) in (select * from t1)";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_SHOW_OPEN_TABLES
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from "show open tables where (1) in (select * from t1)";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_SHOW_STATUS_PROC
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from "show procedure status where (1) in (select * from t1)";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_SHOW_STATUS_FUNC
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from "show function status where (1) in (select * from t1)";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_SHOW_EVENTS
|
|
|
|
--echo #
|
2008-05-20 20:43:26 +02:00
|
|
|
--echo #
|
|
|
|
--echo # Please see this test in ps.test, it requires not_embedded.inc
|
|
|
|
--echo #
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_SET_OPTION
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from "set @a=((1) in (select * from t1))";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_DO
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from "do ((1) in (select * from t1))";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_CALL
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
drop procedure if exists p1;
|
|
|
|
--enable_warnings
|
|
|
|
create procedure p1(a int) begin end;
|
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from "call p1((1) in (select * from t1))";
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop table t1;
|
|
|
|
drop procedure p1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_CREATE_VIEW
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
|
|
|
drop view if exists v1;
|
|
|
|
--enable_warnings
|
|
|
|
create table t1 (a int);
|
|
|
|
prepare stmt from "create view v1 as select * from t1";
|
|
|
|
execute stmt;
|
|
|
|
drop view v1;
|
|
|
|
drop table t1;
|
|
|
|
create table t1 (x int);
|
|
|
|
execute stmt;
|
|
|
|
drop view v1;
|
|
|
|
drop table t1;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
--echo # Intermediate result: number of reprepares matches the number
|
|
|
|
--echo # of tests
|
2008-05-20 20:43:26 +02:00
|
|
|
call p_verify_reprepare_count(17);
|
WL#4165 "Prepared statements: validation".
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
mysql-test/r/ps_ddl.result:
Update test results (WL#4165)
mysql-test/t/ps_ddl.test:
Cover with tests metadata validation of 26 SQL statements.
sql/mysql_priv.h:
Fix the name in the comment.
sql/sp_head.cc:
Changed the way the observer is removed in case of stored procedures
to support validation prepare stmt from "call p1(<expr>)": whereas
tables used in the expression must be validated, substatements
of p1 must not.
The previous scheme used to silence the observer only in stored
functions and triggers.
sql/sql_class.cc:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_class.h:
Now the observer is silenced in sp_head::execute(). Remove it from
Sub_statement_state.
sql/sql_parse.cc:
Add CF_REEXECUTION_FRAGILE to 20 more SQLCOMs that need it.
sql/sql_prepare.cc:
Add metadata validation to ~20 new SQLCOMs that need it.
Fix memory leaks with expressions used in SHOW DATABASES and CALL
(and prepared statements).
We need to fix all expressions at prepare, since if these expressions
use subqueries, there are one-time transformations of the parse
tree that must be done at prepare.
List of fixed commands includes: SHOW TABLES, SHOW DATABASES,
SHOW TRIGGERS, SHOW EVENTS, SHOW OPEN TABLES,SHOW KEYS, SHOW FIELDS,
SHOW COLLATIONS, SHOW CHARSETS, SHOW VARIABLES, SHOW TATUS, SHOW TABLE
STATUS, SHOW PROCEDURE STATUS, SHOW FUNCTION STATUS, CALL.
Add comment to set_parameters().
sql/table.h:
Update comments.
2008-04-16 23:04:49 +02:00
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # SQLCOM_ALTER_VIEW
|
|
|
|
--echo #
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop view if exists v1;
|
|
|
|
--enable_warnings
|
|
|
|
create view v1 as select 1;
|
|
|
|
--error ER_UNSUPPORTED_PS
|
|
|
|
prepare stmt from "alter view v1 as select 2";
|
|
|
|
drop view v1;
|
|
|
|
|
2008-04-07 11:35:42 +02:00
|
|
|
--echo # Cleanup
|
2008-04-17 14:31:43 +02:00
|
|
|
--echo #
|
2008-04-07 11:35:42 +02:00
|
|
|
--disable_warnings
|
|
|
|
drop temporary table if exists t1, t2, t3;
|
|
|
|
drop table if exists t1, t2, t3, v1, v2;
|
|
|
|
drop procedure if exists p_verify_reprepare_count;
|
|
|
|
drop procedure if exists p1;
|
|
|
|
drop function if exists f1;
|
|
|
|
drop view if exists v1, v2;
|
|
|
|
--enable_warnings
|