diff options
| author | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-06-12 22:02:46 +0200 |
|---|---|---|
| committer | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-06-12 22:02:46 +0200 |
| commit | 492ebf924b40ac847201fa6dc3cb44731dbac210 (patch) | |
| tree | e252590c0287c7b25e8b7d291290be7d7a77d932 /mysql-test/t/partition_hash.test | |
| parent | e319a0493461000f9eeabceed7f2c5d57cfc44cd (diff) | |
| parent | ccbada0864161294ca351b2a9b6cfac5d4ce6153 (diff) | |
| download | mariadb-git-492ebf924b40ac847201fa6dc3cb44731dbac210.tar.gz | |
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
into kindahl-laptop.dnsalias.net:/home/bk/b23051-mysql-5.1-rpl
BitKeeper/deleted/.del-binlog_row_blackhole.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
storage/blackhole/ha_blackhole.h:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
storage/innobase/handler/ha_innodb.h:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
mysql-test/t/partition_hash.test:
Manual merge
sql/handler.h:
Manual merge
sql/set_var.cc:
Manual merge
sql/sql_class.h:
Manual merge
sql/sql_insert.cc:
Manual merge
sql/sql_parse.cc:
Manual merge
Diffstat (limited to 'mysql-test/t/partition_hash.test')
| -rw-r--r-- | mysql-test/t/partition_hash.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/partition_hash.test b/mysql-test/t/partition_hash.test index dc527cad2b7..26a563cd8cc 100644 --- a/mysql-test/t/partition_hash.test +++ b/mysql-test/t/partition_hash.test @@ -134,6 +134,7 @@ drop table t1; --disable_warnings CREATE TABLE t1 (s1 int) ENGINE=BLACKHOLE PARTITION BY HASH (s1); --enable_warnings +--error 0,ER_BINLOG_ROW_FORMAT_FORBIDDEN INSERT INTO t1 VALUES (0); DROP TABLE t1; |