mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
164920 commits 2791 branches 343 tags 1.7 GiB
Commit graph

16603 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
dfde70f52e merge 2005-09-15 13:07:22 +02:00
unknown
8cb57f592a .del-readme.txt~b8bfcc7df24862f9: 
Delete: storage/ndb/ndbapi-examples/ndbapi_async_example/readme.txt
.del-ndbapi_async.cpp~319189569fb659ec:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example/ndbapi_async.cpp
.del-Makefile~79de1c081ceb33e9:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example/Makefile
.del-ndbapi_async1.cpp~2995dac9b963a0d:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example1/ndbapi_async1.cpp
.del-Makefile~75b59c8ae729df88:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example1/Makefile
.del-ndbapi_event.cpp~c5d949802966180:
  Delete: storage/ndb/ndbapi-examples/ndbapi_event_example/ndbapi_event.cpp
.del-Makefile~9b32217af2a3145:
  Delete: storage/ndb/ndbapi-examples/ndbapi_event_example/Makefile
.del-ndbapi_retries.cpp~7301496d8c1c310a:
  Delete: storage/ndb/ndbapi-examples/ndbapi_retries_example/ndbapi_retries.cpp
.del-Makefile~39711027c2d962ff:
  Delete: storage/ndb/ndbapi-examples/ndbapi_retries_example/Makefile
.del-ndbapi_simple_index.cpp~4b95a4d71808b5b6:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp
.del-Makefile~27fcbb1f51b14aa7:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile
.del-readme.txt~c54f2dc2297fa97:
  Delete: storage/ndb/ndbapi-examples/ndbapi_scan_example/readme.txt
.del-ndbapi_scan.cpp~14ed2aa9a5d9e597:
  Delete: storage/ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp
.del-Makefile~896f3a0fcdc499eb:
  Delete: storage/ndb/ndbapi-examples/ndbapi_scan_example/Makefile
.del-ndbapi_simple.cpp~80962179f3c2f5b8:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_example/ndbapi_simple.cpp
.del-Makefile~2bb0971c2e0576ef:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_example/Makefile
.del-mgmapi_logevent.cpp~f1e7cf3e70edc4:
  Delete: storage/ndb/ndbapi-examples/mgmapi_logevent_example/mgmapi_logevent.cpp
.del-Makefile~8c7f0da8e0e08db6:
  Delete: storage/ndb/ndbapi-examples/mgmapi_logevent_example/Makefile


BitKeeper/deleted/.del-Makefile~8c7f0da8e0e08db6:
  Delete: storage/ndb/ndbapi-examples/mgmapi_logevent_example/Makefile
BitKeeper/deleted/.del-mgmapi_logevent.cpp~f1e7cf3e70edc4:
  Delete: storage/ndb/ndbapi-examples/mgmapi_logevent_example/mgmapi_logevent.cpp
BitKeeper/deleted/.del-Makefile~2bb0971c2e0576ef:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_example/Makefile
BitKeeper/deleted/.del-ndbapi_simple.cpp~80962179f3c2f5b8:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_example/ndbapi_simple.cpp
BitKeeper/deleted/.del-Makefile~896f3a0fcdc499eb:
  Delete: storage/ndb/ndbapi-examples/ndbapi_scan_example/Makefile
BitKeeper/deleted/.del-ndbapi_scan.cpp~14ed2aa9a5d9e597:
  Delete: storage/ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp
BitKeeper/deleted/.del-readme.txt~c54f2dc2297fa97:
  Delete: storage/ndb/ndbapi-examples/ndbapi_scan_example/readme.txt
BitKeeper/deleted/.del-Makefile~27fcbb1f51b14aa7:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile
BitKeeper/deleted/.del-ndbapi_simple_index.cpp~4b95a4d71808b5b6:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp
BitKeeper/deleted/.del-Makefile~39711027c2d962ff:
  Delete: storage/ndb/ndbapi-examples/ndbapi_retries_example/Makefile
BitKeeper/deleted/.del-ndbapi_retries.cpp~7301496d8c1c310a:
  Delete: storage/ndb/ndbapi-examples/ndbapi_retries_example/ndbapi_retries.cpp
