database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

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

Browse Source 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
This commit is contained in:
istruewing@stella.local
2007-11-26 19:18:21 +01:00
parent 010d82753d f140e7e000
commit 7fcf494018
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/r/delayed.result
View File

@@ -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=
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;

16
mysql-test/t/delayed.test
View File

@@ -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=
# 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;