diff options
author | Igor Babaev <igor@askmonty.org> | 2010-12-27 14:22:05 -0800 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2010-12-27 14:22:05 -0800 |
commit | 0dc5ef87d4c5ad21b5ff5ad26187117514d4fbb7 (patch) | |
tree | 10e4fe145fb1c7300075f1e1f02932a15a32ee38 /mysql-test/suite/innodb/r | |
parent | 1eb5e0e60388f460ab2c4d216a98f4088d9997b9 (diff) | |
parent | 7d68e1ead7be84fd6476854c8b4ff02ef16ea7d4 (diff) | |
download | mariadb-git-0dc5ef87d4c5ad21b5ff5ad26187117514d4fbb7.tar.gz |
Merge
Diffstat (limited to 'mysql-test/suite/innodb/r')
-rw-r--r-- | mysql-test/suite/innodb/r/innodb_mysql.result | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result index ce10a606921..f36a4b2b0ea 100644 --- a/mysql-test/suite/innodb/r/innodb_mysql.result +++ b/mysql-test/suite/innodb/r/innodb_mysql.result @@ -679,8 +679,6 @@ INSERT INTO t1(b,c) SELECT b,c FROM t2; UPDATE t2 SET c='2007-01-03'; INSERT INTO t1(b,c) SELECT b,c FROM t2; set @@sort_buffer_size=8192; -Warnings: -Warning 1292 Truncated incorrect sort_buffer_size value: '8192' SELECT COUNT(*) FROM t1; COUNT(*) 3072 @@ -1597,7 +1595,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; |