diff options
author | Alfranio Correia <alfranio.correia@sun.com> | 2009-12-17 21:43:35 +0000 |
---|---|---|
committer | Alfranio Correia <alfranio.correia@sun.com> | 2009-12-17 21:43:35 +0000 |
commit | 3dadf9564cbfd6e584db282b9105b8f5fb38f99b (patch) | |
tree | fb25bfc9b6c669b42e70afadf7790f0f8d7db7e3 /mysql-test/t/partition_innodb_stmt.test | |
parent | e852131f048df0c48d6779c40b23a347fbccc107 (diff) | |
parent | e83c9f627377f05e093f092cee227da1b43d8e94 (diff) | |
download | mariadb-git-3dadf9564cbfd6e584db282b9105b8f5fb38f99b.tar.gz |
merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1
Diffstat (limited to 'mysql-test/t/partition_innodb_stmt.test')
-rw-r--r-- | mysql-test/t/partition_innodb_stmt.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/partition_innodb_stmt.test b/mysql-test/t/partition_innodb_stmt.test index d6181ce068e..c6f30f41969 100644 --- a/mysql-test/t/partition_innodb_stmt.test +++ b/mysql-test/t/partition_innodb_stmt.test @@ -50,7 +50,7 @@ connection con1; --echo # connection con1 SET TRANSACTION ISOLATION LEVEL READ COMMITTED; BEGIN; ---error ER_BINLOG_LOGGING_IMPOSSIBLE +--error ER_BINLOG_STMT_MODE_AND_ROW_ENGINE INSERT INTO t1 VALUES(9); COMMIT; |