BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-compile-netware-standard:
Delete: netware/BUILD/compile-netware-standard
BitKeeper/deleted/.del-mwenv:
Delete: netware/BUILD/mwenv
BitKeeper/deleted/.del-nwbootstrap:
Delete: netware/BUILD/nwbootstrap
BitKeeper/deleted/.del-compile-AUTOTOOLS:
Delete: netware/BUILD/compile-AUTOTOOLS
BitKeeper/deleted/.del-compile-linux-tools:
Delete: netware/BUILD/compile-linux-tools
BitKeeper/deleted/.del-compile-netware-END:
Delete: netware/BUILD/compile-netware-END
BitKeeper/deleted/.del-compile-netware-START:
Delete: netware/BUILD/compile-netware-START
BitKeeper/deleted/.del-compile-netware-all:
Delete: netware/BUILD/compile-netware-all
BitKeeper/deleted/.del-compile-netware-debug:
Delete: netware/BUILD/compile-netware-debug
BitKeeper/deleted/.del-mwasmnlm~bc5746809d67feb5:
Auto merged
BitKeeper/deleted/.del-mwenv~35c8b56062f4b6aa:
Auto merged
BitKeeper/deleted/.del-mwccnlm~be63afd25a14c3f:
Auto merged
BitKeeper/deleted/.del-mwldnlm~efb26c57cba3c980:
Auto merged
BitKeeper/deleted/.del-netware.patch~f70a3a965f54d9ee:
Auto merged
Docs/internals.texi:
Auto merged
VC++Files/bdb/bdb.dsp:
Auto merged
VC++Files/bdb/build_win32/Berkeley_DB.dsw:
Auto merged
VC++Files/bdb/build_win32/db_archive.dsp:
Auto merged
VC++Files/bdb/build_win32/db_buildall.dsp:
Auto merged
VC++Files/bdb/build_win32/db_checkpoint.dsp:
Auto merged
VC++Files/bdb/build_win32/db_deadlock.dsp:
Auto merged
VC++Files/bdb/build_win32/db_dll.dsp:
Auto merged
VC++Files/bdb/build_win32/db_dump.dsp:
Auto merged
VC++Files/bdb/build_win32/db_java.dsp:
Auto merged
VC++Files/bdb/build_win32/db_load.dsp:
Auto merged
VC++Files/bdb/build_win32/db_printlog.dsp:
Auto merged
VC++Files/bdb/build_win32/db_recover.dsp:
Auto merged
VC++Files/bdb/build_win32/db_stat.dsp:
Auto merged
VC++Files/bdb/build_win32/db_static.dsp:
Auto merged
VC++Files/bdb/build_win32/db_static1.dsp:
Auto merged
VC++Files/bdb/build_win32/db_tcl.dsp:
Auto merged
VC++Files/bdb/build_win32/db_test.dsp:
Auto merged
VC++Files/bdb/build_win32/db_upgrade.dsp:
Auto merged
VC++Files/bdb/build_win32/db_verify.dsp:
Auto merged
VC++Files/bdb/build_win32/ex_access.dsp:
Auto merged
VC++Files/bdb/build_win32/ex_btrec.dsp:
Auto merged
VC++Files/bdb/build_win32/ex_env.dsp:
Auto merged
VC++Files/bdb/build_win32/ex_lock.dsp:
Auto merged
VC++Files/bdb/build_win32/ex_mpool.dsp:
Auto merged
VC++Files/bdb/build_win32/ex_tpcb.dsp:
Auto merged
VC++Files/bdb/build_win32/excxx_access.dsp:
Auto merged
VC++Files/bdb/build_win32/excxx_btrec.dsp:
Auto merged
VC++Files/bdb/build_win32/excxx_env.dsp:
Auto merged
VC++Files/bdb/build_win32/excxx_lock.dsp:
Auto merged
VC++Files/bdb/build_win32/excxx_mpool.dsp:
Auto merged
VC++Files/bdb/build_win32/excxx_tpcb.dsp:
Auto merged
VC++Files/client/mysql.dsp:
Auto merged
VC++Files/client/mysqladmin.dsp:
Auto merged
VC++Files/client/mysqlcheck.dsp:
Auto merged
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/client/mysqlclient.dsw:
Auto merged
VC++Files/client/mysqldump.dsp:
Auto merged
VC++Files/client/mysqlimport.dsp:
Auto merged
VC++Files/client/mysqlshow.dsp:
Auto merged
VC++Files/comp_err/comp_err.dsp:
Auto merged
VC++Files/contrib/asm386/zlibvc.dsp:
Auto merged
VC++Files/contrib/asm386/zlibvc.dsw:
Auto merged
VC++Files/contrib/minizip/zlibvc.dsp:
Auto merged
VC++Files/contrib/minizip/zlibvc.dsw:
Auto merged
VC++Files/dbug/dbug.dsp:
Auto merged
VC++Files/dbug/dbug.dsw:
Auto merged
VC++Files/heap/heap.dsp:
Auto merged
VC++Files/innobase/innobase.dsp:
Auto merged
VC++Files/isam/isam.dsp:
Auto merged
VC++Files/isam/isam.dsw:
Auto merged
VC++Files/isamchk/isamchk.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsw:
Auto merged
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Auto merged
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
VC++Files/libmysqltest/myTest.dsp:
Auto merged
VC++Files/libmysqltest/mytest.dsw:
Auto merged
VC++Files/merge/merge.dsp:
Auto merged
VC++Files/merge/merge.dsw:
Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
Auto merged
VC++Files/myisam/myisam.dsp:
Auto merged
VC++Files/myisamchk/myisamchk.dsp:
Auto merged
VC++Files/myisamlog/myisamlog.dsp:
Auto merged
VC++Files/myisammrg/myisammrg.dsp:
Auto merged
VC++Files/mysql.dsp:
Auto merged
VC++Files/mysql.dsw:
Auto merged
VC++Files/myisampack/myisampack.dsp:
Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
Auto merged
VC++Files/mysqldemb/mysqldemb.dsp:
Auto merged
VC++Files/mysqlmanager/MySqlManager.dsp:
Auto merged
VC++Files/mysqlmanager/mysqlmanager.dsw:
Auto merged
VC++Files/mysqlserver/mysqlserver.dsp:
Auto merged
VC++Files/mysqlshutdown/myshutdown.dsp:
Auto merged
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
Auto merged
VC++Files/mysqlwatch/mysqlwatch.dsp:
Auto merged
VC++Files/mysys/mysys.dsp:
Auto merged
VC++Files/mysys/mysys.dsw:
Auto merged
VC++Files/pack_isam/pack_isam.dsp:
Auto merged
VC++Files/perror/perror.dsp:
Auto merged
VC++Files/regex/regex.dsp:
Auto merged
VC++Files/regex/regex.dsw:
Auto merged
VC++Files/replace/replace.dsp:
Auto merged
VC++Files/sql/mysqld.dsw:
Auto merged
VC++Files/sql/mysqldmax.dsp:
Auto merged
VC++Files/sql/old/mysqld.dsw:
Auto merged
VC++Files/strings/MASM6x/strings.dsp:
Auto merged
VC++Files/strings/MASM6x/strings.dsw:
Auto merged
VC++Files/strings/backup/strings.dsp:
Auto merged
VC++Files/strings/backup/strings.dsw:
Auto merged
VC++Files/strings/noMASM/strings.dsp:
Auto merged
VC++Files/strings/noMASM/strings.dsw:
Auto merged
VC++Files/strings/strings.dsw:
Auto merged
VC++Files/test1/test1.dsp:
Auto merged
VC++Files/thr_insert_test/thr_insert_test.dsp:
Auto merged
VC++Files/thr_test/thr_test.dsp:
Auto merged
VC++Files/vio/vio.dsp:
Auto merged
VC++Files/zlib/zlib.dsp:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqlshow.c:
Auto merged
include/my_global.h:
Auto merged
include/my_sys.h:
Auto merged
include/myisam.h:
Auto merged
include/thr_lock.h:
Auto merged
include/violite.h:
Auto merged
innobase/buf/buf0buf.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/trx/trx0sys.c:
Auto merged
libmysqld/lib_vio.c:
Auto merged
myisam/mi_create.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/join.result:
Auto merged
mysql-test/r/rpl000001.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/auto_increment.test:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/func_like.test:
Auto merged
mysql-test/t/group_by.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
mysql-test/t/type_timestamp.test:
Auto merged
mysys/default.c:
Auto merged
mysys/thr_lock.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mf_iocache.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_serv.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/repl_failsafe.h:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_repl.h:
Auto merged
sql/sql_update.cc:
Auto merged
sql/stacktrace.c:
Auto merged
sql/table.cc:
Auto merged
sql/unireg.h:
Auto merged
strings/ctype-tis620.c:
Auto merged
strings/t_ctype.h:
Auto merged
support-files/mysql.spec.sh:
Auto merged
tests/grant.res:
Auto merged
vio/viosocket.c:
Auto merged
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BUILD/FINISH.sh:
Auto merged
client/mysqldump.c:
Auto merged
include/my_base.h:
Auto merged
include/my_pthread.h:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/ut/ut0mem.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/bigint.result:
Auto merged
mysql-test/r/handler.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/innodb_handler.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/bigint.test:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/innodb_handler.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
sql/table.h:
Auto merged
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
BUILD/FINISH.sh:
Auto merged
client/mysqldump.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sql_class.cc:
Auto merged
BitKeeper/deleted/.del-world.sql~6603b5c62c5bac53:
Auto merged
libmysql/libmysql.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/field.cc:
Auto merged
sql/lex.h:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Replaced mysql.de.texi in mysql-4.0 tree with dummy placeholder.
Moved world.sql sample database to mysqldoc tree.
BitKeeper/deleted/.del-world.sql~6603b5c62c5bac53:
Delete: Docs/world.sql
Docs/manual.de.texi:
Moved mysql.de.texi from mysql-4.0 tree to mysqldoc tree.
Replaced mysql.de.texi in mysql-4.0 tree with dummy placeholder.
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
Makefile.am:
Auto merged
bdb/os/os_handle.c:
Auto merged
client/mysqladmin.c:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/resolveip.c:
Auto merged
include/Makefile.am:
Auto merged
include/config-win.h:
Auto merged
include/my_base.h:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/my_sys.h:
Auto merged
include/mysql.h:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql/Makefile.shared:
Auto merged
libmysql/manager.c:
Auto merged
libmysqld/libmysqld.c:
Auto merged
myisam/ft_static.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/mi_test3.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/func_math.result:
Auto merged
mysql-test/r/handler.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/backup.test:
Auto merged
mysql-test/t/bigint.test:
Auto merged
mysql-test/t/binary.test:
Auto merged
mysql-test/t/count_distinct.test:
Auto merged
mysql-test/t/func_crypt.test:
Auto merged
mysql-test/t/func_group.test:
Auto merged
mysql-test/t/grant_cache.test:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/rpl000015.test:
Auto merged
mysql-test/t/rpl000017.test:
Auto merged
mysys/default.c:
Auto merged
mysys/my_getwd.c:
Auto merged
mysys/my_init.c:
Auto merged
sql/Makefile.am:
Auto merged
sql/des_key_file.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/hostname.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_create.h:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/lex.h:
Auto merged
sql/net_serv.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql-bench/server-cfg.sh:
Auto merged
sql-bench/test-insert.sh:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/table.cc:
Auto merged
Docs/manual.texi:
Use remote version
client/mysql.cc:
Merge
configure.in:
Merge
libmysql/libmysql.c:
Merge
libmysqld/lib_sql.cc:
Merge
myisam/ft_stopwords.c:
Merge
myisam/myisamchk.c:
Merge
mysql-test/r/bigint.result:
Merge
mysql-test/r/group_by.result:
Merge
mysql-test/r/rpl000009.result:
Merge
mysql-test/t/group_by.test:
Merge
mysql-test/t/rpl000009.test:
Merge
mysql-test/t/rpl_rotate_logs.test:
Merge
mysys/Makefile.am:
Merge
mysys/charset.c:
Merge
sql/item.h:
Merge
sql/item_cmpfunc.cc:
Merge
sql/item_cmpfunc.h:
Merge
sql/item_create.cc:
Merge
sql/item_func.cc:
Merge
sql/item_strfunc.h:
Merge
sql/log.cc:
Merge
sql/mysql_priv.h:
Merge
sql/mysqld.cc:
Merge
sql/protocol.cc:
Merge
sql/slave.cc:
Merge
sql/sql_class.h:
Merge
sql/sql_db.cc:
Merge
sql/sql_handler.cc:
Merge
sql/sql_parse.cc:
Merge
sql/sql_select.cc:
Merge
sql/sql_yacc.yy:
Merge
Docs/internals.texi:
Updated protocol information
sql/mysql_priv.h:
Removed clear_error_message()
sql/mysqld.cc:
Removed not used function clear_error_message
sql/protocol.cc:
Simple code cleanup
sql/sql_parse.cc:
Changed clear_error_message() to thd->clear_error()
Simple optimization.
Fix for bug when using auto_increment column and LAST_INSERT_ID()
Makefile.am:
Auto merged
ltconfig:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
sql/Makefile.am:
Auto merged
Docs/Makefile.am:
Merge with 3.23.56
Docs/manual.texi:
Merge with 3.23.56 (Replace manual with 'empty' document)
libmysql/libmysql.c:
Use local version
sql/log.cc:
Fix for bug when using auto_increment column and LAST_INSERT_ID()
sql/sql_base.cc:
Use local version
now maintained in a separate "mysqldoc" BK source tree) - it will be
replaced with the correct manual.texi when building the official
source distribution
- fixed automake error about reservedwords.texi by moving it to EXTRA_DIST
instead
Docs/Makefile.am:
- moved reservedwords.texi from info_TEXINFOS to EXTRA_DIST since it is
not a full-featured texi file and automake would complain about
"missing @setfilename"
Docs/manual.texi:
- replaced manual.texi with a dummy placeholder file (manual.texi is
now maintained in a separate "mysqldoc" BK source tree) - it will be
replaced with the correct manual.texi when building the official
source distribution
so it's part of the distribution (manual.texi includes this file)
It will be replaced with the correct one from the mysqldoc tree before
building the distribution
- removed generation and inclusion of MIRRORS file, since the mirror list
is no longer part of manual.texi anyway
- replaced YFLAGS with AM_YFLAGS in sql/Makefile.am to make automake happy
- Redirect standard error when checking for dpkg-architecture in ltconfig
to avoid error message showing during configuration
Docs/Makefile.am:
- added reservedwords.texi (which gets included by manual.texi)
- removed MIRRORS (mirror list is not part of the manual anymore)
Docs/reservedwords.texi:
- Updated wording a bit after adding it to the tree
Makefile.am:
- removed MIRRORS from EXTRA_DIST (it's not part of the manual anymore)
ltconfig:
- Redirect standard error when checking for dpkg-architecture
to avoid error message showing during configuration (thanks to
John Wythe for the patch)
sql/Makefile.am:
- replaced YFLAGS with AM_YFLAGS to make automake happy
To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys
client/mysqladmin.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/Makefile.am:
Auto merged
include/my_base.h:
Auto merged
innobase/log/log0log.c:
Auto merged
myisam/ft_nlq_search.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/myisam.result:
Auto merged
sql/lex.h:
Auto merged
sql/log_event.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql-bench/test-insert.sh:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
configure.in:
merge with 4.0.9
innobase/btr/btr0pcur.c:
merge with 4.0.9
myisam/mi_check.c:
merge with 4.0.9
myisam/mi_search.c:
merge with 4.0.9
mysql-test/t/myisam.test:
merge with 4.0.9
sql/log_event.cc:
merge with 4.0.9
sql/mysql_priv.h:
merge with 4.0.9
sql/sql_lex.h:
merge with 4.0.9
sql/sql_parse.cc:
merge with 4.0.9
sql/sql_yacc.yy:
merge with 4.0.9
Fix for SHOW VARIABLES in embedded server
Docs/internals.texi:
Added documentation for join_buffer_size
configure.in:
Changed version number
sql/log_event.cc:
Fix for bug in LOAD DATA INFILE
sql/log_event.h:
Fix for bug in LOAD DATA INFILE
sql/slave.cc:
Fix for bug in LOAD DATA INFILE
sql/sql_show.cc:
Fix for SHOW VARIABLES in embedded server
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/multi_update.result:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
mysys/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
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
Changed long packat handling to check for packets of length 0xffffff.
This does however break packet handling for older clients.
If you are using packets >= 16M then you need to upgrade client and server
after this patch.
Docs/internals.texi:
Updated documentation for 4.1 protocol
sql/ha_innodb.cc:
Optimization of checking command
sql/item.h:
Removed automatic set of length for Item_string
sql/item_create.cc:
Optimized create of create_func_current_user()
sql/net_serv.cc:
Fixed wrong max packet length
sql/sql_acl.cc:
Safety fix.
sql/sql_parse.cc:
Cut hostnames at HOSTNAME_LENGTH to avoid theoretical hostname overruns
This fixed some optimization problems when using -DBIG_TABLES
Portabilty fixes for OpenUnix and HPUX
Added C and C++ version numbers to mysqlbug
Docs/mysqld_error.txt:
Added new error message
acinclude.m4:
Fix for configure problem on OpenUnix
configure.in:
Fix for OpenUnix
Added C and C++ versions to mysqlbug
mysql-test/r/variables.result:
Update of max_join_size handling
mysql-test/t/variables.test:
Update of max_join_size handling
mysys/Makefile.am:
Removed duplicate row
mysys/my_alloc.c:
Safety fixes (not fatal)
scripts/Makefile.am:
Added C and C++ compiler versions to mysqlbug
scripts/mysqlbug.sh:
Added C and C++ compiler versions to mysqlbug
sql/item_func.cc:
Fixed that user variables that changes are not threated as constants.
sql/item_func.h:
Fixed that user variables that changes are not threated as constants.
sql/mysqld.cc:
Changed thd variables max_join_size and select_limit to type ha_rows
sql/repl_failsafe.cc:
Removed not needed cast
sql/set_var.cc:
Changed thd variables max_join_size and select_limit to type ha_rows
sql/set_var.h:
Changed thd variables max_join_size and select_limit to type ha_rows
sql/slave.cc:
Removed not needed cast
sql/sql_class.h:
Changed thd variables max_join_size and select_limit to type ha_rows
sql/sql_parse.cc:
Removed not needed cast
Fixed security problem with mysql_drop_db()
sql/sql_show.cc:
Changed thd variables max_join_size and select_limit to type ha_rows
sql/structs.h:
Changed thd variables max_join_size and select_limit to type ha_rows
Added syntax support for
CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;
Docs/internals.texi:
Update binary protocol description
innobase/include/db0err.h:
Merge from 3.23
mysql-test/r/insert.result:
Updated test result from 3.23
sql/log.cc:
Fixed bug in replication and log rotation
sql/log_event.cc:
Ensure that BEGIN / COMMIT is handled properly if slave dies
sql/slave.cc:
Fixed bug in replication and log rotation
sql/slave.h:
Ensure that BEGIN / COMMIT is handled properly if slave dies
sql/sql_analyse.cc:
Moved usage of res before res is destroyed (by bzero(&s...))
sql/sql_yacc.yy:
Added syntax support for
CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;
To be able to read MySQL 4.1 dump files.
Docs/internals.texi:
Added protocol information
(needs to be converted to texi and merged with the old documentation)
configure.in:
Updates for HP compiler (cc)
include/my_global.h:
Add option to handle bugs in 'inline' for HP compiler
libmysql/password.c:
Portability fix (for HP compiler)
mysys/hash.c:
Portability fix (for HP compiler)
mysys/my_static.c:
Portability fix (for HPUX11)
mysys/my_static.h:
Portability fix (for HPUX11)
mysys/my_tempnam.c:
Portability fix (for HPUX11)
sql/sql_analyse.cc:
Fixed bug in decimal handling
Some simple optimizations
Docs/manual.texi:
Updted how binary log works
mysql-test/mysql-test-run.sh:
Added usage of --port to mysqltest
mysql-test/r/func_test.result:
Moved test of datetime comparison to func_time
mysql-test/r/func_time.result:
New test
mysql-test/t/func_test.test:
Moved test of datetime comparison to func_time
mysql-test/t/func_time.test:
Test of DATE BETWEEN TIMESTAMPS
sql/field.h:
Removed wrong patch
sql/item_cmpfunc.cc:
Removed wrong patch
(Need to be fixed by taking into account all arguments to between)
sql/lock.cc:
Removed call to current_thd
sql/set_var.cc:
Don't show 'socket' variable if sockets are not used
sql/sql_base.cc:
Simple optimisation
BitKeeper/deleted/.del-compile-pentium-valgrind-max:
Delete: BUILD/compile-pentium-valgrind-max
Build-tools/Do-compile:
Auto merged
sql/field.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/stacktrace.c:
Auto merged
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Docs/manual.texi:
SCCS merged
Added bug fix from 3.23 for AIX 4.3.3 and gcc 3.x
Small change in EXCHANGE output
Propagate open-files-limit from mysqld_safe -> mysqld
Fixed speed bug in GROUP BY
Added quotes around database name in CREATE DATABASE db_name (for binary log)
BitKeeper/etc/ignore:
added stamp-h1
Docs/manual.texi:
Added 4.1 manual section
Updated changelog
client/mysqltest.c:
Added --skip-safemalloc
include/my_global.h:
Added bug fix from 3.23 for AIX 4.3.3 and gcc 3.x
mysql-test/mysql-test-run.sh:
Start mysqltest with --skip-safemalloc (To get it faster)
mysql-test/r/bdb.result:
Update for new EXPLAIN output
mysql-test/r/compare.result:
Update for new EXPLAIN output
mysql-test/r/create.result:
Update for new EXPLAIN output
mysql-test/r/distinct.result:
Update for new EXPLAIN output
mysql-test/r/explain.result:
Update for new EXPLAIN output
mysql-test/r/group_by.result:
Update for new EXPLAIN output
mysql-test/r/heap.result:
Update for new EXPLAIN output
mysql-test/r/innodb.result:
Update for new EXPLAIN output
mysql-test/r/join_outer.result:
Update for new EXPLAIN output
mysql-test/r/key_diff.result:
Update for new EXPLAIN output
mysql-test/r/merge.result:
Update for new EXPLAIN output
mysql-test/r/null_key.result:
Update for new EXPLAIN output
mysql-test/r/order_by.result:
Update for new EXPLAIN output
mysql-test/r/select.result:
Update for new EXPLAIN output
mysql-test/r/temp_table.result:
Fixed speed bug in GROUP BY
mysql-test/r/type_datetime.result:
Update for new EXPLAIN output
mysql-test/r/user_var.result:
Update for new EXPLAIN output
mysql-test/r/variables.result:
Removed variable safe_show_database
mysql-test/t/temp_table.test:
Fixed speed bug in GROUP BY
mysql-test/t/variables.test:
Removed not used variable safe_show_databases
scripts/mysqld_safe.sh:
Propagate open-files-limit from mysqld_safe -> mysqld
sql/mysqld.cc:
Removed variable safe_show_database
sql/set_var.cc:
Removed variable safe_show_database
sql/slave.cc:
Updated error message
sql/sql_db.cc:
Added quotes around database name in CREATE DATABASE db_name
sql/sql_select.cc:
Fixed speed bug in GROUP BY
Fixed reference to freed memory in acl_init()/grant_init()
Fixed possible memory leak. (Could only happen in very strange circumstances)
Fixed bug in ALTER TABLE with BDB tables
Updated mysql-test for valgrind
Docs/manual.texi:
ChangeLog
acinclude.m4:
Added back old LARGEFILE handling.
(Needed to get MySQL to compile on Solaris 2.9 with gcc 3.x)
configure.in:
Added back old LARGEFILE handling.
(Needed to get MySQL to compile on Solaris 2.9 with gcc 3.x)
libmysqld/lib_sql.cc:
Fixed reference to freed memory
mysql-test/mysql-test-run.sh:
Added option --valgrind
mysys/Makefile.am:
Removed warning when doing make
sql/mysqld.cc:
Free regexp memory on shutdown.
read 'des' key files from data directory
Fixed reference to freed memory in grant_init()
sql/slave.cc:
Fixed wrong printf() argument
sql/sql_acl.cc:
Fixed reference to freed memory
sql/sql_acl.h:
Fixed reference to freed memory
sql/sql_base.cc:
Fixed possible memory leak. (Could only happen in very strange circumstances)
sql/sql_parse.cc:
Updated arguments to grant_reload()
sql/sql_table.cc:
Fixed bug in ALTER TABLE with BDB tables
sql/sql_yacc.yy:
memset -> bzero
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-skipkeys~53ffbfa7d2fa9fb:
Delete: BitKeeper/etc/skipkeys
BitKeeper/etc/skipkeys:
Rename: BitKeeper/deleted/.del-skipkeys~f623848ba4db5c3 -> BitKeeper/etc/skipkeys
Build-tools/Do-compile:
Auto merged
Docs/manual.texi:
Auto merged
innobase/pars/lexyy.c:
Auto merged
innobase/pars/pars0grm.c:
Auto merged
mysys/my_init.c:
Auto merged
scripts/mysqlhotcopy.sh:
Auto merged
sql/nt_servc.cc:
Auto merged
sql/nt_servc.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/t/bdb-crash.test:
Auto merged
