Commits · 5d1792dd0e68d7352bd82c5ee904a2932d30be67 · nexedi / MariaDB

11 May, 2004 18 commits

Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5d1792dd
unknown authored May 11, 2004
```
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
```
5d1792dd

Added comments to all methods. Added explanation for a sequential read through a storage engine. · 8351c87f

unknown authored May 11, 2004


sql/examples/ha_example.cc:
  Documentation updates (lots of comments in the code).
sql/examples/ha_example.h:
  Documenation update, lots of comments in the code.

8351c87f

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 496fa0f7
unknown authored May 12, 2004
```
into mysql.com:/home/my/mysql-4.1
```
496fa0f7

Don't automaticly generate a new key for a foreign key constraint if there is already a usable key. · e8bd153f

unknown authored May 12, 2004

Prefer not automatic keys before automatic keys. If there is two conf


BitKeeper/etc/ignore:
  added *.d
include/my_base.h:
  Added flag for automaticly generated key
mysql-test/r/constraints.result:
  Update tests after bug fix
mysql-test/r/create.result:
  Update tests after bug fix
mysql-test/r/innodb.result:
  Added test of automatic creation of foreign keys
mysql-test/t/innodb.test:
  Added test of automatic creation of foreign keys
mysql-test/t/key_cache.test:
  Portability fixes (64 BIT os)
sql/sql_acl.cc:
  Indentation fixes
sql/sql_class.cc:
  Fix key comparison to handle prefix and optionally key segments in different order.
sql/sql_class.h:
  Added flag for automaticly generated keys
sql/sql_parse.cc:
  Added flag for automaticly generated keys
sql/sql_table.cc:
  Don't automaticly generate a new key for a foreign key constraint if there is already a usable key.
  Prefer not automatic keys before automatic keys. If there is two conflicting automatic keys, prefer the longer one.
sql/sql_yacc.yy:
  Added flag for automaticly generated keys
strings/strings-x86.s:
  Portability fix.

e8bd153f

Cset include: ndbdev@ndbmaster.mysql.com|ChangeSet|20040511202610|13901 · c1cc9bf5

unknown authored May 11, 2004

Cset include: ndbdev@ndbmaster.mysql.com|ChangeSet|20040511202329|47736
Cset include: tomas@mc05.(none)|ChangeSet|20040511192517|11620
Cset include: joreland@mysql.com|ChangeSet|20040511192516|46068
Cset include: tomas@mc05.(none)|ChangeSet|20040511123917|46372
Cset include: tomas@mc05.(none)|ChangeSet|20040511123143|38188
Cset include: tulin@build.mysql.com|ChangeSet|20040510154057|38196
Cset include: joreland@mysql.com|ChangeSet|20040508224854|24167
Cset include: tomas@mc05.(none)|ChangeSet|20040507133412|23798
Cset include: tomas@mc05.(none)|ChangeSet|20040507063942|37686
Cset include: tomas@mc05.(none)|ChangeSet|20040506111114|33079
Cset include: tomas@mc05.(none)|ChangeSet|20040506105341|38394
Cset include: tomas@mc05.(none)|ChangeSet|20040506071539|38751
Cset include: tomas@mc05.(none)|ChangeSet|20040505121947|31340
Cset include: tomas@mc05.(none)|ChangeSet|20040505113759|32666
Cset include: tomas@mc05.(none)|ChangeSet|20040505104200|32652
Cset include: tomas@mc05.(none)|ChangeSet|20040505092956|32651
Cset include: tomas@mc05.(none)|ChangeSet|20040504130019|09791
Cset include: tomas@mc05.(none)|ChangeSet|20040503043335|03888
Cset include: tomas@mc05.(none)|ChangeSet|20040428084951|62492


BitKeeper/etc/logging_ok:
  Include
extra/Makefile.am:
  Include
extra/perror.c:
  Include
ndb/Defs.mk:
  Include
ndb/Epilogue.mk:
  Include
ndb/examples/ndbapi_async_example/ndbapi_async.cpp:
  Include
ndb/examples/ndbapi_scan_example/ndbapi_scan.cpp:
  Include
ndb/include/debugger/SignalLoggerManager.hpp:
  Include
ndb/include/kernel/LogLevel.hpp:
  Include
ndb/include/kernel/signaldata/BuildIndx.hpp:
  Include
ndb/include/kernel/signaldata/SignalData.hpp:
  Include
ndb/src/common/util/new.cpp:
  Include
BitKeeper/deleted/.del-NdbConstant.hpp~de1038c1758cc1f9:
  Include
BitKeeper/deleted/.del-NdbStdio.h~17be17a4f591c671:
  Include
BitKeeper/deleted/.del-NdbString.h~1f9f26341ce5f5f:
  Include
