| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| | |
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
into mysql.com:/home/jonas/src/mysql-4.1
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
ndb/test/run-test/atrt-mysql-test-run:
Fix result handling
ndb/test/run-test/daily-basic-tests.txt:
Move mysql-test-run & testBackup into "basic"
ndb/test/run-test/daily-devel-tests.txt:
Move mysql-test-run & testBackup into "basic"
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
BitKeeper/deleted/.del-sort.c~e2e56b5a37ce86f4:
Auto merged
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
myisam/mi_packrec.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/tztime.cc:
Auto merged
tests/client_test.c:
Auto merged
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
mysys/mf_keycache.c:
Auto merged
sql/item.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
|
| | | | | |
|
|\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
ndb/include/ndbapi/NdbRecAttr.hpp:
Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
|
| | |_|/
| |/| | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
ndb/test/ndbapi/flexAsynch.cpp:
Add includes as memcpy is introduced in NdbRecAttr
ndb/test/ndbapi/flexBench.cpp:
Add includes as memcpy is introduced in NdbRecAttr
ndb/test/ndbapi/flexHammer.cpp:
Add includes as memcpy is introduced in NdbRecAttr
ndb/test/ndbapi/slow_select.cpp:
Add includes as memcpy is introduced in NdbRecAttr
ndb/test/src/HugoCalculator.cpp:
Add includes as memcpy is introduced in NdbRecAttr
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
ndb/include/ndbapi/NdbRecAttr.hpp:
Auto merged
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
corrected possible unalignment in NdbRecAttr access methods
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into mysql.com:/home/jonas/src/mysql-5.0
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
|
| | | |
| | | |
| | | |
| | | |
| | | | |
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
typo
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Make sure to ship error code in system error signal
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
compile error
ndb/src/mgmapi/mgmapi.cpp:
compile error
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
corrected bug when looking at dist keys in create table
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
corrected bug when looking at dist keys in create table
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
mysql-test/r/ndb_autodiscover.result:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
mysql-test/mysql-test-run.sh:
Auto merged
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
added testcase for Bug#8035
added option to wait for not-started
Bug#8035
mysql-test/mysql-test-run.sh:
added variable NDB_MGM to be able to run the management client in tests
mysql-test/r/ndb_autodiscover.result:
added testcase for Bug#8035
mysql-test/t/ndb_autodiscover.test:
added testcase for Bug#8035
ndb/tools/waiter.cpp:
added option to wait for not-started
sql/lock.cc:
Bug#8035
|
| |\ \ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into mysql.com:/home/jonas/src/mysql-5.0
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
release connections when last op was simple read
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
bug#8010
release connections when last op was simple read
|
| |\ \ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into mysql.com:/home/jonas/src/mysql-5.0
|
|\ \ \ \ \ \
| |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/include/kernel/AttributeHeader.hpp:
Auto merged
|
| |\ \ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into mysql.com:/home/jonas/src/mysql-5.0
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
ndb/src/ndbapi/NdbScanOperation.cpp:
align pointers
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
ndb/include/ndb_constants.h:
remove // from .h-file
|
| |\ \ \ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into mysql.com:/home/jonas/src/mysql-5.0
ndb/include/kernel/AttributeHeader.hpp:
Auto merged
ndb/include/ndb_global.h.in:
Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
remove usage of compiler supplied <new> and instead
impl. own inlined placement new
ndb/include/kernel/AttributeHeader.hpp:
remove usage <new>
ndb/include/ndb_global.h.in:
remove usage <new>
instead impl. own
ndb/src/kernel/blocks/backup/BackupInit.cpp:
remove usage <new>
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
remove usage <new>
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
remove usage <new>
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
remove usage <new>
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
remove usage <new>
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
remove usage <new>
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
remove usage <new>
ndb/src/kernel/blocks/grep/GrepInit.cpp:
remove usage <new>
ndb/src/kernel/blocks/suma/SumaInit.cpp:
remove usage <new>
ndb/src/kernel/vm/Emulator.cpp:
remove usage <new>
ndb/src/kernel/vm/SimulatedBlock.hpp:
remove usage <new>
ndb/src/mgmapi/mgmapi_configuration.cpp:
remove usage <new>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
ndb/test/src/HugoCalculator.cpp:
Better handling of strings
|
|\ \ \ \ \ \
| | |_|/ / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into build.mysql.com:/users/tulin/mysql-5.0-ndb
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
corrected erroneous comparison boolean < 0
ndb/src/mgmsrv/MgmtSrvr.cpp:
corrected erroneous comparison boolean < 0
|
| |/ / / / |
|
|\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
|
| |\ \ \ \
| | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into mysql.com:/home/jonas/src/mysql-5.0
configure.in:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
|
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
when using shm transporter, set sigmask on each thread using pthread_sigmask
configure.in:
Add more functions needed for SHM
ndb/src/common/portlib/NdbThread.c:
1) Create thread wrapper function
2) block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
ndb/src/common/transporter/TransporterRegistry.cpp:
(un)block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
sql/ha_ndbcluster.cc:
cast pointer to UintPtr before printout
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
enough platforms
|
| | | | |
|
| | | | |
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/order_by.result:
Auto merged
sql/filesort.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/t/order_by.test:
Merge
sql/sql_lex.cc:
Merge
sql/sql_yacc.yy:
Use local copy
|
| | | | |
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/user_var.test:
Auto merged
sql-common/client.c:
Auto merged
sql/log_event.cc:
Auto merged
mysql-test/r/user_var.result:
SCCS merged
ndb/docs/Makefile.am:
Auto merged
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Bug#7721
ndb/docs/Makefile.am:
Bug#7721
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
compatible with 4.1.9
configure.in:
bumped up ndb version
|
| | |
| | |
| | |
| | |
| | | |
ndb/test/src/HugoCalculator.cpp:
Use reentrant function in HugoCalulator
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into mysql.com:/home/jonas/src/mysql-5.0-ndb
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
ndb/test/src/HugoCalculator.cpp:
fix newly introduced bug in Hugo
ndb/test/src/HugoOperations.cpp:
fix newly introduced bug in Hugo
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/mysqld.cc:
Auto merged
|