merge with 5.3

sql/sql_insert.cc:
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
  ******
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
  small cleanup
  ******
  small cleanup

1 files changed, 11 insertions, 1 deletions

diff --git a/mysql-test/include/mix1.inc b/mysql-test/include/mix1.inc
index 4614535c188..588de7b9f6a 100644
--- a/mysql-test/include/mix1.inc
+++ b/mysql-test/include/mix1.inc
@@ -1377,7 +1377,17 @@ INSERT INTO t1 VALUES (1,'init');
 DELIMITER |;
 CREATE PROCEDURE p1()
 BEGIN
-  UPDATE t1 SET b = CONCAT(b, '+con2')  WHERE a = 1;
+  # 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|
 DELIMITER ;|