• unknown's avatar
    Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines · 7b5da0aa
    unknown authored
    into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
    
    
    configure.in:
      Auto merged
    include/mysql/plugin.h:
      Auto merged
    mysql-test/r/information_schema.result:
      Auto merged
    mysql-test/r/partition_innodb.result:
      Auto merged
    mysql-test/t/information_schema.test:
      Auto merged
    mysql-test/t/partition_innodb.test:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/item_func.h:
      Auto merged
    sql/log.cc:
      Auto merged
    sql/log_event.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/repl_failsafe.cc:
      Auto merged
    sql/slave.cc:
      Auto merged
    sql/slave.h:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_partition.cc:
      Auto merged
    sql/sql_plugin.cc:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    storage/myisam/mi_dynrec.c:
      Auto merged
    7b5da0aa
partition_innodb.test 6.57 KB