diff options
| author | unknown <acurtis@xiphis.org> | 2006-05-12 08:50:31 -0700 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2006-05-12 08:50:31 -0700 |
| commit | 93c397f9fa1e3e9dd62114ea8208557cdce21c29 (patch) | |
| tree | c121f9008dc34c930ea0ddea7f5aa7820c8cd84a /storage | |
| parent | a8c13c34a1b39b1f1fe06458b95f46b900576a51 (diff) | |
| parent | dac69dd4a2179a4bfbfacb22b41969c015f07d2d (diff) | |
| download | mariadb-git-93c397f9fa1e3e9dd62114ea8208557cdce21c29.tar.gz | |
manual merge bug#10952
mysql-test/r/merge.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/blackhole/ha_blackhole.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/blackhole/ha_blackhole.cc b/storage/blackhole/ha_blackhole.cc index e9fd1c2319d..098e44f39ee 100644 --- a/storage/blackhole/ha_blackhole.cc +++ b/storage/blackhole/ha_blackhole.cc @@ -67,7 +67,7 @@ handlerton blackhole_hton= { NULL, /* Alter table flags */ NULL, /* Alter Tablespace */ NULL, /* Fill FILES table */ - HTON_CAN_RECREATE, + HTON_CAN_RECREATE | HTON_ALTER_CANNOT_CREATE, NULL, /* binlog_func */ NULL, /* binlog_log_query */ NULL /* release_temporary_latches */ |