auto merged 5.0-bugteam to /Users/kgeorge/B37830-5.0-bugteam (66d12592) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/parser_stack.result

0 → 100644

+306 −0

Original line number	Diff line number	Diff line
		use test;
		SELECT
		((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
		((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
		((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
		1
		))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
		))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
		))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
		;
		1
		1
		prepare stmt from
		"
		SELECT
		((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
		((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
		((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
		1
		))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
		))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
		))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
		"
		;
		execute stmt;
		1
		1
		drop view if exists view_overflow;
		CREATE VIEW view_overflow AS
		SELECT
		((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
		((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
		((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
		1
		))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
		))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
		))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
		;
		SELECT * from view_overflow;
		1
		1
		drop view view_overflow;
		drop procedure if exists proc_overflow;
		CREATE PROCEDURE proc_overflow()
		BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		select 1;
		select 2;
		select 3;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END $$
		call proc_overflow();
		1
		1
		2
		2
		3
		3
		drop procedure proc_overflow;
		drop function if exists func_overflow;
		create function func_overflow() returns int
		BEGIN
		DECLARE x int default 0;
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		SET x=x+1;
		SET x=x+2;
		SET x=x+3;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		return x;
		END $$
		select func_overflow();
		func_overflow()
		6
		drop function func_overflow;
		drop table if exists table_overflow;
		create table table_overflow(a int, b int);
		create trigger trigger_overflow before insert on table_overflow
		for each row
		BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		SET NEW.b := NEW.a;
		SET NEW.b := NEW.b + 1;
		SET NEW.b := NEW.b + 2;
		SET NEW.b := NEW.b + 3;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END $$
		insert into table_overflow set a=10;
		insert into table_overflow set a=20;
		select * from table_overflow;
		a b
		10 16
		20 26
		drop table table_overflow;
		drop procedure if exists proc_35577;
		CREATE PROCEDURE proc_35577()
		BEGIN
		DECLARE z_done INT DEFAULT 0;
		DECLARE t_done VARCHAR(5000);
		outer_loop: LOOP
		IF t_done=1 THEN
		LEAVE outer_loop;
		END IF;
		inner_block:BEGIN
		DECLARE z_done INT DEFAULT 0;
		SET z_done = 0;
		inner_loop: LOOP
		IF z_done=1 THEN
		LEAVE inner_loop;
		END IF;
		IF (t_done = 'a') THEN
		IF (t_done <> 0) THEN
		IF ( t_done > 0) THEN
		IF (t_done = 'a') THEN
		SET t_done = 'a';
		ELSEIF (t_done = 'a') THEN
		SET t_done = 'a';
		ELSEIF(t_done = 'a') THEN
		SET t_done = 'a';
		ELSEIF(t_done = 'a') THEN
		SET t_done = 'a';
		ELSEIF(t_done = 'a') THEN
		SET t_done = 'a';
		ELSEIF(t_done = 'a') THEN
		SET t_done = 'a';
		ELSEIF(t_done = 'a') THEN
		SET t_done = 'a';
		ELSEIF(t_done = 'a') THEN
		SET t_done = 'a';
		END IF;
		END IF;
		END IF;
		END IF;
		END LOOP inner_loop;
		END inner_block;
		END LOOP outer_loop;
		END $$
		drop procedure proc_35577;
		drop procedure if exists p_37269;
		create procedure p_37269()
		begin
		declare done int default 0;
		declare varb int default 0;
		declare vara int default 0;
		repeat
		select now();
		until done end repeat;
		while varb do
		select now();
		begin
		select now();
		repeat
		select now();
		until done end repeat;
		if vara then
		select now();
		repeat
		select now();
		loop
		select now();
		end loop;
		repeat
		select now();
		label1: while varb do
		select now();
		end while label1;
		if vara then
		select now();
		repeat
		select now();
		until done end repeat;
		begin
		select now();
		while varb do
		select now();
		label1: while varb do
		select now();
		end while label1;
		if vara then
		select now();
		while varb do
		select now();
		loop
		select now();
		end loop;
		repeat
		select now();
		loop
		select now();
		while varb do
		select now();
		end while;
		repeat
		select now();
		label1: loop
		select now();
		if vara then
		select now();
		end if;
		end loop label1;
		until done end repeat;
		end loop;
		until done end repeat;
		end while;
		end if;
		end while;
		end;
		end if;
		until done end repeat;
		until done end repeat;
		end if;
		end;
		end while;
		end $$
		drop procedure p_37269;
		drop procedure if exists p_37228;
		create procedure p_37228 ()
		BEGIN
		DECLARE v INT DEFAULT 123;
		IF (v > 1) THEN SET v = 1;
		ELSEIF (v < 10) THEN SET v = 10;
		ELSEIF (v < 11) THEN SET v = 11;
		ELSEIF (v < 12) THEN SET v = 12;
		ELSEIF (v < 13) THEN SET v = 13;
		ELSEIF (v < 14) THEN SET v = 14;
		ELSEIF (v < 15) THEN SET v = 15;
		ELSEIF (v < 16) THEN SET v = 16;
		ELSEIF (v < 17) THEN SET v = 17;
		ELSEIF (v < 18) THEN SET v = 18;
		ELSEIF (v < 19) THEN SET v = 19;
		ELSEIF (v < 20) THEN SET v = 20;
		ELSEIF (v < 21) THEN SET v = 21;
		ELSEIF (v < 22) THEN SET v = 22;
		ELSEIF (v < 23) THEN SET v = 23;
		ELSEIF (v < 24) THEN SET v = 24;
		ELSEIF (v < 25) THEN SET v = 25;
		ELSEIF (v < 26) THEN SET v = 26;
		ELSEIF (v < 27) THEN SET v = 27;
		ELSEIF (v < 28) THEN SET v = 28;
		ELSEIF (v < 29) THEN SET v = 29;
		ELSEIF (v < 30) THEN SET v = 30;
		ELSEIF (v < 31) THEN SET v = 31;
		ELSEIF (v < 32) THEN SET v = 32;
		ELSEIF (v < 33) THEN SET v = 33;
		ELSEIF (v < 34) THEN SET v = 34;
		ELSEIF (v < 35) THEN SET v = 35;
		ELSEIF (v < 36) THEN SET v = 36;
		ELSEIF (v < 37) THEN SET v = 37;
		ELSEIF (v < 38) THEN SET v = 38;
		ELSEIF (v < 39) THEN SET v = 39;
		END IF;
		END $$
		drop procedure p_37228;

