Commits · 0294a57dff48163b90c5f1c2865357a3c8b63961 · nexedi / MariaDB

16 Sep, 2004 10 commits

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 0294a57d

unknown authored Sep 16, 2004

into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

0294a57d

removed different CFG_ defined for connection host names · 8edc796c

unknown authored Sep 16, 2004

added support for setting up multiple interfaces
correct connect address for mgmt server
bug, -l flag would be interpreted as connectstring
added flag to remove all node id checks
changed automatic allocation of ports somewhat


ndb/include/mgmapi/mgmapi_config_parameters.h:
  removed different CFG_ defined for connection host names
ndb/include/transporter/TransporterRegistry.hpp:
  added support for setting up multiple interfaces
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  removed different CFG_ defined for connection host names
ndb/src/common/mgmcommon/IPCConfig.cpp:
  added support for setting up multiple interfaces
ndb/src/common/portlib/NdbTCP.cpp:
  added debug printouts
ndb/src/common/transporter/TransporterRegistry.cpp:
  added support for setting up multiple interfaces
ndb/src/common/util/SocketServer.cpp:
  added my_thread init to enable debug printouts
ndb/src/mgmclient/CommandInterpreter.cpp:
  shortened lines
ndb/src/mgmsrv/ConfigInfo.cpp:
  removed different CFG_ defined for connection host names
  changed automatic allocation of ports somewhat
ndb/src/mgmsrv/MgmtSrvr.cpp:
  correct connect address for mgmt server
ndb/src/mgmsrv/Services.cpp:
  shoretened lines
ndb/src/mgmsrv/main.cpp:
  bug, -l flag would be interpreted as connectstring
  added flag to remove all node id checks

8edc796c

Fix error handling in atrt-mysqltest-run · 67911ae3
unknown authored Sep 16, 2004

67911ae3
removed extra newline · 9caeb045
unknown authored Sep 16, 2004

9caeb045
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 59aa7518
unknown authored Sep 16, 2004
```
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/mgmsrv/main.cpp:
  Auto merged
```
59aa7518

wl1668 - · e8c7c2c8

unknown authored Sep 16, 2004

Add support for getting events via mgmapi
removed all traces of stat port


BitKeeper/deleted/.del-NodeLogLevel.cpp~324045b93af7123b:
  Delete: ndb/src/mgmsrv/NodeLogLevel.cpp
BitKeeper/deleted/.del-NodeLogLevel.hpp~4f4ab0fe52fb497c:
  Delete: ndb/src/mgmsrv/NodeLogLevel.hpp
BitKeeper/deleted/.del-NodeLogLevelList.cpp~97dc9c909e3e92bf:
  Delete: ndb/src/mgmsrv/NodeLogLevelList.cpp
BitKeeper/deleted/.del-NodeLogLevelList.hpp~ef567dd850abddc7:
  Delete: ndb/src/mgmsrv/NodeLogLevelList.hpp
ndb/include/debugger/EventLogger.hpp:
  Split EventLogger into two classes
ndb/include/kernel/LogLevel.hpp:
  Add some nice to have methods + use uint8 for storage
ndb/include/kernel/signaldata/EventSubscribeReq.hpp:
  operator=
ndb/include/kernel/signaldata/SetLogLevelOrd.hpp:
  operator=
ndb/include/mgmapi/mgmapi.h:
  remove deprecated vars
ndb/src/common/debugger/EventLogger.cpp:
  Split into 2
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Remove hardcoded mgm stuff
ndb/src/mgmsrv/CommandInterpreter.cpp:
  #if 0
  some deprecated code
ndb/src/mgmsrv/Makefile.am:
  remove NodeLogLevel*
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Remove dead code
  Handle multiple event listeners in mgmapi
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Remove dead code
  Handle multiple event listeners in mgmapi
ndb/src/mgmsrv/Services.cpp:
  listen event method in mgmapi
ndb/src/mgmsrv/Services.hpp:
  listen event method in mgmapi