BitKeeper/deleted/.del-NdbUnistd.h~a1b3840adcd49985:
  Include
ndb/include/kernel/signaldata/SignalDataPrint.hpp:
  Include
ndb/include/logger/FileLogHandler.hpp:
  Include
ndb/include/logger/LogHandler.hpp:
  Include
ndb/include/logger/Logger.hpp:
  Include
ndb/include/mgmcommon/MgmtErrorReporter.hpp:
  Include
ndb/include/ndb_types.h:
  Include
ndb/include/ndb_version.h:
  Include
ndb/include/ndbapi/Ndb.hpp:
  Include
ndb/include/ndbapi/NdbConnection.hpp:
  Include
ndb/include/ndbapi/NdbError.hpp:
  Include
ndb/include/ndbapi/NdbEventOperation.hpp:
  Include
ndb/include/ndbapi/NdbOperation.hpp:
  Include
ndb/include/ndbapi/NdbRecAttr.hpp:
  Include
ndb/include/ndbapi/NdbReceiver.hpp:
  Include
ndb/include/ndbapi/NdbScanOperation.hpp:
  Include
ndb/include/ndbapi/NdbSchemaOp.hpp:
  Include
ndb/include/newtonapi/dba.h:
  Include
ndb/include/newtonapi/defs/pcn_types.h:
  Include
ndb/include/portlib/NdbMem.h:
  Include
ndb/include/portlib/NdbTCP.h:
  Include
ndb/include/portlib/NdbThread.h:
  Include
ndb/include/transporter/TransporterDefinitions.hpp:
  Include
ndb/include/util/BaseString.hpp:
  Include
ndb/include/util/Bitmask.hpp:
  Include
ndb/include/util/File.hpp:
  Include
ndb/include/util/InputStream.hpp:
  Include
ndb/include/util/NdbAutoPtr.hpp:
  Include
ndb/include/util/OutputStream.hpp:
  Include
ndb/include/util/Properties.hpp:
  Include
ndb/include/util/SimpleProperties.hpp:
  Include
ndb/include/util/UtilBuffer.hpp:
  Include
ndb/include/util/Vector.hpp:
  Include
ndb/include/util/getarg.h:
  Include
ndb/include/util/socket_io.h:
  Include
ndb/include/util/uucode.h:
  Include
ndb/src/client/odbc/common/Ctx.cpp:
  Include
ndb/src/client/odbc/common/DataField.cpp:
  Include
ndb/src/client/odbc/common/DataType.cpp:
  Include
ndb/src/client/odbc/common/OdbcData.cpp:
  Include
ndb/src/common/debugger/DebuggerNames.cpp:
  Include
ndb/src/common/debugger/EventLogger.cpp:
  Include
ndb/src/common/debugger/SignalLoggerManager.cpp:
  Include
ndb/src/common/debugger/signaldata/CloseComReqConf.cpp:
  Include
ndb/src/common/debugger/signaldata/ContinueB.cpp:
  Include
ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp:
  Include
ndb/src/common/debugger/signaldata/SystemError.cpp:
  Include
ndb/src/common/editline/editline_internal.h:
  Include
ndb/src/common/editline/editline_win32.c:
  Include
ndb/src/common/editline/test/testit.c:
  Include
ndb/src/common/logger/FileLogHandler.cpp:
  Include
ndb/src/common/logger/LogHandler.cpp:
  Include
ndb/src/common/logger/LogHandlerList.cpp:
  Include
ndb/src/common/logger/Logger.cpp:
  Include
ndb/src/common/logger/SysLogHandler.cpp:
  Include
ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp:
  Include
ndb/src/common/logger/loggertest/LoggerUnitTest.cpp:
  Include
ndb/src/common/mgmcommon/Config.hpp:
  Include
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Include
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
  Include
ndb/src/common/mgmcommon/InitConfigFileParser.hpp:
  Include
ndb/src/common/mgmcommon/LocalConfig.hpp:
  Include
ndb/src/common/mgmcommon/NdbConfig.c:
  Include
ndb/src/common/mgmcommon/printConfig/printConfig.cpp:
  Include
ndb/src/common/portlib/memtest/memtest.c:
  Include
ndb/src/common/portlib/memtest/munmaptest/munmaptest.cpp:
  Include
ndb/src/common/portlib/mmstest/mmslist.cpp:
  Include
ndb/src/common/portlib/mmstest/mmstest.cpp:
  Include
ndb/src/common/portlib/ose/NdbCondition.c:
  Include
ndb/src/common/portlib/ose/NdbMem.c:
  Include
ndb/src/common/portlib/ose/NdbMutex.c:
  Include
ndb/src/common/portlib/ose/NdbOut.cpp:
  Include
ndb/src/common/portlib/ose/NdbThread.c:
  Include
