diff options
| author | unknown <ingo/mydev@chilla.local> | 2006-07-24 10:53:26 +0200 |
|---|---|---|
| committer | unknown <ingo/mydev@chilla.local> | 2006-07-24 10:53:26 +0200 |
| commit | 79ebad89c602368094aa506b69ec4c51f857f56e (patch) | |
| tree | dc44aac23142449036f4bcee4b3d1c92c463f8a3 | |
| parent | 93528f288795c6d8efafeeeaf550b3f799b9cc38 (diff) | |
| download | mariadb-git-79ebad89c602368094aa506b69ec4c51f857f56e.tar.gz | |
After merge fix
| -rw-r--r-- | sql/ha_myisammrg.cc | 2 | ||||
| -rw-r--r-- | storage/blackhole/ha_blackhole.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index afeed5f79df..6be714dc2e3 100644 --- a/sql/ha_myisammrg.cc +++ b/sql/ha_myisammrg.cc @@ -555,7 +555,7 @@ static int myisammrg_init() myisammrg_hton.db_type=DB_TYPE_MRG_MYISAM; myisammrg_hton.create=myisammrg_create_handler; myisammrg_hton.panic=myrg_panic; - myisammrg_hton.flags= HTON_CAN_RECREATE | HTON_ALTER_CANNOT_CREATE; + myisammrg_hton.flags= HTON_CAN_RECREATE; return 0; } diff --git a/storage/blackhole/ha_blackhole.cc b/storage/blackhole/ha_blackhole.cc index 1a2bb264ef9..d22d9372e0d 100644 --- a/storage/blackhole/ha_blackhole.cc +++ b/storage/blackhole/ha_blackhole.cc @@ -206,7 +206,7 @@ static int blackhole_init() blackhole_hton.state= SHOW_OPTION_YES; blackhole_hton.db_type= DB_TYPE_BLACKHOLE_DB; blackhole_hton.create= blackhole_create_handler; - blackhole_hton.flags= HTON_CAN_RECREATE | HTON_ALTER_CANNOT_CREATE; + blackhole_hton.flags= HTON_CAN_RECREATE; return 0; } |