ndb/src/mgmsrv/main.cpp:
  remove stat port

e8c7c2c8

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 73d24bf4
unknown authored Sep 16, 2004
```
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
```
73d24bf4

mysql_install_db should do skip-ndbcluster · ec826f76

unknown authored Sep 16, 2004

set a printout in SocketClient only for debug


ndb/src/common/util/SocketClient.cpp:
  set a printout only for debug
scripts/mysql_install_db.sh:
  mysql_install_db should do skip-ndbcluster

ec826f76

item.cc: · 4811a992

unknown authored Sep 16, 2004

  Bug #5561 No BINARY_FLAG in metadata


sql/item.cc:
  Bug #5561 No BINARY_FLAG in metadata

4811a992

Optimzed handling of NO_AUTO_VALUE_ON_ZERO · d560bed4
unknown authored Sep 16, 2004

d560bed4

15 Sep, 2004 30 commits

Merge · 6961ac2e

unknown authored Sep 15, 2004


ndb/test/src/NDBT_Test.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/restore/main.cpp:
  Auto merged
ndb/test/ndbapi/testBackup.cpp:
  Auto merged
ndb/tools/select_all.cpp:
  SCCS merged

6961ac2e

HugoTransactions.cpp · 424295f9

unknown authored Sep 15, 2004

    changed to do execute(commit);restart() transaction instead of closeTransaction();start new
select_all.cpp
    moved my_init outside DBUG_OFF


ndb/test/src/HugoTransactions.cpp:
  changed to do execute(commit);restart() transaction instead of closeTransaction();start new
ndb/tools/select_all.cpp:
  moved my_init outside DBUG_OFF

424295f9

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 08c8a829
unknown authored Sep 15, 2004
```
into poseidon.(none):/home/tomas/mysql-4.1-ndb
```
08c8a829

testBank · 47d3c618

unknown authored Sep 15, 2004

    optimized for fewer timeouts
    changed for consistency in "time"
tests
    moved SR_UNDO tests to basic
    added testBackup -n BackupBank


ndb/test/ndbapi/bank/Bank.cpp:
  optimized for fewer timeouts
  changed for consistency in "time"
ndb/test/ndbapi/bank/Bank.hpp:
  optimized for fewer timeouts
  changed for consistency in "time"
ndb/test/run-test/daily-basic-tests.txt:
  moved SR_UNDO tests to basic
ndb/test/run-test/daily-devel-tests.txt:
  moved SR_UNDO tests to basic
  added testBackup -n BackupBank

47d3c618

Merge mskold@build.mysql.com:/home/bk/mysql-4.1 · f44054a5

unknown authored Sep 15, 2004

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

f44054a5

Fixed compiler warnings · c398621f
unknown authored Sep 15, 2004

c398621f
Merge msvensson@build.mysql.com:/home/bk/mysql-4.1 · 17b22c04
unknown authored Sep 15, 2004
```
into neptunus.(none):/home/magnus/mysql/mysql-4.1
```
17b22c04
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 · a087b9ad
unknown authored Sep 15, 2004
```
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
```
a087b9ad

fixed Bug #5589 "libedit compile failure in term.c" · 183c6ab6

unknown authored Sep 15, 2004

(for octane2)

included term.h if there isn't termcap.h in cmd-line-utils/libedit/term.c


cmd-line-utils/libedit/term.c:
  fixed Bug #5589 "libedit compile failure in term.c"
  
  (for octane2)
  
  included term.h if there isn't termcap.h

183c6ab6

Fixed handling of NO_AUTO_VALUE_ON_ZERO · c5387ade
unknown authored Sep 15, 2004

c5387ade

fixed return code for ndb_backup · fd5c8453

unknown authored Sep 15, 2004

added possibility to set number of accounts in createAndLoadBank
bumbed up number of threads in tastBackup BackupBank


ndb/src/kernel/blocks/backup/restore/main.cpp:
  fixed return code
ndb/test/ndbapi/bank/Bank.hpp:
  added possibility to set number of accounts in createAndLoadBank
