List:Commits« Previous MessageNext Message »
From:holyfoot Date:January 10 2007 1:22pm
Subject:bk commit into 5.1 tree (holyfoot:1.2381)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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, 2007-01-10 16:22:47+04:00, holyfoot@deer.(none) +1 -0
  Merge mysql.com:/home/hf/work/22451/my51-22451
  into  mysql.com:/home/hf/work/mysql-5.1-mrg
  MERGE: 1.2343.16.3

  storage/federated/ha_federated.cc@stripped, 2007-01-10 16:22:37+04:00, holyfoot@deer.(none)
+0 -0
    Auto merged
    MERGE: 1.90.2.1

# 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:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-5.1-mrg/RESYNC

--- 1.94/storage/federated/ha_federated.cc	2007-01-10 16:22:55 +04:00
+++ 1.95/storage/federated/ha_federated.cc	2007-01-10 16:22:55 +04:00
@@ -405,7 +405,7 @@ int federated_db_init(void *p)
   federated_hton->commit= federated_commit;
   federated_hton->rollback= federated_rollback;
   federated_hton->create= federated_create_handler;
-  federated_hton->flags= HTON_ALTER_NOT_SUPPORTED;
+  federated_hton->flags= HTON_ALTER_NOT_SUPPORTED | HTON_NO_PARTITION;
 
   if (pthread_mutex_init(&federated_mutex, MY_MUTEX_INIT_FAST))
     goto error;
Thread
bk commit into 5.1 tree (holyfoot:1.2381)holyfoot10 Jan