BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
BitKeeper/deleted/.del-identity.result~e41453a364242503:
Auto merged
BitKeeper/deleted/.del-identity.test~326f469b59105404:
Auto merged
include/my_pthread.h:
Auto merged
innobase/dict/dict0crea.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/dict/dict0load.c:
Auto merged
innobase/include/univ.i:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/pars/pars0opt.c:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/row/row0upd.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/sync/sync0sync.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/t/func_test.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysys/my_pthread.c:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/sql_show.cc:
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
Docs/glibc-2.2.5.patch:
Updated patch for glibc
Docs/manual.texi:
Updated 'MySQL server gone away' section
client/mysql.cc:
Fixed syntax error from last change
mysys/my_thr_init.c:
Changed EXTRA_DEBUG to EXTRA_DBUG_THREADS
sql-bench/limits/mysql.cfg:
Update to 4.0.2
New file ctype-win1250ch, I forgot to commit it in my previous changes
include/m_ctype.h:
Some charsets require special hash function
mysys/hash.c:
Some charsets require special hash function
strings/ctype-utf8.c:
Some charsets require special hash function
strings/ctype.c:
Some charsets require special hash function
Also --with-libwrap is tested on Linux just fine.
configure.in:
Small fix for HP-UX 10.20 with DCE threads
include/my_pthread.h:
Small fix for HP-UX 10.20 with DCE threads
mysys/my_pthread.c:
Small fix for HP-UX 10.20 with DCE threads
Cleanup of LIBWRAP handling
Docs/manual.texi:
Changelog
include/my_pthread.h:
Fixed pthread_cond_timedwait() for HPUX and DCE threads
mysys/my_pthread.c:
Fixed pthread_cond_timedwait() for HPUX and DCE threads
sql/item_func.cc:
Fixed the GET_LOCK() works with HPUX and DCE threads
sql/mysqld.cc:
Cleanup of LIBWRAP handling
sql/sql_parse.cc:
Safety fix
include/hash.h:
Monty forgot to add H in left part of macros
mysys/hash.c:
I wonder how it happened that my_bool disappeared
sql/sql_acl.cc:
Somebody forgot )
sql/sql_class.h:
I wonder how it happened that this line disappeared
sql/sql_table.cc:
small typo
sql/sql_yacc.yy:
Having ; is more compatible
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BUILD/FINISH.sh:
Auto merged
BUILD/SETUP.sh:
Auto merged
BUILD/compile-pentium-debug:
Auto merged
acconfig.h:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
heap/hp_rfirst.c:
Auto merged
heap/hp_rnext.c:
Auto merged
include/my_sys.h:
Auto merged
include/myisam.h:
Auto merged
libmysql/Makefile.shared:
Auto merged
myisam/mi_write.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/heap.test:
Auto merged
mysql-test/t/select_found.test:
Auto merged
mysql-test/t/union.test:
Auto merged
mysys/mf_iocache2.c:
Auto merged
mysys/my_vsnprintf.c:
Auto merged
sql/convert.cc:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/structs.h:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
strings/Makefile.am:
Auto merged
fixed compilation problem on FreeBSD
added test for truncating temporary tables
mysql-test/r/truncate.result:
truncate test
mysql-test/t/truncate.test:
truncate test update
mysys/safemalloc.c:
fixed FreeBSD compilation problem
sql/sql_delete.cc:
fixed bug in truncating temporary tables
client/mysql.cc:
merge
client/mysqldump.c:
merge
myisam/myisamchk.c:
merge
mysys/my_getopt.c:
Fixed a bug with short options when type was GET_BOOL.
Fixed a bug in my_print_help() function.
developers before pushing my_getopt.
client/mysqladmin.c:
Auto merged
mysys/my_getopt.c:
Auto merged
sql/mysqld.cc:
Auto merged
client/client_priv.h:
Merged in previous changes for new client_priv.h (my_getopt)
mysqlcheck and myisamchk to use new my_getopt struct.
client/client_priv.h:
Changes for my_getopt
client/mysql.cc:
Uses new my_getopt
client/mysqladmin.c:
Uses new my_getopt
client/mysqlcheck.c:
Uses new my_getopt
client/mysqldump.c:
Uses new my_getopt
client/mysqlimport.c:
Uses new my_getopt
client/mysqlshow.c:
Uses new my_getopt
include/my_getopt.h:
Added GET_BOOL type
include/sslopt-case.h:
This is shouldn't be needed anymore.
include/sslopt-longopts.h:
Uses new my_getopt
myisam/myisamchk.c:
Uses new my_getopt
mysys/my_getopt.c:
Some bug fixes and small feature adds to my_getopt
sql/mysqld.cc:
mysqld.cc will be changed next. sslopt-* had to be removed
temporarily.
Don't use DBUG library for struct st_my_thread_var to make code less complicated.
Docs/manual.texi:
Cleanup
acinclude.m4:
Search after openssl in /usr/local
client/mysql.cc:
Fix prompt
client/mysqladmin.c:
Cleanup
client/mysqltest.c:
Cleanup
include/my_pthread.h:
Move thread variables to the right location
include/my_sys.h:
Move thread variables to the right location
include/mysql.h:
Clean up client prototypes
libmysql/libmysql.c:
Clean up client prototypes
mysys/my_static.h:
Cleanup
mysys/my_thr_init.c:
Don't use DBUG library for struct st_my_thread_var to make code less complicated
sql/item_cmpfunc.cc:
Small optimization
sql/net_pkg.cc:
Cleanup
sql/sql_parse.cc:
Allow VARCHAR(0)
DBUG_ macro cleanup
buffer boundary cleanup
This changeset, although not fully tested, works for me better than
anything I've had so far, including what is in the repository. I will
push it unless something crashes while I am writing this :-)
mysql-test/r/rpl000014.result:
updated result
mysql-test/r/rpl000015.result:
updated result
mysql-test/r/rpl000016.result:
updated result
mysql-test/r/rpl_log.result:
new result
mysys/mf_iocache.c:
DBUG_ cleanup
mysys/mf_iocache2.c:
DBUG_ fix
sql/log.cc:
added relay_log_space_limit
sql/mysqld.cc:
relay_log_space_limit
sql/slave.cc:
relay_log_space_limit
sql/slave.h:
relay_log_space_limit
sql/sql_class.h:
relay_log_space_limit
sql/sql_repl.cc:
fixed buffer overrun bug
into mysql.sashanet.com:/reiser-data/mysql-4.0
sql/lex.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
down replication corruption
dbug/dbug.c:
fixed DBUG_ macros to not crash if my_thread_init() had not been called
include/my_sys.h:
keep track of shutdown, main, and signal threads for safemalloc
mysys/my_static.h:
keep track of thread in safemalloc blocks
mysys/my_thr_init.c:
use my_malloc()/my_free() in my_thread_init()
mysys/safemalloc.c:
keep track of threads
do not fuss if main,signal, or shutdown thread still has allocated blocks
when we call TERMINATE() as some blocks are freed later and there is no
easy way to make TERMINATE() wait for those threads
sql/mysqld.cc:
keep track of signal, main, and shutdown threads
Docs/manual.texi:
Fix after merge
include/my_global.h:
merge fix
mysql-test/r/create.result:
merge fix
mysys/thr_alarm.c:
Fix for using --debug with alarms
client/mysql.cc:
new ctypes
client/mysqldump.c:
new ctypes
client/mysqltest.c:
new ctypes
client/sql_string.cc:
new ctypes
client/sql_string.h:
new ctypes
extra/mysql_install.c:
new ctypes
extra/replace.c:
new ctypes
extra/resolve_stack_dump.c:
new ctypes
extra/resolveip.c:
new ctypes
heap/hp_hash.c:
new ctypes
include/m_ctype.h:
new ctypes
include/my_sys.h:
new ctypes
isam/_key.c:
new ctypes
isam/_search.c:
new ctypes
libmysql/Makefile.shared:
new ctypes
libmysql/libmysql.c:
new ctypes
myisam/ft_dump.c:
new ctypes
myisam/ft_parser.c:
new ctypes
myisam/mi_test1.c:
new ctypes
mysys/charset.c:
new ctypes
mysys/default.c:
new ctypes
mysys/getvar.c:
new ctypes
mysys/hash.c:
new ctypes
mysys/mf_casecnv.c:
new ctypes
mysys/mf_dirname.c:
new ctypes
mysys/mf_format.c:
new ctypes
mysys/mf_iocache2.c:
new ctypes
mysys/mf_soundex.c:
new ctypes
mysys/mf_wfile.c:
new ctypes
mysys/my_error.c:
new ctypes
mysys/my_getwd.c:
new ctypes
mysys/my_init.c:
new ctypes
mysys/my_vsnprintf.c:
new ctypes
mysys/typelib.c:
new ctypes
sql/convert.cc:
new ctypes
sql/des_key_file.cc:
new ctypes
sql/field.cc:
new ctypes
sql/field.h:
new ctypes
sql/field_conv.cc:
new ctypes
sql/filesort.cc:
new ctypes
sql/ha_innodb.cc:
new ctypes
sql/hostname.cc:
new ctypes
sql/init.cc:
new ctypes
sql/item.cc:
new ctypes
sql/item_func.cc:
new ctypes
sql/item_strfunc.cc:
new ctypes
sql/item_sum.cc:
new ctypes
sql/item_timefunc.cc:
new ctypes
sql/key.cc:
new ctypes
sql/log.cc:
new ctypes
sql/mysql_priv.h:
new ctypes
sql/mysqld.cc:
new ctypes
sql/opt_range.cc:
new ctypes
sql/procedure.cc:
new ctypes
sql/slave.cc:
new ctypes
sql/sql_acl.cc:
new ctypes
sql/sql_analyse.cc:
new ctypes
sql/sql_base.cc:
new ctypes
sql/sql_cache.cc:
new ctypes
sql/sql_db.cc:
new ctypes
sql/sql_handler.cc:
new ctypes
sql/sql_lex.cc:
new ctypes
sql/sql_parse.cc:
new ctypes
sql/sql_show.cc:
new ctypes
sql/sql_string.cc:
new ctypes
sql/sql_string.h:
new ctypes
sql/sql_table.cc:
new ctypes
sql/sql_yacc.yy:
new ctypes
sql/table.cc:
new ctypes
sql/time.cc:
new ctypes
strings/Makefile.am:
new ctypes
strings/ctype-big5.c:
new ctypes
strings/ctype-czech.c:
new ctypes
strings/ctype-gbk.c:
new ctypes
strings/ctype-latin1_de.c:
new ctypes
strings/ctype-sjis.c:
new ctypes
strings/ctype-tis620.c:
new ctypes
strings/ctype.c:
new ctypes
strings/str2int.c:
new ctypes
strings/strto.c:
new ctypes
tools/mysqlmanager.c:
new ctypes
Fix for HEAP tables with many rows deleted.
Add '' arround database names in SHOW GRANT
Docs/manual.texi:
Fixed symlink examples.
heap/hp_rfirst.c:
Remove not needed patch.
mysql-test/r/heap.result:
Added test case for HEAP + many deletes
mysql-test/t/heap.test:
Added test case for HEAP + many deletes
mysys/mf_loadpath.c:
Resolve path's even if they don't end in '/'
scripts/mysqldumpslow.sh:
Fix for new dump format.
sql/handler.cc:
Fix for HEAP tables with many rows deleted.
sql/sql_acl.cc:
Add '' arround database names in SHOW GRANT
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-all-build-steps:
Auto merged
Build-tools/Do-compile:
Auto merged
Build-tools/Do-rpm:
Auto merged
Docs/manual.texi:
Auto merged
include/hash.h:
Auto merged
include/my_sys.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysys/array.c:
Auto merged
mysys/hash.c:
Auto merged
mysys/mf_qsort.c:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
strings/Makefile.am:
Auto merged
support-files/mysql.spec.sh:
Auto merged
Fix bug when using option groups
libmysql/libmysql.c:
Fix bug when using option groups
myisam/myisamchk.c:
Portability fix
mysys/my_getopt.c:
Portability fix
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-all-build-steps:
Auto merged
Build-tools/Do-compile:
Auto merged
Build-tools/Do-rpm:
Auto merged
Docs/manual.texi:
Auto merged
include/hash.h:
Auto merged
include/my_sys.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/type_date.test:
Auto merged
mysys/array.c:
Auto merged
mysys/hash.c:
Auto merged
mysys/mf_qsort.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
scripts/mysqlhotcopy.sh:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql-bench/server-cfg.sh:
Auto merged
strings/Makefile.am:
Auto merged
overrun sentry in my_vsnprintf() test
will not be pushed yet
BUILD/FINISH.sh:
load local fix
BUILD/SETUP.sh:
load local fix
BUILD/compile-pentium-debug-max:
load local fix
configure.in:
load local fix
mysys/my_vsnprintf.c:
added overrun sentry to the test
BitKeeper/etc/ignore:
Added mysys/test_vsnprintf to the ignore list
mysql-test/mysql-test-run.sh:
post-merge fix
mysys/my_vsnprintf.c:
fixed newly introduced bug
Let's hope this did not break anything. Will not push this one until Monty
gets back
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-all-build-steps:
Auto merged
Build-tools/Do-compile:
Auto merged
Build-tools/Do-rpm:
Auto merged
Docs/manual.texi:
Auto merged
include/hash.h:
Auto merged
include/my_sys.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
mysys/array.c:
Auto merged
mysys/hash.c:
Auto merged
mysys/mf_qsort.c:
Auto merged
sql/sql_base.cc:
Auto merged
sql/table.cc:
Auto merged
strings/Makefile.am:
Auto merged
client/mysql.cc:
merged from 3.23
configure.in:
merged from 3.23
mysql-test/mysql-test-run.sh:
merged from 3.23
sql/mysqld.cc:
merged from 3.23
support-files/mysql.spec.sh:
merged from 3.23
fixed replication bug - flush_master_info() needs to be called every time we read an
event from master
this is will not be pushed yet
mysys/my_vsnprintf.c:
make my_vsnprintf() work with oversized strings
corrected Swedish "skipp" in the comments
sql/log.cc:
wrong change - to be undone
sql/slave.cc:
fixed bug - flush_master_info() needs to be called every time we read an
event from master
qsort implementation backported from 4.0 tree, the old one was buggy
mysys/mf_qsort.c:
qsort implementation backported from 4.0 tree, the old one was buggy
Fix of InnoDB variables in SHOW VARIABLES
Fix for ALTER TABLE and InnoDB
BUILD/FINISH.sh:
Update to autoconf 2.52
BUILD/SETUP.sh:
Update to autoconf 2.52
BUILD/compile-alpha:
Update to autoconf 2.52
BUILD/compile-pentium-gcov:
Update to autoconf 2.52
BUILD/compile-pentium-gprof:
Update to autoconf 2.52
BUILD/compile-pentium:
Update to autoconf 2.52
Docs/manual.texi:
Changelog
acconfig.h:
Update to autoconf 2.52
acinclude.m4:
Update to autoconf 2.52
bdb/dist/configure.in:
Update to autoconf 2.52
client/Makefile.am:
Update to autoconf 2.52
configure.in:
Update to autoconf 2.52
mysql-test/r/innodb.result:
Update of InnoDB Cardinality values
mysys/Makefile.am:
Update to autoconf 2.52
scripts/Makefile.am:
Update to autoconf 2.52
sql/ha_innobase.cc:
Fix of InnoDB variables in SHOW VARIABLES
sql/ha_innobase.h:
Fix of InnoDB variables in SHOW VARIABLES
sql/sql_table.cc:
Fix for ALTER TABLE and InnoDB
support-files/my-huge.cnf.sh:
Fixed typo
support-files/my-large.cnf.sh:
Fixed typo
support-files/my-medium.cnf.sh:
Fixed typo
support-files/my-small.cnf.sh:
Fixed typo
include/my_getopt.h:
Removed a member from my_getopt struct.
myisam/myisamchk.c:
pdated myisamchk. More features in use from my_getopt
mysys/my_getopt.c:
Fixed a bug in handle_options(). Short options were not tested
whether existed when given from the command line. Fixed a bug
in getopt_ll, got division by zero in some cases. Added new functions
my_print_help() and my_print_variables() to be used by mysql server
and most clients.
fixed apparent typo in opt_sum.cc
I will push this Changeset although it fails select test - failing select
is better than the code that does not compile.
mysql-test/r/rpl000001.result:
updated result
mysys/mf_iocache2.c:
fixed wrong DBUG_ASSERT()
sql/opt_sum.cc:
fixed an apparent typo to make it compile
include/my_global.h:
added dbug_volatile
mysys/mf_iocache2.c:
some debugging code to investigate failed assert in my_b_append_tell()
sql/item_func.cc:
fixed logging bug in DO RELEASE_LOCK()
Bug fix when using --no-deaults
Sets ref_length to right value (faster rnd_pos() handling in InnoDB).
Fixed problem with multi-table-delete and InnoDB
Fixed problem with truncate table, which required a COMMIT before.
Fixed multi-table-delete bug with InnoDB.
Remove not used index from EXPLAIN
Docs/manual.texi:
ChangeLog
include/my_getopt.h:
Removed compiler warnings
myisam/myisamchk.c:
Fixes for new getopt
mysql-test/r/explain.result:
Updated test results
mysql-test/r/innodb.result:
Updated test results
mysql-test/r/join.result:
Updated test results
mysql-test/t/innodb.test:
Updated test results
mysys/default.c:
Bug fix when using --no-defaults
mysys/my_getopt.c:
Fixes for new getopt
sql/ha_innodb.cc:
Sets ref_length to right value (faster rnd_pos() handling).
Fixed problem with multi-table-delete.
Fixed problem with truncate table, which required a COMMIT before.
sql/opt_sum.cc:
Remove not used index from EXPLAIN
sql/sql_cache.cc:
Fixed core dump bug when not using query cache
sql/sql_select.cc:
Remove not used index from EXPLAIN
only.
include/my_getopt.h:
Added u_max_value as for user definable maximum value for
a variable in my_getopt.
myisam/myisamchk.c:
myisamchk now uses my_getopt struct for variables also.
Variables can be set with -O var=val, --set-variable=var=val and
--variable=val now.
mysys/getvar.c:
my_set_changeable_var moved to my_getopt.c
mysys/my_getopt.c:
Added special prefix --maximum[-variable-name=...] for user
definable maximum values for variables, among other things.
mysql-test/t/rpl000001.test:
modified test to break current replicatioin on a large log with a large lag
in slave thread between append and read of the relay log
mysys/mf_iocache.c:
fixed one bug in IO_CACHE but there is another one not fixed yet
sql/slave.cc:
fixed bug in 3.23 master replication