ndb/src/common/portlib/test/NdbPortLibTest.cpp:
  Include
ndb/src/common/portlib/unix/NdbCondition.c:
  Include
ndb/src/common/portlib/unix/NdbDaemon.c:
  Include
ndb/src/common/portlib/unix/NdbEnv.c:
  Include
ndb/src/common/portlib/unix/NdbMem.c:
  Include
ndb/src/common/portlib/unix/NdbMutex.c:
  Include
ndb/src/common/portlib/unix/NdbSleep.c:
  Include
ndb/src/common/portlib/unix/NdbThread.c:
  Include
ndb/src/common/portlib/unix/NdbTick.c:
  Include
ndb/src/common/portlib/win32/NdbCondition.c:
  Include
ndb/src/common/portlib/win32/NdbMem.c:
  Include
ndb/src/common/portlib/win32/NdbMutex.c:
  Include
ndb/src/common/portlib/win32/NdbThread.c:
  Include
ndb/src/common/transporter/OSE_Receiver.cpp:
  Include
ndb/src/common/transporter/OSE_Transporter.cpp:
  Include
ndb/src/common/transporter/Packer.cpp:
  Include
ndb/src/common/transporter/SCI_Transporter.cpp:
  Include
ndb/src/common/transporter/SHM_Buffer.hpp:
  Include
ndb/src/common/transporter/SHM_Transporter.cpp:
  Include
ndb/src/common/transporter/SHM_Transporter.unix.cpp:
  Include
ndb/src/common/transporter/SHM_Transporter.win32.cpp:
  Include
ndb/src/common/transporter/SendBuffer.hpp:
  Include
ndb/src/common/transporter/TCP_Transporter.cpp:
  Include
ndb/src/common/transporter/Transporter.cpp:
  Include
ndb/src/common/transporter/TransporterRegistry.cpp:
  Include
ndb/src/common/transporter/basictest/basicTransporterTest.cpp:
  Include
ndb/src/common/transporter/buddy.cpp:
  Include
ndb/src/common/transporter/buddy.hpp:
  Include
ndb/src/common/transporter/failoverSCI/failoverSCI.cpp:
  Include
ndb/src/common/transporter/perftest/perfTransporterTest.cpp:
  Include
ndb/src/common/transporter/priotest/prioTransporterTest.cpp:
  Include
ndb/src/common/util/Base64.cpp:
  Include
ndb/src/common/util/BaseString.cpp:
  Include
ndb/src/common/util/File.cpp:
  Include
ndb/src/common/util/InputStream.cpp:
  Include
ndb/src/common/util/Makefile:
  Include
ndb/src/common/util/NdbErrHnd.cpp:
  Include
ndb/src/common/util/NdbOut.cpp:
  Include
ndb/src/common/util/NdbSqlUtil.cpp:
  Include
ndb/src/common/util/OutputStream.cpp:
  Include
ndb/src/common/util/Parser.cpp:
  Include
ndb/src/common/util/Properties.cpp:
  Include
ndb/src/common/util/SimpleProperties.cpp:
  Include
ndb/src/common/util/SocketServer.cpp:
  Include
ndb/src/common/util/filetest/FileUnitTest.cpp:
  Include
ndb/src/common/util/getarg.c:
  Include
ndb/src/common/util/random.c:
  Include
ndb/src/common/util/socket_io.cpp:
  Include
ndb/src/common/util/strdup.c:
  Include
ndb/src/common/util/strlcat.c:
  Include
ndb/src/common/util/strlcpy.c:
  Include
ndb/src/common/util/testProperties/testProperties.cpp:
  Include
ndb/src/common/util/testSimpleProperties/sp_test.cpp:
  Include
ndb/src/common/util/uucode.c:
  Include
ndb/src/common/util/version.c:
  Include
ndb/src/cw/cpcc-win32/C++/StdAfx.h:
  Include
ndb/src/cw/cpcd/APIService.cpp:
  Include
ndb/src/cw/cpcd/CPCD.cpp:
  Include
ndb/src/cw/cpcd/Monitor.cpp:
  Include
ndb/src/cw/cpcd/Process.cpp:
  Include
ndb/src/cw/cpcd/common.hpp:
  Include
ndb/src/cw/test/socketclient/socketClientTest.cpp:
  Include
ndb/src/cw/util/ClientInterface.hpp:
  Include
ndb/src/kernel/blocks/backup/FsBuffer.hpp:
  Include
ndb/src/kernel/blocks/backup/read.cpp:
  Include
ndb/src/kernel/blocks/backup/restore/Makefile:
  Include
ndb/src/kernel/blocks/backup/restore/Restore.cpp:
  Include
ndb/src/kernel/blocks/backup/restore/Restore.hpp:
  Include
