ndb/src/cw/cpcd/Process.cpp:
Write pgrp in pid-file
Always operate on process group instead of process
ndb/src/mgmclient/test_cpcd/test_cpcd.cpp:
Test using different programs
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
Impl. to handle "angle" process of ndb
ndb/src/cw/cpcd/Process.cpp:
Stop entire process group (if child has forked)
(Does not handle child doing setsid)
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
Czech collations were renamed to _cs
Index.xml:
Czech collation were renamed to _cs
sql/share/charsets/Index.xml:
Czech collation were renamed to _cs
strings/ctype-czech.c:
Czech collations were renamed to _cs
strings/ctype-win1250ch.c:
Czech collations were renamed to _cs
Change strtoll -> my_strtoll10()
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems (Bug #3472)
configure.in:
Fixed problem on IRIX64 (One can't have AC_MSG_RESULT on same row as AC_DEFINE
extra/my_print_defaults.c:
Fixed wrong definition for 'verbose'
include/my_global.h:
Portability fix (IRIX64)
libmysql/client_settings.h:
Remove compiler warnings
libmysql/libmysql.c:
Remove compiler warnings
mysql-test/r/func_str.result:
Updated results
mysql-test/r/key_cache.result:
Updated results to not depend on key_blocks_unused
mysql-test/t/func_str.test:
More test of long overflow
mysql-test/t/key_cache.test:
Updated results to not depend on key_blocks_unused
sql/item.cc:
Portability fix (don't use strtoll())
sql/item.h:
Portability fix (don't use strtoll())
sql/item_sum.h:
Portability fix (don't use strtoll())
sql/item_timefunc.cc:
Fixed compiler warning
strings/ctype-simple.c:
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems
strings/ctype-ucs2.c:
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems
item_list for fake_select will be created only once
(problem reported by valgrind in test_union2 fixed)
sql/sql_lex.h:
new function to keep code in one place
sql/sql_union.cc:
fake_select_lex should be prepared during PS preparation to work correctly
item_list for fake_select will be created only once
that was accidently added by the last BK auto merge
VC++Files/client/mysqlclient.dsp:
- removed duplicate file ..\strings\strxnmov.c that was added by the
last auto merge
libmysql/libmysql.c:
Make advanced_command check client reply
sql/sql_prepare.cc:
mysql_stmt_reset now sends ok/error reply to the client.
tests/client_test.c:
Memory leak fixed.
sql/handler.h:
Fixed (portability) bug. No qualified method names in the class definition.
sql/item_cmpfunc.h:
Attempt to silence cast warnings on some platforms.
sql/item_subselect.h:
Attempt to silence cast warnings on some platforms.
sql/set_var.cc:
Silence warning (missing cast).
sql/spatial.h:
Attempt to silence cast warnings on some platforms.
sql/sql_cache.cc:
Silence warning (wrong cast).
sql/sql_lex.h:
Attempt to silence cast warnings on some platforms.
HEAP: Copies the key count to a backup variable and sets the key count to zero.
That way, no HEAP function will ever try to touch any index.
Re-enabling is done by copying back the backup variable.
To avoid memory leak at table close, disable deletes all index trees.
Re-enabling must be done with empty indexes and data anyway. Otherwise,
the indexes would need to be repaired, wich HEAP is not capable of.
MyISAM: Only the key_map is cleared and set.
Re-enabling must be done with empty indexes and data. Otherwise, repair needs
to be done which will enable all keys persistently.
The former implementation disabled only non-unique keys and maked this persistent.
The new implementation additionally can disable all keys, but only without
making this persistent. Re-enabling all keys can be done without repair,
if data file and indexes are empty.
heap/heapdef.h:
WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
Pulled hp_clear_keys() out of hp_clear().
heap/hp_clear.c:
WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
Pulled hp_clear_keys() out of hp_clear().
Added the new functions for disabling and enabling keys and to ask for the key state.
include/heap.h:
WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
Added a new HP_SHARE element to save the key count while keys are disabled.
Added declarations for the new functions.
myisam/mi_open.c:
WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
Added the new functions for disabling and enabling keys and to ask for the key state.
myisam/myisamdef.h:
WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
Added declarations for the new functions.
sql/ha_heap.cc:
WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
Pulled set_keys_for_scanning() out of open().
Added the new functions for disabling and enabling keys and to ask for the key state.
sql/ha_heap.h:
WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
Added declarations for the new functions.
sql/ha_myisam.cc:
WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
Extended disable_indexes() for all keys and no save.
The argument is now 'mode' as it must handle different cases.
Extended enable_indexes() for no save.
The new feature needs the new argument 'mode' with the same semantics as in disable_indexes().
Added indexes_are_disabled() to ask for the key state.
Extended the existing call to enable_indexes() by the new argument.
sql/ha_myisam.h:
WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
Modified the declarations of dis-/enable_indexes() for the new argument.
Added the declaration of the new function to ask for the key state.
sql/handler.h:
WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
Added declarations for the operation modes for the key switching functions.
Modified the declarations of dis-/enable_indexes() for the new argument.
Added the declaration of the new function to ask for the key state.
sql/sql_select.cc:
WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
In create_myisam_from_heap() take notice of disabled keys
and disable them in the new table before copying the data.
sql/sql_table.cc:
WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
Modified the calls of dis-/enable_indexes() for the new argument.
included full my_global.h and resolved some resulting name conflicts
ndb/include/ndb_global.h:
included full my_global.h and resolved some resulting name conflicts
ndb/include/logger/FileLogHandler.hpp:
included full my_global.h and resolved some resulting name conflicts
ndb/include/util/File.hpp:
included full my_global.h and resolved some resulting name conflicts
ndb/src/common/logger/FileLogHandler.cpp:
included full my_global.h and resolved some resulting name conflicts
ndb/src/common/util/File.cpp:
included full my_global.h and resolved some resulting name conflicts
ndb/src/common/util/strlcat.c:
included full my_global.h and resolved some resulting name conflicts
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
included full my_global.h and resolved some resulting name conflicts
ndb/src/rep/RepComponents.hpp:
included full my_global.h and resolved some resulting name conflicts
ndb/src/rep/rep_version.hpp:
included full my_global.h and resolved some resulting name conflicts
ndb/src/rep/storage/GCIContainer.hpp:
included full my_global.h and resolved some resulting name conflicts
innobase/include/os0file.h:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
mysql-test/r/rpl_server_id2.result:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/slave.cc:
Merge with 4.0
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb_global.h:
new file
ndb/Defs.mk:
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb/Epilogue.mk:
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb/include/util/NdbString.h:
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb/src/common/util/getarg.c:
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb/src/common/util/strdup.c:
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb/src/common/util/strlcat.c:
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb/src/common/util/strlcpy.c:
introduced ndb_global.h and removed som HAVE_ and -D flags
into hundin.mysql.fi:/home/marko/j/mysql-4.1
mysql-test/r/create.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
sql/sql_yacc.yy:
Auto merged
The bug was introduced in a patch in the 4.1.2 source tree.
mysql-test/r/key.result:
New result
mysql-test/t/key.test:
Added test case for bug in key read
sql/sql_select.cc:
Fixed wrong key usage which caused wrong result for some "WHERE primary_key=constant" queries where MySQL could use 'only index' (Bug #3666)
as the I/O thread filters on the server id, we must test replicate_same_server_id in it (on top of in the SQL thread).
mysql-test/r/rpl_server_id2.result:
result update
sql/slave.cc:
As the I/O thread filters on the server id, we must test replicate_same_server_id in it (on top of in the SQL thread).