BitKeeper/deleted/.del-Makefile~9b32217af2a3145:
  Delete: storage/ndb/ndbapi-examples/ndbapi_event_example/Makefile
BitKeeper/deleted/.del-ndbapi_event.cpp~c5d949802966180:
  Delete: storage/ndb/ndbapi-examples/ndbapi_event_example/ndbapi_event.cpp
BitKeeper/deleted/.del-Makefile~75b59c8ae729df88:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example1/Makefile
BitKeeper/deleted/.del-ndbapi_async1.cpp~2995dac9b963a0d:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example1/ndbapi_async1.cpp
BitKeeper/deleted/.del-Makefile~79de1c081ceb33e9:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example/Makefile
BitKeeper/deleted/.del-ndbapi_async.cpp~319189569fb659ec:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example/ndbapi_async.cpp
BitKeeper/deleted/.del-readme.txt~b8bfcc7df24862f9:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example/readme.txt
 2005-09-15 13:00:53 +02:00
tomas@poseidon.ndb.mysql.com
a90c4441de .del-readme.txt~b8bfcc7df24862f9: 
Delete: storage/ndb/ndbapi-examples/ndbapi_async_example/readme.txt
.del-ndbapi_async.cpp~319189569fb659ec:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example/ndbapi_async.cpp
.del-Makefile~79de1c081ceb33e9:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example/Makefile
.del-ndbapi_async1.cpp~2995dac9b963a0d:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example1/ndbapi_async1.cpp
.del-Makefile~75b59c8ae729df88:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example1/Makefile
.del-ndbapi_event.cpp~c5d949802966180:
  Delete: storage/ndb/ndbapi-examples/ndbapi_event_example/ndbapi_event.cpp
.del-Makefile~9b32217af2a3145:
  Delete: storage/ndb/ndbapi-examples/ndbapi_event_example/Makefile
.del-ndbapi_retries.cpp~7301496d8c1c310a:
  Delete: storage/ndb/ndbapi-examples/ndbapi_retries_example/ndbapi_retries.cpp
.del-Makefile~39711027c2d962ff:
  Delete: storage/ndb/ndbapi-examples/ndbapi_retries_example/Makefile
.del-ndbapi_simple_index.cpp~4b95a4d71808b5b6:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp
.del-Makefile~27fcbb1f51b14aa7:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile
.del-readme.txt~c54f2dc2297fa97:
  Delete: storage/ndb/ndbapi-examples/ndbapi_scan_example/readme.txt
.del-ndbapi_scan.cpp~14ed2aa9a5d9e597:
  Delete: storage/ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp
.del-Makefile~896f3a0fcdc499eb:
  Delete: storage/ndb/ndbapi-examples/ndbapi_scan_example/Makefile
.del-ndbapi_simple.cpp~80962179f3c2f5b8:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_example/ndbapi_simple.cpp
.del-Makefile~2bb0971c2e0576ef:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_example/Makefile
.del-mgmapi_logevent.cpp~f1e7cf3e70edc4:
  Delete: storage/ndb/ndbapi-examples/mgmapi_logevent_example/mgmapi_logevent.cpp
.del-Makefile~8c7f0da8e0e08db6:
  Delete: storage/ndb/ndbapi-examples/mgmapi_logevent_example/Makefile
 2005-09-15 13:00:53 +02:00
unknown
519ebe2bdb merge error 2005-09-15 12:53:59 +02:00
tomas@poseidon.ndb.mysql.com
35a520d2c2 merge error 2005-09-15 12:53:59 +02:00
unknown
2ff26b97f2 ndb-wl2325.patch 
storage/ndb/include/debugger/EventLogger.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Import patch ndb-wl2325.patch
storage/ndb/include/kernel/NodeInfo.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/kernel/signaldata/AlterTab.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/kernel/signaldata/CreateEvnt.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/kernel/signaldata/CreateTab.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/kernel/signaldata/DropTab.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/kernel/signaldata/EventReport.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/kernel/signaldata/SumaImpl.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/mgmapi/mgmapi.h:
  Import patch ndb-wl2325.patch
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Import patch ndb-wl2325.patch
storage/ndb/include/mgmapi/ndb_logevent.h:
  Import patch ndb-wl2325.patch