mysql-test/t/parser_stack.test

0 → 100644

+402 −0

Original line number	Diff line number	Diff line
		# Copyright (C) 2008 Sun Microsystems, Inc
		#
		# This program is free software; you can redistribute it and/or modify
		# it under the terms of the GNU General Public License as published by
		# the Free Software Foundation; version 2 of the License.
		#
		# This program is distributed in the hope that it will be useful,
		# but WITHOUT ANY WARRANTY; without even the implied warranty of
		# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		# GNU General Public License for more details.
		#
		# You should have received a copy of the GNU General Public License
		# along with this program; if not, write to the Free Software
		# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

		#
		# These tests are designed to cause an internal parser stack overflow,
		# and trigger my_yyoverflow().
		#

		use test;

		SELECT
		((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
		((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
		((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
		1
		))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
		))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
		))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
		;

		prepare stmt from
		"
		SELECT
		((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
		((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
		((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
		1
		))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
		))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
		))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
		"
		;

		execute stmt;

		--disable_warnings
		drop view if exists view_overflow;
		--enable_warnings

		CREATE VIEW view_overflow AS
		SELECT
		((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
		((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
		((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
		1
		))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
		))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
		))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
		;

		SELECT * from view_overflow;

		drop view view_overflow;

		--disable_warnings
		drop procedure if exists proc_overflow;
		--enable_warnings

		delimiter $$;

		CREATE PROCEDURE proc_overflow()
		BEGIN

		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN

		select 1;
		select 2;
		select 3;

		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;

		END $$

		delimiter ;$$

		call proc_overflow();

		drop procedure proc_overflow;

		--disable_warnings
		drop function if exists func_overflow;
		--enable_warnings

		delimiter $$;

		create function func_overflow() returns int
		BEGIN
		DECLARE x int default 0;

		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN

		SET x=x+1;
		SET x=x+2;
		SET x=x+3;

		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;

		return x;
		END $$

		delimiter ;$$

		select func_overflow();

		drop function func_overflow;

		--disable_warnings
		drop table if exists table_overflow;
		--enable_warnings

		create table table_overflow(a int, b int);

		delimiter $$;

		create trigger trigger_overflow before insert on table_overflow
		for each row
		BEGIN

		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN
		BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN BEGIN

		SET NEW.b := NEW.a;
		SET NEW.b := NEW.b + 1;
		SET NEW.b := NEW.b + 2;
		SET NEW.b := NEW.b + 3;

		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;
		END; END; END; END; END; END; END; END; END; END; END; END;

		END $$

		delimiter ;$$

		insert into table_overflow set a=10;
		insert into table_overflow set a=20;
		select * from table_overflow;

		drop table table_overflow;

		--disable_warnings
		drop procedure if exists proc_35577;
		--enable_warnings

		delimiter $$;

		CREATE PROCEDURE proc_35577()
		BEGIN
		DECLARE z_done INT DEFAULT 0;
		DECLARE t_done VARCHAR(5000);
		outer_loop: LOOP
		IF t_done=1 THEN
		LEAVE outer_loop;
		END IF;

		inner_block:BEGIN
		DECLARE z_done INT DEFAULT 0;
		SET z_done = 0;
		inner_loop: LOOP
		IF z_done=1 THEN
		LEAVE inner_loop;
		END IF;
		IF (t_done = 'a') THEN
		IF (t_done <> 0) THEN
		IF ( t_done > 0) THEN
		IF (t_done = 'a') THEN
		SET t_done = 'a';
		ELSEIF (t_done = 'a') THEN
		SET t_done = 'a';
		ELSEIF(t_done = 'a') THEN
		SET t_done = 'a';
		ELSEIF(t_done = 'a') THEN
		SET t_done = 'a';
		ELSEIF(t_done = 'a') THEN
		SET t_done = 'a';
		ELSEIF(t_done = 'a') THEN
		SET t_done = 'a';
		ELSEIF(t_done = 'a') THEN
		SET t_done = 'a';
		ELSEIF(t_done = 'a') THEN
		SET t_done = 'a';
		END IF;
		END IF;
		END IF;
		END IF;
		END LOOP inner_loop;
		END inner_block;
		END LOOP outer_loop;
		END $$

		delimiter ;$$

		drop procedure proc_35577;

		#
		# Bug#37269 (parser crash when creating stored procedure)
		#

		--disable_warnings
		drop procedure if exists p_37269;
		--enable_warnings

		delimiter $$;

		create procedure p_37269()
		begin
		declare done int default 0;
		declare varb int default 0;
		declare vara int default 0;

		repeat
		select now();
		until done end repeat;
		while varb do
		select now();
		begin
		select now();
		repeat
		select now();
		until done end repeat;
		if vara then
		select now();
		repeat
		select now();
		loop
		select now();
		end loop;
		repeat
		select now();
		label1: while varb do
		select now();
		end while label1;
		if vara then
		select now();
		repeat
		select now();
		until done end repeat;
		begin
		select now();
		while varb do
		select now();
		label1: while varb do
		select now();
		end while label1;
		if vara then
		select now();
		while varb do
		select now();
		loop
		select now();
		end loop;
		repeat
		select now();
		loop
		select now();
		while varb do
		select now();
		end while;
		repeat
		select now();
		label1: loop
		select now();
		if vara then
		select now();
		end if;
		end loop label1;
		until done end repeat;
		end loop;
		until done end repeat;
		end while;
		end if;
		end while;
		end;
		end if;
		until done end repeat;
		until done end repeat;
		end if;
		end;
		end while;
		end $$

		delimiter ;$$

		drop procedure p_37269;

		#
		# Bug#37228 (Sever crashes when creating stored procedure with more than
		# 10 IF/ELSEIF)
		#

		--disable_warnings
		drop procedure if exists p_37228;
		--enable_warnings

		delimiter $$;

		create procedure p_37228 ()
		BEGIN
		DECLARE v INT DEFAULT 123;

		IF (v > 1) THEN SET v = 1;
		ELSEIF (v < 10) THEN SET v = 10;
		ELSEIF (v < 11) THEN SET v = 11;
		ELSEIF (v < 12) THEN SET v = 12;
		ELSEIF (v < 13) THEN SET v = 13;
		ELSEIF (v < 14) THEN SET v = 14;
		ELSEIF (v < 15) THEN SET v = 15;
		ELSEIF (v < 16) THEN SET v = 16;
		ELSEIF (v < 17) THEN SET v = 17;
		ELSEIF (v < 18) THEN SET v = 18;
		ELSEIF (v < 19) THEN SET v = 19;
		ELSEIF (v < 20) THEN SET v = 20;
		ELSEIF (v < 21) THEN SET v = 21;
		ELSEIF (v < 22) THEN SET v = 22;
		ELSEIF (v < 23) THEN SET v = 23;
		ELSEIF (v < 24) THEN SET v = 24;
		ELSEIF (v < 25) THEN SET v = 25;
		ELSEIF (v < 26) THEN SET v = 26;
		ELSEIF (v < 27) THEN SET v = 27;
		ELSEIF (v < 28) THEN SET v = 28;
		ELSEIF (v < 29) THEN SET v = 29;
		ELSEIF (v < 30) THEN SET v = 30;
		ELSEIF (v < 31) THEN SET v = 31;
		ELSEIF (v < 32) THEN SET v = 32;
		ELSEIF (v < 33) THEN SET v = 33;
		ELSEIF (v < 34) THEN SET v = 34;
		ELSEIF (v < 35) THEN SET v = 35;
		ELSEIF (v < 36) THEN SET v = 36;
		ELSEIF (v < 37) THEN SET v = 37;
		ELSEIF (v < 38) THEN SET v = 38;
		ELSEIF (v < 39) THEN SET v = 39;
		END IF;
		END $$

		delimiter ;$$

		drop procedure p_37228;