ndb/src/kernel/blocks/backup/restore/main.cpp:
  Include
ndb/src/kernel/blocks/dbdict/printSchemafile/printSchemafile.cpp:
  Include
ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp:
  Include
ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
  Include
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Include
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Include
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Include
ndb/src/kernel/blocks/ndbfs/Filename.cpp:
  Include
ndb/src/kernel/blocks/ndbfs/Filename.hpp:
  Include
ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
  Include
ndb/src/kernel/blocks/ndbfs/MemoryChannelOSE.hpp:
  Include
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Include
ndb/src/kernel/error/ErrorReporter.cpp:
  Include
ndb/src/kernel/error/ErrorReporter.hpp:
  Include
ndb/src/kernel/ndb-main/Main.cpp:
  Include
ndb/src/kernel/vm/ArrayPool.hpp:
  Include
ndb/src/kernel/vm/ClusterConfiguration.cpp:
  Include
ndb/src/kernel/vm/Configuration.cpp:
  Include
ndb/src/kernel/vm/DLHashTable.hpp:
  Include
ndb/src/kernel/vm/DLHashTable2.hpp:
  Include
ndb/src/kernel/vm/Emulator.cpp:
  Include
ndb/src/kernel/vm/GlobalData.hpp:
  Include
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Include
ndb/src/kernel/vm/TransporterCallback.cpp:
  Include
ndb/src/kernel/vm/VMSignal.hpp:
  Include
ndb/src/kernel/vm/al_test/arrayListTest.cpp:
  Include
ndb/src/kernel/vm/al_test/arrayPoolTest.cpp:
  Include
ndb/src/kernel/vm/al_test/main.cpp:
  Include
ndb/src/kernel/vm/testCopy/rr.cpp:
  Include
ndb/src/kernel/vm/testCopy/testCopy.cpp:
  Include
ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp:
  Include
ndb/src/kernel/vm/testLongSig/testLongSig.cpp:
  Include
ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp:
  Include
ndb/src/mgmapi/mgmapi.cpp:
  Include
ndb/src/mgmapi/test/keso.c:
  Include
ndb/src/mgmapi/test/mgmSrvApi.cpp:
  Include
ndb/src/mgmclient/CommandInterpreter.cpp:
  Include
ndb/src/mgmclient/CommandInterpreter.hpp:
  Include
ndb/src/mgmclient/CpcClient.cpp:
  Include
ndb/src/mgmclient/main.cpp:
  Include
ndb/src/mgmclient/test_cpcd/test_cpcd.cpp:
  Include
ndb/src/mgmsrv/CommandInterpreter.hpp:
  Include
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Include
ndb/src/mgmsrv/NodeLogLevel.hpp:
  Include
ndb/src/mgmsrv/NodeLogLevelList.cpp:
  Include
ndb/src/mgmsrv/convertStrToInt.cpp:
  Include
ndb/src/mgmsrv/mkconfig/mkconfig.cpp:
  Include
ndb/src/ndbapi/ClusterMgr.cpp:
  Include
ndb/src/ndbapi/DictCache.cpp:
  Include
ndb/src/ndbapi/Makefile:
  Include
ndb/src/ndbapi/Ndb.cpp:
  Include
ndb/src/ndbapi/NdbConnectionScan.cpp:
  Include
ndb/src/ndbapi/NdbDictionary.cpp:
  Include
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Include
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Include
ndb/src/ndbapi/NdbOperation.cpp:
  Include
ndb/src/ndbapi/NdbOperationExec.cpp:
  Include
ndb/src/ndbapi/NdbPoolImpl.cpp:
  Include
ndb/src/ndbapi/NdbRecAttr.cpp:
  Include
ndb/src/ndbapi/NdbScanOperation.cpp:
  Include
ndb/src/ndbapi/NdbScanReceiver.hpp:
  Include
ndb/src/ndbapi/NdbUtil.hpp:
  Include
ndb/src/ndbapi/Ndberror.cpp:
  Include
ndb/src/ndbapi/Ndbif.cpp:
  Include
ndb/src/ndbapi/ObjectMap.hpp:
  Include
ndb/src/ndbapi/TransporterFacade.cpp:
  Include
ndb/src/ndbapi/signal-sender/SignalSender.cpp:
  Include
ndb/src/ndbapi/signal-sender/SignalSender.hpp:
  Include
ndb/src/newtonapi/dba_error.cpp:
  Include
ndb/src/newtonapi/dba_internal.hpp:
  Include
ndb/src/rep/RepApiService.cpp:
  Include
ndb/src/rep/RepComponents.hpp:
  Include
ndb/src/rep/RepMain.cpp:
  Include
ndb/src/rep/Requestor.cpp:
  Include