storage/ndb/include/ndbapi/Ndb.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/ndbapi/NdbError.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/ndbapi/NdbEventOperation.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/include/ndbapi/ndberror.h:
  Import patch ndb-wl2325.patch
storage/ndb/ndbapi-examples/Makefile:
  Import patch ndb-wl2325.patch
storage/ndb/src/common/debugger/EventLogger.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/common/debugger/Makefile.am:
  Import patch ndb-wl2325.patch
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/SimBlockList.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/trix/Trix.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/blocks/trix/Trix.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/vm/Configuration.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/mgmapi/mgmapi.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/mgmapi/ndb_logevent.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/mgmsrv/Services.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/mgmsrv/Services.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/Ndb.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/NdbEventOperation.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/NdbWaiter.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/Ndberr.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/Ndbif.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/Ndbinit.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/ObjectMap.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/TransporterFacade.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/src/ndbapi/ndberror.c:
  Import patch ndb-wl2325.patch
storage/ndb/test/include/HugoOperations.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/include/HugoTransactions.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/include/NDBT_Table.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/include/NDBT_Test.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/Makefile.am:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bank/Bank.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bank/Bank.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bank/bankCreator.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bank/bankMakeGL.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bank/bankTimer.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bank/testBank.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bench/asyncGenerator.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/bench/ndb_schema.hpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/test_event.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/ndbapi/test_event_multi_table.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/run-test/Makefile.am:
  Import patch ndb-wl2325.patch
storage/ndb/test/run-test/daily-devel-tests.txt:
  Import patch ndb-wl2325.patch
storage/ndb/test/src/HugoOperations.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/src/HugoTransactions.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/src/NDBT_ResultRow.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/src/NDBT_Tables.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/src/NDBT_Test.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/src/UtilTransactions.cpp:
  Import patch ndb-wl2325.patch
storage/ndb/test/tools/Makefile.am:
  Import patch ndb-wl2325.patch
 2005-09-15 11:33:50 +02:00
tomas@poseidon.ndb.mysql.com[tomas]
8069a6833a ndb-wl2325.patch 2005-09-15 11:33:50 +02:00
unknown
67347ba37f Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/myisam/mi_test2.c:
  Auto merged
 2005-09-15 11:32:49 +02:00
msvensson@neptunus.(none)
10eee79363 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2005-09-15 11:32:49 +02:00
unknown
9a7ec9517c ndb - wl#2624 re-commit due to bk problem 
mysql-test/r/ndb_basic.result:
  wl#2624 re-commit due to bk problem
mysql-test/r/ndb_blob.result:
  wl#2624 re-commit due to bk problem
mysql-test/r/ndb_charset.result:
  wl#2624 re-commit due to bk problem
mysql-test/r/ndb_condition_pushdown.result:
  wl#2624 re-commit due to bk problem
mysql-test/r/ndb_index_ordered.result:
  wl#2624 re-commit due to bk problem
mysql-test/t/ndb_index_ordered.test:
  wl#2624 re-commit due to bk problem
sql/ha_ndbcluster.cc:
  wl#2624 re-commit due to bk problem
sql/ha_ndbcluster.h:
  wl#2624 re-commit due to bk problem
sql/mysqld.cc:
  wl#2624 re-commit due to bk problem
sql/set_var.cc:
  wl#2624 re-commit due to bk problem
sql/sql_class.h:
  wl#2624 re-commit due to bk problem
storage/ndb/include/kernel/AttributeHeader.hpp:
  wl#2624 re-commit due to bk problem
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  wl#2624 re-commit due to bk problem
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dbtux/Makefile.am:
  wl#2624 re-commit due to bk problem
storage/ndb/src/ndbapi/Makefile.am:
  wl#2624 re-commit due to bk problem
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  wl#2624 re-commit due to bk problem
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl#2624 re-commit due to bk problem
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  wl#2624 re-commit due to bk problem
 2005-09-15 02:33:28 +02:00
