summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Elkin <andrei.elkin@oracle.com>2012-04-23 11:51:19 +0300
committerAndrei Elkin <andrei.elkin@oracle.com>2012-04-23 11:51:19 +0300
commitbd0c38064faf52e65ee8d2044f15b6393b44522d (patch)
tree78b8f2b644be8f40874bd3dfe02aa590deec884f
parent49e484c8cd2e362e843bbd5d756422cc7e2686d3 (diff)
downloadmariadb-git-bd0c38064faf52e65ee8d2044f15b6393b44522d.tar.gz
BUG#11754117
rpl_auto_increment_bug45679.test is refined due to not fixed in 5.1 Bug11749859-39934.
-rw-r--r--mysql-test/suite/rpl/r/rpl_auto_increment_bug45679.result2
-rw-r--r--mysql-test/suite/rpl/t/rpl_auto_increment_bug45679.test2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_auto_increment_bug45679.result b/mysql-test/suite/rpl/r/rpl_auto_increment_bug45679.result
index 75f4e661dc1..e2b3206eb02 100644
--- a/mysql-test/suite/rpl/r/rpl_auto_increment_bug45679.result
+++ b/mysql-test/suite/rpl/r/rpl_auto_increment_bug45679.result
@@ -26,7 +26,7 @@ end//
select multi_part_pk_with_autoinc (3);
multi_part_pk_with_autoinc (3)
3
-*** autoincrement field is not the first in PK warning must be there: ***
+*** No warnings in 5.1 because of Bug11749859-39934 ***
show warnings;
Level Code Message
set @@binlog_format=mixed;
diff --git a/mysql-test/suite/rpl/t/rpl_auto_increment_bug45679.test b/mysql-test/suite/rpl/t/rpl_auto_increment_bug45679.test
index 6996e1c73c7..0df086ddbfa 100644
--- a/mysql-test/suite/rpl/t/rpl_auto_increment_bug45679.test
+++ b/mysql-test/suite/rpl/t/rpl_auto_increment_bug45679.test
@@ -35,7 +35,7 @@ end//
delimiter ;//
select multi_part_pk_with_autoinc (3);
---echo *** autoincrement field is not the first in PK warning must be there: ***
+--echo *** No warnings in 5.1 because of Bug11749859-39934 ***
show warnings;
set @@binlog_format=mixed;