• unknown's avatar
    Merge with 3.23: · 3e90ec6a
    unknown authored
    Set innobase_flush_log_at_trx_commit to 1 by default
    Fix problem with timestamp on 64 bit systems
    Reserve alarms for up to 10 slave threads
    
    
    BitKeeper/etc/logging_ok:
      auto-union
    mysql-test/t/rpl_alter.test:
      Auto merged
    mysys/charset.c:
      Auto merged
    sql/log_event.cc:
      Auto merged
    mysql-test/r/join.result:
      Merge with 3.23
    mysql-test/t/join.test:
      Merge with 3.23
    sql/ha_innodb.cc:
      Merge with 3.23;  Set innobase_flush_log_at_trx_commit to 1 by default
    sql/log_event.h:
      Merge with 3.23; Fix problem with timestamp on 64 bit systems
    sql/mini_client.cc:
      Use local version
    sql/mysqld.cc:
      Reserve alarms for up to 10 slave threads
    sql/slave.cc:
      Use local version
    sql/sql_list.h:
      Use local version
    3e90ec6a
charset.c 14.6 KB