pekka@mysql.com
81d8cc1e84 ndb - wl#2624 re-commit due to bk problem 2005-09-15 02:33:28 +02:00
unknown
ee2125c919 merge 
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/ndb/src/common/portlib/NdbTCP.cpp:
  Auto merged
storage/ndb/src/common/portlib/win32/NdbTCP.c:
  Auto merged
 2005-09-14 17:58:20 +02:00
tulin@dl145c.mysql.com
ea4161baed merge 2005-09-14 17:58:20 +02:00
unknown
8943090c33 Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new 
into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my51-bug10713_new


mysql-test/mysql-test-run.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
VC++Files/mysql.sln:
  Manual merge 5.0 -> 5.1
scripts/make_win_src_distribution.sh:
  Manual merge 5.0 -> 5.1
sql/field.cc:
  Manual merge 5.0 -> 5.1
 2005-09-14 09:43:56 +02:00
msvensson@neptunus.(none)
fb63290635 Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new 
into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my51-bug10713_new
 2005-09-14 09:43:56 +02:00
unknown
dca8397833 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/test/include/NDBT_Test.hpp:
  Auto merged
storage/ndb/test/ndbapi/Makefile.am:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.cpp:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.hpp:
  Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
  Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
  Auto merged
 2005-09-13 14:03:00 +02:00
jonas@eel.(none)
183aab9d22 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push
 2005-09-13 14:03:00 +02:00
unknown
0260e3dcc1 Merge 
configure.in:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
sql/sql_table.cc:
  SCCS merged
 2005-09-13 05:33:11 +02:00
ndbdev@dl145c.mysql.com
4e8595862d Merge 2005-09-13 05:33:11 +02:00
unknown
54e99aa58e Merge 
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysys/default.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/heap/hp_hash.c:
  Auto merged
storage/ndb/include/util/Parser.hpp:
  Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/test/include/NDBT_Test.hpp:
  Auto merged
storage/ndb/test/ndbapi/Makefile.am:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.cpp:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.hpp:
  Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
  Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
  Auto merged
mysql-test/mysql-test-run.pl:
  SCCS merged
 2005-09-12 14:22:06 +02:00
tulin@dl145c.mysql.com
a29132cdc5 Merge 2005-09-12 14:22:06 +02:00
unknown
6e1d21039b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
 2005-09-10 21:06:22 +02:00
jonas@eel.(none)
8583963bf6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push
 2005-09-10 21:06:22 +02:00
unknown
3bd9f42ca6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
  Auto merged
 2005-09-10 09:04:34 +02:00
tulin@dl145b.mysql.com
b1994c03b6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-09-10 09:04:34 +02:00
unknown
ba677667f7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push


sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
 2005-09-09 21:05:59 +02:00
jonas@eel.(none)
b5954b69a0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push
 2005-09-09 21:05:59 +02:00
unknown
bbc293fd7c SignalSender.cpp: 
Rename: ndb/src/ndbapi/SignalSender.cpp -> storage/ndb/src/ndbapi/SignalSender.cpp
SignalSender.hpp:
  Rename: ndb/src/ndbapi/SignalSender.hpp -> storage/ndb/src/ndbapi/SignalSender.hpp


storage/ndb/src/ndbapi/SignalSender.hpp:
  Rename: ndb/src/ndbapi/SignalSender.hpp -> storage/ndb/src/ndbapi/SignalSender.hpp
storage/ndb/src/ndbapi/SignalSender.cpp:
  Rename: ndb/src/ndbapi/SignalSender.cpp -> storage/ndb/src/ndbapi/SignalSender.cpp
 2005-09-09 20:37:14 +02:00
tulin@dl145b.mysql.com
8445a0756b SignalSender.cpp: 
Rename: ndb/src/ndbapi/SignalSender.cpp -> storage/ndb/src/ndbapi/SignalSender.cpp
SignalSender.hpp:
  Rename: ndb/src/ndbapi/SignalSender.hpp -> storage/ndb/src/ndbapi/SignalSender.hpp
 2005-09-09 20:37:14 +02:00
unknown
36aeee3682 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupSignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/NodeFailRep.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/ndbapi/Makefile.am:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/src/NdbBackup.cpp:
  Auto merged
 2005-09-09 15:26:47 +02:00
