into hundin.mysql.fi:/home/heikki/mysql-5.0
innobase/fil/fil0fil.c:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/dict/dict0load.c:
Auto merged
innobase/include/dict0dict.h:
Auto merged
innobase/row/row0mysql.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_dynrec.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/r/kill.result:
Auto merged
mysql-test/t/kill.test:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/mysqld.cc:
Auto merged
Impl. stupid mgm lock against shutting down 2 nodes simultaniously
Add some more dump
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Impl. 2 new dump
1) to query nf handling state
2) that impl. sending of arbitrary signal...
to be used with extreme care
ndb/src/kernel/main.cpp:
enable critical and warnings in out file
ndb/src/mgmsrv/MgmtSrvr.cpp:
call handleStopReply on nfCompleteRep instead
ndb/src/mgmsrv/MgmtSrvr.hpp:
call handleStopReply on nfCompleteRep instead
ndb/include/ndbapi/NdbScanOperation.hpp:
release scan op early to save memory
ndb/src/ndbapi/NdbScanOperation.cpp:
release scan op early to save memory
ndb/src/ndbapi/NdbTransaction.cpp:
release scan op early to save memory
ndb/src/ndbapi/Ndblist.cpp:
release scan op early to save memory
sql/ha_ndbcluster.cc:
release scan op early to save memory
into mysql.com:/home/jonas/src/mysql-5.0
mysql-test/mysql-test-run.sh:
Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/user_var.result:
after merge fixes - old (erroneous) results restored.
Should be corrected when the fix is applied
mysql-test/t/user_var.test:
after merge fixes - old (erroneous) results restored.
Should be corrected when the fix is applied
Gluh's SESSION/GLOBAL for @variables fix in sql_yacc.yy and
Bar's well_formed_len() changes in ndb code
did not make it and should be re-applied manually
BitKeeper/etc/logging_ok:
auto-union
include/m_ctype.h:
Auto merged
innobase/btr/btr0pcur.c:
Auto merged
innobase/include/btr0pcur.h:
Auto merged
innobase/include/os0file.h:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/user_var.test:
Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/tools/desc.cpp:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-mb.c:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
strings/ctype-ujis.c:
Auto merged
BitKeeper/deleted/.del-NdbResultSet.cpp~84d192cf3f42600d:
ul
ndb/include/ndbapi/NdbScanOperation.hpp:
ul
ndb/src/ndbapi/NdbIndexOperation.cpp:
ul
ndb/src/ndbapi/NdbOperationDefine.cpp:
ul
ndb/src/ndbapi/NdbOperationSearch.cpp:
ul
ndb/src/ndbapi/NdbScanOperation.cpp:
ul
sql/field.cc:
manually merged, because bk messed it up
sql/sql_yacc.yy:
merged
ndb/include/ndbapi/NdbConnection.hpp:
release scan op of hupped trans at scan close to save memory
ndb/include/ndbapi/NdbScanOperation.hpp:
release scan op of hupped trans at scan close to save memory
ndb/src/ndbapi/NdbConnection.cpp:
release scan op of hupped trans at scan close to save memory
ndb/src/ndbapi/NdbResultSet.cpp:
release scan op of hupped trans at scan close to save memory
ndb/src/ndbapi/NdbScanOperation.cpp:
release scan op of hupped trans at scan close to save memory
ndb/tools/desc.cpp:
release scan op of hupped trans at scan close to save memory
mysql-test/r/group_by.result:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_subselect.h:
Auto merged
sql/sql_select.cc:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
merge
sql/item_cmpfunc.cc:
merge
support-files/mysql.server.sh:
merge
into mysql.com:/home/jonas/src/mysql-5.0
mysql-test/mysql-test-run.sh:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/sql_select.cc:
Auto merged
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
set up long key page vars in ACC_LOCKREQ
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
set up long key page vars in ACC_LOCKREQ
bdb/hash/hash_open.c:
Fix order of arguments to memset()
bdb/btree/bt_open.c:
Fix order of arguments to memset()
ndb/src/kernel/vm/VMSignal.cpp:
Fix order of arguments to memset()
Fix uninit variable (potential segv) in Dbacc::sendNextScanConf
discovered by magnus addition in "globals_list"
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Fix uninit variable (potential segv) in sendNextScanConf
discovered by magnus addition in "globals_list"
