bk commit into 5.1 tree (istruewing:1.2390)

[ingo]

Below is the list of changes that have just been committed into a local
5.1 repository of istruewing. When istruewing 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-12 20:50:58+01:00, istruewing@stripped +5 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1
  into  chilla.local:/home/mydev/mysql-5.1-axmrg
  MERGE: 1.2378.1.2

  sql/sql_class.h@stripped, 2007-01-12 20:50:39+01:00, istruewing@stripped +0 -0
    Auto merged
    MERGE: 1.335.1.2

  sql/sql_parse.cc@stripped, 2007-01-12 20:50:40+01:00, istruewing@stripped +0 -0
    Auto merged
    MERGE: 1.615.1.2

  sql/table.cc@stripped, 2007-01-12 20:50:41+01:00, istruewing@stripped +0 -0
    Auto merged
    MERGE: 1.264.1.2

  storage/federated/ha_federated.cc@stripped, 2007-01-12 20:50:41+01:00, istruewing@stripped +0 -0
    Auto merged
    MERGE: 1.93.1.2

  storage/myisam/mi_check.c@stripped, 2007-01-12 20:50:41+01:00, istruewing@stripped +0 -0
    Auto merged
    MERGE: 1.155.1.3

# 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:	istruewing
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.1-axmrg/RESYNC

--- 1.157/storage/myisam/mi_check.c	2007-01-12 20:51:21 +01:00
+++ 1.158/storage/myisam/mi_check.c	2007-01-12 20:51:21 +01:00
@@ -1813,6 +1813,12 @@ int mi_sort_index(MI_CHECK *param, regis
   MI_STATE_INFO old_state;
   DBUG_ENTER("mi_sort_index");
 
+  /* cannot sort index files with R-tree indexes */
+  for (key= 0,keyinfo= &share->keyinfo[0]; key < share->base.keys ;
+       key++,keyinfo++)
+    if (keyinfo->key_alg == HA_KEY_ALG_RTREE)
+      DBUG_RETURN(0);
+
   if (!(param->testflag & T_SILENT))
     printf("- Sorting index for MyISAM-table '%s'\n",name);
 
@@ -1905,6 +1911,8 @@ static int sort_one_index(MI_CHECK *para
   char llbuff[22];
   DBUG_ENTER("sort_one_index");
 
+  /* cannot walk over R-tree indices */
+  DBUG_ASSERT(keyinfo->key_alg != HA_KEY_ALG_RTREE);
   new_page_pos=param->new_file_pos;
   param->new_file_pos+=keyinfo->block_length;
 

--- 1.95/storage/federated/ha_federated.cc	2007-01-12 20:51:21 +01:00
+++ 1.96/storage/federated/ha_federated.cc	2007-01-12 20:51:22 +01: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;