Portability fix in safemalloc.c
libmysqld/lib_sql.cc:
Removed not needed define
myisam/sort.c:
Fixed core dump crash in repair table.
mysql-test/r/myisam.result:
Test for repair table
mysql-test/t/myisam.test:
Test for repair table
mysys/safemalloc.c:
Portability fix
mysql-test/r/type_decimal.result:
Results for More tests
mysql-test/t/type_decimal.test:
More tests to handle exponent cases
sql/field.cc:
Handle string with exponent for decimal type
Added semaphore support to MIT-pthreads.
Docs/manual.texi:
Updated benchmark data
configure.in:
Portability fix for compiling MIT-pthreads with gcc 3.0.x
(Still not perfect)
include/my_semaphore.h:
Cleanup
mit-pthreads/Changes-mysql:
Added semaphore support
mit-pthreads/include/Makefile.inc:
Added semaphore support
mit-pthreads/include/pthread/ac-types.h:
Added semaphore support
mit-pthreads/pthreads/GNUmakefile.inc:
Added semaphore support
mit-pthreads/pthreads/Makefile.inc:
Added semaphore support
mit-pthreads/stdio/xprintf.c:
Added semaphore support
mysql-test/r/rpl_alter.result:
Fixed test results after merge with 3.23
sql/ha_isam.cc:
Fixed core dump after merge
sql/ha_isam.h:
Fixed core dump after merge
sql/mini_client.cc:
P
for a seemingly impoosbile conds in WHERE....
This crashed MySQL in 4.0.2
Docs/manual.texi:
A fix for a bug which hits the optimiser when trying to group keys
for a seemingly impoosbile conds in WHERE....
mysql-test/r/select.result:
A fix for a bug which hits the optimiser when trying to group keys
for a seemingly impoosbile conds in WHERE....
mysql-test/t/select.test:
A fix for a bug which hits the optimiser when trying to group keys
for a seemingly impoosbile conds in WHERE....
sql/opt_range.cc:
A fix for a bug which hits the optimiser when trying to group keys
for a seemingly impoosbile conds in WHERE....
BitKeeper/etc/logging_ok:
auto-union
sql/item_create.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/lex.h:
Auto merged
client/mysqldump.c:
SCCS merged
SHOW DATABASES
CREATE TEMPORARY TABLE
LOCK TABLES
REPLICATION SLAVE & REPLICATION CLIENT
SUPER
EXECUTE
All scripts & documentation is updated for this change.
Added better error messages for global privileges
BitKeeper/deleted/.del-mysql_new_fix_privilege_tables.sh~b1664b401375eece:
Delete: scripts/mysql_new_fix_privilege_tables.sh
Docs/manual.texi:
Updated manual for privilege changes.
include/mysqld_error.h:
new error messages
mysql-test/install_test_db.sh:
Updated to use new privileges
mysql-test/r/grant_cache.result:
Updated to use new privileges
mysql-test/r/rpl000017.result:
Updated to use new privileges
mysql-test/t/rpl000017.test:
Updated to use new privileges
mysys/safemalloc.c:
Cleanup
scripts/mysql_fix_privilege_tables.sh:
Updated to use new privileges
scripts/mysql_install_db.sh:
Updated to use new privileges
sql/field.h:
Cleanup
sql/item_strfunc.cc:
Updated to use new privileges
sql/lex.h:
Updated to use new privileges
sql/log.cc:
Updated to use new privileges
sql/mysql_priv.h:
Updated to use new privileges
sql/mysqld.cc:
Updated to use new privileges
sql/repl_failsafe.cc:
Updated to use new privileges
sql/share/czech/errmsg.txt:
new error messages
sql/share/danish/errmsg.txt:
new error messages
sql/share/dutch/errmsg.txt:
new error messages
sql/share/english/errmsg.txt:
new error messages
sql/share/estonian/errmsg.txt:
new error messages
sql/share/french/errmsg.txt:
new error messages
sql/share/german/errmsg.txt:
new error messages
sql/share/greek/errmsg.txt:
new error messages
sql/share/hungarian/errmsg.txt:
new error messages
sql/share/italian/errmsg.txt:
new error messages
sql/share/japanese/errmsg.txt:
new error messages
sql/share/korean/errmsg.txt:
new error messages
sql/share/norwegian-ny/errmsg.txt:
new error messages
sql/share/norwegian/errmsg.txt:
new error messages
sql/share/polish/errmsg.txt:
new error messages
sql/share/portuguese/errmsg.txt:
new error messages
sql/share/romanian/errmsg.txt:
new error messages
sql/share/russian/errmsg.txt:
new error messages
sql/share/slovak/errmsg.txt:
new error messages
sql/share/spanish/errmsg.txt:
new error messages
sql/share/swedish/errmsg.txt:
new error messages
sql/share/ukrainian/errmsg.txt:
new error messages
sql/slave.cc:
Portability cleanup
sql/sql_acl.cc:
Updated to use new privileges
sql/sql_acl.h:
Updated to use new privileges
sql/sql_base.cc:
Remove not used include file
sql/sql_class.cc:
Comment cleanup
sql/sql_class.h:
Updated to use new privileges
Comment cleanups
sql/sql_insert.cc:
Updated to use new privileges
sql/sql_lex.h:
Indentation cleanup
sql/sql_parse.cc:
Updated to use new privileges
sql/sql_repl.cc:
Updated to use new privileges
Comment cleanup
sql/sql_show.cc:
Updated to use new privileges
sql/sql_yacc.yy:
Updated to use new privileges
Sorted some tockens for easer merge to 4.1 in the future.
sql/table.h:
Updated to use new privileges
tests/grant.pl:
Updated to use new privileges
tests/grant.res:
Updated to use new privileges
Still not able to make a proper test case as this crashes on files
where key and data pointers are 4 bytes each. Possibly a proper
test case would require myisampack.
sql/sql_lex.cc:
Just in case ...
to Monty's code style and optimization comments
client/client_priv.h:
New value for --single-transaction option
client/mysqldump.c:
Add --single-transaction option for consistent dumps
mysql-test/r/func_str.result:
New functions test results
mysql-test/t/func_str.test:
Tests for SHA/AES functions
mysys/Makefile.am:
Extra files require compilation now
sql/item_create.cc:
New functions
sql/item_create.h:
New functions
sql/item_strfunc.cc:
Implementation of SHA/AES_ENCRYPT/AES_DECRYPT
sql/item_strfunc.h:
Required class definition
sql/lex.h:
Add symbols for implemented functions
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Docs/manual.texi:
Changelog
mysql-test/r/select_found.result:
Test of FOUND_ROWS() bug fix
mysql-test/t/select_found.test:
Test of FOUND_ROWS() bug fix
Fixed problem in access rights testing (from last patch)
mysql-test/r/group_by.result:
Condenced GROUP test case
mysql-test/t/group_by.test:
Condenced GROUP test case
sql/sql_parse.cc:
Fixed problem in access rights testing (from last patch)
sql/sql_select.cc:
Rollback Sinisa's GROUP BY patch and make a better one.
Added syntax for column comments (for compability with 4.1)
Fix of ALTER TABLE RENAME
Docs/manual.texi:
Changelog
client/mysqltest.c:
Enable LOAD DATA LOCAL INFILE
mysql-test/r/alter_table.result:
Test of syntax for column comments
mysql-test/r/func_math.result:
Fixed test of new truncate
mysql-test/t/alter_table.test:
Test of syntax for column comments
mysys/my_gethostbyname.c:
Portability fix
sql/hostname.cc:
Fixed pointer bug
sql/item_cmpfunc.cc:
Optimizing LIKE code
sql/item_cmpfunc.h:
Cleanup
sql/mysqld.cc:
Avoid warning of duplicate calls to mysql_thread_init()
sql/sql_analyse.cc:
Removed warning from DBUG
sql/sql_parse.cc:
Avoid warning of duplicate calls to mysql_thread_init()
sql/sql_table.cc:
Fix of ALTER TABLE RENAME
sql/sql_yacc.yy:
Added syntax for field comments
vio/test-sslserver.c:
Cleanup
BitKeeper/deleted/.del-rpl_empty_master_crash.result:
Delete: mysql-test/r/rpl_empty_master_crash.result
BitKeeper/deleted/.del-rpl_empty_master_crash.test:
Delete: mysql-test/t/rpl_empty_master_crash.test
configure.in:
Auto merged
include/my_net.h:
Auto merged
include/my_pthread.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/func_math.test:
Auto merged
mysys/my_gethostbyname.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_func.cc:
Auto merged
Change TRUNCATE(number) to truncate towards zero for negative numbers
Fix NULL handling for DESCRIBE table_name
Docs/manual.texi:
Update of TRUNCATE() information
configure.in:
Fix for HPUX
extra/resolveip.c:
Fix for SCO
include/my_net.h:
Fix for HPUX
libmysql/libmysql.c:
Removed warning on HPUX 10.20
mysql-test/r/func_math.result:
Test of new TRUNCATE handling
mysql-test/t/func_math.test:
Test of new TRUNCATE handling
mysys/my_gethostbyname.c:
Portability fix
sql/item_func.cc:
Change TRUNCATE(number) to truncate towards zero for negative numbers
sql/sql_show.cc:
Fix NULL handling for DESCRIBE table_name
Now it properly returns error.
Added respective test case.
sql/repl_failsafe.cc:
fixed bug: load table from master w/ empty master would hang.
Now it properly returns error.
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
Docs/manual.texi:
Auto merged
extra/resolveip.c:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/t/type_enum.test:
Auto merged
mysys/mf_strip.c:
Auto merged
mysys/raid.cc:
Auto merged
include/my_net.h:
merge
mysql-test/r/type_enum.result:
merge
mysql-test/t/type_decimal.test:
merge
mysys/Makefile.am:
merge
sql/sql_db.cc:
merge
sql/sql_parse.cc:
merge
Remove end space from ENUM and SET strings
mysql-test/t/type_enum.test:
Test of end space in enum's
Docs/manual.texi:
Changelog
include/my_sys.h:
Renamed stripp_sp -> strip_sp
mysql-test/r/type_enum.result:
Test of end space in enums
mysys/Makefile.am:
change stripp_sp -> strip_sp
mysys/mf_strip.c:
change stripp_sp -> strip_sp
sql/sql_db.cc:
change stripp_sp -> strip_sp
sql/sql_parse.cc:
change stripp_sp -> strip_sp
Remove end space from ENUM and SET strings
Fixed some portability things in my_gethostbyname_r
Portability fix for type_decimal.test
BUILD/SETUP.sh:
Fixes for gcc 3.1
extra/resolveip.c:
Cleanup
include/my_net.h:
Portability fix for SCO
mysql-test/t/type_decimal.test:
Portability fix for FreeBSD
mysys/Makefile.am:
Portability fix for OSF1
mysys/raid.cc:
Portability fix for OSF1
Fixed problem with --password in mysql
client/mysql.cc:
Fixed problem with --password in mysql
mysql-test/r/type_decimal.result:
Portability fix
mysql-test/t/type_decimal.test:
Portability fix
Fixed bug in new code for regexp LIKE NULL
BUILD/SETUP.sh:
Fixes for gcc 3.1
BUILD/compile-solaris-sparc-debug:
Fixes for gcc 3.1
BUILD/compile-solaris-sparc-purify:
Fixes for gcc 3.1
BUILD/compile-solaris-sparc:
Fixes for gcc 3.1
Docs/manual.texi:
Fixed typo
include/violite.h:
Fixes for gcc 3.1
mysql-test/r/func_concat.result:
Updated test results
sql/item_cmpfunc.cc:
Fixed bug in new code for regexp LIKE NULL
Docs/manual.texi:
Added info about LIKE optimization
mysql-test/r/func_like.result:
Test of new LIKE optimization
mysql-test/t/func_like.test:
Test of new LIKE optimization
Update of glibc patch from MySQL 4.0
Docs/glibc-2.2.5.patch:
Update of patch from MySQL 4.0
Docs/manual.texi:
ChangeLog
sql/item_strfunc.cc:
Fix bug in CONCAT_WS()
sql/share/italian/errmsg.txt:
Update of new error messages
Docs/manual.texi:
Small changes regarind user resources
client/mysqlbinlog.cc:
Applied patch to support --database
mysql-test/r/func_isnull.result:
New test results
mysql-test/r/join.result:
New test results
mysql-test/r/show_check.result:
New test results
mysql-test/r/type_datetime.result:
New test results
mysql-test/r/type_decimal.result:
New test results
mysql-test/r/type_float.result:
New test results
mysys/my_gethostbyname.c:
Fixed type on last push
mysys/my_pthread.c:
Fixed type on last push
sql/sql_select.cc:
Fixed bug in LIMIT handling
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-mysql_fix_extensions.sh:
Delete: scripts/mysql_fix_extensions.sh
Build-tools/Do-rpm:
Auto merged
Makefile.am:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/resolve_stack_dump.c:
Auto merged
include/my_pthread.h:
Auto merged
include/my_sys.h:
Auto merged
include/mysqld_error.h:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
isam/pack_isam.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/func_if.result:
Auto merged
mysql-test/t/join.test:
Auto merged
mysys/array.c:
Auto merged
mysys/charset.c:
Auto merged
mysys/default.c:
Auto merged
mysys/hash.c:
Auto merged
mysys/my_thr_init.c:
Auto merged
mysys/raid.cc:
Auto merged
mysql-test/t/type_decimal.test:
Auto merged
sql/hostname.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/log.cc:
Auto merged
sql/mini_client.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
strings/Makefile.am:
Auto merged
Docs/manual.texi:
Update of new GRANT options
libmysql/manager.c:
Use new my_gethostbyname_r() functions
mysql-test/r/select_found.result:
new test case
mysql-test/t/select_found.test:
new test case
sql/mysqld.cc:
Change names of some status variables
Docs/manual.texi:
Changelog
mysql-test/r/type_datetime.result:
Test of datetime optimization
mysql-test/t/type_datetime.test:
Test of datetime optimization
mysql-test/t/func_encrypt-master.opt:
added --loose to --des-key-file for mysql-test not to fail w/o ssl
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
mysql-test/r/func_if.result:
Fixed results after last changes
mysql-test/r/func_test.result:
Fixed results after last changes
mysql-test/r/type_float.result:
Fixed results after last changes
Docs/manual.texi:
Changlog
configure.in:
Change to version 3.23.51
Fix for OSF1
include/mysqld_error.h:
Added copyright message
isam/pack_isam.c:
Added copyright message
mysql-test/r/type_decimal.result:
New test results
mysql-test/t/type_decimal.test:
New test results
strings/Makefile.am:
Added mising file
myisam/ft_boolean_search.c:
Portability fix
mysql-test/mysql-test-run.sh:
Added slave_net_timeout
mysql-test/r/func_if.result:
Updated results after merge from 3.23
mysql-test/r/func_test.result:
Updated results after merge from 3.23
mysql-test/r/innodb.result:
Updated results after merge from 3.23
mysql-test/r/show_check.result:
Updated results after merge from 3.23
mysql-test/r/variables.result:
Updated results after merge from 3.23
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
Added copyright messages to some files that was missing it.
Docs/manual.texi:
Changelog
dbug/Makefile.am:
Added missing dbug_analyze.c
dbug/monty.doc:
Added copyright message
mysql-test/t/func_test.test:
Moved test of IF to new file
sql/item_cmpfunc.cc:
Fixed that IF is case insensitive if 2 and 3 arguments are case insensitive.
strings/bfill.c:
Added copyright message
strings/bmove.c:
Added copyright message
strings/ctype-ujis.c:
Added copyright message
strings/strend.c:
Added copyright message
strings/strstr.c:
Added copyright message
strings/strxmov.c:
Added copyright message
strings/strxnmov.c:
Added copyright message
bison 1.34 yacc rule compliance
more robust handling of relay log corruption
mysql-test/r/rpl000014.result:
updated result
mysql-test/r/rpl_log.result:
updated result
sql/mysqld.cc:
reckless slave option
sql/slave.cc:
reckless slave + more robust handling of relay log corruption
sql/slave.h:
reckless slave
sql/sql_yacc.yy:
brought the rules into compliance with bison 1.34 by adding ';' at the end of each rule
Split handler->option_flag() to handler->table_flags() and handler->index_flags()
Docs/manual.texi:
Updated standard binary options
include/my_base.h:
Update for BTREE keys in HEAP tables
libmysql/net.c:
merge with net_serv.cc
mysql-test/r/func_misc.result:
Update for new behaviour of inet_ntoa
sql/field.cc:
Update for BTREE keys in HEAP tables
sql/field.h:
Update for BTREE keys in HEAP tables
sql/filesort.cc:
Update for BTREE keys in HEAP tables
sql/ha_berkeley.h:
Update for BTREE keys in HEAP tables
sql/ha_heap.h:
Update for BTREE keys in HEAP tables
sql/ha_innodb.h:
Update for BTREE keys in HEAP tables
sql/ha_isam.cc:
Update for BTREE keys in HEAP tables
sql/ha_isam.h:
Update for BTREE keys in HEAP tables
sql/ha_isammrg.h:
Update for BTREE keys in HEAP tables
sql/ha_myisam.cc:
Update for BTREE keys in HEAP tables
sql/ha_myisam.h:
Update for BTREE keys in HEAP tables
sql/ha_myisammrg.h:
Update for BTREE keys in HEAP tables
sql/handler.cc:
Update for BTREE keys in HEAP tables
sql/handler.h:
Update for BTREE keys in HEAP tables
sql/log.cc:
Update for BTREE keys in HEAP tables
sql/net_serv.cc:
Update for BTREE keys in HEAP tables
sql/opt_range.cc:
Update for BTREE keys in HEAP tables
sql/opt_sum.cc:
Update for BTREE keys in HEAP tables
sql/records.cc:
Update for BTREE keys in HEAP tables
sql/sql_class.h:
Update for BTREE keys in HEAP tables
sql/sql_handler.cc:
Update for BTREE keys in HEAP tables
sql/sql_insert.cc:
Update for BTREE keys in HEAP tables
sql/sql_select.cc:
Update for BTREE keys in HEAP tables
sql/sql_show.cc:
Update for BTREE keys in HEAP tables
sql/sql_table.cc:
Update for BTREE keys in HEAP tables
sql/structs.h:
Update for BTREE keys in HEAP tables
sql/table.cc:
Update for BTREE keys in HEAP tables
sql/unireg.cc:
Update for BTREE keys in HEAP tables
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
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
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
Build-tools/Do-compile:
Auto merged
Build-tools/Do-rpm:
Auto merged
configure.in:
Auto merged
include/mysql_com.h:
Auto merged
innobase/btr/btr0btr.c:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/btr/btr0sea.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/dict/dict0load.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/fsp/fsp0fsp.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/include/sync0rw.ic:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/row/row0upd.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/t/range.test:
Auto merged
scripts/mysqldumpslow.sh:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/lock.cc:
Auto merged
sql/share/Makefile.am:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
Docs/manual.texi:
merge
client/mysql.cc:
merge
client/mysqldump.c:
merge
innobase/buf/buf0buf.c:
merge
innobase/os/os0file.c:
merge
innobase/row/row0mysql.c:
merge
mysql-test/r/range.result:
merge
sql/ha_innodb.cc:
merge
sql/log_event.h:
merge
sql/mysqld.cc:
merge
sql/sql_base.cc:
merge
sql/sql_load.cc:
merge
configure.in:
new configure parameter (now only for embeded server)
include/my_global.h:
now query cache always included in server, because of problrms with test suit
mysql-test/r/flush.result:
removed double testing
mysql-test/t/flush.test:
removed double testing
mysql-test/t/grant_cache.test:
now it is only memo about query cache
mysql-test/t/query_cache.test:
now it is only memo about query cache
Docs/manual.texi:
Changelog
myisam/myisampack.c:
Delete tmp file on error.
mysql-test/r/range.result:
Updated test case
mysql-test/t/range.test:
Updated test case
Fix thread-related bug when doing DROP TABLE
Fix bug in RENAME TABLE on windows
Docs/manual.texi:
Changelog
client/mysqldump.c:
Quote names to SHOW CREATE
mysql-test/t/range.test:
Test case for range bug
sql/lock.cc:
Fix thread-related bug when doing DROP TABLE
sql/sql_base.cc:
Fix thread-related bug when doing DROP TABLE
sql/sql_rename.cc:
Fix bug in RENAME TABLE on windows
checkings
mysql-test/r/union.result:
fix for the limit bug in UNION's
mysql-test/t/union.test:
fix for the limit bug in UNION's
sql/sql_union.cc:
fix for the limit bug in UNION's
sql/sql_yacc.yy:
Syntax checking for options that should appear in main select only.
memory corruption I can only repeat on one system.
mysql-test/r/multi_update.result:
extended test trying to find why the old one was failing
mysql-test/r/rpl000015.result:
result update
mysql-test/t/multi_update.test:
updated test to do more intermediate result checks
mysql-test/t/rpl000014.test:
cosmetic change
mysql-test/t/rpl000015-slave-master-info.opt:
reduce connect retry trying to simulate a bug
mysql-test/t/rpl000015.test:
cosmetic change
sql/lex.h:
added RELAY_LOG_FILE and RELAY_LOG_POS to CHANGE MASTER TO
sql/log.cc:
fixed replication bug
sql/log_event.cc:
properly ignore replication errors according to error mask
sql/mysqld.cc:
handle SIGFPE in the coredump handler
sql/slave.cc:
do not kick slave if it has already exited and freed the structures
sql/sql_lex.cc:
fixed initialization bug in CHANGE MASTER TO
sql/sql_lex.h:
CHANGE MASTER TO .. RELAY_LOG_FILE=,RELAY_LOG_POS=
sql/sql_repl.cc:
CHANGE MASTER TO .. RELAY_LOG_FILE=,RELAY_LOG_POS=
sql/sql_yacc.yy:
CHANGE MASTER TO .. RELAY_LOG_FILE=,RELAY_LOG_POS=
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
configure.in:
Auto merged
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Auto merged
client/mysqlimport.c:
Auto merged
sql/ha_isam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/table.cc:
Auto merged
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
Fix for bug on intel where (int32) 1 << 32 == 1, which gave problems when using 32 keys.
Allow SET PASSWORD for anonymous user
Docs/manual.texi:
Changelog
client/mysql.cc:
Added help for --local-infile
client/mysqlimport.c:
Merge with 4.0.
Patch for LOCAL INFILE handling
configure.in:
cleanup
include/global.h:
Fix for bug on intel where (int32) 1 << 32 == 1
mysql-test/r/create.result:
Test of CREATE TABLE with 32 keys
mysql-test/t/create.test:
Test of CREATE TABLE with 32 keys
scripts/mysqlhotcopy.sh:
Patch for databasenames with space.
sql/ha_isam.cc:
Fix for bug on intel where (int32) 1 << 32 == 1
sql/ha_myisam.cc:
Fix for bug on intel where (int32) 1 << 32 == 1
sql/ha_myisammrg.cc:
Fix for bug on intel where (int32) 1 << 32 == 1
sql/mysqld.cc:
Added help for --local-infile
sql/sql_acl.cc:
Allow SET PASSWORD of anonymous user
sql/table.cc:
Fix for bug on intel where (int32) 1 << 32 == 1
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
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
Build-tools/Do-compile:
Fixed typo
Docs/manual.texi:
Changelog
mysql-test/r/type_date.result:
Added test of bug in DATE_FORMAT
mysql-test/t/type_date.test:
Added test of bug in DATE_FORMAT
scripts/mysqlhotcopy.sh:
Fix for RAID files
sql/table.cc:
Fixed typo in last patch
Fix for --enable-local-infile
Portability fix for bison
bdb/dist/s_recover:
Update for new POSIX spec
configure.in:
Fix for --enable-local-infile
libmysql/libmysql.c:
Cleanup
mysql-test/mysql-test-run.sh:
Update for new POSIX spec
scripts/safe_mysqld.sh:
Update for new POSIX spec
sql-bench/server-cfg.sh:
Update for new POSIX spec
sql/sql_yacc.yy:
Portability fix for bison
mysql-test/mysql-test-run.sh:
Fix for LOAD DATA LOCAL ...
mysql-test/r/select_found.result:
Added result for a new test of combo of options for FOUND_ROWS and
BUFFER_RESULT
mysql-test/t/select_found.test:
Added test for combo of options for BUFFER_RESULT and FOUND_ROWS
sql/sql_select.cc:
Added fix for combo of options for BUFFER_RESULT and FOUND_ROWS
Fix problem with HAVING and MAX() IS NOT NULL
Docs/manual.texi:
Changelog & NULL usage with ORDER BY
client/mysqldump.c:
Cleanup disable keys
mysql-test/r/distinct.result:
Fix results after ORDER BY with NULL fix
mysql-test/r/group_by.result:
Fix results after ORDER BY with NULL fix
mysql-test/r/having.result:
Testcase for bug with HAVING
mysql-test/t/distinct.test:
Test for DISTINCT + ORDER BY DESC bug
mysql-test/t/having.test:
Test of HAVING and MAX IS NOT NULL
sql/filesort.cc:
Fix sorting of NULL values (Should always be first)
sql/item.h:
Fix problem with HAVING and MAX() IS NOT NULL
sql/item_sum.h:
Fix problem with HAVING and MAX() IS NOT NULL
sql/opt_range.cc:
Fix problem with HAVING and MAX() IS NOT NULL
sql/opt_range.h:
Fix sorting of NULL values
sql/sql_select.cc:
Fix sorting of ORDER BY ... DESC on NULL values.
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
mysql-test/r/fulltext.result:
test added
mysql-test/t/fulltext.test:
test added
sql/item_func.cc:
fulltext+const_table problem fixed once and forever
sql/item_func.h:
fulltext+const_table problem fixed once and forever
sql/sql_select.cc:
fulltext+const_table problem fixed once and forever
sql/table.h:
fulltext+const_table problem fixed once and forever
libmysql/libmysql.c:
Fixes a very rare bug when variable name (without '_') and it's
value are at the very end of the config file.
I have tested it , but would liek little mobster to test it further
mysql-test/r/union.result:
results for union test that proves that EXPLAIN UNION bugs are fixed
mysql-test/t/union.test:
additional tests for EXPLAIN on UNION's that have previously failed
sql/sql_yacc.yy:
Some small fixes for newer parsers.
Only unsigned int yystacksize remains to be fixed.
This I leave to Monty.
Present fixes are only aesthetic and do not harm.
Docs/manual.texi:
Added section about LOAD DATA LOCAL
libmysqld/lib_sql.cc:
Remove not used option
mysql-test/r/comments.result:
Updated results
sql/sql_parse.cc:
Fix queries / second
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
Docs/manual.texi:
Auto merged
client/client_priv.h:
Auto merged
include/mysql.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
mysql-test/t/comments.test:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/unireg.cc:
Auto merged
sql/unireg.h:
Auto merged
BUILD/FINISH.sh:
Auto merged
BUILD/SETUP.sh:
Auto merged
BUILD/compile-alpha:
Auto merged
BUILD/compile-pentium-gcov:
Auto merged
BUILD/compile-pentium-gprof:
Auto merged
BUILD/compile-pentium:
Auto merged
BitKeeper/deleted/.del-my_new.cc:
Delete: mysys/my_new.cc
Build-tools/Do-compile:
Auto merged
acconfig.h:
Auto merged
acinclude.m4:
Auto merged
Docs/manual.texi:
Auto merged
bdb/dist/configure.in:
Auto merged
client/Makefile.am:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/buf/buf0lru.c:
Auto merged
innobase/dict/dict0crea.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/trx/trx0purge.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/join.test:
Auto merged
mysys/Makefile.am:
Auto merged
scripts/Makefile.am:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.cc:
Auto merged
sql/my_lock.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
support-files/my-huge.cnf.sh:
Auto merged
support-files/my-large.cnf.sh:
Auto merged
support-files/my-medium.cnf.sh:
Auto merged
support-files/my-small.cnf.sh:
Auto merged
configure.in:
merge
innobase/row/row0mysql.c:
merge
innobase/trx/trx0trx.c:
merge
mysql-test/r/innodb.result:
merge
mysql-test/r/join.result:
merge
sql/ha_innodb.cc:
merge
sql/slave.cc:
merge
got LOAD DATA INFILE replication from 3.23 master to 4.0 slave to work
for some reason query_cache now fails - will push anyway and document the
failure if I can repeat it.
client/mysqltest.c:
added require_version
mysql-test/mysql-test-run.sh:
added --master-binary=,--slave-binary=,--old-master options
sleep_until_file_exists -> sleep_until_file_created
sql/slave.cc:
fixed bug in LOAD DATA INFILE replication from 3.23 master
Added counting of rollback's and commits
Fixed bug in 'SELECT 0 LIMIT 0'
Fixed bug in 'SELECT SQL_CALC_FOUND_ROWS'
Docs/manual.texi:
Changelog
configure.in:
Cleanup
myisam/myisamchk.c:
Fix some bugs introduced with the new my_getopt
mysql-test/r/limit.result:
Test for bugfix
mysql-test/r/rpl000001.result:
fix wrong result
mysql-test/r/select.result:
Fix things after fixing ignore index()
mysql-test/r/select_found.result:
Test of bug in SQL_CALC_FOUND_ROWS
mysql-test/t/limit.test:
Test bug in LIMIT 0
mysql-test/t/rpl000001.test:
fix wrong result
mysql-test/t/select_found.test:
Test of bug in SQL_CALC_FOUND_ROWS
sql/handler.cc:
Added counting of rollback's and commits
sql/mysql_priv.h:
Added counting of rollback's and commits
sql/mysqld.cc:
Added counting of rollback's and commits
sql/sql_select.cc:
Fixed bug in 'SELECT 0 LIMIT 0'
Fixed bug in 'SELECT SQL_CALC_FOUND_ROWS'
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
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
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
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/mem/mem0dbg.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/rem/rem0rec.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/trx/trx0undo.c:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/t/join.test:
Auto merged
mysys/hash.c:
Auto merged
scripts/mysql_config.sh:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/sql_acl.cc:
Auto merged
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
Test of unsigned BIGINT values
Fixes for queries-per-hour
Cleanup of replication code (comments and portability fixes)
Make most of the binary log code 4G clean
Changed syntax for GRANT ... QUERIES PER HOUR
Docs/manual.texi:
Fixed Changelog, upgrading to 4.0 and 4.1 TODO sections.
Docs/mysqld_error.txt:
Added error message.
configure.in:
Fix for autoconf 2.52
include/my_getopt.h:
Portability fix.
include/my_global.h:
Portablity fix.
include/mysqld_error.h:
New error messages
mysql-test/r/bigint.result:
Test of unsigned BIGINT values.
mysql-test/r/func_op.result:
Test of unsigned BIGINT values.
mysql-test/r/varbinary.result:
Test of unsigned BIGINT values.
mysql-test/t/bigint.test:
Test of unsigned BIGINT values.
sql/item_func.h:
Optimized Item_int_func() usage.
sql/lock.cc:
Cleanup comments
sql/log.cc:
Cleanup
sql/log_event.cc:
Cleanup and portability fixes.
sql/log_event.h:
Cleanup and portability fixes.
sql/mini_client.cc:
Cleanup and portability fixes.
sql/mysqld.cc:
Fix for queries-per-hour
sql/repl_failsafe.cc:
Prepare for making binary log 2G clean.
sql/share/czech/errmsg.txt:
New error messages
sql/share/danish/errmsg.txt:
New error messages
sql/share/dutch/errmsg.txt:
New error messages
sql/share/english/errmsg.txt:
New error messages
sql/share/estonian/errmsg.txt:
New error messages
sql/share/french/errmsg.txt:
New error messages
sql/share/german/errmsg.txt:
New error messages
sql/share/greek/errmsg.txt:
New error messages
sql/share/hungarian/errmsg.txt:
New error messages
sql/share/italian/errmsg.txt:
New error messages
sql/share/japanese/errmsg.txt:
New error messages
sql/share/korean/errmsg.txt:
New error messages
sql/share/norwegian-ny/errmsg.txt:
New error messages
sql/share/norwegian/errmsg.txt:
New error messages
sql/share/polish/errmsg.txt:
New error messages
sql/share/portuguese/errmsg.txt:
New error messages
sql/share/romanian/errmsg.txt:
New error messages
sql/share/russian/errmsg.txt:
New error messages
sql/share/slovak/errmsg.txt:
New error messages
sql/share/spanish/errmsg.txt:
New error messages
sql/share/swedish/errmsg.txt:
New error messages
sql/share/ukrainian/errmsg.txt:
New error messages
sql/slave.cc:
Cleanup
sql/slave.h:
Cleanup
sql/sql_acl.cc:
Cleanup and removal of possible reserved words
sql/sql_base.cc:
More DBUG
sql/sql_cache.cc:
Cleanup & portability fixes
sql/sql_class.h:
Make binary log 4G clean
sql/sql_delete.cc:
More DBUG
sql/sql_handler.cc:
Cleanup & portability fixes
sql/sql_parse.cc:
Cleanup of queries-per-hours code
sql/sql_rename.cc:
Add missing DBUG_RETURN
sql/sql_repl.cc:
Cleanup & portability fixes
sql/sql_select.cc:
Cleanup & portability fixes
sql/sql_show.cc:
Cleanup & portability fixes
sql/sql_update.cc:
Small cleanup of multi-update-code (need second pass)
sql/sql_yacc.yy:
Changed syntax for GRANT ... QUERIES PER HOUR
strings/str2int.c:
Cleanup & portability fixes
likely() and unlikely() branch prediction compiler hint macros
clean-up of comments
include/my_global.h:
added likely() and unlikely() macros to help some compilers optimize
the code for architecture-specific branch prediction policies
include/my_sys.h:
coverted my_b_append_tell() from macro to a function as it needed to be more
complex to avoid a potential race condition
mysql-test/mysql-test-run.sh:
hostname-independent relay log name to have consistent SHOW SLAVE STATUS
output
mysql-test/r/rpl000014.result:
result update
mysql-test/r/rpl000015.result:
result update
mysql-test/r/rpl000016.result:
result update
mysql-test/r/rpl_log.result:
result update
mysql-test/t/rpl000017-slave.sh:
proper cleanup of old logs
mysys/mf_iocache.c:
cosmetic changes + more debugging asserts
mysys/mf_iocache2.c:
my_b_append_tell()
cleanup of comments
sql/log.cc:
fix potential bug - do not rotate log in the middle of event
sql/slave.cc:
do not write stop events when the server does not actually stop but just
rotates the log
fixed race between queue_event() and show_slave_status()
clean-up of comments
sql/slave.h:
added ignore_stop_event flag to SLAVE_LOG_INFO
fixed a couple of bugs with SEQ_READ_APPEND cache
rpl000016 still has non-deterministic result, but I am going to commit and
push since what I have is now better than what is in the main repository
client/mysqltest.c:
added wait_for_slave_to_stop
cleaned up TODO and comments
include/my_sys.h:
fixed race in flush_io_cache in SEQ_READ_APPEND cache
mysql-test/r/rpl000016.result:
updated result
mysql-test/t/rpl000016.test:
use wait_for_slave_to_stop to have deterministic slave behaviour for the test
mysys/mf_iocache.c:
fixed race in flush_io_cache()
fixed failure to unlock mutex in my_b_append()
sql/log.cc:
be compatible with 3.23 master
sql/log_event.cc:
3.23 master compat
sql/slave.cc:
3.23 master compat
sql/sql_class.h:
compat with 3.23 master
Faster 'read_first_row' (Fixes slow 'preparing' state)
Read constant tables earlier, which provides better optimzations when using tables with <=1 row.
This also fixes a complicated bug involving const tables.
Docs/manual.texi:
Changelog
client/mysql.cc:
Increase max package length to 512M
client/mysqldump.c:
Increase max package length to 512M
dbug/dbug.c:
Fixed wrong printf() format string.
mysql-test/t/innodb.test:
Test for multi-table delete
sql/handler.cc:
Faster 'read_first_row' (Fixes slow 'preparing' state)
sql/handler.h:
Faster 'read_first_row' (Fixes slow 'preparing' state)
sql/opt_range.cc:
More debug info.
sql/sql_select.cc:
Read constant tables earlier, which provides better optimzations when using tables with <=1 row.
This also fixes a complicated bug involving const tables.
sql/sql_select.h:
Read const tables earlier
fixed too quick timeout in mysql-test-run which caused a race with the
new server getting started before the old one completely finished
shutdown. This should fix the pid warning we've been getting as well as
inconsistent results when running tests with the manager
libmysqld/lib_sql.cc:
post-merge fix
mysql-test/mysql-test-run.sh:
fixed start/stop timeout and cleanup of log directory
mysql-test/r/rpl000014.result:
post-merge fix
mysql-test/r/rpl000015.result:
post-merge fix
mysql-test/r/rpl000016.result:
post-merge fix
mysql-test/r/rpl_log.result:
post-merge fix
sql/log_event.cc:
post-merge fix
sql/slave.cc:
post-merge fix
sql/slave.h:
post-merge fix
sql/sql_class.h:
post-merge fix
tools/mysqlmanager.c:
added debug message
before I can push
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
include/my_sys.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/t/rpl_log.test:
Auto merged
mysys/mf_iocache.c:
Auto merged
mysys/mf_iocache2.c:
Auto merged
mysys/thr_mutex.c:
Auto merged
sql/item_func.cc:
Auto merged
sql/lex.h:
Auto merged
sql/mini_client.cc:
Auto merged
sql/mini_client.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/stacktrace.c:
Auto merged
sql/structs.h:
Auto merged
mysql-test/r/rpl000014.result:
merge
mysql-test/r/rpl000015.result:
merge
mysql-test/r/rpl000016.result:
merge
mysql-test/r/rpl_log.result:
merge
sql/log.cc:
merge
sql/log_event.cc:
merge
sql/log_event.h:
merge
sql/mysqld.cc:
merge
sql/slave.cc:
merge
sql/slave.h:
merge
sql/sql_class.h:
merge
sql/sql_parse.cc:
merge
sql/sql_repl.cc:
merge
sql/sql_yacc.yy:
merge
first pull, merge,test, and get it to work.
The main change is the new replication code - now we have two slave threads
SQL thread and I/O thread. I have also re-written a lot of the code to
prepare for multi-master implementation.
I also documented IO_CACHE quite extensively and to some extend, THD class.
Makefile.am:
moved tags target script into a separate file
include/my_sys.h:
fixes in IO_CACHE for SEQ_READ_APPEND + some documentation
libmysqld/lib_sql.cc:
updated replication locks, but now I see I did it wrong and it won't compile. Will fix
before the push.
mysql-test/r/rpl000014.result:
test result update
mysql-test/r/rpl000015.result:
test result update
mysql-test/r/rpl000016.result:
test result update
mysql-test/r/rpl_log.result:
test result update
mysql-test/t/rpl000016-slave.sh:
remove relay logs
mysql-test/t/rpl000017-slave.sh:
remove relay logs
mysql-test/t/rpl_log.test:
updated test
mysys/mf_iocache.c:
IO_CACHE updates to make replication work
mysys/mf_iocache2.c:
IO_CACHE update to make replication work
mysys/thr_mutex.c:
cosmetic change
sql/item_func.cc:
new replication code
sql/lex.h:
new replication
sql/log.cc:
new replication
sql/log_event.cc:
new replication
sql/log_event.h:
new replication
sql/mini_client.cc:
new replication
sql/mini_client.h:
new replication
sql/mysql_priv.h:
new replication
sql/mysqld.cc:
new replication
sql/repl_failsafe.cc:
new replication
sql/slave.cc:
new replication
sql/slave.h:
new replication
sql/sql_class.cc:
new replication
sql/sql_class.h:
new replication
sql/sql_lex.h:
new replication
sql/sql_parse.cc:
new replication
sql/sql_repl.cc:
new replication
sql/sql_repl.h:
new replication
sql/sql_show.cc:
new replication
sql/sql_yacc.yy:
new replication
sql/stacktrace.c:
more robust stack tracing
sql/structs.h:
new replication code
BitKeeper/etc/ignore:
Added mysql-test/r/rpl000002.eval mysql-test/r/rpl000014.eval mysql-test/r/rpl000015.eval mysql-test/r/rpl000016.eval mysql-test/r/slave-running.eval mysql-test/r/slave-stopped.eval to the ignore list
Docs/manual.texi:
Changelog
mysql-test/r/join.result:
Test of join bug
mysql-test/t/join.test:
Test of join bug
mysys/hash.c:
Fix for SUNPRO_C
scripts/mysql_config.sh:
Fix for MacOS X
Fixed bug in multi-table-delete
Docs/manual.texi:
Changelog
include/mysql_com.h:
Define MAX_CHAR_WIDTH
myisam/mi_extra.c:
Cleanup
mysql-test/r/bdb.result:
Bug test
mysql-test/r/group_by.result:
Bug test
mysql-test/t/bdb.test:
Bug test
mysql-test/t/group_by.test:
Bug test
sql/ha_berkeley.cc:
More debug statements
sql/handler.cc:
Move HA_EXTRA_NO_READCHECK to ha_open
sql/records.cc:
More DBUG statements
sql/sql_analyse.cc:
Cleanup
sql/sql_base.cc:
Move HA_EXTRA_NO_READCHECK to ha_open
sql/sql_delete.cc:
Fixed bug in multi-table-delete
Cleanup
sql/sql_select.cc:
Move HA_EXTRA_NO_READCHECK to ha_open
sql/sql_update.cc:
Move HA_EXTRA_NO_READCHECK to ha_open
Add ISAM to Windows version
Fix of test results
Fixes for NULL keys in HEAP tables.
Docs/manual.texi:
Changelog
heap/hp_open.c:
Add support for NULL=NULL in keys (for GROUP BY)
heap/hp_rkey.c:
Cleanup
heap/hp_write.c:
Cleanup
include/config-win.h:
Add ISAM to Windows version
include/my_base.h:
Add support for NULL=NULL in keys (for GROUP BY)
libmysqld/Makefile.am:
Rename of innobase to innodb
myisam/mi_write.c:
Add support for NULL=NULL in keys (for GROUP BY)
BitKeeper/etc/ignore:
Added libmysqld/ha_innodb.cc to the ignore list
mysql-test/r/group_by.result:
Test of NULL keys in HEAP tables
mysql-test/r/heap.result:
Test of NULL keys in HEAP tables
mysql-test/r/null.result:
Cleanup
mysql-test/r/order_by.result:
Fix for result of new ORDER BY optimization
mysql-test/t/group_by.test:
Test of NULL keys in HEAP tables
mysql-test/t/heap.test:
Test of NULL keys in HEAP tables
mysql-test/t/null.test:
Cleanup
sql/ha_heap.cc:
Add support of NULL keys
sql/item_strfunc.h:
Fix for BINARY and CAST functions
sql/item_timefunc.h:
Fix for BINARY and CAST functions
sql/sql_parse.cc:
Cleanup
sql/sql_select.cc:
Add support for NULL=NULL in keys (for GROUP BY)
mysql-test/r/query_cache.result:
Test changed according with new block sizes
mysql-test/t/query_cache.test:
Test changed according with new block sizes
Cleanup of multi-table-delete in sql_yacc.yy
Changed syntax of MAXIMUM QUERIES PER HOUR to MAX_QUERIES_PER_HOUR to
not get too many reserved words.
Docs/manual.texi:
Updated information about CAST
mysql-test/r/bigint.result:
New CAST syntax
mysql-test/r/create.result:
New CAST syntax
mysql-test/r/variables.result:
Fix after merge with 3.23
mysql-test/t/bigint.test:
New CAST syntax
mysql-test/t/create.test:
New CAST syntax
sql/item_create.cc:
New CAST syntax
sql/item_func.h:
New CAST syntax
sql/item_timefunc.cc:
New CAST syntax
sql/item_timefunc.h:
New CAST syntax
sql/lex.h:
Changed syntax to MAX_QUERIES_PER_HOUR to not get too many reserved words.
sql/mysql_priv.h:
Cleanup multi-delete
sql/sql_parse.cc:
Cleanup multi-delete
sql/sql_yacc.yy:
Cleanup multi-delete.
New CAST syntax.
Removed some restricted words.
Docs/manual.texi:
Auto merged
sql/item_func.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Auto merged
Docs/manual.texi:
Auto merged
client/client_priv.h:
Auto merged
extra/resolveip.c:
Auto merged
innobase/btr/btr0sea.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysys/my_bitmap.c:
Auto merged
sql/ha_innobase.cc:
Auto merged
sql/ha_innobase.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_do.cc:
Auto merged
sql/sql_select.cc:
Auto merged
client/mysqldump.c:
Use local version in 4.0
configure.in:
Use 4.0 code
Fixes for building MySQL with gcc 3.0
Added SIGNED / UNSIGNED casts
Fixed core dump bug in net_clear() with libmysqld.
Back to using semaphores in query cache.
Added 'Null' and 'Index_type' to SHOW INDEX.
BUILD/FINISH.sh:
Fixes for gcc 3.0
BUILD/SETUP.sh:
Fixes for gcc 3.0
Docs/manual.texi:
Changelog + SIGNED/UNSIGNED casts.
Makefile.am:
include BUILD scripts in source distribution.
client/Makefile.am:
Fixes for gcc 3.0
client/mysql.cc:
Cleanup
client/mysqldump.c:
Changed 'K' to mean 'disable-keys' instead of 'no-disabled-keys'
client/readline.cc:
Cleanup
configure.in:
Include BUILD in source distrbution
extra/my_print_defaults.c:
Cleanup
include/my_global.h:
Fix for HPUX and setrlimit.
Portability fix.
Added macros for nice TIMESPEC usage.
innobase/include/dyn0dyn.h:
Fix for AIX
libmysql/Makefile.shared:
Added strxmov to libmysqld
libmysqld/examples/Makefile.am:
Fixes for gcc 3.0
libmysqld/lib_vio.c:
Cleanup
myisam/ft_dump.c:
Portability fixes
myisam/ftdefs.h:
Portability fixes
mysql-test/r/bdb.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/bigint.result:
New test for SIGNED/UNSIGNED
mysql-test/r/fulltext.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/heap.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/innodb.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/isam.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/key.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/myisam.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/query_cache.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/select.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/show_check.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/type_ranges.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/t/bigint.test:
New test for SIGNED/UNSIGNED
mysql-test/t/key.test:
New test for SIGNED/UNSIGNED
mysql-test/t/query_cache.test:
Test for FOUND_ROWS()
sql-bench/crash-me.sh:
Safety fixes
sql/derror.cc:
Cleanup
sql/ha_berkeley.h:
New test for SIGNED/UNSIGNED
sql/ha_heap.h:
New test for SIGNED/UNSIGNED
sql/ha_innobase.cc:
New test for SIGNED/UNSIGNED
sql/ha_innobase.h:
New test for SIGNED/UNSIGNED
sql/ha_isam.h:
New test for SIGNED/UNSIGNED
sql/ha_myisam.cc:
New test for SIGNED/UNSIGNED
sql/ha_myisam.h:
New test for SIGNED/UNSIGNED
sql/handler.h:
New test for SIGNED/UNSIGNED
sql/item_func.cc:
Cleanup TIMESPEC usage
sql/item_func.h:
Added SIGNED / UNSIGNED casts
sql/lex.h:
Added SIGNED / UNSIGNED casts
sql/mysqld.cc:
Cleanup TIMESPEC usage
sql/net_pkg.cc:
Cleanup
sql/net_serv.cc:
Fixed core dump bug in net_clear()
sql/slave.cc:
Cleanup
sql/sql_cache.cc:
Back to using semaphores
sql/sql_cache.h:
Back to using semaphores
sql/sql_insert.cc:
Cleanup TIMESPEC usage
sql/sql_manager.cc:
Cleanup TIMESPEC usage
sql/sql_parse.cc:
Cleanup
sql/sql_repl.cc:
Cleanup TIMESPEC usage
sql/sql_show.cc:
Added 'Null' and 'Index_type' to SHOW INDEX.
sql/sql_table.cc:
Sort keys in table in a more logical order.
sql/sql_yacc.yy:
Support for SIGNED/UNSIGNED casts.
creates proper column types, out of any function, expression or from
other tables.
mysql-test/r/create.result:
This is a result for the test which creates all proper column types
out of CREATE ... SELECT ...
One more notice:
limiting number of queries per hour for different users has been done
on 4.0.1 , but I can port it to 3.23.*
This will require only certain changes, like number of columns in user
table.
I will also make a test case for it, after it is approved by Monty,
as result file will depend on the error message text.
BitKeeper/etc/ignore:
auto-union
libmysqld/lib_sql.cc:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/lex.h:
Changes for BitKeeper resolve...
sql/sql_class.h:
Changes for BitKeeper resolve...
sql/sql_lex.h:
Changes for BitKeeper resolve...
sql/sql_parse.cc:
Changes for BitKeeper resolve...
sql/sql_yacc.yy:
Changes for BitKeeper resolve...
* multi-table updates
* new paid feature for limiting number of queries per hour for users
* optional syntax for multi-table deletes
* optimization for SQL_CALC_FOUND_ROWS
* a small addition for CREATE .. SELECT that will be of future use
I know that all this will require many additions to documentation,
which I have not done, but I am at Arjen's disposal to help him document
all this.
libmysqld/lib_sql.cc:
This is a small change required due to new paid feature of limiting
number of queries per hour for each user.
mysql-test/r/multi_update.result:
Change of the result to accomodate multi-table updates
mysql-test/t/multi_update.test:
Change in multi-table tests to accomodate multi-table updates
BitKeeper/etc/ignore:
Added 50 sql/new.cc to the ignore list
scripts/mysql_install_db.sh:
This is a small change required due to new paid feature of limiting
number of queries per hour for each user.
sql/item_timefunc.h:
This is a small feature that will be of use later in the proper
creation of the tables out of CREATE ... SELECT...
Further changes will come after this resolve/push/test passes ..
sql/lex.h:
This is a small change required due to new paid feature of limiting
number of queries per hour for each user.
sql/mysql_priv.h:
This is a small change required due to new paid feature of limiting
number of queries per hour for each user.
sql/mysqld.cc:
This is a small change required due to new paid feature of limiting
number of queries per hour for each user.
sql/sql_acl.cc:
This is a small change required due to new paid feature of limiting
number of queries per hour for each user.
sql/sql_acl.h:
This is a small change required due to new paid feature of limiting
number of queries per hour for each user.
sql/sql_class.h:
These are changes required for multi-table updates.
sql/sql_lex.h:
Changes required for both multi-table updates and limiting number of
queries per hour (paid feature).
sql/sql_parse.cc:
Ha ! So many changes.
* multi-table updates
* limiting number of queries per hour for users
sql/sql_select.cc:
Optimisation for SQL_CALC_FOUND_ROWS, when a query involves a single
table, without WHERE or GROUP clause
sql/sql_update.cc:
multi-table updates
sql/sql_yacc.yy:
Many things :
* multi-table updates
* limiting number of queries per hour for users
* new optional syntax for multi-table deletes. This one is different
from the one demanded by user. USING clause MUST include ALL tables,
not just the ones that are used and not deleted from.
Fix problem with query cache and database names
mysql-test/mysql-test-run.sh:
Portability fixes
mysql-test/r/query_cache.result:
More tests when using different databases
mysql-test/t/query_cache.test:
More tests when using different databases
sql-bench/test-wisconsin.sh:
Portability fix
sql/sql_cache.cc:
Fix problem with query cache and database names
sql/sql_parse.cc:
Remove pre and end space in query.
sql/sql_table.cc:
Limit created keys to MAX_KEY_LENGTH.
Change tests to use database 'mysqltest' instead of 'foo'
Add option to not print access denied messages to check_table_access()
Docs/manual.texi:
Updated query cache information.
client/mysqltest.c:
When connection to the database '*NO-ONE*, connect without specify a database.
include/raid.h:
Portability fix
mysql-test/r/drop.result:
Change test to use database 'mysqltest' instead of 'foo'
mysql-test/r/flush.result:
Change test to use database 'mysqltest' instead of 'foo'
mysql-test/r/innodb.result:
Change test to use database 'mysqltest' instead of 'foo'
mysql-test/r/query_cache.result:
Change test to use database 'mysqltest' instead of 'foo'
mysql-test/t/drop.test:
Change test to use database 'mysqltest' instead of 'foo'
mysql-test/t/flush.test:
Change test to use database 'mysqltest' instead of 'foo'
mysql-test/t/innodb.test:
Change test to use database 'mysqltest' instead of 'foo'
mysql-test/t/query_cache.test:
Change test to use database 'mysqltest' instead of 'foo'
sql/mysql_priv.h:
Add option to not print access denied messages
sql/net_pkg.cc:
Fix for query cache
sql/net_serv.cc:
Speed improvment
sql/sql_cache.cc:
Fixed access privilege bug in query cache
sql/sql_cache.h:
Always compiled with integrity check function prototypes.
sql/sql_do.cc:
Removed warning
sql/sql_parse.cc:
Add option to not print access denied messages
Fixed data corruption bug in query cache.
Made queries be dependent of the database in use.
Docs/manual.texi:
Update binary log reference
client/mysql.cc:
Removed warning
include/thr_alarm.h:
Cleanup of alarm macros.
libmysql/libmysql.c:
Portabiliy fix
libmysql/net.c:
Cleanup of alarm macros.
mysql-test/t/rpl_get_lock.test:
Fixed results after merge.
mysys/my_bitmap.c:
Removed warning.
sql/log_event.cc:
Use thd->db_length
sql/mini_client.cc:
Cleanup of alarm macros.
sql/net_serv.cc:
Cleanup of alarm macros.
sql/sql_acl.cc:
Use thd->db_length
sql/sql_cache.cc:
Store used database together with the query.
sql/sql_class.cc:
Use thd->db_length
sql/sql_class.h:
Use thd->db_length
sql/sql_db.cc:
Use thd->db_length
sql/sql_parse.cc:
Use thd->db_length
sql/sql_udf.cc:
Use thd->db_length
Fix pthread_mutex_trylock on HPUX (needed for query cache).
include/my_pthread.h:
Fixed mutex problem with pthread_mutex_trylock on HPUX.
mysql-test/mysql-test-run.sh:
Wait for .pid file instead of .sock, because .pid is created later.
mysql-test/r/query_cache.result:
Test insert delated + query cache
mysql-test/t/query_cache.test:
Test insert delated + query cache
mysys/my_pthread.c:
Fixed mutex problem with pthread_mutex_trylock on HPUX.
sql/repl_failsafe.cc:
Safety
sql/sql_insert.cc:
Fix insert delated + query cache
Changed 'send_file_to_server' to use less stack (Fixed replication problem on OSF1).
Docs/manual.texi:
Changelog
libmysql/libmysql.c:
Changed 'send_file_to_server' to use less stack (Fixed some problems in threaded applications)
mysql-test/mysql-test-run.sh:
Fixed --sleep option
sql/mini_client.cc:
Changed 'send_file_to_server' to use less stack (Fixed replication problem on OSF1).
sql/mysqld.cc:
Destroy query cache properly
sql/sql_cache.cc:
Fixed bug in FLUSH QUERY CACHE
BitKeeper/etc/ignore:
Added libmysqld/sql_do.cc to the ignore list
include/m_string.h:
Fix for purify
libmysql/Makefile.shared:
Fix for purify
libmysqld/Makefile.am:
Fix for purify
sql/sql_handler.cc:
Cleanup
Fixed shutdown on HPUX.
Fixed bug in query cache.
Docs/manual.texi:
Changelog
configure.in:
Fixes for HPUX
include/m_string.h:
Fixes for Purify
include/my_pthread.h:
Fixes for HPUX
include/raid.h:
Portability fix.
innobase/include/univ.i:
Portability fix.
mysql-test/mysql-test-run.sh:
Added --manual-gdb
mysql-test/r/rpl_log.result:
Portability fix
mysql-test/t/rpl_log.test:
Portability fix
mysys/my_pthread.c:
Portability fix (HPUX)
mysys/raid.cc:
Portability fix
mysys/thr_mutex.c:
Portability fix
scripts/mysql_install_db.sh:
Clean up install message
sql-bench/test-alter-table.sh:
Fix testsuite
sql/ha_innobase.cc:
Fixed stack overwrite.
sql/log_event.cc:
Fixed purify warning
sql/mysqld.cc:
Added patch from FreeBSD port.
Fixed shutdown on HPUX.
sql/slave.cc:
Cleanup
sql/sql_cache.cc:
Binary search in 'step' searching
Check maximal block in bin
Limit of comparasions number in list of memory blocks.
Fixed bug in pack()
sql/sql_cache.h:
Binary search in 'step' searching
Check maximal block in bin
Limit of comparasions number in list of memory blocks.
Fixed bug in pack()
sql/sql_parse.cc:
Optimize
tools/mysqlmanager.c:
Portability fix
horrible bug fixed
mysql-test/r/fulltext_multi.result:
Change mode to -rw-rw-r--
mysql-test/r/fulltext_order_by.result:
Change mode to -rw-rw-r--
mysql-test/r/fulltext_update.result:
Change mode to -rw-rw-r--
mysql-test/r/fulltext_var.result:
Change mode to -rw-rw-r--
mysql-test/r/bulk_replace.result:
Change mode to -rw-rw-r--
mysql-test/r/handler.result:
Change mode to -rw-rw-r--
include/my_global.h:
FreeBSD fix for openssl
myisam/ft_static.c:
some boolean search operators added
sql/sql_parse.cc:
fixed horrible bug that makes mysqld CRASH when mysql client is started
libmysqld/lib_sql.cc:
Fix for new bitmap
mysql-test/r/rpl_get_lock.result:
Fix results after merge
mysql-test/r/rpl_skip_error.result:
Fix results after merge
sql/log_event.cc:
Finish merge of slave.cc
sql/slave.cc:
Finish merge
extra/resolve_stack_dump.c:
Auto merged
include/my_bitmap.h:
Auto merged
innobase/buf/buf0buf.c:
Auto merged
innobase/dict/dict0crea.c:
Auto merged
mysql-test/t/rpl_get_lock.test:
Auto merged
client/mysqltest.c:
--replace_result can now use variables
mysql-test/r/rpl000014.result:
Fix to use new replace
mysql-test/r/rpl000015.result:
Fix to use new replace
mysql-test/r/rpl000016.result:
Fix to use new replace
mysql-test/r/rpl_log.result:
Fix to use new replace
mysql-test/t/join.test:
Fix to use new replace
mysql-test/t/rpl000014.test:
Fix to use new replace
mysql-test/t/rpl000015.test:
Fix to use new replace
mysql-test/t/rpl000016.test:
Fix to use new replace
mysql-test/t/rpl_log.test:
Fix to use new replace
readline/rltty.c:
Add missing function
Added new tests to testsuite.
extra/resolveip.c:
Portabilit fix.
mysql-test/create-test-result:
Fix for new mysql-test-run
mysql-test/r/query_cache.result:
Updated benchmarks
mysql-test/t/query_cache-master.opt:
Updated benchmarks
mysql-test/t/query_cache.test:
Updated benchmarks
sql/sql_cache.cc:
Removed not used functions
sql/sql_cache.h:
Removed not used functions
Docs/manual.texi:
fixed bad merge
include/my_bitmap.h:
fixed comment format
mysql-test/r/rpl_get_lock.result:
make the test results predicable
mysql-test/t/rpl_get_lock.test:
predicatable test results
mysys/my_bitmap.c:
do not init/destroy mutex if bitmap is not declared thread safe
sql/slave.cc:
clean-up suggested by Monty to make init_slave_skip_errors() more compact
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