ndb/src/rep/Requestor.hpp:
  Include
ndb/src/rep/adapters/AppNDB.hpp:
  Include
ndb/src/rep/adapters/ExtNDB.cpp:
  Include
ndb/src/rep/adapters/ExtNDB.hpp:
  Include
ndb/src/rep/dbug_hack.cpp:
  Include
ndb/src/rep/rep_version.hpp:
  Include
ndb/src/rep/repapi/repapi.cpp:
  Include
ndb/src/rep/state/Interval.cpp:
  Include
ndb/src/rep/storage/GCIBuffer.cpp:
  Include
ndb/src/rep/storage/GCIBuffer.hpp:
  Include
ndb/src/rep/storage/GCIContainer.hpp:
  Include
ndb/src/rep/storage/LogRecord.hpp:
  Include
ndb/src/rep/storage/NodeGroupInfo.hpp:
  Include
ndb/src/rep/transfer/TransPS.cpp:
  Include
ndb/src/rep/transfer/TransPS.hpp:
  Include
ndb/src/rep/transfer/TransSS.cpp:
  Include
ndb/src/rep/transfer/TransSS.hpp:
  Include
ndb/test/include/NDBT_Stats.hpp:
  Include
ndb/test/include/NDBT_Table.hpp:
  Include
ndb/test/include/NDBT_Test.hpp:
  Include
ndb/test/include/NdbTimer.hpp:
  Include
ndb/test/ndbapi/acid2/acid2.cpp:
  Include
ndb/test/ndbapi/bank/bankCreator/bankCreator.cpp:
  Include
ndb/test/ndbapi/bank/bankMakeGL/bankMakeGL.cpp:
  Include
ndb/test/ndbapi/bank/bankSumAccounts/bankSumAccounts.cpp:
  Include
ndb/test/ndbapi/bank/bankTimer/bankTimer.cpp:
  Include
ndb/test/ndbapi/bank/bankTransactionMaker/bankTransactionMaker.cpp:
  Include
ndb/test/ndbapi/bank/bankValidateAllGLs/bankValidateAllGLs.cpp:
  Include
ndb/test/ndbapi/bulk_copy/bulk_copy.cpp:
  Include
ndb/test/ndbapi/create_all_tabs/create_all_tabs.cpp:
  Include
ndb/test/ndbapi/create_tab/create_tab.cpp:
  Include
ndb/test/ndbapi/drop_all_tabs/drop_all_tabs.cpp:
  Include
ndb/test/ndbapi/flexAsynch/flexAsynch.cpp:
  Include
ndb/test/ndbapi/flexBench/flexBench.cpp:
  Include
ndb/test/ndbapi/flexHammer/flexHammer.cpp:
  Include
ndb/test/ndbapi/flexScan/flexScan.cpp:
  Include
ndb/test/ndbapi/flexTT/flexTT.cpp:
  Include
ndb/test/ndbapi/flex_bench_mysql/flex_bench_mysql.cpp:
  Include
ndb/test/ndbapi/indexTest/index.cpp:
  Include
ndb/test/ndbapi/indexTest2/index2.cpp:
  Include
ndb/test/ndbapi/interpreterInTup/interpreterInTup.cpp:
  Include
ndb/test/ndbapi/lmc-bench/async-src/generator/asyncGenerator.cpp:
  Include
ndb/test/ndbapi/lmc-bench/async-src/generator/mainAsyncGenerator.cpp:
  Include
ndb/test/ndbapi/lmc-bench/async-src/user/macros.h:
  Include
ndb/test/ndbapi/lmc-bench/async-src/user/ndb_error.hpp:
  Include
ndb/test/ndbapi/lmc-bench/async-src/user/userInterface.cpp:
  Include
ndb/test/ndbapi/lmc-bench/include/testDefinitions.h:
  Include
ndb/test/ndbapi/lmc-bench/src/generator/dbGenerator.c:
  Include
ndb/test/ndbapi/lmc-bench/src/generator/mainGenerator.c:
  Include
ndb/test/ndbapi/lmc-bench/src/populator/dbPopulate.c:
  Include
ndb/test/ndbapi/lmc-bench/src/populator/mainPopulate.c:
  Include
ndb/test/ndbapi/lmc-bench/src/user/localDbPrepare.c:
  Include
ndb/test/ndbapi/lmc-bench/src/user/macros.h:
  Include
ndb/test/ndbapi/lmc-bench/src/user/ndb_error.hpp:
  Include
ndb/test/ndbapi/lmc-bench/src/user/ndb_user_populate.cpp:
  Include
ndb/test/ndbapi/lmc-bench/src/user/old/userInterface.c:
  Include
ndb/test/ndbapi/lmc-bench/src/user/old/userTransaction.c:
  Include
