into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21799
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-127.(none):/mnt/mysql/home/ngb/mysql-5.0/bug21530
ndb/src/mgmclient/CommandInterpreter.cpp:
Many methods add the return value that indicates whether the execution of operation succeeds.
This can make ndb_mgm management client set the exit status on errors.
almost useless for any kind of shell script automation.
Now add the return value that indicates the execution whether or not success
for many methods.
ndb/src/mgmclient/CommandInterpreter.cpp:
Many methods add the return value that indicates whether the execution of operatioin succeeds.
This can make ndb_mgm management client set the exit status on errors.
Data node is not allowed to get added in the cluster when it is in single user mode.
ndb/include/kernel/signaldata/CmRegSignalData.hpp:
Data node is not allowed to get added in the cluster when it is in single user mode.
ndb/include/mgmapi/ndbd_exit_codes.h:
Data node is not allowed to get added in the cluster when it is in single user mode.
ndb/include/ndb_version.h.in:
added version macro for version 5.0.25.
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Data node is not allowed to get added in the cluster when it is in single user mode.
ndb/src/kernel/error/ndbd_exit_codes.c:
Data node is not allowed to get added in the cluster when it is in single user mode.
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.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.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-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.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.
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/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
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.
ndb/src/kernel/vm/DLHashTable2.hpp:
add isEmpty for use in DICT
ndb/test/include/NDBT_Tables.hpp:
getIndexes - return index cols of standard test table
ndb/test/src/NDBT_Tables.cpp:
getIndexes - return index cols of standard test table
ndb/test/ndbapi/testDict.cpp:
bug#21017: index create/drop during NR
ndb/include/kernel/signaldata/CreateIndx.hpp:
add 711
ndb/include/kernel/signaldata/DropIndx.hpp:
add 711
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
block index create/drop during NR.
fix 2 ndbrequires by checking exact schema op types
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
block index create/drop during NR.
fix 2 ndbrequires by checking exact schema op types
into dev3-76.dev.cn.tlan:/home/lisj/mysql/mysql-5.0/mysql-5.0-ndb-bj
mysql-test/t/ctype_utf8.test:
Auto merged
BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3:
Auto merged
BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5:
Auto merged
myisam/mi_unique.c:
ul
ul
ul
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
BitKeeper/deleted/.del-mysql_client.result:
Auto merged
BitKeeper/deleted/.del-mysql_client.test:
Auto merged
client/mysql.cc:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
mysql-test/r/grant.result:
Auto merged
mysql-test/t/grant.test:
Auto merged
tests/mysql_client_test.c:
Auto merged
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
mysql-test/r/grant.result:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
mysql-test/r/mysql_client.result:
Removed OS dependant output.
mysql-test/t/mysql_client.test:
Re-directed output to a temporary file because the actual output isn't important and was causing a Windows test failure.
