diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-11-08 20:59:08 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-11-08 20:59:08 +0400 |
| commit | e02ad98c63506c3260ac3a365e72886d7d02304a (patch) | |
| tree | 88ff7149921c8f4e47d5a628bfdc8f4241ad8c06 /mysql-test/extra/binlog_tests/binlog.test | |
| parent | 7876d53b5f17e2c906f41d97e22514c1e36640bb (diff) | |
| parent | d79d0c4045f5b93ded001ca6b963727b3362cd15 (diff) | |
| download | mariadb-git-e02ad98c63506c3260ac3a365e72886d7d02304a.tar.gz | |
Merge 5.5 -> 10.0-base
Diffstat (limited to 'mysql-test/extra/binlog_tests/binlog.test')
| -rw-r--r-- | mysql-test/extra/binlog_tests/binlog.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/extra/binlog_tests/binlog.test b/mysql-test/extra/binlog_tests/binlog.test index a87f1f351cc..190aa9e04b9 100644 --- a/mysql-test/extra/binlog_tests/binlog.test +++ b/mysql-test/extra/binlog_tests/binlog.test @@ -216,7 +216,7 @@ reset master; create table t1 (id tinyint auto_increment primary key); insert into t1 values(5); set insert_id=128; ---error 167 +--error HA_ERR_AUTOINC_ERANGE insert into t1 values(null) /* Not binlogged */; # The followin insert ignore will be put in binlog @@ -238,7 +238,7 @@ drop table t1; create table t1 (id tinyint auto_increment primary key) engine=myisam; set insert_id=128; ---error 167 +--error HA_ERR_AUTOINC_ERANGE insert into t1 values(5),(null) /* Insert_id 128 */; # The followin insert ignore will be put in binlog |