ndb/test/ndbapi/lmc-bench/src/user/userInterface.cpp:
  Include
ndb/test/ndbapi/lmc-bench/src/user/userTransaction.c:
  Include
ndb/include/ndb_global.h:
  Include
ndb/include/ndb_net.h:
  Include
ndb/include/ndbapi/ndberror.h:
  Include
ndb/src/ndbapi/NdbErrorOut.cpp:
  Include
ndb/src/ndbapi/ndberror.c:
  Include
ndb/test/ndbapi/restarter/restarter.cpp:
  Include
ndb/test/ndbapi/restarter2/restarter2.cpp:
  Include
ndb/test/ndbapi/restarts/restarts.cpp:
  Include
ndb/test/ndbapi/ronja/benchronja/benchronja.cpp:
  Include
ndb/test/ndbapi/telco/msa.cpp:
  Include
ndb/test/ndbapi/testBlobs/testBlobs.cpp:
  Include
ndb/test/ndbapi/testDataBuffers/testDataBuffers.cpp:
  Include
ndb/test/ndbapi/testGrep/verify/testGrepVerify.cpp:
  Include
ndb/test/ndbapi/testOIBasic/testOIBasic.cpp:
  Include
ndb/test/ndbapi/vw_test/bcd.h:
  Include
ndb/test/ndbapi/vw_test/cdrserver.cpp:
  Include
ndb/test/ndbapi/vw_test/size.cpp:
  Include
ndb/test/newtonapi/basic_test/basic/basic.cpp:
  Include
ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp:
  Include
ndb/test/newtonapi/basic_test/common.cpp:
  Include
ndb/test/newtonapi/basic_test/common.hpp:
  Include
ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp:
  Include
ndb/test/newtonapi/basic_test/too_basic.cpp:
  Include
ndb/test/newtonapi/perf_test/perf.cpp:
  Include
ndb/test/odbc/driver/testOdbcDriver.cpp:
  Include
ndb/test/run-test/main.cpp:
  Include
ndb/test/run-test/run-test.hpp:
  Include
ndb/test/src/HugoCalculator.cpp:
  Include
ndb/test/src/NDBT_Error.cpp:
  Include
ndb/test/src/NDBT_ResultRow.cpp:
  Include
ndb/test/src/NDBT_ReturnCodes.cpp:
  Include
ndb/test/src/NDBT_Table.cpp:
  Include
ndb/test/src/NDBT_Tables.cpp:
  Include
ndb/test/src/NdbBackup.cpp:
  Include
ndb/test/src/NdbConfig.cpp:
  Include
ndb/test/src/NdbGrep.cpp:
  Include
ndb/test/src/NdbRestarter.cpp:
  Include
ndb/test/tools/hugoCalculator/hugoCalculator.cpp:
  Include
ndb/test/tools/hugoFill/hugoFill.cpp:
  Include
ndb/test/tools/hugoLockRecords/hugoLockRecords.cpp:
  Include
ndb/test/tools/hugoPkDelete/hugoPkDel.cpp:
  Include
ndb/test/tools/hugoPkRead/hugoPkRead.cpp:
  Include
ndb/test/tools/hugoPkReadRecord/hugoPkReadRecord.cpp:
  Include
ndb/test/tools/hugoPkUpdate/hugoPkUpd.cpp:
  Include
ndb/test/tools/hugoScanRead/hugoScanRead.cpp:
  Include
ndb/test/tools/hugoScanUpdate/hugoScanUpd.cpp:
  Include
ndb/test/tools/restart/restart.cpp:
  Include
ndb/test/tools/waiter/waiter.cpp:
  Include
ndb/tools/copy_tab/copy_tab.cpp:
  Include
ndb/tools/cpcc/cpcc.cpp:
  Include
ndb/tools/create_index/create_index.cpp:
  Include
ndb/tools/delete_all/delete_all.cpp:
  Include
ndb/tools/drop_index/drop_index.cpp:
  Include
ndb/tools/drop_tab/drop_tab.cpp:
  Include
ndb/tools/list_tables/listTables.cpp:
  Include
ndb/tools/select_all/select_all.cpp:
  Include
ndb/tools/select_count/select_count.cpp:
  Include
ndb/tools/transproxy/transproxy.cpp:
  Include
ndb/tools/verify_index/verify_index.cpp:
  Include

c1cc9bf5

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · d483aee5
unknown authored May 11, 2004
```
into ndbmaster.mysql.com:/ndb/clone-4.1-ndb-daily


BitKeeper/etc/logging_ok:
  auto-union
```
d483aee5
Inverted #ifdef on HAVE_MLOCKALL · faf64f28
unknown authored May 11, 2004
```
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
```
faf64f28
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · c60f6698
unknown authored May 11, 2004
```
into mc05.(none):/space2/tomas/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
```
c60f6698

