• unknown's avatar
    Merge with 4.0 · 8b2c74ee
    unknown authored
    
    configure.in:
      Auto merged
    BitKeeper/deleted/.del-mutex.m4~a13383cde18a64e1:
      Auto merged
    mysql-test/mysql-test-run.sh:
      Auto merged
    mysql-test/r/func_test.result:
      Auto merged
    mysql-test/r/null_key.result:
      Auto merged
    mysql-test/t/func_test.test:
      Auto merged
    sql/handler.cc:
      Auto merged
    sql/item_create.cc:
      Auto merged
    sql/item_timefunc.h:
      Auto merged
    sql/lex.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/opt_range.cc:
      Auto merged
    sql/sql_delete.cc:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    sql/sql_update.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    sql/item_func.h:
      Merge
    8b2c74ee
mysqld.cc 171 KB