• unknown's avatar
    Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new · 150d8d35
    unknown authored
    into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
    
    
    configure.in:
      Auto merged
    BUILD/SETUP.sh:
      Auto merged
    include/my_dbug.h:
      Auto merged
    sql/ha_heap.cc:
      Auto merged
    sql/ha_myisammrg.cc:
      Auto merged
    sql/ha_ndbcluster.cc:
      Auto merged
    sql/ha_ndbcluster.h:
      Auto merged
    sql/ha_partition.h:
      Auto merged
    sql/handler.h:
      Auto merged
    sql/log.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/partition_info.h:
      Auto merged
    sql/set_var.cc:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_class.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_partition.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    sql/share/errmsg.txt:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    sql/table.cc:
      Auto merged
    mysql-test/r/ndb_partition_key.result:
      manual merge
    mysql-test/t/ndb_partition_key.test:
      manual merge
    sql/ha_partition.cc:
      manual merge
    150d8d35
ha_ndbcluster.cc 292 KB