cpcd - setsid - angle fixes · 9e1c6b2a

unknown authored May 11, 2004


ndb/src/cw/cpcd/Process.cpp:
  Write pgrp in pid-file
  Always operate on process group instead of process
ndb/src/mgmclient/test_cpcd/test_cpcd.cpp:
  Test using different programs

9e1c6b2a

Merge build:/home/bk/mysql-4.1 · 76447c6c
unknown authored May 11, 2004
```
into build.mysql.com:/users/tsmith/m/41/mysql-4.1
```
76447c6c

lots of HAVE_ and some ndb_global fixes for ndb subtree · b87a116a

unknown authored May 11, 2004


ndb/include/portlib/NdbTCP.h:
  introduced ndb_net.h
ndb/include/portlib/NdbThread.h:
  ndb_global
ndb/src/common/portlib/unix/NdbCondition.c:
  Used HAVE_CLOCK_GETTIME
ndb/src/common/portlib/unix/NdbMem.c:
  used HAVE_MLOCKALL
ndb/src/common/portlib/unix/NdbSleep.c:
  ndb_global
ndb/src/common/portlib/unix/NdbThread.c:
  .
ndb/src/common/portlib/unix/NdbTick.c:
  HAVE_CLOCK_GETTIME
ndb/src/kernel/vm/Emulator.cpp:
  ndb_global

b87a116a

updated with HAV_ symbols in ndb_global · 5c6f5b94
unknown authored May 11, 2004

5c6f5b94
Merge bk-internal:/home/bk/mysql-4.1/ · 23dc0829
unknown authored May 11, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
23dc0829
out-of-bound array access fixed · 8ef59f52
unknown authored May 11, 2004

8ef59f52

InnoDB: Replace ut_strdup() with mem_strdup() · 151337d9

unknown authored May 11, 2004


innobase/include/ut0mem.h:
  Remove ut_strdup(), as it is a clone of mem_strdup()
innobase/os/os0file.c:
  Replace ut_strdup() with mem_strdup()
innobase/ut/ut0mem.c:
  Remove ut_strdup(), as it is a clone of mem_strdup()

151337d9

Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 · 97f18ba3
unknown authored May 11, 2004
```
into mysql.com:/space/my/mysql-4.1
```
97f18ba3
Use Windows code page 1252 instead of real ISO 8859-1 · e2f4c1fa
unknown authored May 11, 2004
```
strings/dump_map.c:
  Produce better formatted dump.
```
e2f4c1fa
Removing VC++ compiler warnings · 4e383aa4
unknown authored May 10, 2004

4e383aa4

10 May, 2004 15 commits

Fix VC++ compiler error (function redifinition) for embedded server · ba0ff286
unknown authored May 10, 2004

ba0ff286

logging_ok: · 66f9fc5e

unknown authored May 10, 2004

  Logging to logging@openlogging.org accepted
