mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.
mysql_upgrade results changed due to the error messesge of mysqlcheck has changed.
This commit is contained in:
@@ -7997,8 +7997,24 @@ select (select func30787(f1)) as ttt from t1;
|
||||
drop function func30787;
|
||||
drop table t1;
|
||||
|
||||
###########################################################################
|
||||
#
|
||||
# Bug #33811: Call to stored procedure with SELECT * / RIGHT JOIN fails
|
||||
# after the first time
|
||||
#
|
||||
CREATE TABLE t1 (id INT);
|
||||
INSERT INTO t1 VALUES (1),(2),(3),(4);
|
||||
|
||||
CREATE PROCEDURE test_sp()
|
||||
SELECT t1.* FROM t1 RIGHT JOIN t1 t2 ON t1.id=t2.id;
|
||||
|
||||
CALL test_sp();
|
||||
CALL test_sp();
|
||||
|
||||
DROP PROCEDURE test_sp;
|
||||
DROP TABLE t1;
|
||||
|
||||
|
||||
###########################################################################
|
||||
#
|
||||
# Bug#38291 memory corruption and server crash with view/sp/function
|
||||
#
|
||||
@@ -8041,6 +8057,28 @@ delimiter ;$
|
||||
call `p2`('s s s s s s');
|
||||
drop procedure `p2`;
|
||||
|
||||
#
|
||||
# Bug#38823: Invalid memory access when a SP statement does wildcard expansion
|
||||
#
|
||||
|
||||
--disable_warnings
|
||||
drop table if exists t1;
|
||||
drop procedure if exists p1;
|
||||
--enable_warnings
|
||||
|
||||
delimiter $;
|
||||
create procedure p1() begin select * from t1; end$
|
||||
--error ER_NO_SUCH_TABLE
|
||||
call p1$
|
||||
create table t1 (a integer)$
|
||||
call p1$
|
||||
alter table t1 add b integer;
|
||||
call p1$
|
||||
delimiter ;$
|
||||
|
||||
drop table t1;
|
||||
drop procedure p1;
|
||||
|
||||
--echo # ------------------------------------------------------------------
|
||||
--echo # -- End of 5.0 tests
|
||||
--echo # ------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user