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
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
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
search for subscriber should be done on nodeid basis and not reference, only one subscriber per event per nodeid allowed
not necessarily the same starts and stops...
+error corrected in ref signal
added print of error codes + more correct error handling of event errors
+ added goto instead of erroneous break to fix bug#7627
ndb/include/kernel/signaldata/SignalData.hpp:
added som signal printout functions
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
added som signal printout functions
ndb/src/common/debugger/signaldata/SignalNames.cpp:
added som signal printout functions
ndb/src/common/debugger/signaldata/SumaImpl.cpp:
added som signal printout functions
ndb/src/kernel/blocks/suma/Suma.cpp:
search for subscriber should be done on nodeid basis and not reference, only one subscriber per event per nodeid allowed
not necessarily the same starts and stops...
+error corrected in ref signal
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
indentation
event error handling
debug printouts
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
debug printouts
+ added goto instead of erroneous break to fix bug#7627
ndb/test/src/HugoTransactions.cpp:
added print of error codes + more correct error handling of event errors
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Pre book fragments to keep count how many ops need to be continued by
api
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Pre book fragments to keep count how many ops need to be continued by
api
Fixes problem with parallelism < fragcount && committed read
ndb/test/ndbapi/testScan.cpp:
new testcase for scan parallelism
ndb/test/run-test/daily-basic-tests.txt:
Run new testcase
ndb/test/src/HugoTransactions.cpp:
Use parallelism parameter
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
client/mysql.cc:
Auto merged
include/my_sys.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/strfunc.cc:
Auto merged
VC++Files/sql/mysqld.dsp:
Libraries changed
mysys/default.c:
get_defaults_files implementation added
sql/sql_base.cc:
merging
sql/sql_show.cc:
merging
into mysql.com:/home/jonas/src/mysql-5.0
mysql-test/r/ndb_index_ordered.result:
Auto merged
mysql-test/t/ndb_index_ordered.test:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
sql/net_serv.cc:
Auto merged
sql/sql_class.h:
Auto merged
