After merge fix

f74c4a06 · unknown · 050aa61e · f74c4a06 · f74c4a06
Commit f74c4a06 authored Jul 24, 2006 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/ha_myisammrg.cc sql/ha_myisammrg.cc +1 -1

storage/blackhole/ha_blackhole.cc storage/blackhole/ha_blackhole.cc +1 -1

No files found.
--- 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;
 }


--- 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;
 }