• unknown's avatar
    Merge witty.:/Users/mattiasj/clones/mysql-5.1-bug20129.2 · 8144fd1a
    unknown authored
    into  witty.:/Users/mattiasj/clones/topush-51
    
    
    mysql-test/r/partition.result:
      Auto merged
    mysql-test/suite/parts/t/disabled.def:
      Auto merged
    mysql-test/t/partition.test:
      Auto merged
    sql/sql_partition.cc:
      Auto merged
    mysql-test/suite/parts/r/partition_basic_innodb.result:
      Manual merge
    mysql-test/suite/parts/r/partition_basic_myisam.result:
      Manual merge
    mysql-test/suite/parts/r/partition_engine_innodb.result:
      Manual merge
    mysql-test/suite/parts/r/partition_engine_myisam.result:
      Manual merge
    8144fd1a
disabled.def 2.04 KB