• unknown's avatar
    Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19140 · 508336fe
    unknown authored
    into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
    
    
    mysql-test/t/partition.test:
      Auto merged
    sql/sql_partition.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    mysql-test/r/ndb_partition_key.result:
      manual merge
    mysql-test/r/partition.result:
      manual merge
    mysql-test/t/ndb_partition_key.test:
      manual merge
    508336fe
sql_table.cc 199 KB