ndb/test/ndbapi/bank/BankLoad.cpp:
  added possibility to set number of accounts in createAndLoadBank
ndb/test/ndbapi/testBackup.cpp:
  bumbed up number of threads in tastBackup BackupBank
ndb/test/src/NdbBackup.cpp:
  some small optimizations

fd5c8453

ndb charsets: DICT · 36bdf4f9
unknown authored Sep 15, 2004

36bdf4f9
Added support for auto_increment of partial key · 427e0769
unknown authored Sep 15, 2004

427e0769
Merge msvensson@build.mysql.com:/home/bk/mysql-4.1 · e624fa3a
unknown authored Sep 15, 2004
```
into neptunus.(none):/home/magnus/mysql/mysql-4.1
```
e624fa3a
Print the error message if read of local config fails. · 4bdfd908
unknown authored Sep 15, 2004
```
ndb/src/mgmsrv/main.cpp:
  Print error if read of local config file fails.
```
4bdfd908
drop table after test (if created & success) · 2e60d37d
unknown authored Sep 15, 2004
```
ndb/test/ndbapi/testLcp.cpp:
  Remove diskdata stuff
```
2e60d37d
Merge mysql.com:/home/jonas/src/mysql-4.1 · aee58edd
unknown authored Sep 15, 2004
```
into mysql.com:/home/jonas/src/mysql-4.1-ndb
```
aee58edd
New test prg, testLcp · e67097fe
unknown authored Sep 15, 2004
```
ndb/test/ndbapi/Makefile.am:
  New test prg
```
e67097fe
Merge mysql.com:/home/jonas/src/mysql-4.1 · 4280b3f5
unknown authored Sep 15, 2004
```
into mysql.com:/home/jonas/src/mysql-4.1-ndb
```
4280b3f5
ndb: set column type sets column defaults · b82dede5
unknown authored Sep 15, 2004

b82dede5
fixed bug in bank · 861165e8
unknown authored Sep 15, 2004

861165e8
delete unnecessary include my_sys.h · 4f5bbc54
unknown authored Sep 15, 2004

4f5bbc54

Fix the test case to make it more predictable (cause: 4.1.5 test failure · 057f6b6f

unknown authored Sep 15, 2004

on intelxeon3 (Solaris x86))


mysql-test/r/ps_2myisam.result:
  Test results fixed (order by for a couple of statements in the PS test).
mysql-test/r/ps_3innodb.result:
  Test results fixed (order by for a couple of statements in the PS test).
mysql-test/r/ps_4heap.result:
  Test results fixed (order by for a couple of statements in the PS test).
mysql-test/r/ps_5merge.result:
  Test results fixed (order by for a couple of statements in the PS test).
mysql-test/r/ps_6bdb.result:
  Test results fixed (order by for a couple of statements in the PS test).

057f6b6f

