into mysql.com:/space/pekka/ndb/version/my51-bug14509
mysql-test/r/ndb_basic.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
delete non-sense error 4336
storage/ndb/include/ndbapi/Ndb.hpp:
add auto-incr methods which take explicit Ndb::TupleIdRange & argument
for NDB API programs the range is under local dict cache (as in 5.0)
the handler level uses its own Ndb objects and ranges
storage/ndb/src/ndbapi/DictCache.cpp:
add auto-incr methods which take explicit Ndb::TupleIdRange & argument
for NDB API programs the range is under local dict cache (as in 5.0)
the handler level uses its own Ndb objects and ranges
storage/ndb/src/ndbapi/DictCache.hpp:
add auto-incr methods which take explicit Ndb::TupleIdRange & argument
for NDB API programs the range is under local dict cache (as in 5.0)
the handler level uses its own Ndb objects and ranges
storage/ndb/src/ndbapi/Ndb.cpp:
add auto-incr methods which take explicit Ndb::TupleIdRange & argument
for NDB API programs the range is under local dict cache (as in 5.0)
the handler level uses its own Ndb objects and ranges
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
add auto-incr methods which take explicit Ndb::TupleIdRange & argument
for NDB API programs the range is under local dict cache (as in 5.0)
the handler level uses its own Ndb objects and ranges
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
add auto-incr methods which take explicit Ndb::TupleIdRange & argument
for NDB API programs the range is under local dict cache (as in 5.0)
the handler level uses its own Ndb objects and ranges
a problem when the table only has a single record in it. This patch corrects that.
ha_tina.cc:
Fix problem with previous patch when there is only one record in the table
storage/csv/ha_tina.cc:
Fix problem with previous patch when there is only one record in the table
include/config-win.h:
force time_t to be 32 bit on Visual C++ 2005 or later
sql/net_serv.cc:
include winsock after my_global so the time_t #define can take effect
storage/csv/ha_tina.cc:
fix the csv engine so that it supports DOS, Unix, and Mac line endings
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
include/m_string.h:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/share/errmsg.txt:
C
Merged.
?
Remove unused and obsolete mgmapi functionality (that did nothing anyway).
storage/ndb/include/mgmapi/mgmapi.h:
remove dead internal ndb_mgm_get_stat_port function.
storage/ndb/src/mgmapi/mgmapi.cpp:
remove ndb_mgm_get_stat_port
was only marked for internal use.
dead (in 5.0 as well, only removed in 5.1 for safety)
storage/ndb/src/mgmsrv/Services.cpp:
remove dead 'get statport'
storage/ndb/src/mgmsrv/Services.hpp:
remove dead getStatPort
into mysql.com:/home/jimw/my/mysql-5.1-clean
include/my_pthread.h:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/rpl_temporary.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_acl.cc:
Auto merged
storage/ndb/test/ndbapi/Makefile.am:
Auto merged
storage/ndb/test/ndbapi/testInterpreter.cpp:
Auto merged
sql/set_var.cc:
Resolve conflict
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Resolve conflict
Fix recursive mutex lock in drop index (ndbapi programs only)
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Fix recursive mutex lock in drop index (ndbapi programs only)
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Fix recursive mutex lock in drop index (ndbapi programs only)
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/include/util/SocketServer.hpp:
Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
mysql-test/r/csv.result:
Correct result file
storage/csv/ha_tina.cc:
Get rid of mmap in tina. Use usual reads/writes
to access the file.
storage/csv/ha_tina.h:
Add Transparent_file class, which hides details of access
to the file. Perform a cleanup & add new functions.
sql/ha_ndbcluster_binlog.cc:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
- small correction of previous patch
storage/ndb/src/ndbapi/DictCache.cpp:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
- cache not released properly
storage/ndb/tools/desc.cpp:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
- added retry option so that ndb_desc can be used to wait for a table to be created
Removed Berkeley DB
configure.in:
Adjusted Netware support
basic.t.c:
Change for Netware
Makefile.am:
Use thread safe libmysqlclient_r if it was built
valgrind.supp:
Hide report about strlen/_dl_init_paths
ha_tina.cc:
Temporarely disable CSV engine on Netware,
as the engine depends on mmap()
net_serv.cc:
Include <sys/select.h> for Netware
sql/net_serv.cc:
Include <sys/select.h> for Netware
storage/csv/ha_tina.cc:
Temporarely disable CSV engine on Netware,
as the engine depends on mmap()
mysql-test/valgrind.supp:
Hide report about strlen/_dl_init_paths
tests/Makefile.am:
Use thread safe libmysqlclient_r if it was built
unittest/mytap/t/basic.t.c:
Change for Netware
configure.in:
Adjusted Netware support
support-files/mysql.spec.sh:
Removed Berkeley DB
The problem was that the optimize code was not closing both the reader and writer streams before attempting
to rename the file. This will not work on Windows where all file handles have to be closed before the
file can be renamed, moved, or deleted. The fix was to move the close calls before the rename.
We return the error code from my_rename in case of failure but we attempt to reopen the writers and readers
even in the case of failure so that the table can still be usable.
storage/archive/ha_archive.cc:
close the writer and reader before the rename so that the rename will work on Windows.
into mysql.com:/space/pekka/ndb/version/my51-bug14509
storage/ndb/include/ndbapi/Ndb.hpp:
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
Auto merged
sql/ha_ndbcluster.cc:
manual merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
use local, weird diff
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
Auto merged
support-files/mysql.spec.sh:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
manual merge
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
client/mysql.cc:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/rpl_temporary.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/rpl_temporary.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
Auto merged
storage/ndb/src/ndbapi/TransporterFacade.hpp:
Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
Auto merged
mysql-test/r/information_schema.result:
manual merge
mysql-test/t/information_schema.test:
manual merge
sql/ha_ndbcluster.cc:
manual merge
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
manual merge
storage/ndb/src/ndbapi/DictCache.cpp:
manual merge
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
mysql-test/t/disabled.def:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
