Commit d1f93762 authored by kostja@dipika.(none)'s avatar kostja@dipika.(none)
Browse files

Tentative implementation of 

WL#4165 Prepared statements: validation 
WL#4166 Prepared statements: automatic re-prepare
Fixes
Bug#27430 Crash in subquery code when in PS and table DDL changed after PREPARE
Bug#27690 Re-execution of prepared statement after table was replaced with a view crashes
Bug#27420 A combination of PS and view operations cause error + assertion on shutdown

The basic idea of the patch is to keep track of table metadata between
prepared statement prepare and execute. If some table used in the statement
has changed, the prepared statement is re-prepared before execution.

See WL#4165 and WL#4166 contents and comments in the code for details
of the implementation.
parent a9fff11f

include/my_global.h

+1 −1
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ typedef unsigned short ushort; 


#define CMP_NUM(a,b)    (((a) < (b)) ? -1 : ((a) == (b)) ? 0 : 1)

#define sgn(a)		(((a) < 0) ? -1 : ((a) > 0) ? 1 : 0)

#define swap_variables(t, a, b) { register t dummy; dummy= a; a= b; b= dummy; }

#define swap_variables(t, a, b) { t dummy; dummy= a; a= b; b= dummy; }

#define test(a)		((a) ? 1 : 0)

#define set_if_bigger(a,b)  do { if ((a) < (b)) (a)=(b); } while(0)

#define set_if_smaller(a,b) do { if ((a) > (b)) (a)=(b); } while(0)

mysql-test/r/ps_1general.result

+10 −9
Original line number Diff line number Diff line
@@ -143,32 +143,32 @@ b char(30) 
);

insert into t5( a, b, c) values( 9, 'recreated table', 9);

execute stmt2 ;

a	b	c

9	recreated table	9

a	c	b

9	9	recreated table

drop table t5 ;

create table t5

(

a int primary key,

b char(30),

c int,

d timestamp default current_timestamp

d timestamp default '2008-02-23 09:23:45'

);

insert into t5( a, b, c) values( 9, 'recreated table', 9);

execute stmt2 ;

a	b	c

9	recreated table	9

a	b	c	d

9	recreated table	9	2008-02-23 09:23:45

drop table t5 ;

create table t5

(

a int primary key,

d timestamp default current_timestamp,

d timestamp default '2008-02-23 09:23:45',

b char(30),

c int

);

insert into t5( a, b, c) values( 9, 'recreated table', 9);

execute stmt2 ;

a	b	c

9	recreated table	9

a	d	b	c

9	2008-02-23 09:23:45	recreated table	9

drop table t5 ;

create table t5

(
@@ -189,7 +189,8 @@ f3 int 
);

insert into t5( f1, f2, f3) values( 9, 'recreated table', 9);

execute stmt2 ;

ERROR 42S22: Unknown column 'test.t5.a' in 'field list'

f1	f2	f3

9	recreated table	9

drop table t5 ;

prepare stmt1 from ' select * from t1 where a <= 2 ' ;

execute stmt1 ;

mysql-test/r/query_cache_merge.result

+1 −0
Original line number Diff line number Diff line
@@ -18,3 +18,4 @@ Variable_name Value 
Qcache_queries_in_cache	0

drop table t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36,t37,t38,t39,t40,t41,t42,t43,t44,t45,t46,t47,t48,t49,t50,t51,t52,t53,t54,t55,t56,t57,t58,t59,t60,t61,t62,t63,t64,t65,t66,t67,t68,t69,t70,t71,t72,t73,t74,t75,t76,t77,t78,t79,t80,t81,t82,t83,t84,t85,t86,t87,t88,t89,t90,t91,t92,t93,t94,t95,t96,t97,t98,t99,t100,t101,t102,t103,t104,t105,t106,t107,t108,t109,t110,t111,t112,t113,t114,t115,t116,t117,t118,t119,t120,t121,t122,t123,t124,t125,t126,t127,t128,t129,t130,t131,t132,t133,t134,t135,t136,t137,t138,t139,t140,t141,t142,t143,t144,t145,t146,t147,t148,t149,t150,t151,t152,t153,t154,t155,t156,t157,t158,t159,t160,t161,t162,t163,t164,t165,t166,t167,t168,t169,t170,t171,t172,t173,t174,t175,t176,t177,t178,t179,t180,t181,t182,t183,t184,t185,t186,t187,t188,t189,t190,t191,t192,t193,t194,t195,t196,t197,t198,t199,t200,t201,t202,t203,t204,t205,t206,t207,t208,t209,t210,t211,t212,t213,t214,t215,t216,t217,t218,t219,t220,t221,t222,t223,t224,t225,t226,t227,t228,t229,t230,t231,t232,t233,t234,t235,t236,t237,t238,t239,t240,t241,t242,t243,t244,t245,t246,t247,t248,t249,t250,t251,t252,t253,t254,t255,t256,t257,t00;

SET @@global.query_cache_size=0;

set @@global.table_definition_cache=@save_table_definition_cache;

mysql-test/r/trigger.result

+0 −1
Original line number Diff line number Diff line
@@ -820,7 +820,6 @@ call p1(); 
drop trigger t1_bi;

create trigger t1_bi after insert on t1 for each row insert into t3 values (new.id);

execute stmt1;

ERROR 42S02: Table 'test.t3' doesn't exist

call p1();

ERROR 42S02: Table 'test.t3' doesn't exist

deallocate prepare stmt1;

mysql-test/t/disabled.def

+0 −1
Original line number Diff line number Diff line
@@ -18,6 +18,5 @@ federated_transactions : Bug#29523 Transactions do not work 
lowercase_table3         : Bug#32667 lowercase_table3.test reports to error log

ctype_create         : Bug#32965 main.ctype_create fails

status               : Bug#32966 main.status fails

ps_ddl               : Bug#12093 2007-12-14 pending WL#4165 / WL#4166

csv_alter_table      : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables

cast                 : Bug#35594 2008-03-27 main.cast fails on Windows2003-64