and other commands related to ndb. For all of these, the help screen contains
"Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete.
storage/ndb/include/util/ndb_opts.h:
Change help information from including "Ndb.cfg" to "my.cnf" in the header file.
storage/ndb/test/ndbapi/flexScan.cpp:
Change help information from including "Ndb.cfg" to "my.cnf".
storage/ndb/tools/ndb_condig.cpp:
Change help information from including "Ndb.cfg" to "my.cnf".
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug19787
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
correct error message when illegal configuration changed
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21128
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
Auto merged
ndb/include/mgmapi/mgmapi.h:
add one function
ndb/src/mgmapi/mgmapi.cpp:
add one function to get cluster loglevel
ndb/src/mgmsrv/Services.cpp:
addn one function to deal with get log level
ndb/src/mgmsrv/Services.hpp:
add getClusterLogLevel() function define
into dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-21345
mysql-test/r/ctype_utf8.result:
Auto merged
storage/ndb/include/util/File.hpp:
Auto merged
storage/ndb/src/common/logger/FileLogHandler.cpp:
Auto merged
storage/ndb/src/common/util/File.cpp:
Auto merged
into dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-21345
ndb/include/util/File.hpp:
Auto merged
ndb/src/common/logger/FileLogHandler.cpp:
Auto merged
ndb/src/common/util/File.cpp:
Auto merged
Fixed the cluster logfile rotation code, let the cluster logfile be renamed correctly when the main logfile exceeds the configured maximum size.
ndb/include/util/File.hpp:
Fix for BUG#21345, Error in cluster logfile rotation.
ndb/src/common/logger/FileLogHandler.cpp:
Fix for BUG#21345, Error in cluster logfile rotation.
ndb/src/common/util/File.cpp:
Fix for BUG#21345, Error in cluster logfile rotation.
into dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-21345
BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3:
Auto merged
BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
storage/myisam/mi_unique.c:
Auto merged
storage/ndb/include/util/File.hpp:
Auto merged
storage/ndb/src/common/logger/FileLogHandler.cpp:
Auto merged
storage/ndb/src/common/util/File.cpp:
Auto merged
strings/ctype-win1250ch.c:
Auto merged
into dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-ndb-bj
BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3:
Auto merged
BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5:
Auto merged
myisam/mi_unique.c:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
into dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-ndb-bj
BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3:
Auto merged
BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5:
Auto merged
mysql-test/r/ctype_cp1250_ch.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_cp1250_ch.test:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
storage/myisam/mi_unique.c:
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
Ndb.closeTransaction() modifies the value of Ndb.theError.code,
but the error code shouldn't be changed here.
Mysqld will use the returning error code to log the correct information.
into dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-bug19873
include/config-netware.h:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_view.cc:
Auto merged
storage/innobase/btr/btr0btr.c:
Auto merged
storage/innobase/buf/buf0buf.c:
Auto merged
storage/innobase/dict/dict0dict.c:
Auto merged
storage/innobase/fil/fil0fil.c:
Auto merged
storage/innobase/fsp/fsp0fsp.c:
Auto merged
storage/innobase/include/buf0buf.ic:
Auto merged
storage/innobase/log/log0log.c:
Auto merged
storage/innobase/log/log0recv.c:
Auto merged
storage/innobase/os/os0file.c:
Auto merged
storage/innobase/row/row0sel.c:
Auto merged
storage/innobase/srv/srv0start.c:
Auto merged
storage/innobase/ut/ut0dbg.c:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
tests/mysql_client_test.c:
Auto merged
into dev3-127.(none):/mnt/mysql/home/ngb/bug19873
ndb/src/mgmclient/CommandInterpreter.cpp:
ndb_mgm can automatically reconnect to the ndb_mgmd after ndb_mgmd restarted.
and this commit fixes probable mem leak
into dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-ndb-bj
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
into dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_view.cc:
Auto merged
into dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-21345
ndb/include/util/File.hpp:
Auto merged
ndb/src/common/util/File.cpp:
Auto merged
Fixed the cluster logfile rotation code, let the cluster log file be renamed correctly when the main log file exceeds the configured maximum size.
ndb/include/util/File.hpp:
Fix for bug #21345: Error in cluster logfile rotation.
ndb/src/common/logger/FileLogHandler.cpp:
Fix for bug #21345: Error in cluster logfile rotation.
ndb/src/common/util/File.cpp:
Fix for bug #21345: Error in cluster logfile rotation.
affects basically all replication tests
storage/ndb/include/kernel/signaldata/SumaImpl.hpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
1) Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
2) make sure to set NdbdNodeId on _TE_STOP
storage/ndb/src/ndbapi/NdbBlob.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/NdbEventOperation.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/Ndbif.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
read TransactionDeadlockTimeout (for scans) to cater for insane settings
ndb/src/ndbapi/NdbScanOperation.cpp:
read TransactionDeadlockTimeout to cater for insane settings
Fix so that expand_check2 is only run per fragment,
as restore now works 1 fragment at a time (again)
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Fix so that expand_check2 is only run per fragment,
as restore now works 1 fragment at a time (again)
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
mysql-test/r/ndb_lock.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
mysql-test/r/ndb_lock.result:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
mysql-test/t/disabled.def:
merge
sql/ha_ndbcluster.cc:
merge
when X.509 subject was required for a connect, we tested whether it was the right
one, but did not refuse the connexion if not. fixed.
(corrected CS now --replace_results socket-path)
mysql-test/r/openssl_1.result:
Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both
test not only whether we can connect with a correct X.509 subject when one is
required, but also assure that we can't without one.
mysql-test/t/openssl_1.test:
Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both
test not only whether we can connect with a correct X.509 subject when one is
required, but also assure that we can't without one.
sql/sql_acl.cc:
Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both
actually refuse connexion if X.509 is required, but does not match. kudos to Al Smith.
