• unknown's avatar
    Merge with 4.0.3 · fa182ded
    unknown authored
    Some simple optimzations, more comments and indentation changes.
    Add ` around database in 'use database' in binary log.
    Moved max_error_count and max_warning_count to variables struct.
    Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
    Changed string functions to use character set of first string argument as default return characterset
    (Each string function can change the above assumption if needed)
    
    
    BitKeeper/etc/ignore:
      auto-union
    BitKeeper/etc/logging_ok:
      auto-union
    BUILD/SETUP.sh:
      Auto merged
    BitKeeper/deleted/.del-getopt.h~a9ae679fa84f395:
      Auto merged
    BitKeeper/deleted/.del-getvar.c~2a29ff383970fd31:
      Auto merged
    Docs/manual.texi:
      Auto merged
    SSL/cacert.pem:
      Auto merged
    SSL/client-cert.pem:
      Auto merged
    SSL/client-key.pem:
      Auto merged
    SSL/server-cert.pem:
      Auto merged
    SSL/server-key.pem:
      Auto merged
    client/mysqldump.c:
      Auto merged
    include/my_base.h:
      Auto merged
    include/my_sys.h:
      Auto merged
    include/mysql_com.h:
      Auto merged
    isam/isamlog.c:
      Auto merged
    isam/pack_isam.c:
      Auto merged
    libmysqld/lib_sql.cc:
      Auto merged
    myisam/ft_dump.c:
      Auto merged
    myisam/ft_parser.c:
      Auto merged
    myisam/ft_static.c:
      Auto merged
    myisam/ft_test1.c:
      Auto merged
    myisam/ft_update.c:
      Auto merged
    myisam/mi_create.c:
      Auto merged
    myisam/mi_key.c:
      Auto merged
    myisam/mi_open.c:
      Auto merged
    myisam/mi_static.c:
      Auto merged
    myisam/mi_test1.c:
      Auto merged
    myisam/mi_test2.c:
      Auto merged
    myisam/mi_test3.c:
      Auto merged
    myisam/mi_update.c:
      Auto merged
    myisam/mi_write.c:
      Auto merged
    myisam/myisamchk.c:
      Auto merged
    myisam/myisamdef.h:
      Auto merged
    myisam/myisamlog.c:
      Auto merged
    myisam/myisampack.c:
      Auto merged
    mysql-test/mysql-test-run.sh:
      Auto merged
    mysql-test/r/create.result:
      Auto merged
    mysql-test/r/fulltext.result:
      Auto merged
    mysql-test/r/func_math.result:
      Auto merged
    mysql-test/r/innodb.result:
      Auto merged
    mysql-test/r/merge.result:
      Auto merged
    mysql-test/r/myisam.result:
      Auto merged
    mysql-test/r/select.result:
      Auto merged
    mysql-test/r/select_found.result:
      Auto merged
    mysql-test/r/union.result:
      Auto merged
    mysql-test/t/create.test:
      Auto merged
    mysql-test/t/myisam.test:
      Auto merged
    mysql-test/t/select_found.test:
      Auto merged
    mysql-test/t/union.test:
      Auto merged
    mysys/default.c:
      Auto merged
    mysys/mf_iocache2.c:
      Auto merged
    mysys/my_error.c:
      Auto merged
    mysys/my_init.c:
      Auto merged
    scripts/mysql_config.sh:
      Auto merged
    sql/convert.cc:
      Auto merged
    sql/filesort.cc:
      Auto merged
    sql/gen_lex_hash.cc:
      Auto merged
    sql/ha_berkeley.cc:
      Auto merged
    sql/ha_innodb.cc:
      Auto merged
    sql/ha_myisam.cc:
      Auto merged
    sql/handler.cc:
      Auto merged
    sql/handler.h:
      Auto merged
    sql/hostname.cc:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/item_sum.cc:
      Auto merged
    sql/item_sum.h:
      Auto merged
    sql/item_timefunc.cc:
      Auto merged
    sql/item_timefunc.h:
      Auto merged
    sql/key.cc:
      Auto merged
    sql/log.cc:
      Auto merged
    sql/net_pkg.cc:
      Auto merged
    sql/opt_range.cc:
      Auto merged
    sql/opt_range.h:
      Auto merged
    sql/opt_sum.cc:
      Auto merged
    sql/repl_failsafe.cc:
      Auto merged
    sql/slave.cc:
      Auto merged
    sql/sql_cache.cc:
      Auto merged
    sql/sql_db.cc:
      Auto merged
    sql/sql_handler.cc:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    sql/sql_lex.cc:
      Auto merged
    sql/sql_load.cc:
      Auto merged
    sql/sql_string.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    sql/sql_test.cc:
      Auto merged
    sql/time.cc:
      Auto merged
    sql/unireg.cc:
      Auto merged
    strings/Makefile.am:
      Auto merged
    strings/ctype-latin1_de.c:
      Auto merged
    strings/ctype-tis620.c:
      Auto merged
    tools/mysqlmanager.c:
      Auto merged
    BitKeeper/deleted/.del-sslopt-case.h~224c80e75dad4997:
      merge with 4.0.3
    BitKeeper/triggers/post-commit:
      merge with 4.0.3
    client/mysql.cc:
      merge with 4.0.3 + simple optimsation
    client/mysqltest.c:
      merge with 4.0.3 (Indentation change)
    configure.in:
      merge with 4.0.3
    extra/resolve_stack_dump.c:
      merge with 4.0.3 (Indentation change)
    include/Makefile.am:
      merge with 4.0.3
    include/myisam.h:
      merge with 4.0.3 (Indentation change)
    include/mysql.h:
      merge with 4.0.3 (removed not used structure)
    include/mysqld_error.h:
      merge with 4.0.3
    libmysql/Makefile.shared:
      merge with 4.0.3
    libmysql/libmysql.c:
      merge with 4.0.3 (Indentation change)
    libmysqld/Makefile.am:
      merge with 4.0.3
    myisam/ft_boolean_search.c:
      merge with 4.0.3 (Indentation change)
    myisam/ft_nlq_search.c:
      merge with 4.0.3 (Indentation change)
    myisam/mi_check.c:
      merge with 4.0.3
    myisam/mi_search.c:
      merge with 4.0.3
    myisam/mi_unique.c:
      merge with 4.0.3
    mysys/Makefile.am:
      merge with 4.0.3
    mysys/mf_casecnv.c:
      merge with 4.0.3
    sql-bench/server-cfg.sh:
      Removed 8000 max row limit for Innodb
    sql/Makefile.am:
      merge with 4.0.3
    sql/field.cc:
      Indentation cleanup
      Changed sprintf -> my_sprintf
    sql/field.h:
      merge with 4.0.3
    sql/ha_heap.cc:
      merge with 4.0.3 (Indentation change)
    sql/item.h:
      merge with 4.0.3 (Indentation change)
    sql/item_cmpfunc.cc:
      merge with 4.0.3
    sql/item_cmpfunc.h:
      Removed size_of() from items
      Indentation cleanup
    sql/item_create.cc:
      merge
    sql/item_create.h:
      merge
    sql/item_func.cc:
      Added comments
      Changed string functions to use character set of first string argument as default return characterset
      Simple optimizations.
      Removed return of uninitalized variable.
    sql/item_func.h:
      merge
    sql/item_strfunc.cc:
      merge with 4.0.3 (Indentation change)
    sql/item_strfunc.h:
      removed size_of()
    sql/item_uniq.h:
      removed size_of()
    sql/lex.h:
      merge with 4.0.3 (Indentation change)
    sql/log_event.cc:
      Add ` around database in 'use database' in binary log.
    sql/mysql_priv.h:
      merge with 4.0.3
    sql/mysqld.cc:
      merge with 4.0.3 (Indentation change)
    sql/share/czech/errmsg.txt:
      merge
    sql/share/danish/errmsg.txt:
      merge
    sql/share/dutch/errmsg.txt:
      merge
    sql/share/english/errmsg.txt:
      merge
    sql/share/estonian/errmsg.txt:
      merge
    sql/share/french/errmsg.txt:
      merge
    sql/share/german/errmsg.txt:
      merge
    sql/share/greek/errmsg.txt:
      merge
    sql/share/hungarian/errmsg.txt:
      merge
    sql/share/italian/errmsg.txt:
      merge
    sql/share/japanese/errmsg.txt:
      merge
    sql/share/korean/errmsg.txt:
      merge
    sql/share/norwegian-ny/errmsg.txt:
      merge
    sql/share/norwegian/errmsg.txt:
      merge
    sql/share/polish/errmsg.txt:
      merge
    sql/share/portuguese/errmsg.txt:
      merge
    sql/share/romanian/errmsg.txt:
      merge
    sql/share/russian/errmsg.txt:
      merge
    sql/share/slovak/errmsg.txt:
      merge
    sql/share/spanish/errmsg.txt:
      merge
    sql/share/swedish/errmsg.txt:
      merge
    sql/share/ukrainian/errmsg.txt:
      merge
    sql/sql_acl.cc:
      merge with 4.0.3
    sql/sql_base.cc:
      More comments
      Fixed bug in send_fields() when using convert
    sql/sql_class.cc:
      merge
    sql/sql_class.h:
      Merge with 4.0.3
      Moved max_error_count and max_warning_count to variables struct.
    sql/sql_delete.cc:
      merge with 4.0.3 (Indentation change)
    sql/sql_lex.h:
      merge with 4.0.3
    sql/sql_parse.cc:
      Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT.
      (Should be retrived from variables)
    sql/sql_select.cc:
      merge with 4.0.3
    sql/sql_show.cc:
      merge with 4.0.3
    sql/sql_union.cc:
      merge with 4.0.3
    sql/sql_update.cc:
      merge with 4.0.3
    sql/sql_yacc.yy:
      merge with 4.0.3
      Indentation cleanup
    sql/structs.h:
      merge with 4.0.3
    sql/table.cc:
      merge with 4.0.3
    sql/table.h:
      merge with 4.0.3
    fa182ded
mi_write.c 26.2 KB