Commit 0af7dd0c authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents b6d61639 2e43fc33

mysql-test/r/sp-error.result

+14 −0
Original line number Diff line number Diff line
@@ -672,3 +672,17 @@ select default(t30.s1) from t30; 
end|

drop procedure bug10969|

drop table t1|

prepare stmt from "select 1";

create procedure p() deallocate prepare stmt;

ERROR 0A000: DEALLOCATE is not allowed in stored procedures

create function f() returns int begin deallocate prepare stmt;

ERROR 0A000: DEALLOCATE is not allowed in stored procedures

create procedure p() prepare stmt from "select 1";

ERROR 0A000: PREPARE is not allowed in stored procedures

create function f() returns int begin prepare stmt from "select 1";

ERROR 0A000: PREPARE is not allowed in stored procedures

create procedure p() execute stmt;

ERROR 0A000: EXECUTE is not allowed in stored procedures

create function f() returns int begin execute stmt;

ERROR 0A000: EXECUTE is not allowed in stored procedures

deallocate prepare stmt;

mysql-test/r/sp-threads.result

+15 −0
Original line number Diff line number Diff line
@@ -40,3 +40,18 @@ Id User Host db Command Time State Info 
unlock tables;

drop procedure bug9486;

drop table t1, t2;

drop procedure if exists bug11158;

create procedure bug11158() delete t1 from t1, t2 where t1.id = t2.id;

create table t1 (id int, j int);

insert into t1 values (1, 1), (2, 2);

create table t2 (id int);

insert into t2 values (1);

call bug11158();

select * from t1;

id	j

2	2

lock tables t2 read;

call bug11158();

unlock tables;

drop procedure bug11158;

drop table t1, t2;

mysql-test/t/sp-error.test

+21 −0
Original line number Diff line number Diff line
@@ -965,3 +965,24 @@ drop procedure bug10969| 
drop table t1|



delimiter ;|



#

# Bug#10975, #10605, #7115: Dynamic SQL by means of

# PREPARE/EXECUTE/DEALLOCATE is not supported yet.

# Check that an error message is returned.

#

prepare stmt from "select 1";

--error ER_SP_BADSTATEMENT

create procedure p() deallocate prepare stmt; 

--error ER_SP_BADSTATEMENT

create function f() returns int begin deallocate prepare stmt;

--error ER_SP_BADSTATEMENT

create procedure p() prepare stmt from "select 1";

--error ER_SP_BADSTATEMENT

create function f() returns int begin prepare stmt from "select 1";

--error ER_SP_BADSTATEMENT

create procedure p() execute stmt; 

--error ER_SP_BADSTATEMENT

create function f() returns int begin execute stmt;

deallocate prepare stmt;

mysql-test/t/sp-threads.test

+26 −0
Original line number Diff line number Diff line
@@ -84,6 +84,32 @@ reap; 
drop procedure bug9486;

drop table t1, t2;



#

# BUG#11158: Can't perform multi-delete in stored procedure

#

--disable_warnings

drop procedure if exists bug11158;

--enable_warnings

create procedure bug11158() delete t1 from t1, t2 where t1.id = t2.id;

create table t1 (id int, j int);

insert into t1 values (1, 1), (2, 2);

create table t2 (id int);

insert into t2 values (1);

# Procedure should work and cause proper effect (delete only first row)

call bug11158();

select * from t1;

# Also let us test that we obtain only read (and thus non exclusive) lock

# for table from which we are not going to delete rows.

connection con2root;

lock tables t2 read;

connection con1root;

call bug11158();

connection con2root;

unlock tables;

connection con1root;

# Clean-up

drop procedure bug11158;

drop table t1, t2;



#

# BUG#NNNN: New bug synopsis

sql/mysql_priv.h

+2 −1
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ bool check_merge_table_access(THD *thd, char *db, 
			      TABLE_LIST *table_list);

bool check_some_routine_access(THD *thd, const char *db, const char *name, bool is_proc);

bool multi_update_precheck(THD *thd, TABLE_LIST *tables);

bool multi_delete_precheck(THD *thd, TABLE_LIST *tables, uint *table_count);

bool multi_delete_precheck(THD *thd, TABLE_LIST *tables);

bool mysql_multi_update_prepare(THD *thd);

bool mysql_multi_delete_prepare(THD *thd);

bool mysql_insert_select_prepare(THD *thd);
@@ -581,6 +581,7 @@ void mysql_init_query(THD *thd, uchar *buf, uint length); 
bool mysql_new_select(LEX *lex, bool move_down);

void create_select_for_variable(const char *var_name);

void mysql_init_multi_delete(LEX *lex);

bool multi_delete_set_locks_and_link_aux_tables(LEX *lex);

void init_max_user_conn(void);

void init_update_queries(void);

void free_max_user_conn(void);