bk commit into 5.1 tree (ingo:1.2266)

[ingo]

Below is the list of changes that have just been committed into a local
5.1 repository of mydev. When mydev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-24 10:53:26+02:00, ingo@stripped +2 -0
  After merge fix

  sql/ha_myisammrg.cc@stripped, 2006-07-24 10:53:21+02:00, ingo@stripped +1 -1
    After merge fix

  storage/blackhole/ha_blackhole.cc@stripped, 2006-07-24 10:53:21+02:00, ingo@stripped +1 -1
    After merge fix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.1-amerge

--- 1.91/sql/ha_myisammrg.cc	2006-07-24 10:53:37 +02:00
+++ 1.92/sql/ha_myisammrg.cc	2006-07-24 10:53:37 +02:00
@@ -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.37/storage/blackhole/ha_blackhole.cc	2006-07-24 10:53:37 +02:00
+++ 1.38/storage/blackhole/ha_blackhole.cc	2006-07-24 10:53:37 +02:00
@@ -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;
 }