database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge with 5.1

Browse Source 
(Includes patch for overrun detected by valgrind thanks to previous my_alloca() -> my_malloc() patch)
This commit is contained in:
Michael Widenius
2010-12-13 15:51:47 +02:00
parent ffb0cd6146 0b20943e9d
commit 09d2e7f680
16 changed files with 92 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/suite/innodb_plugin/r/innodb_mysql.result
View File

@ -1594,7 +1594,17 @@ TRUNCATE t1;
INSERT INTO t1 VALUES (1,'init');
CREATE PROCEDURE p1()
BEGIN
# retry the UPDATE in case it times out the lock before con1 has time
# to COMMIT.
DECLARE do_retry INT DEFAULT 0;
DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET do_retry = 1;
retry_loop:LOOP
UPDATE t1 SET b = CONCAT(b, '+con2') WHERE a = 1;
IF do_retry = 0 THEN
LEAVE retry_loop;
END IF;
SET do_retry = 0;
END LOOP;
INSERT INTO t2 VALUES ();
END|
BEGIN;