summaryrefslogtreecommitdiff
path: root/BitKeeper
Commit message (Collapse)AuthorAgeFilesLines
* mysql-copyright:unknown2004-06-231-0/+1
| | | | | | | | | | Cleaned-up trim_the_fat() Build-tools/mysql-copyright: Cleaned-up trim_the_fat() BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* ndb file missing in src distunknown2004-06-211-0/+1
| | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* Randomise time-out to avoid aborting both transactions in deadlockunknown2004-06-101-0/+1
| | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* charset.c:unknown2004-06-091-0/+1
| | | | | | | | | | | | Fix to be ANSI C complient , mysys/charset.c: Fix to be ANSI C complient , BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* Added function innobase_store_binlog_offset_and_flush_log requested by Guilhem unknown2004-06-081-0/+1
| | | | | | | | | | | | | | | | | | to ha_innodb.cc and ha_innodb.h sql/ha_innodb.cc: /*********************************************************************** This function stores binlog offset and flushes logs */ void innobase_store_binlog_offset_and_flush_log( /*=============================*/ char *binlog_name, /* in: binlog name */ longlong offset /* in: binlog offset */ ); BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-06-051-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1 BitKeeper/etc/logging_ok: auto-union acconfig.h: Auto merged acinclude.m4: Auto merged configure.in: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged
| * Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-251-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1 BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged sql/Makefile.am: Auto merged sql/handler.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged
| | * Resolving merge issues between archive and most recent changes by Monty/NDBunknown2004-05-211-0/+1
| | |\ | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union
| | | * First commit of archive example. Archive is a simple storage engine that ↵unknown2004-05-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handles inserts and selects. acconfig.h: Adding undef piece for HAVE_ARCHIVE_DB acinclude.m4: Code needed for --with-archive-storage-engine flag for compile. configure.in: Adding tag for Archive sql/Makefile.am: Source updates to compile ha_archive sql/examples/ha_archive.cc: Class file for archive storage engine. First version. sql/handler.cc: Updates needed for adding archive storage engine. sql/handler.h: ENUM for archive storage engine. sql/mysql_priv.h: Archive show options sql/mysqld.cc: Ifdef foor HAVE_ARCHIVE_DB sql/examples/ha_archive.h: Include file for archive storage engine addition. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | extern"C" bugunknown2004-06-031-0/+1
| | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | various ndb make changes, see respective fileunknown2004-06-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-Makefile.am~d4e228ebd21fc066: Delete: ndb/include/Makefile.am acinclude.m4: static linking of ndbclient into mysqld configure.in: removed ndb/include/Makefile.am + fixed conditional compile of ndb shm, sci ndb/Makefile.am: dist-hook for make distdir in ndb ndb/config/type_ndbapitest.mk.am: use of libndbclient.so in testprograms ndb/config/type_ndbapitools.mk.am: static linking to binary distributed ndb tools ndb/src/Makefile.am: enable libndbclient.so ndb/src/common/transporter/Makefile.am: added support for optional inclusion of shared mem and sci in ndb transporter ndb/tools/Makefile.am: new type for tools which should be statically linked with libndbclient BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Added missing ;unknown2004-05-281-0/+1
| | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | added shared mem + sci options for ndbunknown2004-05-281-0/+1
| | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-251-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | into mc05.(none):/space2/tomas/mysql-4.1-ndb-test BitKeeper/etc/logging_ok: auto-union
| * | | Mergeunknown2004-05-241-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union Build-tools/Do-compile: SCCS merged
| | * | | logging_ok:unknown2004-05-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logging to logging@openlogging.org accepted Do-compile: 1. Option to ensure that logs are moved and then backed up on each host prior to a build 2. Option to run build with flag "--without-ndbcluster" Build-tools/Do-compile: 1. Option to ensure that logs are moved and then backed up on each host prior to a build 2. Option to run build with flag "--without-ndbcluster" BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | | fix for macosx where SIGRTMIN is missingunknown2004-05-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-211-0/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.(none):/home/tomas/mysql-4.1-ndb ndb/src/kernel/ndb-main/Main.cpp: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | | Fix for BUG#3839 , too many signal handlers installedunknown2004-05-201-0/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | ndb/src/kernel/ndb-main/Main.cpp: Only install signalhandlers up to SIGRTMIN BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Merge mysql.com:/home/bk/mysql-4.1-ndbunknown2004-05-191-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysqldev/tulin/mysql-4.1-ndb BitKeeper/etc/logging_ok: auto-union ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged
| * | | | Forte compile fixesunknown2004-05-191-0/+1
| |/ / / | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbunknown2004-05-181-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/mikron/patch_cluster BitKeeper/etc/logging_ok: auto-union
| * | | | fix ndb odbc compileunknown2004-05-181-0/+1
| |/ / / | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Snippet from the Internet:unknown2004-05-131-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Common Symbols If you get errors in linking complaining about common symbols ld: common symbols not allowed with MH_DYLIB format Then it means that you've got a global variable in the library which has not been assigned a value. Got this problem with three globals in NdbDaemon.c BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbunknown2004-05-111-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ndbmaster.mysql.com:/ndb/clone-4.1-ndb-daily BitKeeper/etc/logging_ok: auto-union
| * | | Inverted #ifdef on HAVE_MLOCKALLunknown2004-05-111-0/+1
| | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-111-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | into mc05.(none):/space2/tomas/mysql-4.1 BitKeeper/etc/logging_ok: auto-union
| * | | logging_ok:unknown2004-05-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logging to logging@openlogging.org accepted item_cmpfunc.cc, ctype_recoding.test, ctype_recoding.result: Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec() (but #3704) mysql-test/r/ctype_recoding.result: Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec() mysql-test/t/ctype_recoding.test: Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec() sql/item_cmpfunc.cc: Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec() BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | merge resolveunknown2004-05-101-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extra/perror.c: Auto merged ndb/include/debugger/SignalLoggerManager.hpp: Auto merged ndb/include/ndb_version.h: Auto merged ndb/src/common/portlib/unix/NdbMem.c: Auto merged ndb/src/common/portlib/unix/NdbThread.c: Auto merged ndb/src/common/util/Parser.cpp: Auto merged ndb/src/common/util/getarg.c: Auto merged ndb/src/common/util/version.c: Auto merged ndb/src/kernel/blocks/backup/restore/Restore.cpp: Auto merged ndb/src/kernel/blocks/dbutil/DbUtil.cpp: Auto merged ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp: Auto merged ndb/src/kernel/ndb-main/Main.cpp: Auto merged ndb/src/mgmapi/test/keso.c: Auto merged ndb/src/mgmclient/test_cpcd/test_cpcd.cpp: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Added additional parameter userdata for mysql_set_local_infile_handlerunknown2004-05-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to allow binding of userland functions in PHP. include/mysql.h: added new last parameter (void *) for mysql_set_local_infile_handler st_mysql_options: added void *local_infile_userdata added last parameter (void *) for local_infile_init function pointer libmysql/libmysql.c: added parameter userdata in mysql_set_local_infile_handler added parameter (void *userdata __attribute__ ((unused))) in mysql_local_infile_init passed additional parameter userdata to init function in handle_local_infile BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Merge with 4.0.19unknown2004-05-051-0/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union VC++Files/client/mysqlclient.dsp: Auto merged VC++Files/mysql.dsw: Auto merged extra/perror.c: Auto merged extra/replace.c: Auto merged innobase/configure.in: Auto merged innobase/include/lock0lock.h: Auto merged innobase/include/row0mysql.h: Auto merged innobase/include/sync0sync.h: Auto merged innobase/lock/lock0lock.c: Auto merged ltmain.sh: Auto merged BitKeeper/deleted/.del-libmysqld.def~8edf7b8780ce943c: Auto merged innobase/os/os0file.c: Auto merged innobase/pars/lexyy.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/sync/sync0arr.c: Auto merged innobase/sync/sync0sync.c: Auto merged innobase/trx/trx0trx.c: Auto merged mysql-test/r/alias.result: Auto merged mysql-test/t/system_mysql_db_fix-master.opt: Auto merged mysql-test/r/func_time.result: Automatic merge mysql-test/r/innodb.result: Automatic merge mysql-test/t/alias.test: Automatic merge mysql-test/t/create.test: Automatic merge mysql-test/t/func_time.test: Automatic merge sql/ha_innodb.cc: Automatic merge sql/mysql_priv.h: Automatic merge mysql-test/r/rpl_multi_update.result: Automatic merge mysql-test/t/rpl_error_ignored_table.test: Automatic merge mysql-test/t/rpl_multi_update.test: Automatic merge sql/slave.h: Automatic merge sql/sql_base.cc: Automatic merge sql/sql_db.cc: Automatic merge sql/sql_insert.cc: Automatic merge sql/structs.h: Automatic merge sql/table.cc: Automatic merge strings/longlong2str-x86.s: Automatic merge strings/strings-x86.s: Automatic merge support-files/my-medium.cnf.sh: Automatic merge
| * | | my-medium.cnf.sh:unknown2004-04-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct typo, and fix up rest of sentence as well. support-files/my-medium.cnf.sh: Correct typo, and fix up rest of sentence as well. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | Fix for Bug 3481unknown2004-04-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CREATE statement allowed extra unnecessary commas mysql-test/r/alias.result: Extra comma removed in CREATE statement mysql-test/r/create.result: New test for Bug 3481 mysql-test/r/func_str.result: Extra comma removed in CREATE statement mysql-test/r/rpl_multi_update.result: Extra comma removed in CREATE statement mysql-test/t/alias.test: Extra comma removed in CREATE statement mysql-test/t/create.test: New test for bug 3481 mysql-test/t/func_str.test: Extra comma removed in CREATE statement mysql-test/t/rpl_multi_update.test: Extra comma removed in CREATE statement sql/sql_yacc.yy: Fix for bug 3481 No path through the grammar which has no clauses BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | Fix typos that resulted in adding names to the global namespace thatunknown2004-04-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | were never defined. This potentially caused problems when trying to link libmysqld with shared libraries. strings/longlong2str-x86.s: typo: longlong10_str -> longlong10_to_str strings/strings-x86.s: typo: strxmov_end-strxmov -> .strxmov_end-strxmov BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Merge NDB patches into 4.1-clone, below is list of changesetsunknown2004-05-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # -------------------------------------------- # 04/04/13 joreland@mysql.com 1.1858.1.1 # Removal of NDBT_Table # -------------------------------------------- # 04/04/13 joreland@mysql.com 1.1858.1.2 # Removal of NDBT_Table # -------------------------------------------- # 04/04/13 joreland@mysql.com 1.1858.1.3 # Fix for crashing AT # -------------------------------------------- # 04/04/13 joreland@mysql.com 1.1858.1.4 # Bug fixes in testIndex # -------------------------------------------- # 04/04/13 joreland@mysql.com 1.1866.1.5 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mysql.com:/home/jonas/src/tmp # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.1.5 # Fix for takeover when accessing indexes. # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1866.1.6 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mysql.com:/home/jonas/src/tmp # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.2.1 # Fixed error handling of fire_trigger_ord + lqhkeyref w.r.t indexes # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.2.2 # Simple retry mechanism in UTIL # Helps testIndex -n BuildDuring _a lot_ # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.2.3 # Misc fixes to test prg. # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.2.4 # Allow more retires on application errors # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1858.2.5 # Pass no of rows fetched in SUB_SYNC_CONTINUE_REQ # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1869 # wl1714 # Improve parallellism # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1870 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mysql.com:/home/jonas/src/wl1714 # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1866.1.7 # Merge # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1871 # Merge mysql.com:/home/jonas/src/wl1714 # into mysql.com:/home/jonas/src/mysql-4.1-ndb # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1872 # Fix for testScan -n ScanReadError5030 # -------------------------------------------- # 04/04/14 joreland@mysql.com 1.1873 # fix testDict -n FragmentType* # -------------------------------------------- # 04/04/14 johan@stingray.(none) 1.1866.2.1 # small fixes # -------------------------------------------- # 04/04/14 johan@stingray.(none) 1.1874 # Merge jandersson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into stingray.(none):/space/bk/rep/mysql-4.1-ndb # -------------------------------------------- # 04/04/14 johan@stingray.(none) 1.1875 # handle rep node as an api node # -------------------------------------------- # 04/04/14 pekka@mysql.com 1.1873.1.1 # Fix for NDBT_Table removal # -------------------------------------------- # 04/04/15 joreland@mysql.com 1.1873.1.2 # Uninitialized var. # -------------------------------------------- # 04/04/15 johan@stingray.(none) 1.1876 # Merge jandersson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into stingray.(none):/space/bk/rep/mysql-4.1-ndb # -------------------------------------------- # 04/04/15 joreland@mysql.com 1.1873.1.3 # Write pid before changing user # (as runas user probably doesn't have permissions on pid-dir) # -------------------------------------------- # -------------------------------------------- # 04/04/15 ndb@mc03.ndb.mysql.com 1.1862.1.3 # Fix printout of varchars # -------------------------------------------- # 04/04/15 ndb@mc03.ndb.mysql.com 1.1877 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mc03.ndb.mysql.com:/space/ndb/tmp # -------------------------------------------- # 04/04/15 ndb@mc03.ndb.mysql.com 1.1862.1.4 # Hmm.. don't print attr as many times as length of array # -------------------------------------------- # 04/04/15 ndb@mc03.ndb.mysql.com 1.1878 # Merge mc03.ndb.mysql.com:/space/ndb/mysql-4.1-ndb # into mc03.ndb.mysql.com:/space/ndb/tmp # -------------------------------------------- # 04/04/15 joreland@mysql.com 1.1876.1.1 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mysql.com:/home/jonas/src/mysql-4.1-ndb # -------------------------------------------- # 04/04/15 joreland@mysql.com 1.1877.1.1 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mysql.com:/home/jonas/src/mysql-4.1-ndb # -------------------------------------------- # 04/04/15 ndb@mc03.ndb.mysql.com 1.1879 # Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb # into mc03.ndb.mysql.com:/space/ndb/tmp # -------------------------------------------- # 04/04/17 joreland@mysql.com 1.1880 # LCP bug when restarting ops take's longer than DIH sending a new lcp ord # Solution: # Send LCP_FRAG_REP after restarting all ops # -------------------------------------------- # 04/04/18 joreland@mysql.com 1.1881 # Missspelled ERROR_INSERT # -------------------------------------------- # 04/04/18 joreland@mysql.com 1.1882 # Added possibility to log only distributed signals # -------------------------------------------- # 04/04/22 joreland@mysql.com 1.1883 # Removed dependancy to libstdc++ # * pure virtual functions "__cxa_pure_virtual" is defined in libstd++ -> # remove all pure virtual functions # -------------------------------------------- # 04/04/23 joreland@mysql.com 1.1884 # Various minor bug fixes for problems found while compiling # with icc # -------------------------------------------- # -------------------------------------------- # 04/04/25 joreland@mysql.com 1.1885 # Removed debug code (joreland:1.1875) # -------------------------------------------- # 04/04/26 ejonore@mc03.ndb.mysql.com 1.1862.1.5 # Lock pages in memory _after_ daemon-mode (exec/fork) # -------------------------------------------- # 04/04/27 ejonore@mc03.ndb.mysql.com 1.1862.1.6 # 1) Trap abort() # 2) StopStart/StopAborted events # 3) warning if memlock fails # 4) use g_logger more often (instead of ndbout) # # -------------------------------------------- # 04/04/27 joreland@mysql.com 1.1886 # bug fix for a bug in wl1714 + software upgrade # -------------------------------------------- # 04/04/27 joreland@mysql.com 1.1887 # Cset exclude: joreland@mysql.com|ChangeSet|20040422160720|05374 # -------------------------------------------- # 04/04/27 joreland@mysql.com 1.1888 # removed libstc++ second try... # -------------------------------------------- # 04/04/28 ejonore@mc03.ndb.mysql.com 1.1862.1.7 # 1) Don't lock FUTURE pages but only current # 2) Do this when SIZEALT has completed # -------------------------------------------- # 04/04/30 joreland@mysql.com 1.1889 # Merge jonas@orca:/home/ndb/releases/mysql-4.1-ndb-3.4.x # into mysql.com:/home/jonas/src/mysql-4.1-ndb # -------------------------------------------- # 04/05/03 ndb@mc03.ndb.mysql.com 1.1862.1.8 # Version update # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1862.3.1 # Changed restart behavior. # Use "angel" process which monitor "real" process # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1862.1.9 # Merge jonas@orca:/home/ndb/releases/mysql-4.1-ndb-3.4.x # into mysql.com:/home/jonas/src/mysql-4.1-ndb-3.4.x # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1890 # Merge B2 fixes # -------------------------------------------- # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1862.1.10 # Better handling of children terminations # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1862.1.11 # Fixes for angel-restarting # -------------------------------------------- # 04/05/03 joreland@mysql.com 1.1891 # Merge mysql.com:/home/jonas/src/mysql-4.1-ndb-3.4.x # into mysql.com:/home/jonas/src/mysql-4.1-ndb # -------------------------------------------- # ndb/config/Defs.LINUX.x86.GCC.mk: Merge ndb fixes ndb/examples/ndbapi_async_example/Makefile: Merge ndb fixes ndb/examples/ndbapi_async_example/ndbapi_async.cpp: Merge ndb fixes ndb/examples/ndbapi_scan_example/Makefile: Merge ndb fixes ndb/include/debugger/SignalLoggerManager.hpp: Merge ndb fixes ndb/include/kernel/signaldata/ScanFrag.hpp: Merge ndb fixes ndb/include/ndb_version.h: Merge ndb fixes ndb/include/ndbapi/NdbScanOperation.hpp: Merge ndb fixes ndb/include/util/SocketServer.hpp: Merge ndb fixes ndb/src/common/debugger/SignalLoggerManager.cpp: Merge ndb fixes ndb/src/common/logger/ConsoleLogHandler.cpp: Merge ndb fixes ndb/src/common/portlib/unix/NdbMem.c: Merge ndb fixes ndb/src/common/util/Makefile: Merge ndb fixes ndb/src/common/util/version.c: Merge ndb fixes ndb/src/cw/cpcd/Process.cpp: Merge ndb fixes ndb/src/kernel/blocks/ERROR_codes.txt: Merge ndb fixes ndb/src/kernel/blocks/backup/restore/Restore.cpp: Merge ndb fixes ndb/src/kernel/blocks/backup/restore/Restore.hpp: Merge ndb fixes ndb/src/kernel/blocks/backup/restore/main.cpp: Merge ndb fixes ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Merge ndb fixes ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Merge ndb fixes ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Merge ndb fixes ndb/src/kernel/blocks/dblqh/DblqhInit.cpp: Merge ndb fixes ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Merge ndb fixes ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Merge ndb fixes ndb/src/kernel/blocks/dbtc/DbtcInit.cpp: Merge ndb fixes ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Merge ndb fixes ndb/src/kernel/blocks/dbutil/DbUtil.cpp: Merge ndb fixes ndb/src/kernel/blocks/dbutil/DbUtil.hpp: Merge ndb fixes ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Merge ndb fixes ndb/src/kernel/blocks/ndbfs/Filename.cpp: Merge ndb fixes ndb/src/kernel/blocks/suma/Suma.cpp: Merge ndb fixes ndb/src/kernel/error/Error.hpp: Merge ndb fixes ndb/src/kernel/ndb-main/Main.cpp: Merge ndb fixes ndb/src/kernel/vm/Configuration.cpp: Merge ndb fixes ndb/src/kernel/vm/Configuration.hpp: Merge ndb fixes ndb/src/kernel/vm/DLFifoList.hpp: Merge ndb fixes ndb/src/kernel/vm/Emulator.cpp: Merge ndb fixes ndb/src/kernel/vm/SignalCounter.hpp: Merge ndb fixes ndb/src/kernel/vm/SimulatedBlock.cpp: Merge ndb fixes ndb/src/mgmsrv/MgmtSrvr.cpp: Merge ndb fixes ndb/src/mgmsrv/NodeLogLevel.cpp: Merge ndb fixes ndb/src/ndbapi/ClusterMgr.cpp: Merge ndb fixes ndb/src/ndbapi/Ndberror.cpp: Merge ndb fixes ndb/src/rep/rep_version.hpp: Merge ndb fixes ndb/test/ndbapi/testDict/testDict.cpp: Merge ndb fixes ndb/test/ndbapi/testIndex/testIndex.cpp: Merge ndb fixes ndb/test/ndbapi/testMgm/testMgm.cpp: Merge ndb fixes ndb/test/ndbapi/testScan/testScan.cpp: Merge ndb fixes ndb/test/src/HugoTransactions.cpp: Merge ndb fixes ndb/test/src/NDBT_Tables.cpp: Merge ndb fixes ndb/test/src/NDBT_Test.cpp: Merge ndb fixes ndb/test/src/UtilTransactions.cpp: Merge ndb fixes BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-04-271-0/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mishka.local:/home/my/mysql-4.1 BitKeeper/etc/logging_ok: auto-union sql/set_var.cc: Auto merged
| * | | Merge with 4.0unknown2004-04-261-0/+1
| |\ \ \ | | |/ / | | | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/dict/dict0boot.c: Auto merged innobase/dict/dict0load.c: Auto merged innobase/dict/dict0mem.c: Auto merged innobase/fut/fut0lst.c: Auto merged innobase/include/buf0lru.h: Auto merged innobase/include/dict0mem.h: Auto merged innobase/include/fsp0fsp.h: Auto merged innobase/include/ha0ha.h: Auto merged innobase/include/ibuf0ibuf.h: Auto merged innobase/include/lock0lock.h: Auto merged innobase/include/log0log.h: Auto merged innobase/include/mem0pool.h: Auto merged innobase/include/mtr0mtr.h: Auto merged innobase/include/os0file.h: Auto merged innobase/include/rem0rec.h: Auto merged innobase/include/rem0rec.ic: Auto merged innobase/include/srv0srv.h: Auto merged innobase/include/sync0sync.h: Auto merged innobase/include/trx0sys.h: Auto merged innobase/include/ut0byte.h: Auto merged innobase/include/ut0ut.h: Auto merged innobase/mem/mem0pool.c: Auto merged innobase/mtr/mtr0mtr.c: Auto merged innobase/os/os0proc.c: Auto merged innobase/pars/lexyy.c: Auto merged innobase/pars/pars0opt.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0purge.c: Auto merged innobase/row/row0uins.c: Auto merged innobase/row/row0umod.c: Auto merged innobase/row/row0undo.c: Auto merged innobase/row/row0upd.c: Auto merged innobase/trx/trx0purge.c: Auto merged innobase/trx/trx0roll.c: Auto merged innobase/trx/trx0sys.c: Auto merged innobase/trx/trx0undo.c: Auto merged innobase/ut/ut0byte.c: Auto merged pstack/bucomm.h: Auto merged pstack/budbg.h: Auto merged sql/item_sum.h: Auto merged sql/slave.cc: Auto merged sql/sql_db.cc: Auto merged support-files/mysql.spec.sh: Auto merged tests/insert_test.c: Auto merged mysql-test/t/func_group.test: Merge with 4.0 Put 4.1 tests lasts sql/ha_innodb.cc: Merge with 4.0 Added checking of results from my_malloc() BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Resolved changes between example storage engine and NDB storage engine.unknown2004-04-141-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union acconfig.h: Auto merged acinclude.m4: Merged in example storage engine with NDB configure.in: Resolved conflict between NDB check with EXAMPLE DB.
| * \ \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-04-141-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1-examples BitKeeper/etc/logging_ok: auto-union include/my_base.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged
| | * \ \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-04-051-0/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1-examples BitKeeper/etc/logging_ok: auto-union
| | | * | | First commit of the skeleton storage engine. Use this example as a template ↵unknown2004-04-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to build storage engines. Also includes a new degine for marking storage engine methods as not being implemented. sql/examples/ha_example.h: First commit of example storage engine. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | | logging_ok:unknown2004-04-141-0/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logging to logging@openlogging.org accepted stop_ndbcluster, ndb_config_2_node.ini, install_ndbcluster: new file BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | Initial revision of NDB Cluster filesunknown2004-04-141-0/+1
| |_|/ / |/| | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Fixed a problem with mysqld_multi log file. The default is now ↵unknown2004-04-061-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | datadir/mysqld_multi.log, if doesn't exists or is not writable, then /var/log/mysqld_multi.log, if does not exists or is not writable, then /tmp/mysqld_multi.log, but only in case the file does not yet exists in /tmp. Otherwise log will be disabled, unless user explicitely sets it with an option. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Merge bk-internal:/home/bk/mysql-4.1/unknown2004-04-021-0/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 sql/ha_myisam.cc: Auto merged sql/sql_load.cc: Auto merged sql/table.h: Auto merged
| * | | correct test in triggerunknown2004-04-021-2/+1
| | | |
| * | | trying pre-delta triggerunknown2004-04-021-0/+12
| |/ /
* | | WL#775 "Add status variable identifying binlog_cache_size shortage"unknown2004-04-021-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added two status variables: binlog_cache_use - counts number of transactions that used somehow transaction temporary binary log. binlog_cache_disk_use - counts number of transactions that required disk I/O for storing info in this this binary log. include/my_sys.h: Added disk_writes member to the IO_CACHE structure for counting number of times when IO_CACHE was forced to write to disk. mysql-test/r/rpl_relayrotate.result: Fixed test result since added test for binlog_cache_use and binlog_cache_disk_use status variables. mysql-test/t/rpl_relayrotate.test: Added test for binlog_cache_use and binlog_cache_disk_use status variables. Now dropping t1 table on master too. mysys/mf_iocache.c: Added disk_writes member to the IO_CACHE structure for counting number of times when IO_CACHE was forced to write to disk. sql/handler.cc: Added support for binlog_cache_use and binlog_cache_disk_use status variable. First one is incremented if transaction used somehow transaction temporary binary log (doesn't matter in memory only or with writes to disk), the second one is incremented if this binary log was flushed to disk at some point. sql/mysql_priv.h: Added declaration of status variables binlog_cache_use and binlog_cache_disk_use. sql/mysqld.cc: Added status variables binlog_cache_use and binlog_cache_disk_use. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Merge of fix for bug #2050 and bug #3307unknown2004-03-311-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union sql/item.cc: Auto merged sql/item.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Manual merge
| * | "Fix" for BUG #2050 "10 to 1 performance drop with server 4.1.1".unknown2004-03-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually it is not a bug but right behavior observed as pefomance degradation after we have forced Item_field::fix_fields() to re-execute each time when we are executing prep stmt. This patch implements small optimization which heals this bad behavior. We are caching field position in TABLE::field array in Item's member and are using this position for speeding up field lookups in fix_fields() in case of its re-execution. sql/item.cc: Added cached_field_index member to Item_ident for caching field position in TABLE::field array for quicker field lookup in case fix_fields() is executed twice. sql/item.h: Added cached_field_index member to Item_ident for caching field position in TABLE::field array for quicker field lookup in case fix_fields() is executed twice. sql/mysql_priv.h: Now find_field_in_table has one more in-out parameter which is used for caching field index in TABLE::field array stored for quicker field look up. sql/sql_acl.cc: Now find_field_in_table has one more in-out parameter which is used for caching field index in TABLE::field array stored for quicker field look up. sql/sql_base.cc: Optimization: Now when we are looking up Field by its name we are caching its position in TABLE::field array in Item_ident::cached_field_index, so when we will call fix_fields() second time for this item (e.g. when we are re-executing prep statement) we can reuse this index to speed up this lookup. sql/table.cc: Now we storing in TABLE::name_hash pointers to elements of TABLE::field array, because this allows easily retrieve index of field in this array when it is looked up by its name. sql/table.h: Added comment claryfying what we store in TABLE::name_hash. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted