Commit d56ca9c7 authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
parents 73238e55 a52a5923

sql/ha_ndbcluster.cc

+6 −4
Original line number Diff line number Diff line
@@ -1367,15 +1367,17 @@ int ha_ndbcluster::drop_indexes(Ndb *ndb, TABLE *tab) 
*/

NDB_INDEX_TYPE ha_ndbcluster::get_index_type_from_table(uint inx) const

{

  return get_index_type_from_key(inx, table_share->key_info);

  return get_index_type_from_key(inx, table_share->key_info,

                                 inx == table_share->primary_key);

}



NDB_INDEX_TYPE ha_ndbcluster::get_index_type_from_key(uint inx,

                                                      KEY *key_info) const

                                                      KEY *key_info,

                                                      bool primary) const

{

  bool is_hash_index=  (key_info[inx].algorithm == 

                        HA_KEY_ALG_HASH);

  if (inx == table_share->primary_key)

  if (primary)

    return is_hash_index ? PRIMARY_KEY_INDEX : PRIMARY_KEY_ORDERED_INDEX;

  

  return ((key_info[inx].flags & HA_NOSAME) ?
@@ -4644,7 +4646,7 @@ int ha_ndbcluster::add_index(TABLE *table_arg, 
    KEY *key= key_info + idx;

    KEY_PART_INFO *key_part= key->key_part;

    KEY_PART_INFO *end= key_part + key->key_parts;

    NDB_INDEX_TYPE idx_type= get_index_type_from_key(idx, key);

    NDB_INDEX_TYPE idx_type= get_index_type_from_key(idx, key, false);

    DBUG_PRINT("info", ("Adding index: '%s'", key_info[idx].name));

    // Add fields to key_part struct

    for (; key_part != end; key_part++)

sql/ha_ndbcluster.h

+2 −1
Original line number Diff line number Diff line
@@ -719,7 +719,8 @@ static void set_tabname(const char *pathname, char *tabname); 
  void release_metadata();

  NDB_INDEX_TYPE get_index_type(uint idx_no) const;

  NDB_INDEX_TYPE get_index_type_from_table(uint index_no) const;

  NDB_INDEX_TYPE get_index_type_from_key(uint index_no, KEY *key_info) const;

  NDB_INDEX_TYPE get_index_type_from_key(uint index_no, KEY *key_info, 

                                         bool primary) const;

  int check_index_fields_not_null(uint index_no);



  uint set_up_partition_info(partition_info *part_info,