into clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug24028
mysql-test/r/ndb_blob.result:
Auto merged
mysql-test/t/ndb_blob.test:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
Auto merged
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/help.result:
Auto merged
mysql-test/t/help.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
into chilla.local:/home/mydev/mysql-5.1-bug26996
mysql-test/r/heap_btree.result:
Auto merged
mysql-test/t/heap_btree.test:
Auto merged
storage/heap/hp_write.c:
Auto merged
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/tools/restore/Restore.cpp:
Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
Opening certain tables that have different definitions in .MYI and
.frm may result in a server crash.
Compare .MYI and .frm definition when myisam table is opened. In case
definitions are diffirent refuse to open such table.
No test case, since it requires broken table.
storage/myisam/ha_myisam.cc:
Compare .MYI and .frm definition when myisam table is opened. In case
definitions are diffirent refuse to open such table.
make sure master node is sendable, when getting ref::NotMaster
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
make sure master node is sendable, when getting ref::NotMaster
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
storage/ndb/src/common/debugger/EventLogger.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-comp_err.vcproj~45c167ae5ddd5a96:
Auto merged
BitKeeper/deleted/.del-gen_lex_hash.vcproj~544be6b6:
Auto merged
BitKeeper/deleted/.del-heap.vcproj~4382203ba03f4038:
Auto merged
BitKeeper/deleted/.del-myTest.vcproj~dba5adc4fad3c06:
Auto merged
BitKeeper/deleted/.del-my_print_defaults.vcproj~c8aa2bd86e13c3f9:
Auto merged
BitKeeper/deleted/.del-myisam_ftdump.vcproj~409c19b0274b7f8e:
Auto merged
BitKeeper/deleted/.del-myisamchk.vcproj~982ebe5673e58fb6:
Auto merged
BitKeeper/deleted/.del-myisamlog.vcproj~daa6596ea386e5a7:
Auto merged
BitKeeper/deleted/.del-myisampack.vcproj~3f7d4ec0cb56a9a0:
Auto merged
BitKeeper/deleted/.del-mysql.vcproj~f7bfe13a8836eea0:
Auto merged
BitKeeper/deleted/.del-mysql_client_test.vcproj~22188dcd372bc9de:
Auto merged
BitKeeper/deleted/.del-mysql_upgrade.vcproj~54815b7265120589:
Auto merged
BitKeeper/deleted/.del-mysqladmin.vcproj~178fa55cba442d50:
Auto merged
BitKeeper/deleted/.del-mysqlbinlog.vcproj~b2a5b1868f5d6596:
Auto merged
BitKeeper/deleted/.del-mysqlcheck.vcproj~7022581c8b8a7ea2:
Auto merged
BitKeeper/deleted/.del-mysqlclient.vcproj~e78a73e31368a44a:
Auto merged
BitKeeper/deleted/.del-mysqlimport.vcproj~5a30228ef641c081:
Auto merged
BitKeeper/deleted/.del-mysqlshow.vcproj~797d4fa322faa148:
Auto merged
BitKeeper/deleted/.del-mysqltest.vcproj~21878840704179ef:
Auto merged
BitKeeper/deleted/.del-perror.vcproj~86ad9dc660a048ad:
Auto merged
BitKeeper/deleted/.del-regex.vcproj~9dea9caafa801b26:
Auto merged
BitKeeper/deleted/.del-replace.vcproj~9620b1ced86e527a:
Auto merged
BitKeeper/deleted/.del-strings.vcproj~6d1126ae59e4bf82:
Auto merged
BitKeeper/deleted/.del-test1.vcproj~c474b4614c67e2d2:
Auto merged
BitKeeper/deleted/.del-test_libmysqld.vcproj~fb301d42d5c4e6f4:
Auto merged
BitKeeper/deleted/.del-thr_test.vcproj~fc0e15c1e6880160:
Auto merged
BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85:
Auto merged
BitKeeper/deleted/.del-zlib.vcproj~9b1a681d56dae190:
Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
Auto merged
extra/yassl/yassl.vcproj:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/delayed.result:
Auto merged
mysql-test/r/loaddata.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/t/delayed.test:
Auto merged
mysql-test/t/init_connect.test:
Auto merged
mysql-test/t/loaddata.test:
Auto merged
mysql-test/t/merge.test:
Auto merged
netware/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj:
Auto merged
mysql-test/install_test_db.sh:
SCCS merged
+ some fixes to do the enable
mysql-test/r/rpl_ndb_sync.result:
enabled test case
mysql-test/t/disabled.def:
enabled test case
sql/ha_ndbcluster.cc:
enabled test case
sql/ha_ndbcluster_tables.h:
add defines for old sys table
storage/ndb/tools/restore/Restore.cpp:
add check for old sys table
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
merge
mysql-test/r/ndb_dd_basic.result:
adding some test result for increasing test codes.
mysql-test/t/ndb_dd_basic.test:
adding some test codes for nodatafile in tablespace.
storage/ndb/include/kernel/signaldata/Extent.hpp:
Add NoDatafile error code when allocating extent.
storage/ndb/src/kernel/blocks/tsman.cpp:
when there is no datafile in spacefile , it should return NoDatafile error code, rather than NoExtentAvailable.
storage/ndb/src/ndbapi/ndberror.c:
add no datafile error code and corresponding error message for NoDatafile
into bodhi.local:/opt/local/work/mysql-5.1-runtime
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/events_scheduling.result:
Auto merged
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
Auto merged
BitKeeper/deleted/.del-mysql_create_system_tables.sh:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/events_scheduling.test:
Auto merged
mysql-test/t/grant_cache.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/view.test:
Auto merged
scripts/mysql_system_tables_fix.sql:
Auto merged
sql/event_db_repository.cc:
Auto merged
sql/event_queue.cc:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/tztime.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/ha_myisam.h:
Auto merged
mysql-test/r/skip_grants.result:
Manualmerge.
mysql-test/r/sp.result:
Manualmerge.
mysql-test/t/skip_grants.test:
Manualmerge.
mysql-test/t/sp.test:
Manualmerge.
sql/event_data_objects.cc:
Manualmerge.
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
Fix race in testprg...causing random TC crashes
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
remove incorrect work-around
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Fix race in testprg...causing random TC crashes
into poseidon.:/home/tomas/mysql-5.1-new-ndb
storage/ndb/tools/restore/consumer_restore.cpp:
Auto merged
storage/ndb/tools/restore/restore_main.cpp:
Auto merged
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
