diff options
| author | unknown <lars/lthalmann@dl145j.mysql.com> | 2007-06-18 09:42:22 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145j.mysql.com> | 2007-06-18 09:42:22 +0200 |
| commit | 3a7c84066b02f3f32868a69fb1d6e7c5508347f1 (patch) | |
| tree | 5d72c9e47c88d4643b3354241a81f22fda24a3ad /storage/heap | |
| parent | c951bc08b118ea5586ce1519ca0fa981069378a5 (diff) | |
| parent | 3b42df6b76676676c5ba410be60c3b253bb46a43 (diff) | |
| download | mariadb-git-3a7c84066b02f3f32868a69fb1d6e7c5508347f1.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
mysql-test/t/ndb_charset.test:
Auto merged
mysql-test/t/ndb_index_unique.test:
Auto merged
mysql-test/t/ndb_insert.test:
Auto merged
mysql-test/t/ndb_replace.test:
Auto merged
mysql-test/t/ndb_update.test:
Auto merged
mysql-test/t/rpl_000015.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/rpl_row_inexist_tbl.test:
Auto merged
sql/Makefile.am:
Auto merged
BitKeeper/deleted/.del-ndb_binlog_basic2.test:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
sql/item_create.cc:
Manual merge
Diffstat (limited to 'storage/heap')
| -rw-r--r-- | storage/heap/ha_heap.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/heap/ha_heap.h b/storage/heap/ha_heap.h index c93a33b524b..f41c710716d 100644 --- a/storage/heap/ha_heap.h +++ b/storage/heap/ha_heap.h @@ -48,6 +48,7 @@ public: ulonglong table_flags() const { return (HA_FAST_KEY_READ | HA_NO_BLOBS | HA_NULL_IN_KEY | + HA_BINLOG_ROW_CAPABLE | HA_BINLOG_STMT_CAPABLE | HA_REC_NOT_IN_SEQ | HA_CAN_INSERT_DELAYED | HA_NO_TRANSACTIONS | HA_HAS_RECORDS | HA_STATS_RECORDS_IS_EXACT); } |