sql/filesort.cc

+53 −13

File changed.

Preview size limit exceeded, changes collapsed.

sql/mysql_priv.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -1557,8 +1557,8 @@ ulonglong get_datetime_value(THD thd, Item item_arg, Item cache_arg,
		int test_if_number(char str,int res,bool allow_wildcards);
		void change_byte(byte *,uint,char,char);
		void init_read_record(READ_RECORD info, THD thd, TABLE *reg_form,
		SQL_SELECT *select,
		int use_record_cache, bool print_errors);
		SQL_SELECT *select, int use_record_cache,
		bool print_errors, bool disable_rr_cache);
		void init_read_record_idx(READ_RECORD info, THD thd, TABLE *table,
		bool print_error, uint idx);
		void end_read_record(READ_RECORD *info);

sql/opt_range.cc

+10 −5

Original line number	Diff line number	Diff line
		@@ -6494,7 +6494,7 @@ int QUICK_INDEX_MERGE_SELECT::read_keys_and_merge()
		QUICK_RANGE_SELECT* cur_quick;
		int result;
		Unique *unique;
		DBUG_ENTER("QUICK_INDEX_MERGE_SELECT::prepare_unique");
		DBUG_ENTER("QUICK_INDEX_MERGE_SELECT::read_keys_and_merge");

		/* We're going to just read rowids. */
		if (head->file->extra(HA_EXTRA_KEYREAD))
		@@ -6565,13 +6565,17 @@ int QUICK_INDEX_MERGE_SELECT::read_keys_and_merge()

		}

		/* ok, all row ids are in Unique */
		/*
		Ok all rowids are in the Unique now. The next call will initialize
		head->sort structure so it can be used to iterate through the rowids
		sequence.
		*/
		result= unique->get(head);
		delete unique;
		doing_pk_scan= FALSE;
		/* start table scan */
		init_read_record(&read_record, thd, head, (SQL_SELECT*) 0, 1, 1);
		/* index_merge currently doesn't support "using index" at all */

		/* Start the rnd_pos() scan. */
		init_read_record(&read_record, thd, head, (SQL_SELECT*) 0, 1 , 1, TRUE);
		head->file->extra(HA_EXTRA_NO_KEYREAD);

		DBUG_RETURN(result);
		@@ -6601,6 +6605,7 @@ int QUICK_INDEX_MERGE_SELECT::get_next()
		{
		result= HA_ERR_END_OF_FILE;
		end_read_record(&read_record);
		free_io_cache(head);
		/* All rows from Unique have been retrieved, do a clustered PK scan */
		if (pk_quick_select)
		{