• unknown's avatar
    Merge with 4.0.8 · eebc67f6
    unknown authored
    
    BitKeeper/etc/logging_ok:
      auto-union
    VC++Files/sql/mysqld.dsp:
      Auto merged
    acinclude.m4:
      Auto merged
    include/my_base.h:
      Auto merged
    include/myisam.h:
      Auto merged
    include/myisammrg.h:
      Auto merged
    libmysql/libmysql.c:
      Auto merged
    myisam/mi_check.c:
      Auto merged
    myisam/mi_write.c:
      Auto merged
    myisam/myisamdef.h:
      Auto merged
    mysql-test/mysql-test-run.sh:
      Auto merged
    mysql-test/r/case.result:
      Auto merged
    mysql-test/r/distinct.result:
      Auto merged
    mysql-test/r/fulltext.result:
      Auto merged
    mysql-test/r/key_diff.result:
      Auto merged
    mysql-test/r/multi_update.result:
      Auto merged
    mysql-test/r/order_by.result:
      Auto merged
    mysql-test/r/select.result:
      Auto merged
    mysql-test/r/show_check.result:
      Auto merged
    mysql-test/t/multi_update.test:
      Auto merged
    mysql-test/t/rpl_log_pos.test:
      Auto merged
    mysys/Makefile.am:
      Auto merged
    scripts/Makefile.am:
      Auto merged
    sql/field.cc:
      Auto merged
    sql/ha_innodb.cc:
      Auto merged
    sql/ha_myisam.cc:
      Auto merged
    sql/ha_myisammrg.cc:
      Auto merged
    sql/ha_myisammrg.h:
      Auto merged
    sql/item_cmpfunc.cc:
      Auto merged
    sql/item_create.h:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/item_func.h:
      Auto merged
    sql/lex.h:
      Auto merged
    sql/log.cc:
      Auto merged
    sql/net_serv.cc:
      Auto merged
    sql/repl_failsafe.cc:
      Auto merged
    sql/set_var.h:
      Auto merged
    sql/slave.cc:
      Auto merged
    sql/slave.h:
      Auto merged
    sql/sql_acl.cc:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    sql/sql_load.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    sql/sql_udf.cc:
      Auto merged
    sql/sql_update.cc:
      Auto merged
    sql-bench/crash-me.sh:
      Auto merged
    sql-bench/server-cfg.sh:
      Auto merged
    sql/share/english/errmsg.txt:
      Auto merged
    sql/structs.h:
      Auto merged
    eebc67f6
rpl_failsafe.result 838 Bytes