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
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()
sql/ha_ndbcluster.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/ha_ndbcluster.cc:
Manual merge
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Proactive compile fix (in case we ever enable "EVENT_DEBUG" on IRIX):
Two identical declarations on loop level will collide at function level.
at function level.
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Avoid compilation error: On IRIX, variables declared within a loop control statement
seem to have function scope. Either use different identifiers, or declare them
at function level.
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Found use of uninitialised variable when increasing m_commit_count.
Moved initialisation of rootfragrecptr to before increase of m_commit_count, and removed the two initializations further down, since they are now unneccessary.
into hundin.mysql.fi:/home/heikki/mysql-5.0
innobase/log/log0recv.c:
Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb - Reenable MAX_OPEN_FILES to enable LCP in some situations
ndb/include/mgmapi/mgmapi_config_parameters.h:
Reenable MAX_OPEN_FILES to enable LCP in some situations
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Reenable MAX_OPEN_FILES to enable LCP in some situations
ndb/src/mgmsrv/ConfigInfo.cpp:
Reenable MAX_OPEN_FILES to enable LCP in some situations
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-compile:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
include/my_sys.h:
Auto merged
innobase/buf/buf0lru.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/include/page0page.ic:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/os/os0thread.c:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/trx/trx0sys.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/ut/ut0ut.c:
Auto merged
myisam/ft_parser.c:
Auto merged
myisam/mi_create.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/ndb_alter_table.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/ndb_alter_table.test:
Auto merged
mysys/hash.c:
Auto merged
mysys/my_bitmap.c:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/net_serv.cc:
Auto merged
sql/sql_select.cc:
Auto merged
debug printouts
ndb documentation update
ndb/include/ndbapi/Ndb.hpp:
ndb documentation update
ndb/src/kernel/blocks/suma/Suma.cpp:
fixed mem leak in subscriction handling in Suma
debug printouts
ndb/src/kernel/blocks/suma/Suma.hpp:
fixed mem leak in subscriction handling in Suma
fix crashing bug in Dict caused by Suma on CREATE_SUBID_REF
ndb/include/kernel/signaldata/SumaImpl.hpp:
fix crashing bug in Dict caused by Suma on CREATE_SUBID_REF
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
fixed bug in event handling of several tables
