Commit 79ebad89 authored by unknown's avatar unknown
Browse files

After merge fix

parent 93528f28
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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;
}

+1 −1
Original line number Diff line number Diff line
@@ -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;
}