Skip to content

M
MariaDB
Commit f74c4a06 authored by unknown's avatar unknown
Browse files
Options

After merge fix

parent 050aa61e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sql/ha_myisammrg.cc
View file @ f74c4a06
...@@ -555,7 +555,7 @@ static int myisammrg_init() ...@@ -555,7 +555,7 @@ static int myisammrg_init()
myisammrg_hton.db_type=DB_TYPE_MRG_MYISAM; myisammrg_hton.db_type=DB_TYPE_MRG_MYISAM;
myisammrg_hton.create=myisammrg_create_handler; myisammrg_hton.create=myisammrg_create_handler;
myisammrg_hton.panic=myrg_panic; myisammrg_hton.panic=myrg_panic;
myisammrg_hton.flags= HTON_CAN_RECREATE | HTON_ALTER_CANNOT_CREATE; myisammrg_hton.flags= HTON_CAN_RECREATE;
return 0; return 0;
} }
......
storage/blackhole/ha_blackhole.cc
View file @ f74c4a06
...@@ -206,7 +206,7 @@ static int blackhole_init() ...@@ -206,7 +206,7 @@ static int blackhole_init()
blackhole_hton.state= SHOW_OPTION_YES; blackhole_hton.state= SHOW_OPTION_YES;
blackhole_hton.db_type= DB_TYPE_BLACKHOLE_DB; blackhole_hton.db_type= DB_TYPE_BLACKHOLE_DB;
blackhole_hton.create= blackhole_create_handler; blackhole_hton.create= blackhole_create_handler;
blackhole_hton.flags= HTON_CAN_RECREATE | HTON_ALTER_CANNOT_CREATE; blackhole_hton.flags= HTON_CAN_RECREATE;
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7