| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
- Define and pass compile time path variables as pre-processor definitions to
mimic the makefile build.
- Set new CMake version and policy requirements explicitly.
- Changed DATADIR to MYSQL_DATADIR to avoid conflicting definition in
Platform SDK header ObjIdl.h which also defines DATADIR.
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| | |
into mysql.com:/home/kent/bk/build/mysql-5.0-build
ndb/src/common/util/SocketServer.cpp:
Auto merged
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Corrected calculation of version id, incorrect last two digits if < 10
Keep "sp1" or "a" in MYSQL_NO_DASH_VERSION, to set correct version in
RPM spec file
Added MYSQL_NUMERIC_VERSION that is like MYSQL_NO_DASH_VERSION before
Added clear doc how the different version variables differ
SocketServer.cpp:
Corrected typo in debug error message
ndb/src/common/util/SocketServer.cpp:
Corrected typo in debug error message
configure.in:
Corrected calculation of version id, incorrect last two digits if < 10
Keep "sp1" or "a" in MYSQL_NO_DASH_VERSION, to set correct version in
RPM spec file
Added MYSQL_NUMERIC_VERSION that is like MYSQL_NO_DASH_VERSION before
Added clear doc how the different version variables differ
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-4.1/mysql-4.1-ndb
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-4.1/mysql-4.1-bug21715
ndb/src/mgmclient/CommandInterpreter.cpp:
Adding 'version' variable assigns the right value
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
into whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-opt
|
| | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
|
| | |\ \ \ \ \ \ \
| | | |_|/ / / / /
| | |/| | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
|
| | | |\ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
|
| |\ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| |/| | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
into siva.hindu.god:/home/tsmith/m/bk/maint/41
sql/sql_prepare.cc:
Manual merge
|
| |\ \ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-4.1/mysql-4.1-bug21715
|
| |\ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / /
| | |/| | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
into ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-4.1/mysql-4.1-ndb
|
| | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
into ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-4.1/mysql-4.1-ndb
|
| | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-4.1/bug19352
|
| | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
into dev3-127.(none):/mnt/mysql/home/ngb/mysql-4.1/mysql-4.1-bug21858
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
chance.
ndb/src/common/util/File.cpp:
Avoid memory leak when EINTR error returns. Even though a close-error happens, a ERROR message in out file
is given, and this shouldn't affect the normally running.
|
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
into trift2.:/MySQL/M50/push-5.0
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
Auto merged
|
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
race conditions
|
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
ndb/src/common/debugger/SignalLoggerManager.cpp:
some warnings, debug errors
ndb/src/common/debugger/signaldata/ScanTab.cpp:
some warnings, debug errors
ndb/src/kernel/vm/pc.hpp:
some warnings, debug errors
|
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
ndb/src/ndbapi/Ndb.cpp:
fix pthread_t abuse
ndb/test/ndbapi/testOIBasic.cpp:
fix pthread_t abuse
|
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
ndb/test/ndbapi/testInterpreter.cpp:
bug#34107 testInterpreter test case
ndb/test/run-test/daily-basic-tests.txt:
bug#34107 testInterpreter test case
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
into sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug34107
|
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
mysql-test/r/ndb_condition_pushdown.result:
bug#34107 lower scanfilter max size to not hit TUP limit
mysql-test/t/ndb_condition_pushdown.test:
bug#34107 lower scanfilter max size to not hit TUP limit
ndb/include/ndbapi/ndbapi_limits.h:
bug#34107 lower scanfilter max size to not hit TUP limit
|
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
bug#34107 check stored proc overflow
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
bug#34107 check stored proc overflow
ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp:
bug#34107 check stored proc overflow
ndb/src/ndbapi/ndberror.c:
bug#34107 check stored proc overflow
|
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
make sure release of not added ptr does not corrupt hashtable
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
into perch.ndb.mysql.com:/home/jonas/src/50-ndb
|
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
Backup can assert with "big" table definitions
Correct condition before fetching next meta-table
Increase meta-buffer, to cope with atleast 2 tables
ndb/src/kernel/blocks/backup/Backup.cpp:
Correct condition, before fetching new meta-table
ndb/src/kernel/blocks/backup/Backup.hpp:
Make sure atleast 2 tables can fix
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
into sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug31477
|
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
mysql-test/r/ndb_bug31477.result:
BitKeeper file /export/space/pekka/ndb/version/my50-bug31477/mysql-test/r/ndb_bug31477.result
mysql-test/t/ndb_bug31477.test:
BitKeeper file /export/space/pekka/ndb/version/my50-bug31477/mysql-test/t/ndb_bug31477.test
ndb/src/common/util/NdbOut.cpp:
missing comma, causing weird Uint64 printout
ndb/test/ndbapi/testOIBasic.cpp:
adjust params
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
bug#31477 - explicit rewrite of tuxQueryTh
if active op then non-dirty scan enters lock queue via TUX
instead of skipping the tuple
ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
bug#31477 - explicit rewrite of tuxQueryTh
if active op then non-dirty scan enters lock queue via TUX
instead of skipping the tuple
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
bug#31477 - explicit rewrite of tuxQueryTh
if active op then non-dirty scan enters lock queue via TUX
instead of skipping the tuple
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
into mysql.com:/home/marty/MySQL/mysql-5.0-ndb
ndb/include/ndbapi/Ndb.hpp:
Auto merged
|
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
Changed function attribute names to match implementation
ndb/include/ndbapi/Ndb.hpp:
Changed function attribute names to match implementation
|
| | | | | | | | | | | | | | | | | | |
|
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node
ndb_restore.result, ndb_restore.test:
Changed test to use information_schema to check auto_increment
DictCache.cpp, Ndb.cpp:
Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node. When setting the auto_increment value we'll also read up the new value, this is useful if we use the table the first time in this MySQL Server and haven't yet seen the NEXTID value. The kernel will avoid updating since it already has the value but will also read up the NEXTID value to ensure we don't need to do this any more time.
ndb_auto_increment.result:
Updated result file since it was incorrect
ndb/include/ndbapi/Ndb.hpp:
Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node
ndb/src/ndbapi/DictCache.hpp:
Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node
ndb/src/ndbapi/DictCache.cpp:
Add new variable m_highest_seen when only peeking at auto_increment NEXTID
and not retrieving to cache. Add new method to check tupleId before calling
data node. When setting the auto_increment value we'll also read up the new
value, this is useful if we use the table the first time in this MySQL Server
and haven't yet seen the NEXTID value. The kernel will avoid updating since it
already has the value but will also read up the NEXTID value to ensure we
don't need to do this any more time.
ndb/src/ndbapi/Ndb.cpp:
Add new variable m_highest_seen when only peeking at auto_increment NEXTID
and not retrieving to cache. Add new method to check tupleId before calling
data node. When setting the auto_increment value we'll also read up the new
value, this is useful if we use the table the first time in this MySQL Server
and haven't yet seen the NEXTID value. The kernel will avoid updating since
it already has the value but will also read up the NEXTID value to ensure we
don't need to do this any more time.
mysql-test/r/ndb_restore.result:
Changed test to use information_schema to check auto_increment
mysql-test/t/ndb_restore.test:
Changed test to use information_schema to check auto_increment
mysql-test/r/ndb_auto_increment.result:
Updated result file since it was incorrect
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj
|
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
into perch.ndb.mysql.com:/home/jonas/src/50-ndb
ndb/src/common/transporter/TCP_Transporter.cpp:
Auto merged
|
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
make sure whole send buffer is flushed, even when wrapping around end
ndb/src/common/transporter/TCP_Transporter.cpp:
ndb - bug#34005
make sure whole send buffer is flush, even when wrapping around end
|
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / /
| | | | | / / / / / / / / / / / / / /
| | | |_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
into perch.ndb.mysql.com:/home/jonas/src/50-ndb
ndb/src/common/util/Bitmask.cpp:
merge
ndb/test/ndbapi/testBitfield.cpp:
merge
|
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
make sure that getField does not write after supplied buffer
(recommit to correct clone, for easy merging)
ndb/include/util/Bitmask.hpp:
ndb- bug#33750
make sure that getField does not write after supplied buffer
ndb/src/common/util/Bitmask.cpp:
ndb- bug#33750
make sure that getField does not write after supplied buffer
ndb/test/ndbapi/testBitfield.cpp:
move test from Bitmask.cpp into testBitfield
for automatic testing
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bj
mysql-test/r/view.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
|
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug28298
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
|
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
error
ndb/include/kernel/ndb_limits.h:
1) define a macro MAX_DATA_NODE_ID to set the max ID of data nodes to be MAX_NDB_NODES - 1
2) define a macro MAX_NODES_ID to set the max ID of API and MGM to be MAX_NODES -1
ndb/src/mgmsrv/ConfigInfo.cpp:
1) replace MAX_NODES with MAX_DATA_NODE_ID (= MAX_NDB_NODES - 1) when the NodeId represents data nodes.
2) replace MAX_NODES with MAX_NODES_ID (= MAX_NODES -1) when the NodeId represents API or MGM nodes.
|
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | |
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug30271
|
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | |
bytes, not kilobyte
ndb/include/mgmapi/ndb_logevent.h:
Add page_size_bytes member variable for MemoryUsage. And don't remove page_size_kb member variable at present for the compatibility backward.
ndb/src/mgmapi/ndb_logevent.cpp:
change the page_size_kb member variable of MemoryUsage to page_size_bytes
|
| | | | | | | | | | | | | | | | | | | | |
|
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | |
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
|