A fix (bug #5540: CONCAT function and 'double' type). · 5eb1bc39
unknown authored Sep 15, 2004

5eb1bc39

ndb_init() to all ndb programs · 3664c673

unknown authored Sep 15, 2004


ndb/examples/ndbapi_async_example/ndbapi_async.cpp:
  ndb_init()
ndb/examples/ndbapi_example1/ndbapi_example1.cpp:
  ndb_init()
ndb/examples/ndbapi_example2/ndbapi_example2.cpp:
  ndb_init()
ndb/examples/ndbapi_example3/ndbapi_example3.cpp:
  ndb_init()
ndb/examples/ndbapi_example4/ndbapi_example4.cpp:
  ndb_init()
ndb/examples/ndbapi_example5/ndbapi_example5.cpp:
  ndb_init()
ndb/examples/ndbapi_scan_example/ndbapi_scan.cpp:
  ndb_init()
ndb/examples/select_all/select_all.cpp:
  ndb_init()
ndb/include/ndb_global.h:
  ndb_init()
ndb/src/common/util/Makefile.am:
  ndb_init()
ndb/src/kernel/blocks/backup/read.cpp:
  ndb_init()
ndb/src/kernel/blocks/backup/restore/main.cpp:
  ndb_init()
ndb/src/kernel/main.cpp:
  ndb_init()
ndb/src/kernel/vm/Configuration.cpp:
  ndb_init()
ndb/src/mgmclient/main.cpp:
  ndb_init()
ndb/src/mgmsrv/main.cpp:
  ndb_init()
ndb/src/mgmsrv/mkconfig/mkconfig.cpp:
  ndb_init()
ndb/src/ndbapi/Ndbinit.cpp:
  ndb_init()
ndb/test/ndbapi/acid.cpp:
  ndb_init()
ndb/test/ndbapi/acid2.cpp:
  ndb_init()
ndb/test/ndbapi/benchronja.cpp:
  ndb_init()
ndb/test/ndbapi/bulk_copy.cpp:
  ndb_init()
ndb/test/ndbapi/cdrserver.cpp:
  ndb_init()
ndb/test/ndbapi/celloDb.cpp:
  ndb_init()
ndb/test/ndbapi/create_all_tabs.cpp:
  ndb_init()
ndb/test/ndbapi/create_tab.cpp:
  ndb_init()
ndb/test/ndbapi/drop_all_tabs.cpp:
  ndb_init()
ndb/test/ndbapi/flexAsynch.cpp:
  ndb_init()
ndb/test/ndbapi/flexBench.cpp:
  ndb_init()
ndb/test/ndbapi/flexHammer.cpp:
  ndb_init()
ndb/test/ndbapi/flexScan.cpp:
  ndb_init()
ndb/test/ndbapi/flexTT.cpp:
  ndb_init()
ndb/test/ndbapi/flexTimedAsynch.cpp:
  ndb_init()
ndb/test/ndbapi/flex_bench_mysql.cpp:
  ndb_init()
ndb/test/ndbapi/index.cpp:
  ndb_init()
ndb/test/ndbapi/index2.cpp:
  ndb_init()
ndb/test/ndbapi/initronja.cpp:
  ndb_init()
ndb/test/ndbapi/interpreterInTup.cpp:
  ndb_init()
ndb/test/ndbapi/mainAsyncGenerator.cpp:
  ndb_init()
ndb/test/ndbapi/msa.cpp:
  ndb_init()
ndb/test/ndbapi/restarter.cpp:
  ndb_init()
ndb/test/ndbapi/restarter2.cpp:
  ndb_init()
ndb/test/ndbapi/restarts.cpp:
  ndb_init()
ndb/test/ndbapi/size.cpp:
  ndb_init()
ndb/test/ndbapi/slow_select.cpp:
  ndb_init()
ndb/test/ndbapi/testBackup.cpp:
  ndb_init()
ndb/test/ndbapi/testBasic.cpp:
  ndb_init()
ndb/test/ndbapi/testBasicAsynch.cpp:
  ndb_init()
ndb/test/ndbapi/testBlobs.cpp:
  ndb_init()
ndb/test/ndbapi/testDataBuffers.cpp:
  ndb_init()
ndb/test/ndbapi/testDeadlock.cpp:
  ndb_init()
ndb/test/ndbapi/testDict.cpp:
  ndb_init()
ndb/test/ndbapi/testGrep.cpp:
  ndb_init()
ndb/test/ndbapi/testGrepVerify.cpp:
  ndb_init()
ndb/test/ndbapi/testIndex.cpp:
  ndb_init()
ndb/test/ndbapi/testInterpreter.cpp:
  ndb_init()
ndb/test/ndbapi/testMgm.cpp:
  ndb_init()
ndb/test/ndbapi/bank/bankCreator.cpp:
  ndb_init()
ndb/test/ndbapi/bank/bankMakeGL.cpp:
  ndb_init()
ndb/test/ndbapi/bank/bankSumAccounts.cpp:
  ndb_init()
ndb/test/ndbapi/bank/bankTimer.cpp:
  ndb_init()
ndb/test/ndbapi/bank/bankTransactionMaker.cpp:
  ndb_init()
ndb/test/ndbapi/bank/bankValidateAllGLs.cpp:
  ndb_init()
ndb/test/ndbapi/bank/testBank.cpp:
  ndb_init()
ndb/test/ndbapi/testNdbApi.cpp:
  ndb_init()
ndb/test/ndbapi/testNodeRestart.cpp:
  ndb_init()
ndb/test/ndbapi/testOIBasic.cpp:
  ndb_init()
ndb/test/ndbapi/testOperations.cpp:
  ndb_init()
ndb/test/ndbapi/testOrderedIndex.cpp:
  ndb_init()
ndb/test/ndbapi/testReadPerf.cpp:
  ndb_init()
ndb/test/ndbapi/testRestartGci.cpp:
  ndb_init()
ndb/test/ndbapi/testScan.cpp:
  ndb_init()
ndb/test/ndbapi/testScanInterpreter.cpp:
  ndb_init()
ndb/test/ndbapi/testScanPerf.cpp:
  ndb_init()
ndb/test/ndbapi/testSystemRestart.cpp:
  ndb_init()
ndb/test/ndbapi/testTimeout.cpp:
  ndb_init()
ndb/test/ndbapi/testTransactions.cpp:
  ndb_init()
ndb/test/ndbapi/test_event.cpp:
  ndb_init()
ndb/test/run-test/main.cpp:
  ndb_init()
ndb/test/src/NDBT_Test.cpp:
  ndb_init()
ndb/test/tools/copy_tab.cpp:
  ndb_init()
ndb/test/tools/cpcc.cpp:
  ndb_init()
ndb/test/tools/create_index.cpp:
  ndb_init()
ndb/test/tools/hugoCalculator.cpp:
  ndb_init()
ndb/test/tools/hugoFill.cpp:
  ndb_init()
ndb/test/tools/hugoLoad.cpp:
  ndb_init()
ndb/test/tools/hugoLockRecords.cpp:
  ndb_init()
ndb/test/tools/hugoPkDelete.cpp:
  ndb_init()
ndb/test/tools/hugoPkRead.cpp:
  ndb_init()
ndb/test/tools/hugoPkReadRecord.cpp:
  ndb_init()
ndb/test/tools/hugoPkUpdate.cpp:
  ndb_init()
ndb/test/tools/hugoScanRead.cpp:
  ndb_init()
ndb/test/tools/hugoScanUpdate.cpp:
  ndb_init()
ndb/test/tools/restart.cpp:
  ndb_init()
ndb/test/tools/transproxy.cpp:
  ndb_init()
ndb/test/tools/verify_index.cpp:
  ndb_init()
ndb/tools/delete_all.cpp:
  ndb_init()
ndb/tools/desc.cpp:
  ndb_init()
ndb/tools/drop_index.cpp:
  ndb_init()
ndb/tools/drop_tab.cpp:
  ndb_init()
ndb/tools/listTables.cpp:
  ndb_init()
ndb/tools/ndbsql.cpp:
  ndb_init()
ndb/tools/select_all.cpp:
  ndb_init()
ndb/tools/select_count.cpp:
  ndb_init()
ndb/tools/waiter.cpp:
  ndb_init()

3664c673

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8858000f
unknown authored Sep 15, 2004
```
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5546
```
8858000f
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · f7b832a8
unknown authored Sep 15, 2004
```
into mysql.com:/usr/home/bar/mysql-4.1
```
f7b832a8
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6a573bc7
unknown authored Sep 15, 2004
```
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5546
```
6a573bc7

CommandInterpreter.cpp: · 9d46fb1b

unknown authored Sep 15, 2004

  removed help text for non implemented command


ndb/src/mgmclient/CommandInterpreter.cpp:
  removed help text for non implemented command

9d46fb1b

fixed cosmetic printouts · 41854336
unknown authored Sep 15, 2004

41854336