• unknown's avatar
    Merge with 4.0.16 · f16887c5
    unknown authored
    BitKeeper/etc/ignore:
      auto-union
    BitKeeper/etc/logging_ok:
      auto-union
    BitKeeper/deleted/.del-mysqldump.result:
      Delete: mysql-test/r/mysqldump.result
    BitKeeper/deleted/.del-mysqldump.test:
      Delete: mysql-test/t/mysqldump.test
    BitKeeper/deleted/.del-compile-netware-max:
      Delete: netware/BUILD/compile-netware-max
    BitKeeper/deleted/.del-compile-netware-max-debug:
      Delete: netware/BUILD/compile-netware-max-debug
    BitKeeper/deleted/.del-compile-netware-src:
      Delete: netware/BUILD/compile-netware-src
    BitKeeper/deleted/.del-knetware.imp:
      Delete: netware/BUILD/knetware.imp
    BUILD/compile-pentium-valgrind-max:
      Auto merged
    BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
      Auto merged
    BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
      Auto merged
    BitKeeper/deleted/.del-openssl.imp:
      Delete: netware/BUILD/openssl.imp
    acinclude.m4:
      Auto merged
    SSL/cacert.pem:
      Auto merged
    SSL/client-cert.pem:
      Auto merged
    SSL/server-cert.pem:
      Auto merged
    client/mysqlbinlog.cc:
      Auto merged
    extra/resolveip.c:
      Auto merged
    heap/hp_test2.c:
      Auto merged
    include/my_global.h:
      Auto merged
    innobase/row/row0mysql.c:
      Auto merged
    innobase/row/row0sel.c:
      Auto merged
    libmysql/libmysql.def:
      Auto merged
    libmysqld/examples/Makefile.am:
      Auto merged
    myisam/mi_check.c:
      Auto merged
    myisam/mi_test2.c:
      Auto merged
    myisam/myisamdef.h:
      Auto merged
    mysql-test/r/fulltext_multi.result:
      Auto merged
    mysql-test/r/fulltext_order_by.result:
      Auto merged
    mysql-test/r/select.result:
      Auto merged
    mysql-test/r/user_var.result:
      Auto merged
    mysql-test/std_data/rpl_loaddata2.dat:
      Auto merged
    mysql-test/t/rpl_loaddata.test:
      Auto merged
    mysql-test/t/select.test:
      Auto merged
    mysql-test/t/user_var.test:
      Auto merged
    mysys/mf_dirname.c:
      Auto merged
    scripts/make_win_src_distribution.sh:
      Auto merged
    sql/des_key_file.cc:
      Auto merged
    sql/log.cc:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/repl_failsafe.cc:
      Auto merged
    sql/slave.h:
      Auto merged
    sql-bench/crash-me.sh:
      Auto merged
    sql-bench/server-cfg.sh:
      Auto merged
    sql-bench/test-insert.sh:
      Auto merged
    sql-bench/test-transactions.sh:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_load.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    support-files/mysql.server.sh:
      Auto merged
    client/mysqltest.c:
      Merge with 4.0.16
      Changed version number to '2.0' to avoid confusion with version numbering in 3.23
    mysql-test/r/distinct.result:
      Updated results for merge
    mysql-test/r/insert.result:
      Updated results for merge
    mysql-test/r/insert_select.result:
      Updated results for merge
    mysql-test/r/join_outer.result:
      Updated results for merge
    mysql-test/r/mix_innodb_myisam_binlog.result:
      Updated results for merge
    mysql-test/r/order_by.result:
      Updated results for merge
    mysql-test/r/rpl000009.result:
      Updated results for merge
    mysql-test/r/rpl_loaddata.result:
      Updated results for merge
    mysql-test/r/rpl_log.result:
      Updated results for merge
    mysql-test/r/select_safe.result:
      Updated results for merge
    scripts/mysql_install_db.sh:
      Change -eq to =
    BitKeeper/deleted/.del-ins000001.test~2428ee5c9b1bc483:
      dummy
    f16887c5
make_win_src_distribution.sh 8.1 KB