ndbdev@dl145b.mysql.com
46cc62e216 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-09-09 15:26:47 +02:00
unknown
173bdc337e 5.0->5.1 merge fix 
5.1 has moved ndb into storage


storage/ndb/test/ndbapi/testSRBank.cpp:
  Rename: ndb/test/ndbapi/testSRBank.cpp -> storage/ndb/test/ndbapi/testSRBank.cpp
 2005-09-09 13:44:48 +02:00
jonas@eel.(none)
5fa930ad2d 5.0->5.1 merge fix 
5.1 has moved ndb into storage
 2005-09-09 13:44:48 +02:00
unknown
12dbb18815 Merge eel.(none):/home/jonas/src/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.1-push


sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
  Auto merged
storage/ndb/test/include/NDBT_Test.hpp:
  Auto merged
storage/ndb/test/ndbapi/Makefile.am:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.cpp:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.hpp:
  Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
  Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
  Auto merged
 2005-09-09 13:30:38 +02:00
jonas@eel.(none)
315b8ef3bb Merge eel.(none):/home/jonas/src/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.1-push
 2005-09-09 13:30:38 +02:00
unknown
e371b26468 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push
 2005-09-09 13:27:59 +02:00
jonas@eel.(none)
ae690c7f48 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push
 2005-09-09 13:27:59 +02:00
unknown
4ec11b2797 Merge 127.(none):/home/osku/mysql/5.0/12084 
into  127.(none):/home/osku/mysql/5.1/clean


sql/ha_innodb.cc:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/include/dict0dict.h:
  Auto merged
storage/innobase/include/row0mysql.h:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
 2005-09-08 11:36:11 +03:00
osku@127.(none)
89e8df28ec Merge 127.(none):/home/osku/mysql/5.0/12084 
into  127.(none):/home/osku/mysql/5.1/clean
 2005-09-08 11:36:11 +03:00
unknown
c8cb9b1191 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
 2005-09-06 12:50:30 +02:00
jonas@eel.(none)
e615b5cc99 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push
 2005-09-06 12:50:30 +02:00
unknown
5ac4b63188 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1


storage/ndb/include/util/ndb_opts.h:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.hpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.hpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged
 2005-09-06 09:21:23 +02:00
ndbdev@dl145c.mysql.com
86344c4a83 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-09-06 09:21:23 +02:00
unknown
f6c1d4191c Merge 
Makefile.am:
  Auto merged
BitKeeper/etc/config:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/innobase/include/page0page.ic:
  Auto merged
storage/innobase/include/univ.i:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
storage/myisam/mi_static.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/ndb/include/kernel/signaldata/SignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StartFragReq.hpp:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/StartRec.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
sql/log_event.cc:
  SCCS merged
sql/sql_prepare.cc:
  SCCS merged
sql/share/errmsg.txt:
  merge
 2005-09-06 09:20:15 +02:00
ndbdev@dl145c.mysql.com
f40c1576b0 Merge 2005-09-06 09:20:15 +02:00
unknown
616df8931f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push


sql/ha_innodb.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  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/ndbapi/ndberror.c:
  Auto merged
 2005-09-06 06:52:06 +02:00
jonas@eel.(none)
2575f62b85 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push
 2005-09-06 06:52:06 +02:00
unknown
7cbc039c9e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/mi_extra.c:
  Auto merged
storage/ndb/include/kernel/signaldata/FsRef.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/sql_acl.cc:
  Merge 5.0 -> 5.1
storage/ndb/src/kernel/blocks/dbdih/Makefile.am:
  Merge 5.0 -> 5.1
 2005-09-02 08:59:59 +02:00
msvensson@neptunus.(none)
345dfef41f Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2005-09-02 08:59:59 +02:00
unknown
008f4121d5 merge 
BitKeeper/etc/config:
  Auto merged
Makefile.am:
  Auto merged
VC++Files/sql/mysqld.vcproj:
  Auto merged
configure.in:
  Auto merged
extra/perror.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.h:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
  Auto merged
 2005-08-31 20:45:48 +02:00