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
BUILD/compile-alpha-cxx:
Fix for Alpha ccc
configure.in:
Remove not used libraries
mysql-test/r/innodb.result:
Fix test case
sql/sql_base.cc:
Fix wrong memory allocation in SHOW OPEN TABLES.
Docs/manual.texi:
Auto merged
sql/ha_innobase.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/mysql-test-run.sh:
Add timeout for shutdown
mysql-test/r/innodb.result:
Use local test
mysql-test/t/innodb.test:
merge
Docs/manual.texi:
Changelog
mysql-test/mysql-test-run.sh:
Change shutdown to 20 seconds for slow systems
mysql-test/r/innodb.result:
Testcase for found bug
mysql-test/t/innodb.test:
Testcase for found bug
innobase/include/srv0srv.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_innobase.cc:
Auto merged
Applied patch to mysqlhotcopy
myisam/mi_open.c:
Fixed some purify warnings
mysql-test/mysql-test-run.sh:
Added --core as default to test suite
scripts/make_binary_distribution.sh:
Added missing mysqlbinlog
scripts/mysqlhotcopy.sh:
Applied patch with --record-log option
sql/item_timefunc.cc:
Fixed problem with SEC_TO_TIME() for long signed integers.
Portability fixes.
Don't delete temporary tables on FLUSH tables.
client/client_priv.h:
Fix after merge
client/mysqldump.c:
Fix after merge
include/my_global.h:
Change CMP -> CMP_NUM because CMP was used in other places
include/violite.h:
Added missing prototype
myisam/ft_boolean_search.c:
Removed warnings
myisam/ft_nlq_search.c:
Removed warnings
myisam/mi_search.c:
CMP -> CMP_NUM
mysql-test/mysql-test-run.sh:
Write all logs to log directory
mysql-test/r/func_time.result:
Fix test results after merge
mysql-test/r/having.result:
Fix test results after merge
mysql-test/r/join.result:
Fix test results after merge
mysql-test/r/rpl000012.result:
Fix test results after merge
mysys/mf_iocache.c:
Allow multiple call to end_iocache.
sql/ha_innobase.cc:
Removed possible problem with using uninitialized variable
sql/log_event.cc:
Don't delete temporary tables on FLUSH tables.
(Needs to be fixed properly)
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
BitKeeper/etc/logging_ok:
auto-union
acinclude.m4:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
Docs/manual.texi:
Bad merge.
include/mysqld_error.h:
Merge with 3.23
Merged error messages with 3.23.44
Fixed bug with DATA DIRECTORY on windows
Docs/internals.texi:
Update coding policies
Docs/manual.texi:
Minor general corrections
acinclude.m4:
Fixed wrong cpu-test
configure.in:
Remove CPU test, because this makes unportable binaries.
include/mysql.h:
Added STDCALL to mysql_sever and mysql_thread variables
include/mysqld_error.h:
Merged error messages with 3.23.44
libmysql/libmysql.c:
Added STDCALL to mysql_sever and mysql_thread variables
libmysqld/lib_sql.cc:
Added STDCALL to mysql_sever and mysql_thread variables
sql-bench/limits/db2.cfg:
New limits file
sql-bench/test-select.sh:
Fixed bug in cache test
sql/share/czech/errmsg.txt:
Merged error messages with 3.23.44
sql/share/danish/errmsg.txt:
Merged error messages with 3.23.44
sql/share/dutch/errmsg.txt:
Merged error messages with 3.23.44
sql/share/english/errmsg.txt:
Merged error messages with 3.23.44
sql/share/estonian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/french/errmsg.txt:
Merged error messages with 3.23.44
sql/share/german/errmsg.txt:
Merged error messages with 3.23.44
sql/share/greek/errmsg.txt:
Merged error messages with 3.23.44
sql/share/hungarian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/italian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/japanese/errmsg.txt:
Merged error messages with 3.23.44
sql/share/korean/errmsg.txt:
Merged error messages with 3.23.44
sql/share/norwegian-ny/errmsg.txt:
Merged error messages with 3.23.44
sql/share/norwegian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/polish/errmsg.txt:
Merged error messages with 3.23.44
sql/share/portuguese/errmsg.txt:
Merged error messages with 3.23.44
sql/share/romanian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/russian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/slovak/errmsg.txt:
Merged error messages with 3.23.44
sql/share/spanish/errmsg.txt:
Merged error messages with 3.23.44
sql/share/swedish/errmsg.txt:
Merged error messages with 3.23.44
sql/share/ukrainian/errmsg.txt:
Merged error messages with 3.23.44
sql/sql_parse.cc:
Fix bug with DATA DIRECTORY on windows.
sql/sql_select.cc:
Cleanup
BUILD/SETUP.sh:
Use -O1 to avoid problem with INLINE functions
Docs/manual.texi:
Changelog
mysql-test/r/join.result:
Test for bugfix
mysql-test/t/join.test:
Test for bugfix
sql/sql_select.cc:
Fixed problem with t1 LEFT_JOIN t2 ... WHERE t2.date_column IS NULL when date_column was declared as NOT NULL.
BitKeeper/etc/ignore:
Added bdb/include/db_ext.h bdb/include/mutex_ext.h to the ignore list
Fixed bug with BLOB keys in BDB tables
Fixed problem with MERGE tables on OS with 32 bit files
Fixed that TIME_TO_SEC() works with negative times
Docs/manual.texi:
Changelog
client/mysqladmin.c:
Fix that mysqladmin shutdown can be interrupted with ^C
include/mysqld_error.h:
Fixed typo
mysql-test/r/func_time.result:
Added test case for negative times
mysql-test/t/func_time.test:
Added test case for negative times
mysql-test/t/rpl000015-slave.sh:
Removed warnings
mysql-test/t/rpl000016-slave.sh:
Removed warnings
sql/field.cc:
Fixed bug with BLOB keys in BDB tables
sql/field.h:
Fixed bug with BLOB keys in BDB tables
sql/ha_berkeley.cc:
Fixed bug with BLOB keys in BDB tables
sql/ha_myisammrg.cc:
Fixed problem with MERGE tables on OS with 32 bit files
sql/item_timefunc.cc:
Fixed that TIME_TO_SEC() works with negative times.
sql/share/swedish/errmsg.txt:
Merge with 4.0
sql/sql_acl.cc:
Fixed typo
Fix for consistent 0000-00-00 date handling
Close + open binary logs on flush tables
Fix for AVG() in HAVING.
BUILD/SETUP.sh:
Compile MySQL with -O0 to make debugging easier.
Docs/manual.texi:
Changelog
configure.in:
Version change
innobase/buf/buf0lru.c:
Fix for windows
mysql-test/r/func_time.result:
Updated tests
mysql-test/r/having.result:
Updated tests
mysql-test/t/func_time.test:
Updated tests
mysql-test/t/having.test:
Updated tests
mysys/mf_casecnv.c:
Portability fix
mysys/mf_qsort.c:
Portability fix
mysys/my_compress.c:
Portability fix
mysys/my_tempnam.c:
More comments
sql/field.cc:
Fix for consistent 0000-00-00 date handling
sql/item.h:
Fix for AVG() in HAVING
sql/log.cc:
Close + open update logs on flush tables
sql/sql_select.cc:
More debugging info
sql/time.cc:
Fix for consistent 0000-00-00 date handling
strings/ctype.c:
Portability fix
strings/strto.c:
Portability fix
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
Fix for using quoted table names with the SJIS character set.
BUILD/FINISH.sh:
Fix for gcc 3.0
BUILD/SETUP.sh:
Fix for gcc 3.0
Docs/manual.texi:
Changelog
innobase/include/univ.i:
Fix for gcc 3.0
sql/sql_lex.cc:
Fix for using quoted table names with the SJIS character set.
Extended MODIFY and CHANGE in ALTER TABLE to accept the AFTER keyword.
Extended MyISAM to handle records > 16M.
Docs/manual.texi:
Updated state of different modules.
Rewrote description of 'perror' and 'Packet too large'.
myisam/mi_dynrec.c:
Extended MyISAM to handle records > 16M
myisam/mi_open.c:
Fix error message when opening a not-MyISAM file.
myisam/myisamdef.h:
Extended MyISAM to handle records > 16M
mysql-test/r/alter_table.result:
Added test for CHANGE col ... AFTER
mysql-test/t/alter_table.test:
Added test for CHANGE col ... AFTER
sql/sql_table.cc:
Extended MODIFY and CHANGE in ALTER TABLE to accept the AFTER keyword.
sql/sql_yacc.yy:
Extended MODIFY and CHANGE in ALTER TABLE to accept the AFTER keyword.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
mysql-test/r/union.result:
New results for optional UNION syntax
mysql-test/t/union.test:
New test for alternate syntax for UNION
sql/sql_delete.cc:
Fixed bug in multi-table delete's with transactional tables
sql/sql_parse.cc:
A small change to enable new UNION syntax
sql/sql_union.cc:
New alternate UNION syntax
sql/sql_yacc.yy:
New alternate UNION syntax
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
