• unknown's avatar
    Merge with 4.0.4 · 72708f10
    unknown authored
    
    BitKeeper/etc/logging_ok:
      auto-union
    client/mysqldump.c:
      Auto merged
    include/Makefile.am:
      Auto merged
    include/my_base.h:
      Auto merged
    include/my_sys.h:
      Auto merged
    include/sslopt-case.h:
      Auto merged
    libmysql/libmysql.c:
      Auto merged
    libmysql/libmysql.def:
      Auto merged
    libmysqld/lib_sql.cc:
      Auto merged
    myisam/ft_boolean_search.c:
      Auto merged
    myisam/mi_check.c:
      Auto merged
    myisam/mi_create.c:
      Auto merged
    myisam/myisamchk.c:
      Auto merged
    mysql-test/mysql-test-run.sh:
      Auto merged
    mysql-test/r/create.result:
      Auto merged
    mysql-test/r/innodb.result:
      Auto merged
    mysql-test/r/myisam.result:
      Auto merged
    mysql-test/r/select.result:
      Auto merged
    mysql-test/r/type_set.result:
      Auto merged
    mysql-test/t/create.test:
      Auto merged
    mysql-test/t/myisam.test:
      Auto merged
    sql/Makefile.am:
      Auto merged
    sql/filesort.cc:
      Auto merged
    sql/ha_innodb.cc:
      Auto merged
    sql/ha_myisam.cc:
      Auto merged
    sql/handler.h:
      Auto merged
    sql/item_cmpfunc.cc:
      Auto merged
    sql/item_strfunc.cc:
      Auto merged
    sql/item_strfunc.h:
      Auto merged
    sql/lex.h:
      Auto merged
    sql/log.cc:
      Auto merged
    sql/log_event.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/net_pkg.cc:
      Auto merged
    sql/net_serv.cc:
      Auto merged
    sql/opt_range.cc:
      Auto merged
    sql/set_var.h:
      Auto merged
    sql/slave.cc:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    sql/sql_lex.cc:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/sql_load.cc:
      Auto merged
    sql/share/english/errmsg.txt:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    sql/sql_udf.cc:
      Auto merged
    sql/sql_union.cc:
      Auto merged
    sql/unireg.h:
      Auto merged
    sql/sql_cache.cc:
      Code cleanup (removed ifdef)
    72708f10
set_var.h 13.3 KB