• unknown's avatar
    Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new · a5b8b775
    unknown authored
    into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754
    
    
    mysql-test/r/partition.result:
      Auto merged
    mysql-test/t/partition.test:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/sql_partition.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    mysql-test/r/ndb_partition_key.result:
      manual merge
    mysql-test/t/ndb_partition_key.test:
      manual merge
    a5b8b775
ndb_partition_key.result 4.68 KB