item_cmpfunc.cc, ctype_recoding.test, ctype_recoding.result:
  Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec() (but #3704)


mysql-test/r/ctype_recoding.result:
  Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec()
mysql-test/t/ctype_recoding.test:
  Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec()
sql/item_cmpfunc.cc:
  Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec()
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

66f9fc5e

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · cce3988e
unknown authored May 10, 2004
```
into mysql.com:/home/my/mysql-4.1
```
cce3988e
Merge mysql.com:/space/my/mysql-4.1 · f60aba09
unknown authored May 10, 2004
```
into mysql.com:/space/my/mysql-4.1-build
```
f60aba09

- Renamed the Mac OS X StartupItem directory from · 267956b6

unknown authored May 10, 2004

   /Library/StartupItems/MySQL to /Library/StartupItems/MySQLCOM
   to avoid a name space collision with the MySQL Startup Item shipped
   with Mac OS X Server, updated the MySQLStartupItem PKG version
   number to reflect the change.


Build-tools/Do-pkg:
   - Renamed the StartupItem directory from /Library/StartupItems/MySQL
     to /Library/StartupItems/MySQLCOM to avoid a name space collision
     with the MySQL Startup Item in Mac OS X Server
support-files/MacOSX/StartupItem.Description.plist:
   - Bumped up the StartupItem Package version to 1.1 to indicate the
     change in directory naming

267956b6

Merge bk-internal:/home/bk/mysql-4.1/ · 3565cbc5
unknown authored May 10, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


client/mysqldump.c:
  Auto merged
```
3565cbc5

merge resolve · 3c58a197

unknown authored May 10, 2004


extra/perror.c:
  Auto merged
ndb/include/debugger/SignalLoggerManager.hpp:
  Auto merged
ndb/include/ndb_version.h:
  Auto merged
ndb/src/common/portlib/unix/NdbMem.c:
  Auto merged
ndb/src/common/portlib/unix/NdbThread.c:
  Auto merged
ndb/src/common/util/Parser.cpp:
  Auto merged
ndb/src/common/util/getarg.c:
  Auto merged
ndb/src/common/util/version.c:
  Auto merged
ndb/src/kernel/blocks/backup/restore/Restore.cpp:
  Auto merged
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
  Auto merged
ndb/src/mgmapi/test/keso.c:
  Auto merged
ndb/src/mgmclient/test_cpcd/test_cpcd.cpp:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

3c58a197

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 4610b0fd
unknown authored May 10, 2004
```
into mysql.com:/home/my/mysql-4.1
```
4610b0fd

Add read_rnd_buffer_size in my.cnf example files · e37ec666

unknown authored May 10, 2004

Remove wrong redefine of vio_reset() (to compile libmysqld on windows)


include/violite.h:
  Remove wrong redefine of vio_reset()
support-files/my-huge.cnf.sh:
  Add read_rnd_buffer_size
support-files/my-large.cnf.sh:
  Add read_rnd_buffer_size
support-files/my-medium.cnf.sh:
  Add read_rnd_buffer_size
support-files/my-small.cnf.sh:
  Add read_rnd_buffer_size

e37ec666

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3ff2fcc9
unknown authored May 10, 2004
```
into mc05.(none):/space/tomas/mysql-4.1
```
3ff2fcc9

Makefile: · 24bcebd8

unknown authored May 10, 2004

  slim make for ndb


ndb/Makefile:
  slim make for ndb

24bcebd8

make warning fixes for ndb · 3e4afd98
unknown authored May 10, 2004

3e4afd98
Merge marko@build.mysql.com:/home/bk/mysql-4.1 · 241a49c8
unknown authored May 10, 2004
```
into hundin.mysql.fi:/home/marko/j/mysql-4.1
```
241a49c8
more slim make of ndb tree · 10cd7df1
unknown authored May 10, 2004

10cd7df1
fix compiler warnings in ndb · 5f6d3f21
unknown authored May 10, 2004

5f6d3f21

08 May, 2004 1 commit

Stop entire process group (if child has forked) · d092cfb1

unknown authored May 09, 2004

Impl. to handle "angle" process of ndb


ndb/src/cw/cpcd/Process.cpp:
  Stop entire process group (if child has forked)
  (Does not handle child doing setsid)

d092cfb1

07 May, 2004 6 commits

more removing of "system" files and introducing ndb_global/my_global · b36f1784

unknown authored May 07, 2004


BitKeeper/deleted/.del-NdbStdio.h~17be17a4f591c671:
  Delete: ndb/include/portlib/NdbStdio.h
BitKeeper/deleted/.del-NdbString.h~1f9f26341ce5f5f:
  Delete: ndb/include/util/NdbString.h
BitKeeper/deleted/.del-NdbConstant.hpp~de1038c1758cc1f9:
  Delete: ndb/include/portlib/NdbConstant.hpp
BitKeeper/deleted/.del-NdbUnistd.h~a1b3840adcd49985:
  Delete: ndb/include/portlib/NdbUnistd.h

b36f1784

Merge marko@build.mysql.com:/home/bk/mysql-4.1 · 1f0e4f40
unknown authored May 07, 2004
```
into hundin.mysql.fi:/home/marko/j/mysql-4.1


sql/sql_table.cc:
  Auto merged
```
1f0e4f40

Added additional parameter userdata for mysql_set_local_infile_handler · fabcf369

unknown authored May 07, 2004

to allow binding of userland functions in PHP.


include/mysql.h:
  added new last parameter (void *) for mysql_set_local_infile_handler
  st_mysql_options:
    added void *local_infile_userdata
    added last parameter (void *) for local_infile_init function pointer
libmysql/libmysql.c:
  added parameter userdata in mysql_set_local_infile_handler
  added parameter (void *userdata __attribute__ ((unused))) in mysql_local_infile_init
  passed additional parameter userdata to init function in handle_local_infile
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

fabcf369

Merge marko@build.mysql.com:/home/bk/mysql-4.1 · 88065f5c
unknown authored May 07, 2004
```
into hundin.mysql.fi:/home/marko/j/mysql-4.1


sql/sql_table.cc:
  Auto merged
```
88065f5c

Merge mysql.com:/home/mydev/mysql-4.1 · 0a86a110

unknown authored May 07, 2004

into mysql.com:/home/mydev/mysql-4.1-wl1687


sql/handler.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

0a86a110

introduced ndb_global.h/my_global.h to replace sytem lib includes e.g. stdio, stdlib · fb6fd48f
unknown authored May 07, 2004

fb6fd48f