summaryrefslogtreecommitdiff
path: root/BitKeeper
Commit message (Collapse)AuthorAgeFilesLines
* Merge with 4.0 for 4.1 releaseunknown2004-10-061-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Noteworthy: - New HANDLER code - New multi-update-grant-check code - Table lock code in ha_innodb.cc was not applied BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e: Auto merged Build-tools/mysql-copyright-2: Auto merged acinclude.m4: Auto merged client/mysqladmin.c: Auto merged client/mysqldump.c: Auto merged include/config-win.h: Auto merged include/my_global.h: Auto merged include/myisam.h: Auto merged innobase/btr/btr0btr.c: Auto merged innobase/buf/buf0buf.c: Auto merged ltmain.sh: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/fsp/fsp0fsp.c: Auto merged innobase/include/dict0dict.h: Auto merged innobase/include/row0mysql.h: Auto merged innobase/log/log0log.c: Auto merged innobase/log/log0recv.c: Auto merged innobase/pars/pars0opt.c: Auto merged innobase/row/row0row.c: Auto merged innobase/sync/sync0arr.c: Auto merged innobase/ut/ut0dbg.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_close.c: Auto merged myisam/mi_create.c: Auto merged myisam/mi_locking.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/r/delete.result: Auto merged mysql-test/r/func_if.result: Auto merged Build-tools/mysql-copyright: Merge with 4.0 (too most of the code from 4.0) Makefile.am: merge client/mysql.cc: Used 4.1 code configure.in: merge innobase/os/os0file.c: merge innobase/row/row0mysql.c: merge mysql-test/r/ctype_latin1_de.result: merge mysql-test/r/flush_table.result: merge mysql-test/r/func_str.result: merge mysql-test/r/handler.result: merge mysql-test/r/multi_update.result: merge mysql-test/r/type_timestamp.result: Removed testing of 'new' mode, as this is only relevant for 4.0 mysql-test/r/update.result: merge mysql-test/t/delete.test: merge mysql-test/t/flush_table.test: merge mysql-test/t/func_str.test: merge mysql-test/t/handler.test: merge mysql-test/t/multi_update.test: merge mysql-test/t/type_timestamp.test: Removed testing of 'new' mode, as this is only relevant for 4.0 mysql-test/t/update.test: merge mysys/errors.c: merge mysys/my_fstream.c: merge mysys/my_pread.c: merge mysys/my_write.c: merge mysys/mysys_priv.h: merge scripts/mysqlhotcopy.sh: merge sql/field.cc: Keep code from 4.1 sql/field.h: Keep code from 4.1 sql/ha_innodb.cc: Don't merge lock code from 4.0; Heikki will look at this sql/ha_myisam.cc: merge sql/handler.cc: merge sql/item_cmpfunc.cc: merge sql/item_cmpfunc.h: merge sql/item_strfunc.cc: merge sql/mysql_priv.h: merge sql/mysqld.cc: merge sql/protocol.cc: merge sql/records.cc: merge sql/repl_failsafe.cc: merge mysql-test/r/lock_multi.result: merge mysql-test/t/ctype_latin1_de.test: merge mysql-test/t/func_if.test: merge mysql-test/t/lock_multi.test: merge sql/repl_failsafe.h: merge Remove unnessessary header protection sql/slave.h: merge sql/sql_acl.cc: merge sql/sql_base.cc: merge sql/sql_cache.cc: auto merge sql/sql_class.cc: merge sql/sql_class.h: merge sql/sql_delete.cc: merge sql/sql_handler.cc: Get new HANDLER code into 4.1 sql/sql_parse.cc: Keep old file sql/sql_repl.cc: merge sql/sql_repl.h: merge sql/sql_show.cc: merge sql/sql_table.cc: merge sql/sql_union.cc: Applied the examine_rows bug fix from 4.0 by hand sql/sql_update.cc: New multi-update-grant-check code from 4.0 sql/sql_yacc.yy: New multi-update-grant-check code from 4.0 sql/stacktrace.c: merge sql/table.h: merge
| * make --with-openssl work with parameters as expected,unknown2004-09-261-0/+1
| | | | | | | | | | | | | | | | | | | | old options for include path and library settings still work for backwards compatibility (fix for BUG #5494) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * Bug#5553 - Multi table UPDATE IGNORE fails on dup keyunknown2004-09-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want the update to abort when IGNORE is specified mysql-test/r/update.result: Bug#5553 - UPDATE IGNORE fails on dup key New test mysql-test/t/update.test: Bug#5553 - UPDATE IGNORE fails on dup key New test BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * configure.in:unknown2004-09-101-0/+1
| | | | | | | | | | | | | | | | | | | | Updated to 4.0.22 configure.in: Updated to 4.0.22 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * Updating the headers on a few files to include GPL header.unknown2004-09-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/repl_failsafe.cc: Removed reference to old maintainer. sql/repl_failsafe.h: Added license header. sql/slave.h: Added license header. sql/sql_repl.cc: Removed old maintainer. sql/sql_repl.h: Added license header BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * win1251.conf:unknown2004-08-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Wrong UPPER/LOWER translation for Cyrillic letter tse was fixed. bug#5110 sql/share/charsets/win1251.conf: Wrong UPPER/LOWER translation for Cyrillic letter tse was fixed. bug#5110 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Mergeunknown2004-10-031-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union sql/ha_ndbcluster.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged mysql-test/mysql-test-run.sh: SCCS merged sql/ha_ndbcluster.cc: SCCS merged
| * \ Mergeunknown2004-09-261-0/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union mysql-test/mysql-test-run.sh: Auto merged ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged ndb/src/ndbapi/ndb_cluster_connection.cpp: Auto merged sql/sql_show.cc: Auto merged sql/ha_ndbcluster.cc: SCCS merged
| * | | WL#1424 Updated after reviewunknown2004-09-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Changed the implementation of ndbcluster_find_files to be more efficient, using only one mutex lock * Moved ha_find_files to end of mysql_find_files so that it can be passed the list that we are interested to find. mysql-test/t/ndb_autodiscover.test: Added a new test case, disabled for now, waiting for mysql-test-run to set a NDB_CONNECTSTRING sql/ha_ndbcluster.cc: Rewrite of ndbcluster_find_files to remove and delete files using only one mutex lock. This version only discover files that fulfill wildcard. sql/ha_ndbcluster.h: Add list of files as parameter sql/handler.cc: Add list of files as parameter sql/handler.h: Add list of files as parameter sql/sql_show.cc: Moving the ha_find_files to end of function, so that the file lista can be passsed to it. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | logging_ok:unknown2004-10-011-0/+1
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logging to logging@openlogging.org accepted sql_acl.cc, grant.test, grant.result: BUG 5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass. mysql-test/r/grant.result: BUG 5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass. mysql-test/t/grant.test: BUG 5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass. sql/sql_acl.cc: BUG 5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-09-241-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged
| * | | logging_ok:unknown2004-09-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logging to logging@openlogging.org accepted sql_show.cc, type_enum.test, type_enum.result: Bug #5628 German characters in field-defs will be '?' with some table definitions mysql-test/r/type_enum.result: Bug #5628 German characters in field-defs will be '?' with some table definitions mysql-test/t/type_enum.test: Bug #5628 German characters in field-defs will be '?' with some table definitions sql/sql_show.cc: Bug #5628 German characters in field-defs will be '?' with some table definitions BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Mergeunknown2004-09-211-0/+1
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | | | | BitKeeper/etc/logging_ok: auto-union sql/ha_ndbcluster.cc: SCCS merged
| * | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-09-211-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into private-client-ip-101.oz.net:/Users/brian/mysql/mysql-4.1 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbunknown2004-09-201-0/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1-ndb BitKeeper/etc/logging_ok: auto-union
| * | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbunknown2004-09-161-0/+3
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mc04.(none):/space/mysql/mysql-4.1-ndb acinclude.m4: Auto merged configure.in: Auto merged ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged sql/Makefile.am: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | logging_ok:unknown2004-09-151-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logging to logging@openlogging.org accepted SCI_Transporter.hpp, SCI_Transporter.cpp: Major fix-up of SCI Transporter, fixed so that it works with single card, fixed wrap around, added lots of DBUG statements, merged with new transporter handling TransporterRegistry.cpp: Some fixes for wrap around needed plus DBUG handling TCP_Transporter.hpp, TCP_Transporter.cpp: Added DBUG statements SHM_Transporter.hpp, SHM_Transporter.cpp: Fixed SHM Transporter SHM_Buffer.hpp: Fixed SHM Buffer to handle wrap around properly IPCConfig.cpp: Fixed up config of SCI SocketServer.cpp: Added DBUG support for SocketServer threads ConfigInfo.cpp: Config changes for SCI TransporterDefinitions.hpp, mgmapi_config_parameters.h: SCI fixes Makefile.am, type_ndbapitools.mk.am, type_ndbapitest.mk.am: Added SCI library path to Makefiles configure.in: Fixed small bug with shared mem and sci together in configure acinclude.m4: Added possibility of providing SCI library path in confgure acinclude.m4: Added possibility of providing SCI library path in confgure configure.in: Fixed small bug with shared mem and sci together in configure ndb/config/type_ndbapitest.mk.am: Added SCI library path to Makefiles ndb/config/type_ndbapitools.mk.am: Added SCI library path to Makefiles ndb/src/cw/cpcd/Makefile.am: Added SCI library path to Makefiles ndb/src/kernel/Makefile.am: Added SCI library path to Makefiles ndb/src/kernel/blocks/backup/restore/Makefile.am: Added SCI library path to Makefiles ndb/src/mgmsrv/Makefile.am: Added SCI library path to Makefiles sql/Makefile.am: Added SCI library path to Makefiles ndb/src/common/transporter/Makefile.am: Added SCI library path to Makefiles ndb/include/mgmapi/mgmapi_config_parameters.h: SCI fixes ndb/include/transporter/TransporterDefinitions.hpp: SCI fixes ndb/src/mgmsrv/ConfigInfo.cpp: Config changes for SCI ndb/src/common/util/SocketServer.cpp: Added DBUG support for SocketServer threads ndb/src/common/mgmcommon/IPCConfig.cpp: Fixed up config of SCI ndb/src/common/transporter/SHM_Buffer.hpp: Fixed SHM Buffer to handle wrap around properly ndb/src/common/transporter/SHM_Transporter.cpp: Fixed SHM Transporter ndb/src/common/transporter/SHM_Transporter.hpp: Fixed SHM Transporter ndb/src/common/transporter/TCP_Transporter.cpp: Added DBUG statements ndb/src/common/transporter/TCP_Transporter.hpp: Added DBUG statements ndb/src/common/transporter/TransporterRegistry.cpp: Some fixes for wrap around needed plus DBUG handling ndb/src/common/transporter/SCI_Transporter.cpp: Major fix-up of SCI Transporter, fixed so that it works with single card, fixed wrap around, added lots of DBUG statements, merged with new transporter handling ndb/src/common/transporter/SCI_Transporter.hpp: Major fix-up of SCI Transporter, fixed so that it works with single card, fixed wrap around, added lots of DBUG statements, merged with new transporter handling BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | These modifications were part of WL#1856 Conversion of client_test.c tests ↵unknown2004-09-201-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cases to mysqltest if possible They are separated from the other WL#1856 stuff, because they improve the behaviour of the current tests. Make the result sets (order of rows) more predictable by using ORDER BY. mysql-test/include/ps_modify.inc: Make the result sets more predictable by using ORDER BY mysql-test/include/ps_modify1.inc: Make the result sets more predictable by using ORDER BY mysql-test/r/ps_2myisam.result: updated results mysql-test/r/ps_3innodb.result: updated results mysql-test/r/ps_4heap.result: updated results mysql-test/r/ps_5merge.result: updated results mysql-test/r/ps_6bdb.result: updated results BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Merge mysql.com:/home/jonas/src/mysql-4.1unknown2004-08-271-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1-ndb BitKeeper/etc/logging_ok: auto-union ndb/include/ndb_global.h: Auto merged ndb/src/common/mgmcommon/NdbConfig.c: Auto merged
| * \ mergedunknown2004-08-261-0/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union VC++Files/sql/mysqld.dsp: Auto merged client/mysql.cc: Auto merged client/mysqladmin.c: Auto merged BitKeeper/deleted/.del-mysql_install.c~8c089740d79a92: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged client/mysqlmanager-pwgen.c: Auto merged client/mysqlshow.c: Auto merged client/mysqltest.c: Auto merged extra/my_print_defaults.c: Auto merged extra/perror.c: Auto merged extra/resolve_stack_dump.c: Auto merged extra/resolveip.c: Auto merged include/my_getopt.h: Auto merged innobase/buf/buf0rea.c: Auto merged isam/isamchk.c: Auto merged isam/pack_isam.c: Auto merged libmysqld/Makefile.am: Auto merged myisam/mi_test1.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged sql/gen_lex_hash.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged tools/mysqlmanager.c: Auto merged
| | * Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-08-261-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into build.mysql.com:/users/rburnett/mysql-4.0 BitKeeper/etc/logging_ok: auto-union sql/mysql_priv.h: Auto merged
| | | * Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-08-251-0/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into build.mysql.com:/users/rburnett/mysql-4.0 BitKeeper/etc/logging_ok: auto-union client/mysql.cc: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged
| | | | * mysql_priv.h:unknown2004-08-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added declarations for print_msg_to_log and vprint_msg_to_log. sql_print_error are simple functions that wrap calls to print_msg_to_log. Define the different error types with MY_ERROR_TYPE, MY_WARNING_TYPE, and MY_INFORMATION_TYPE gen_lex_hash.cc: Added NULL error reporting parameter to handle_options log.cc: Add print_msg_to_log, print_buffer_to_log, and vprint_msg_to_log. Print_msg_to_log will write the message to the windows event log if on NT. We now have error, warning, and information versions of sql_print_xxxx. T his is a variation of a similar changeset WAX did. mysqld.cc: Added option_error_reporter callback function and pass that into handle_options mysql.cc: Added NULL as error reporter arg to the end of handle_options Many files: Added NULL error reporter parameter as the last paramter to handle_options my_getopt.c: Added second function pointer to server as an error reporting callback. Added local function report_option_error that will either write the error to stderr or to the error reporting callback. changed all calls in handle_options from fprintf(stderr, ... ) to report_option_error my_getopt.h: Changed declaration of handle_options to use typedefs for the two function pointers. added second function pointer to server as an error reporting callback mysqld.dsp: Added custom build step for compiling message file and added message resource file (output of mc) VC++Files/sql/mysqld.dsp: Added custom build step for compiling message file and added message resource file (output of mc) client/mysqladmin.c: Added NULL error reporter parameter as the last paramter to handle_options client/mysqlcheck.c: Added NULL error reporter parameter as the last paramter to handle_options client/mysqldump.c: Added NULL error reporter parameter as the last paramter to handle_options client/mysqlimport.c: Added NULL error reporter parameter as the last paramter to handle_options client/mysqlmanager-pwgen.c: Added NULL error reporter parameter as the last paramter to handle_options client/mysqlmanagerc.c: Added NULL error reporter parameter as the last paramter to handle_options client/mysqlbinlog.cc: Added NULL error reporter parameter as the last paramter to handle_options client/mysqlshow.c: Added NULL error reporter parameter as the last paramter to handle_options client/mysqltest.c: Added NULL error reporter parameter as the last paramter to handle_options extra/my_print_defaults.c: Added NULL error reporter parameter as the last paramter to handle_options extra/mysql_install.c: Added NULL error reporter parameter as the last paramter to handle_options extra/mysql_waitpid.c: Added NULL error reporter parameter as the last paramter to handle_options extra/perror.c: Added NULL error reporter parameter as the last paramter to handle_options extra/resolve_stack_dump.c: Added NULL error reporter parameter as the last paramter to handle_options extra/resolveip.c: Added NULL error reporter parameter as the last paramter to handle_options isam/isamchk.c: Added NULL error reporter parameter as the last paramter to handle_options isam/pack_isam.c: Added NULL error reporter parameter as the last paramter to handle_options myisam/mi_test1.c: Added NULL error reporter parameter as the last paramter to handle_options myisam/myisam_ftdump.c: Added NULL error reporter parameter as the last paramter to handle_options myisam/myisamchk.c: Added NULL error reporter parameter as the last paramter to handle_options myisam/myisampack.c: Added NULL error reporter parameter as the last paramter to handle_options include/my_getopt.h: Changed declaration of handle_options to use typedefs for the two function pointers. added second function pointer to server as an error reporting callback mysys/my_getopt.c: Added second function pointer to server as an error reporting callback. Added local function report_option_error that will either write the error to stderr or to the error reporting callback. changed all calls in handle_options from fprintf(stderr, ... ) to report_option_error tools/mysqlmanager.c: Added NULL error reporter parameter as the last paramter to handle_options client/mysql.cc: Added NULL as error reporter arg to the end of handle_options sql/mysqld.cc: Added option_error_reporter callback function and pass that into handle_options sql/log.cc: Add print_msg_to_log, print_buffer_to_log, and vprint_msg_to_log. Print_msg_to_log will write the message to the windows event log if on NT. We now have error, warning, and information versions of sql_print_xxxx. T his is a variation of a similar changeset WAX did. sql/gen_lex_hash.cc: Added NULL error reporting parameter to handle_options sql/mysql_priv.h: Added declarations for print_msg_to_log and vprint_msg_to_log. sql_print_error are simple functions that wrap calls to print_msg_to_log. Define the different error types with MY_ERROR_TYPE, MY_WARNING_TYPE, and MY_INFORMATION_TYPE BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | | All 'Makefile's must use '$(AR)' (not just 'ar') because the variable may ↵unknown2004-08-241-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contain options. libmysqld/Makefile.am: Always use 'make' variable '$(AR)' so that options (AIX 64 bit!) are included. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | Fix warning VC++ and fix applied fisrt to source 4.1unknown2004-08-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysys/my_lib.c: Same fix for bug #4737 that wrongly I did first on tree 4.1 mysys/my_vsnprintf.c: Fix VC++ warning assuming that my_vsnprintf() is external BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-08-111-0/+1
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug4411 BitKeeper/etc/logging_ok: auto-union
| | | * Bug#4411unknown2004-08-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for server hang bug mysql-test/r/heap.result: Bug#4411 Test for server hang bug mysql-test/t/heap.test: Bug#4411 Test for server hang bug sql/opt_sum.cc: Bug#4411 Allow code to exit the loop. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | Fix for bug #4491 "timestamp(19) doesn't work".unknown2004-08-061-0/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should allow 19 as length of newly created TIMESTAMP fields. mysql-test/r/type_timestamp.result: Added test of TIMESTAMP(19) support. mysql-test/t/type_timestamp.test: Added test of TIMESTAMP(19) support. sql/sql_parse.cc: add_field_to_list(): TIMESTAMP columns should also support 19 as length since it is length of 4.1 compatible representation. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Merge build.mysql.com:/home/bk/mysql-4.1-ndbunknown2004-08-211-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into build.mysql.com:/users/mronstrom/wl2056 ndb/src/common/mgmcommon/ConfigInfo.cpp: Auto merged ndb/src/common/mgmcommon/LocalConfig.cpp: Auto merged ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp: Auto merged ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp: Auto merged ndb/src/kernel/vm/Configuration.cpp: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | This fixes a Windows build failure. How did this build on Linux?unknown2004-08-191-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | logging_ok: Logging to logging@openlogging.org accepted mysql_priv.h, my_time.h: Moved declaration of days_in_month array from mysql_priv.h to my_time.h to correct Windows build issues include/my_time.h: Moved declaration of days_in_month array from mysql_priv.h to my_time.h to correct Windows build issues sql/mysql_priv.h: Moved declaration of days_in_month array from mysql_priv.h to my_time.h to correct Windows build issues BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Removed non-used variableunknown2004-08-171-0/+1
| | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Mergeunknown2004-08-051-0/+2
|\ \ | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union configure.in: SCCS merged
| * \ Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-08-051-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/mikron/mysql-4.1 BitKeeper/etc/logging_ok: auto-union
| | * | mysqld.cc, mysql_test_run.c:unknown2004-08-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed URL in error message, page has moved netware/mysql_test_run.c: Changed URL in error message, page has moved sql/mysqld.cc: Changed URL in error message, page has moved BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | Remove unused config parametersunknown2004-08-051-0/+1
| |/ / | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Merge joreland@bk-internal.mysql.com:irixunknown2004-08-051-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eel.hemma.oreland.se:/ndb/clone-mysql-4.1-ndb-daily-2004-08-04 BitKeeper/etc/logging_ok: auto-union ndb/src/common/debugger/signaldata/SignalDataPrint.cpp: Auto merged ndb/src/cw/cpcd/Process.cpp: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged ndb/src/kernel/blocks/dbtux/Dbtux.hpp: Auto merged ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp: Auto merged ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp: Auto merged ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged ndb/test/ndbapi/testBasic.cpp: Auto merged ndb/test/run-test/main.cpp: Auto merged ndb/test/src/HugoTransactions.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged
| * \ \ Merge 4.1 with jonas irix cloneunknown2004-08-031-0/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union ndb/include/kernel/NodeState.hpp: Auto merged ndb/include/ndbapi/NdbDictionary.hpp: Auto merged ndb/include/util/Bitmask.hpp: Auto merged ndb/src/common/debugger/EventLogger.cpp: Auto merged ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged ndb/src/common/util/SocketServer.cpp: Auto merged ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihInit.cpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged ndb/src/kernel/main.cpp: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged ndb/src/kernel/error/ErrorReporter.hpp: Auto merged ndb/src/mgmapi/mgmapi.cpp: Auto merged ndb/src/mgmclient/CpcClient.cpp: Auto merged ndb/src/mgmsrv/Services.cpp: Auto merged ndb/src/ndbapi/Ndb.cpp: Auto merged ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged ndb/src/ndbapi/NdbEventOperationImpl.cpp: Auto merged ndb/src/ndbapi/Ndbinit.cpp: Auto merged ndb/test/include/NDBT_Table.hpp: Auto merged ndb/test/include/NDBT_Test.hpp: Auto merged ndb/test/run-test/main.cpp: Auto merged ndb/test/src/HugoOperations.cpp: Auto merged ndb/test/src/HugoTransactions.cpp: Auto merged ndb/test/src/NDBT_Tables.cpp: Auto merged ndb/test/src/NDBT_Test.cpp: Auto merged ndb/test/src/NdbRestarter.cpp: Auto merged ndb/tools/waiter.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged
| | * | Irix64 mipspro ndb compile fixesunknown2004-07-091-0/+1
| | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-08-041-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | into eel.hemma.oreland.se:/ndb/clone-mysql-4.1-ndb-daily-2004-08-04 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Added innodb_locks_unsafe_for_binlog option. This option turns off Innodb unknown2004-07-201-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | next-key locking. Using this option the locks InnoDB sets on index records do not affect the ``gap'' before that index record. Thus, this option allows phantom problem. innobase/include/srv0srv.h: Added srv_locks_unsafe_for_binlog for innodb_locks_unsafe_for_binlog option. innobase/row/row0sel.c: If innodb_locks_unsafe_for_binlog option is used, we lock only the record, i.e. next-key locking is not used. Therefore, setting lock to the index record do not affect the ``gap'' before that index record. Thus, this option allows phantom problem, because concurrent insert operations are allowed inside the select range. innobase/srv/srv0srv.c: Added srv_locks_unsafe_for_binlog for innodb_locks_unsafe_for_binlog option. sql/ha_innodb.cc: Added innobase_locks_unsafe_for_binlog and srv_locks_unsafe_for_binlog for innodb_locks_unsafe_for_binlog option. sql/ha_innodb.h: Added innobase_locks_unsafe_for_binlog for innodb_locks_unsafe_for_binlog option. sql/mysqld.cc: Added OPT_INNODB_LOCKS_UNSAFE_FOR_BINLOG, innobase_locks_unsafe_for_binlog for innodb_locks_unsafe_for_binlog option. sql/set_var.cc: Added innodb_locks_unsafe_for_binlog and innobase_locks_unsafe_for_binlog for innodb_locks_unsafe_for_binlog option. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Bug#4407 - assertion in ha_myisam.ccunknown2004-07-061-0/+1
| | | | | | | | | | | | | | | | | | Fix assertion failure where ha_myisam::index_next() is called without first calling ha_myisam::ha_index_init() BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | BUG#4384unknown2004-07-051-0/+1
| | | | | | | | | | | | | | | | | | ndb/src/common/util/ConfigValues.cpp: BUG#4384 Compute pointers manually instead of using ptr[-x] Changed return type from "*&" to "**" BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | WL#1564 Intensive test of prepared statements via 'mysqltest'unknown2004-07-011-0/+1
| | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Merge with 4.0 to get the latest bug patches to 4.1unknown2004-06-251-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: added sql/mysql_tzinfo_to_sql BitKeeper/etc/logging_ok: auto-union acinclude.m4: Auto merged extra/perror.c: Auto merged include/mysql.h: Auto merged innobase/include/mach0data.ic: Auto merged innobase/include/mtr0log.h: Auto merged innobase/include/mtr0log.ic: Auto merged innobase/mem/mem0dbg.c: Auto merged innobase/pars/lexyy.c: Auto merged BitKeeper/deleted/.del-4.0.XX-gpl.ipr~f5909a9e9bd8094: Auto merged BitKeeper/deleted/.del-Clients and Tools.fgl~bf0f776883577f02: Auto merged BitKeeper/deleted/.del-Development.fgl~6392ce285e73f5fc: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/innodb_cache.result: Auto merged mysql-test/r/lowercase_table2.result: Auto merged mysql-test/t/innodb_cache.test: Auto merged mysql-test/t/lowercase_table2.test: Auto merged sql/ha_berkeley.cc: Auto merged sql/handler.cc: Auto merged scripts/make_win_src_distribution.sh: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged libmysql/libmysql.c: Merge with 4.0 mysql-test/r/bdb.result: Merge with 4.0 mysql-test/r/range.result: Merge with 4.0 mysql-test/t/bdb.test: Merge with 4.0 mysys/hash.c: Merge with 4.0 scripts/mysql_install_db.sh: Merge with 4.0 sql/field.cc: Merge with 4.0 sql/field.h: Merge with 4.0 sql/mysql_priv.h: Merge with 4.0 sql/sql_handler.cc: Merge with 4.0 sql/sql_select.cc: Merge with 4.0 sql/sql_table.cc: Merge with 4.0
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-06-181-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | into here.mwagner.org:/Volumes/BK/mysql-4.0-work BitKeeper/etc/logging_ok: auto-union
| | * my_md5sum:unknown2004-06-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | new file, simulates 'md5sum' as a perl script BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | Fix for bug #4182unknown2004-06-181-0/+1
| |/ | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * see notes for Do-compileunknown2004-05-241-0/+1
| | | | | | | | | | | | | | | | | | Build-tools/Do-compile: Added two options that: 1. Clear logs on each host prior to build 2. Turn off ndbcluster BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * Merge mysql.com:/home/mydev/mysql-4.0unknown2004-05-071-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.0-bug2831 BitKeeper/etc/logging_ok: auto-union
| | * Fix a forgotten skip of space at line begin for the 'system' command.unknown2004-05-061-0/+1
| | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
View Lorry Controller Status