From f140e7e000706ff65ea19d71bc13b064ad5487cc Mon Sep 17 00:00:00 2001
From: "istruewing@stella.local" <>
Date: Mon, 26 Nov 2007 19:16:23 +0100
Subject: [PATCH] Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
 Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables Fixed
 wrong variable assignment.

---
 mysql-test/r/delayed.result | 16 ++++++++--------
 mysql-test/t/delayed.test   | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/mysql-test/r/delayed.result b/mysql-test/r/delayed.result
index b37679847be..ff333d88fef 100644
--- a/mysql-test/r/delayed.result
+++ b/mysql-test/r/delayed.result
@@ -73,13 +73,13 @@ a
 13
 DROP TABLE t1;
 SET @bug20627_old_auto_increment_offset=
-@@auto_increment_offset= 2;
+@@auto_increment_offset;
 SET @bug20627_old_auto_increment_increment=
-@@auto_increment_increment= 3;
+@@auto_increment_increment;
 SET @bug20627_old_session_auto_increment_offset=
-@@session.auto_increment_offset= 4;
+@@session.auto_increment_offset;
 SET @bug20627_old_session_auto_increment_increment=
-@@session.auto_increment_increment= 5;
+@@session.auto_increment_increment;
 SET @@auto_increment_offset= 2;
 SET @@auto_increment_increment= 3;
 SET @@session.auto_increment_offset= 4;
@@ -116,13 +116,13 @@ SET             @@session.auto_increment_offset=
 SET             @@session.auto_increment_increment=
 @bug20627_old_session_auto_increment_increment;
 SET @bug20830_old_auto_increment_offset=
-@@auto_increment_offset= 2;
+@@auto_increment_offset;
 SET @bug20830_old_auto_increment_increment=
-@@auto_increment_increment= 3;
+@@auto_increment_increment;
 SET @bug20830_old_session_auto_increment_offset=
-@@session.auto_increment_offset= 4;
+@@session.auto_increment_offset;
 SET @bug20830_old_session_auto_increment_increment=
-@@session.auto_increment_increment= 5;
+@@session.auto_increment_increment;
 SET @@auto_increment_offset= 2;
 SET @@auto_increment_increment= 3;
 SET @@session.auto_increment_offset= 4;
diff --git a/mysql-test/t/delayed.test b/mysql-test/t/delayed.test
index 13615c8c269..b09472d3485 100644
--- a/mysql-test/t/delayed.test
+++ b/mysql-test/t/delayed.test
@@ -103,13 +103,13 @@ DROP TABLE t1;
 # Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
 #
 SET @bug20627_old_auto_increment_offset=
-                @@auto_increment_offset= 2;
+                @@auto_increment_offset;
 SET @bug20627_old_auto_increment_increment=
-                @@auto_increment_increment= 3;
+                @@auto_increment_increment;
 SET @bug20627_old_session_auto_increment_offset=
-                @@session.auto_increment_offset= 4;
+                @@session.auto_increment_offset;
 SET @bug20627_old_session_auto_increment_increment=
-                @@session.auto_increment_increment= 5;
+                @@session.auto_increment_increment;
 SET @@auto_increment_offset= 2;
 SET @@auto_increment_increment= 3;
 SET @@session.auto_increment_offset= 4;
@@ -151,13 +151,13 @@ SET             @@session.auto_increment_increment=
 # Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
 #
 SET @bug20830_old_auto_increment_offset=
-                @@auto_increment_offset= 2;
+                @@auto_increment_offset;
 SET @bug20830_old_auto_increment_increment=
-                @@auto_increment_increment= 3;
+                @@auto_increment_increment;
 SET @bug20830_old_session_auto_increment_offset=
-                @@session.auto_increment_offset= 4;
+                @@session.auto_increment_offset;
 SET @bug20830_old_session_auto_increment_increment=
-                @@session.auto_increment_increment= 5;
+                @@session.auto_increment_increment;
 SET @@auto_increment_offset= 2;
 SET @@auto_increment_increment= 3;
 SET @@session.auto_increment_offset= 4;