Skip to content

M
mariadb
Commit 7fcf4940 authored by istruewing@stella.local's avatar istruewing@stella.local
Browse files
Options

Merge stella.local:/home2/mydev/mysql-5.0-axmrg 

into  stella.local:/home2/mydev/mysql-5.1-axmrg
parents 010d8275 f140e7e0
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
mysql-test/r/delayed.result
View file @ 7fcf4940
...@@ -73,13 +73,13 @@ a ...@@ -73,13 +73,13 @@ a
13 13
DROP TABLE t1; DROP TABLE t1;
SET @bug20627_old_auto_increment_offset= SET @bug20627_old_auto_increment_offset=
@@auto_increment_offset= 2; @@auto_increment_offset;
SET @bug20627_old_auto_increment_increment= SET @bug20627_old_auto_increment_increment=
@@auto_increment_increment= 3; @@auto_increment_increment;
SET @bug20627_old_session_auto_increment_offset= SET @bug20627_old_session_auto_increment_offset=
@@session.auto_increment_offset= 4; @@session.auto_increment_offset;
SET @bug20627_old_session_auto_increment_increment= SET @bug20627_old_session_auto_increment_increment=
@@session.auto_increment_increment= 5; @@session.auto_increment_increment;
SET @@auto_increment_offset= 2; SET @@auto_increment_offset= 2;
SET @@auto_increment_increment= 3; SET @@auto_increment_increment= 3;
SET @@session.auto_increment_offset= 4; SET @@session.auto_increment_offset= 4;
...@@ -116,13 +116,13 @@ SET @@session.auto_increment_offset= ...@@ -116,13 +116,13 @@ SET @@session.auto_increment_offset=
SET @@session.auto_increment_increment= SET @@session.auto_increment_increment=
@bug20627_old_session_auto_increment_increment; @bug20627_old_session_auto_increment_increment;
SET @bug20830_old_auto_increment_offset= SET @bug20830_old_auto_increment_offset=
@@auto_increment_offset= 2; @@auto_increment_offset;
SET @bug20830_old_auto_increment_increment= SET @bug20830_old_auto_increment_increment=
@@auto_increment_increment= 3; @@auto_increment_increment;
SET @bug20830_old_session_auto_increment_offset= SET @bug20830_old_session_auto_increment_offset=
@@session.auto_increment_offset= 4; @@session.auto_increment_offset;
SET @bug20830_old_session_auto_increment_increment= SET @bug20830_old_session_auto_increment_increment=
@@session.auto_increment_increment= 5; @@session.auto_increment_increment;
SET @@auto_increment_offset= 2; SET @@auto_increment_offset= 2;
SET @@auto_increment_increment= 3; SET @@auto_increment_increment= 3;
SET @@session.auto_increment_offset= 4; SET @@session.auto_increment_offset= 4;
......
mysql-test/t/delayed.test
View file @ 7fcf4940
...@@ -103,13 +103,13 @@ DROP TABLE t1; ...@@ -103,13 +103,13 @@ DROP TABLE t1;
# Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables # Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
# #
SET @bug20627_old_auto_increment_offset= SET @bug20627_old_auto_increment_offset=
@@auto_increment_offset= 2; @@auto_increment_offset;
SET @bug20627_old_auto_increment_increment= SET @bug20627_old_auto_increment_increment=
@@auto_increment_increment= 3; @@auto_increment_increment;
SET @bug20627_old_session_auto_increment_offset= SET @bug20627_old_session_auto_increment_offset=
@@session.auto_increment_offset= 4; @@session.auto_increment_offset;
SET @bug20627_old_session_auto_increment_increment= SET @bug20627_old_session_auto_increment_increment=
@@session.auto_increment_increment= 5; @@session.auto_increment_increment;
SET @@auto_increment_offset= 2; SET @@auto_increment_offset= 2;
SET @@auto_increment_increment= 3; SET @@auto_increment_increment= 3;
SET @@session.auto_increment_offset= 4; SET @@session.auto_increment_offset= 4;
...@@ -151,13 +151,13 @@ SET @@session.auto_increment_increment= ...@@ -151,13 +151,13 @@ SET @@session.auto_increment_increment=
# Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID # Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
# #
SET @bug20830_old_auto_increment_offset= SET @bug20830_old_auto_increment_offset=
@@auto_increment_offset= 2; @@auto_increment_offset;
SET @bug20830_old_auto_increment_increment= SET @bug20830_old_auto_increment_increment=
@@auto_increment_increment= 3; @@auto_increment_increment;
SET @bug20830_old_session_auto_increment_offset= SET @bug20830_old_session_auto_increment_offset=
@@session.auto_increment_offset= 4; @@session.auto_increment_offset;
SET @bug20830_old_session_auto_increment_increment= SET @bug20830_old_session_auto_increment_increment=
@@session.auto_increment_increment= 5; @@session.auto_increment_increment;
SET @@auto_increment_offset= 2; SET @@auto_increment_offset= 2;
SET @@auto_increment_increment= 3; SET @@auto_increment_increment= 3;
SET @@session.auto_increment_offset= 4; SET @@session.auto_increment_offset= 4;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7