5.0 -> 5.1 manual merge, part 4 of 4 (or more?)

cc4a6e00 · tsmith@maint1.mysql.com · 8e0cc34a · cc4a6e00
Commit cc4a6e00 authored Aug 03, 2006 by tsmith@maint1.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/sql/ha_myisammrg.cc
+++ b/sql/ha_myisammrg.cc
@@ -551,7 +551,7 @@ bool ha_myisammrg::check_if_incompatible_data(HA_CREATE_INFO *info,

 static int myisammrg_init()
 {
-  myisammrg_hton.state=SHOW_OPTION_YES;
+  myisammrg_hton.state=have_merge_db;
  myisammrg_hton.db_type=DB_TYPE_MRG_MYISAM;
  myisammrg_hton.create=myisammrg_create_handler;
  myisammrg_hton.panic=myrg_panic;