Add 4.0 commands to SHOW STATUS.
Docs/manual.texi:
Cleanup
mysql-test/r/innodb.result:
Fixe results
sql/mysqld.cc:
Add commands unique for 4.0
sql/sql_lex.h:
Cleanup
sql/sql_parse.cc:
Cleanup
sql/sql_show.cc:
Fix that SHOW STATUS works with SSL.
sql/sql_yacc.yy:
Cleanup
innobase/btr/btr0cur.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/table.cc:
Auto merged
sql/unireg.cc:
Auto merged
Docs/manual.texi:
Merge
New HEX() function.
Final (?) cleanup of des_encrypt() / des_decrypt().
Added missing files to Makefiles.
Docs/Makefile.am:
Add missing files
Docs/manual.texi:
Added information about HEX() and des_encrypt() / des_decrypt().
include/mysql_com.h:
Added FLUSH DES_KEY_FILE
myisam/ft_update.c:
Removed compiler warnings
mysql-test/mysql-test-run.sh:
Fixes needed for des_key tests.
mysql-test/r/func_crypt.result:
Moved crypt test from func_str to func_crypt
mysql-test/r/func_encrypt.result:
Moved crypt test from func_str to func_crypt
mysql-test/r/func_str.result:
Moved crypt test from func_str to func_crypt
mysql-test/t/func_crypt.test:
Moved crypt test from func_str to func_crypt
mysql-test/t/func_encrypt.test:
New tests
mysql-test/t/func_str.test:
Moved crypt test from func_str to func_crypt
sql/des_key_file.cc:
Changes needed for FLUSH DES_KEY_FILE
sql/item_create.cc:
New HEX() function
sql/item_strfunc.cc:
Changes needed for FLUSH DES_KEY_FILE
sql/item_strfunc.h:
New HEX() function
sql/item_timefunc.cc:
cleanup
sql/lex.h:
FLUSH DES_KEY_FILE
sql/mysql_priv.h:
FLUSH DES_KEY_FILE
sql/mysqld.cc:
FLUSH DES_KEY_FILE
sql/sql_parse.cc:
Cleanup sql_yacc.yy
sql/sql_yacc.yy:
Cleanup sql_yacc.yy
added extra/mysql_install.c - will work on it in 4.0, but it does not hurt
to have it sit in 3.23 tree for now since it will eventually be backported
to 3.23 anyway
Docs/manual.texi:
documented slave-skip-errors
updated change history
extra/resolve_stack_dump.c:
fixed wrong help message
include/my_bitmap.h:
bitmap code updates
mysql-test/r/rpl_get_lock.result:
test for a possible bug in release_lock() replication
mysql-test/t/rpl_get_lock.test:
test for possible bug in release_lock replication
mysys/my_bitmap.c:
bitmap code updates/clean-up
sql/mysqld.cc:
slave-skip-errors
sql/slave.cc:
slave-skip-errors
sql/slave.h:
slave skip errors
Fixed bug in query cache.
Cleaned up des_crypt code.
BitKeeper/deleted/.del-fsck.mysql~87170d4358b50d60:
Delete: fs/fsck.mysql
Docs/manual.texi:
Changed != to <>
mysql-test/mysql-test-run.sh:
Fix sleep times to take into account creation of InnoDB tables.
mysql-test/r/group_by.result:
More tests
mysql-test/r/query_cache.result:
More tests
mysql-test/r/union.result:
More tests
mysql-test/t/func_str.test:
Fix for FreeBSD
mysql-test/t/query_cache.test:
More tests
mysql-test/t/union.test:
More tests
mysys/my_winsem.c:
Cleanup comments
sql/des_key_file.cc:
Cleanup des_crypt code
sql/item_strfunc.cc:
Cleanup des_crypt code
sql/item_strfunc.h:
Cleanup des_crypt code
sql/mysql_priv.h:
Cleanup des_crypt code
sql/mysqld.cc:
Cleanup des_crypt code
sql/sql_acl.cc:
For for GRANT and lower-case-table names
sql/sql_cache.cc:
Function for integrity checking.
Fixed bug when merging blocks.
sql/sql_cache.h:
Function for integrity checking.
sql/sql_delete.cc:
Cleanup
sql/sql_parse.cc:
For for GRANT and lower-case-table names
sql/sql_union.cc:
Cleanup & fixed bug in LIMIT handling
sql/sql_yacc.yy:
C
Changed some sql_alloc() -> thd->alloc()
Removed a lot of compiler warnings on Linux Alpha (64 bit)
Fixed some core dumps on 64 bit systems (wrong type for packet_len)
Docs/manual.texi:
Added base information about the query cache.
include/hash.h:
Export hash_replace
include/myisam.h:
Update of query cache code
libmysql/net.c:
Add casts to make things safe on 64 bit systems.
myisam/mi_write.c:
Update of query cache code
myisammrg/myrg_extra.c:
Update of query cache code
mysys/hash.c:
Added safety check to hash_replace
sql/field.cc:
Removed compiler warnings.
sql/field.h:
Removed compiler warnings
sql/ha_myisam.cc:
Fixed wrong type of packet_len
sql/item.h:
Remove warnings
sql/log_event.cc:
Cleanup
sql/log_event.h:
Cleanup to make code more readable
sql/mf_iocache.cc:
Fixed wrong type
sql/mysql_priv.h:
Update of query cache code
sql/mysqld.cc:
Update of query cache code
sql/net_serv.cc:
Remove compiler warnings
sql/opt_range.h:
Remove compiler warnings
sql/sql_cache.cc:
Update of query cache code
sql/sql_cache.h:
Update of query cache code
sql/sql_class.h:
Cleanup
sql/sql_insert.cc:
Use thd->alloc() instead of sql_alloc()
sql/sql_parse.cc:
Fixed compiler warnings.
Changed some sql_alloc() -> thd->alloc()
sql/sql_select.cc:
Changed sql_alloc() -> thd_alloc()
sql/sql_select.h:
Faster alloc()
sql/sql_show.cc:
Update of query cache code
sql/sql_table.cc:
Faster alloc()
sql/table.cc:
Faster alloc()
Portability fixes.
BUILD/compile-alpha-debug:
Update to newer version
libmysqld/lib_vio.c:
dbug_assert -> DBUG_ASSERT
mysql-test/r/symlink.result:
Update for new tests
mysql-test/t/symlink.test:
Update for new test format
mysys/mf_iocache2.c:
Fixed bug when reading in old buffer
sql-bench/test-transactions.sh:
Update with delete tests
sql/mysqld.cc:
Updates for amiga
sql/sql_string.cc:
Fix typo
sql/stacktrace.c:
Portability fix
Fixed bug where one got an empty set instead of a DEADLOCK error when using BDB tables.
Docs/manual.texi:
Cleanup
configure.in:
Version number change
mysql-test/t/backup.test:
drop used tables
mysql-test/t/bdb-crash.test:
cleanup
mysys/thr_lock.c:
cleanup
sql/mysqld.cc:
safety fix
sql/records.cc:
Fixed bug where one got an empty set instead of a DEADLOCK error when using
BDB tables.
sql/sql_table.cc:
Fix race condition in ANALYZE TABLE.
BitKeeper/deleted/.del-WHITEPAPER~da1226799debcf3f:
Delete: libmysqld/WHITEPAPER
Docs/manual.texi:
Changelog
client/mysqltest.c:
Fix things that crashed embedded MySQL
libmysqld/examples/test-run:
Cleanup of old BDB files.
mysql-test/r/innodb.result:
Fix for embedded library
mysql-test/t/innodb.test:
Fix for embedded library
mysys/mf_keycache.c:
Safety
sql/ha_berkeley.cc:
Added DBUG statements
sql/ha_innobase.cc:
Fixed bug for embedded version
sql/ha_innobase.h:
Fix to use index when doing an ORDER BY on a whole InnoDB table
sql/handler.h:
Fix to use index when doing an ORDER BY on a whole InnoDB table
sql/mysqld.cc:
Safety fix
sql/sql_base.cc:
cleanup
sql/sql_select.cc:
Fix to use index when doing an ORDER BY on a whole InnoDB table
First (incomplete) version of transaction and as3ap tests.
BitKeeper/etc/ignore:
Added sql-bench/test-transactions to the ignore list
mysql-test/r/fulltext.result:
Update fulltext results after merge
sql-bench/Makefile.am:
Added transaction test
sql-bench/run-all-tests.sh:
Added transaction test
sql-bench/server-cfg.sh:
Added transaction test
sql-bench/test-ATIS.sh:
Cleanup
sql/item_func.cc:
Fix bad merge
sql/mysqld.cc:
Cleanup
sql/sql_base.cc:
Fix bad merge
sql/sql_delete.cc:
Cleanup
sql/sql_parse.cc:
Fix bad merge
sql/sql_select.cc:
Fix bad merge
sql/sql_union.cc:
Fix bad merge
tools/mysqlmanager.c:
C
signal. Tested to the extent that it does not break Linux. Could not test on
Darwin because the machine was not reachable. Will push anyway - at least it
does not make things worse. Testing on Darwin is needed, however.
sql/mysqld.cc:
backport of shutdown fix for platforms that cannot break a syscall with a signal
fixed bugs in new IO_CACHE code so that the old calls work
fixed shutdown bug
clean-up of mysql-test-run
include/my_sys.h:
fixes for IO_CACHE
mysql-test/mysql-test-run.sh:
fixed missing \ bug
added --skip-gdb-magic to skip Sergei's automatic mysql_parse break
do not delete the breakpoint in command - it crashes gdb sometimes
mysys/mf_iocache2.c:
rc_pos->write_pos in my_b_seek for WRITE_CACHE
sql/mysqld.cc:
fixed shutdown bug when singals DO break read introduced by the fix for
when they don't.
sql/repl_failsafe.cc:
fixed memory leak
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
BitKeeper/etc/ignore:
auto-union
mysql-test/mysql-test-run.sh:
Auto merged
sql/mysqld.cc:
Auto merged
tools/mysqlmanager.c:
Auto merged
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
BitKeeper/etc/ignore:
auto-union
mysql-test/mysql-test-run.sh:
Auto merged
mysys/mf_iocache.c:
Auto merged
sql/mysqld.cc:
Auto merged
fixes for IO_CACHE
need to pull Monty's fixes - this is not final, will not be pushed
include/my_sys.h:
IO_CACHE fixes
mysql-test/mysql-test-run.sh:
manager clean-up
mysys/mf_iocache.c:
IO_CACHE fix
sql/mysqld.cc:
more debug messages
tools/mysqlmanager.c:
added pid-file
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
include/my_base.h:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/rpl000012.test:
Auto merged
BUILD/FINISH.sh:
Auto merged
BitKeeper/deleted/.del-db_ext.h~a1e210bbd0de0a48:
Auto merged
BitKeeper/deleted/.del-mutex_ext.h~f20f47ddc346598b:
Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
Auto merged
Build-tools/Do-all-build-steps:
Auto merged
client/client_priv.h:
Auto merged
client/mysqladmin.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/include/univ.i:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
isam/pack_isam.c:
Auto merged
libmysql_r/Makefile.am:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/t/having.test:
Auto merged
mysql-test/t/rpl000015-slave.sh:
Auto merged
mysql-test/t/rpl000016-slave.sh:
Auto merged
mysys/mf_cache.c:
Auto merged
mysys/mf_casecnv.c:
Auto merged
mysys/mf_tempfile.c:
Auto merged
readline/vi_mode.c:
Auto merged
strings/strto.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/time.cc:
Auto merged
BUILD/SETUP.sh:
Use -mcpu as default (safe for all x86 cpu's)
client/mysqldump.c:
Merge from 3.23.44
configure.in:
Update version number
extra/resolveip.c:
Portability fix
portability fixes for systems with broken syscalls that do not interrupt on
a signal
temporary commit - will not be pushed, need to sync up
include/my_sys.h:
work on READ_APPEND cache
mysys/Makefile.am:
change to test IO_CACHE
mysys/mf_iocache.c:
work on READ_APPEND cache
BitKeeper/etc/ignore:
Added mysys/#mf_iocache.c# mysys/test_io_cache to the ignore list
sql/mysqld.cc:
make shutdown work on broken systems
sql/sql_repl.cc:
make sure slave can be stopped on broken systems in all cases, clean-up
include/my_base.h:
Try again merge InnoDB-3.23.44
include/mysqld_error.h:
Try again merge InnoDB-3.23.44
sql/handler.cc:
Try again merge InnoDB-3.23.44
sql/mysqld.cc:
Try again merge InnoDB-3.23.44
sql/ha_innobase.cc:
Try again merge InnoDB-3.23.44
sql/ha_innobase.h:
Try again merge InnoDB-3.23.44
sql/share/czech/errmsg.txt:
Try again merge InnoDB-3.23.44
sql/share/danish/errmsg.txt:
Try again merge InnoDB-3.23.44
sql/share/dutch/errmsg.txt:
Try again merge InnoDB-3.23.44
sql/share/english/errmsg.txt:
Try again merge InnoDB-3.23.44
sql/share/estonian/errmsg.txt:
Try again merge InnoDB-3.23.44
sql/share/french/errmsg.txt:
Try again merge InnoDB-3.23.44
sql/share/german/errmsg.txt:
Try again merge InnoDB-3.23.44
sql/share/greek/errmsg.txt:
Try again merge InnoDB-3.23.44
sql/share/hungarian/errmsg.txt:
Try again merge InnoDB-3.23.44
sql/share/italian/errmsg.txt:
Try again merge InnoDB-3.23.44
sql/share/japanese/errmsg.txt:
Try again merge InnoDB-3.23.44
sql/share/korean/errmsg.txt:
Try again merge InnoDB-3.23.44
sql/share/norwegian-ny/errmsg.txt:
Try again merge InnoDB-3.23.44
sql/share/norwegian/errmsg.txt:
Try again merge InnoDB-3.23.44
sql/share/polish/errmsg.txt:
Try again merge InnoDB-3.23.44
sql/share/portuguese/errmsg.txt:
Try again merge InnoDB-3.23.44
sql/share/romanian/errmsg.txt:
Try again merge InnoDB-3.23.44
sql/share/russian/errmsg.txt:
Try again merge InnoDB-3.23.44
sql/share/slovak/errmsg.txt:
Try again merge InnoDB-3.23.44
sql/share/spanish/errmsg.txt:
Try again merge InnoDB-3.23.44
sql/share/swedish/errmsg.txt:
Try again merge InnoDB-3.23.44
sql/share/ukrainian/errmsg.txt:
Try again merge InnoDB-3.23.44
innobase/btr/btr0btr.c:
Try again merge InnoDB-3.23.44
innobase/buf/buf0flu.c:
Try again merge InnoDB-3.23.44
innobase/buf/buf0lru.c:
Try again merge InnoDB-3.23.44
innobase/dict/dict0boot.c:
Try again merge InnoDB-3.23.44
innobase/dict/dict0crea.c:
Try again merge InnoDB-3.23.44
innobase/dict/dict0dict.c:
Try again merge InnoDB-3.23.44
innobase/ibuf/ibuf0ibuf.c:
Try again merge InnoDB-3.23.44
innobase/include/dict0boot.h:
Try again merge InnoDB-3.23.44
innobase/include/dict0boot.ic:
Try again merge InnoDB-3.23.44
innobase/include/dict0dict.h:
Try again merge InnoDB-3.23.44
innobase/include/os0file.h:
Try again merge InnoDB-3.23.44
innobase/include/os0sync.h:
Try again merge InnoDB-3.23.44
innobase/include/page0page.ic:
Try again merge InnoDB-3.23.44
innobase/include/read0read.h:
Try again merge InnoDB-3.23.44
innobase/include/row0mysql.h:
Try again merge InnoDB-3.23.44
innobase/include/srv0srv.h:
Try again merge InnoDB-3.23.44
innobase/include/srv0start.h:
Try again merge InnoDB-3.23.44
innobase/include/trx0purge.h:
Try again merge InnoDB-3.23.44
innobase/include/trx0rec.h:
Try again merge InnoDB-3.23.44
innobase/include/trx0trx.h:
Try again merge InnoDB-3.23.44
innobase/lock/lock0lock.c:
Try again merge InnoDB-3.23.44
innobase/log/log0log.c:
Try again merge InnoDB-3.23.44
innobase/log/log0recv.c:
Try again merge InnoDB-3.23.44
innobase/os/os0file.c:
Try again merge InnoDB-3.23.44
innobase/page/page0page.c:
Try again merge InnoDB-3.23.44
innobase/read/read0read.c:
Try again merge InnoDB-3.23.44
innobase/rem/rem0cmp.c:
Try again merge InnoDB-3.23.44
innobase/rem/rem0rec.c:
Try again merge InnoDB-3.23.44
innobase/row/row0ins.c:
Try again merge InnoDB-3.23.44
innobase/row/row0mysql.c:
Try again merge InnoDB-3.23.44
innobase/row/row0purge.c:
Try again merge InnoDB-3.23.44
innobase/row/row0row.c:
Try again merge InnoDB-3.23.44
innobase/row/row0sel.c:
Try again merge InnoDB-3.23.44
innobase/row/row0umod.c:
Try again merge InnoDB-3.23.44
innobase/row/row0upd.c:
Try again merge InnoDB-3.23.44
innobase/row/row0vers.c:
Try again merge InnoDB-3.23.44
innobase/srv/srv0start.c:
Try again merge InnoDB-3.23.44
innobase/sync/sync0arr.c:
Try again merge InnoDB-3.23.44
innobase/trx/trx0purge.c:
Try again merge InnoDB-3.23.44
innobase/trx/trx0rec.c:
Try again merge InnoDB-3.23.44
innobase/trx/trx0roll.c:
Try again merge InnoDB-3.23.44
innobase/trx/trx0sys.c:
Try again merge InnoDB-3.23.44
innobase/trx/trx0trx.c:
Try again merge InnoDB-3.23.44
innobase/trx/trx0undo.c:
Try again merge InnoDB-3.23.44
innobase/srv/srv0srv.c:
Commit change made by heikki
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
routines for avoid to leave the Service Control Manager
in bad state. Print messages for to reduce the current
user errors when are trying to install or start the service.
Adding the option to install the service for manual start:
--install-manual.
sql/mysqld.cc:
Changes on install and remove service
sql/nt_servc.cc:
Changes for install and remove routine.
Adding the seek status routine
sql/nt_servc.h:
Changes for install and remove routines
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Docs/manual.texi:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
mysql-test/t/null.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/slave.cc:
keep local copy
Added missing InnoDB variables to SHOW VARIABLES.
Fixed bug when doing WHERE 'column_name=NULL' on an indexed column that had NULL values.
Fixed bug when doing 'LEFT JOIN ... ON (column_name = constant) WHERE column_name = constant'
Docs/manual.texi:
Changelog
libmysql/libmysql.c:
Don't use signal() on windows.
mysql-test/r/join_outer.result:
Test for bugfix
mysql-test/r/null.result:
Test for bugfix
mysql-test/t/join_outer.test:
Test for bugfix
mysql-test/t/null.test:
Test for bugfix
sql/mysqld.cc:
Add missing InnoDB variables to SHOW VARIABLES.
sql/sql_select.cc:
Fixed bug when doing WHERE 'column_name=NULL' on an indexed column that had NULL values.
Fixed bug when doing 'LEFT JOIN ... ON (column_name = constant) WHERE column_name = constant'
client/mysqlmanagerc.c:
Only use needed include files
libmysql/manager.c:
cleanup include files
scripts/make_binary_distribution.sh:
Fixed wrong filename
sql/mysqld.cc:
cleanup
tools/mysqlmanager.c:
Read with retrys
mysqltest can run without connecting to the manager for tests that do not
require manager operations
client/mysqltest.c:
make mysqltest work without having to connect to the manager
mysql-test/mysql-test-run.sh:
init-rpl-role option to servers
pass manager-host to mysqltest
mysql-test/r/rpl_failsafe.result:
updated result
mysql-test/t/rpl_failsafe.test:
check for Rpl_status
sql/mysqld.cc:
fixed bad merge
sql/repl_failsafe.cc:
fixed bug
sql/repl_failsafe.h:
fixed compile error
sql/sql_show.cc:
fixed compile error
myself a run of compile-pentium-debug. I have not even tried to compile the
new code
sql/Makefile.am:
added repl_failsafe.*
sql/mysqld.cc:
added Rpl_status
sql/sql_show.cc:
added rpl_status
sql/structs.h:
rpl_status
