Commits · 1fefa5b3b4a07f4662c71d6ca85c7bb0ddda91ba · Kirill Smelkov / mariadb

16 Dec, 2004 2 commits

wl2240 - fix handling of distribution key wrt unique indexes · 1fefa5b3

unknown authored Dec 16, 2004


ndb/include/kernel/AttributeDescriptor.hpp:
  removed unused
ndb/include/kernel/ndb_limits.h:
  removed unused
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Differentiate between nullable columns and null fields
    TUP wants sum all other want #null cols
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Differentiate between nullable columns and null fields
    TUP wants sum all other want #null cols
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Handle distribution key and collation in same subroutine
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle distribution key and collation in same subroutine
ndb/src/kernel/vm/VMSignal.hpp:
  Increase size of signal->theData to 32k
ndb/test/ndbapi/testPartitioning.cpp:
  better usage

1fefa5b3

wl2240 - ndb - more testing · 66f7bd24

unknown authored Dec 16, 2004


ndb/test/ndbapi/testPartitioning.cpp:
  Update test partitioning to add primary keys (distribution keys)
    incase of either 
  - only 1 primary key
  - primary keys with charsets
ndb/test/src/HugoCalculator.cpp:
  Fix so that Hugo can cope with pk's in the "end" of the table

66f7bd24

15 Dec, 2004 9 commits

wl2240 - test prg for distribution keys wrt ordered indexes · 61680336

unknown authored Dec 15, 2004


ndb/test/include/HugoOperations.hpp:
  Fix pkRead on ordered index
ndb/test/ndbapi/testPartitioning.cpp:
  Update test prg to handled ordered indexes aswell
ndb/test/src/HugoOperations.cpp:
  Fix pkRead on ordered index
ndb/test/src/HugoTransactions.cpp:
  Fix pkRead on ordered index

61680336

wl2240 - ndb - fix typo · ce897872
unknown authored Dec 15, 2004
```
ndb/src/ndbapi/NdbOperationSearch.cpp:
  Fix typo
```
ce897872

wl2240 - ndb partitioning bug fixes for range scans · 7bc419f5

unknown authored Dec 15, 2004


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fix setting of dist keys for ordered indexes
ndb/src/ndbapi/NdbOperationSearch.cpp:
  Remove support for combined distribution key and range scan
sql/ha_ndbcluster.cc:
  Merge error with wl2126

7bc419f5

wl2126 - ndb - merge and ifdef still waiting for inge · 527b18aa

unknown authored Dec 15, 2004


sql/ha_ndbcluster.cc:
  #ifdef on key_multi_range
sql/ha_ndbcluster.h:
  Use forward declarations for key_multi_range

527b18aa

Merge · ae971ecd

unknown authored Dec 15, 2004


ndb/include/kernel/AttributeHeader.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/include/HugoOperations.hpp:
  Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
ndb/test/src/HugoOperations.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
ndb/test/src/UtilTransactions.cpp:
  Auto merged
ndb/tools/select_count.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  SCCS merged
ndb/src/ndbapi/NdbDictionary.cpp:
  SCCS merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  SCCS merged

ae971ecd

wl2240 - ndb - scan only 1 fragment if possible · 7a7ac8f6

unknown authored Dec 15, 2004


ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Fix printout
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Set distribution key for ordered indexes
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Allow create_index_object to modify index_table
ndb/tools/restore/consumer_restore.cpp:
  Allow create_index_object to modify index_table

7a7ac8f6

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 09206a94
unknown authored Dec 15, 2004
```
into shark.:/space/ndbdev/clone-mysql-5.0-ndb-daily-2004-12-14
```
09206a94
don't compile instance-manager by default, as it never compiles · 14987c6b
unknown authored Dec 15, 2004
```
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
```
14987c6b

wl2240 - ndb partitioning, bug fixes · 9c81f43b

unknown authored Dec 15, 2004


ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Fix printout of SCAN_TABREQ
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Set correct status on scanfrag record
ndb/src/ndbapi/NdbScanOperation.cpp:
  Fix setting of distribution key wrt scan
ndb/tools/select_count.cpp:
  Fix select_count

9c81f43b

14 Dec, 2004 8 commits

ndb - major update HugoOperations/Transactions · 3f89a4f3

unknown authored Dec 14, 2004

     +more code reuse
     +easier testing of indexes


ndb/include/ndbapi/NdbDictionary.hpp:
  Remove unimplemented enums
ndb/test/include/HugoOperations.hpp:
  Pass index on constructor
ndb/test/include/HugoTransactions.hpp:
  Pass index on constructor
ndb/test/include/UtilTransactions.hpp:
  Pass index on constructor
ndb/test/src/HugoAsynchTransactions.cpp:
  Pass index on constructor
ndb/test/src/HugoOperations.cpp:
  Use getOperation to select operation type
ndb/test/src/HugoTransactions.cpp:
  Use HugoOpertaions to run transactions
ndb/test/src/UtilTransactions.cpp:
  Use HugoOpertaions to run transactions

3f89a4f3

wl2240 - ndb partitioning, · 253dab84

unknown authored Dec 14, 2004

  fix scan take over


ndb/include/kernel/AttributeDescriptor.hpp:
  remove deprecated bits
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  removed deprecated parameters
  moved never implemented to Unimplemented
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  removed deprecated parameters
  moved never implemented to Unimplemented
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  removed deprecated parameters
  moved never implemented to Unimplemented
ndb/src/kernel/vm/MetaData.hpp:
  removed deprecated parameters
  moved never implemented to Unimplemented
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  removed deprecated parameters
  moved never implemented to Unimplemented
ndb/src/ndbapi/NdbScanOperation.cpp:
  Do scan take over via distribution key code

253dab84

Merge mysql.com:/home/jonas/src/mysql-4.1-fix · c798d5be
unknown authored Dec 14, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
c798d5be
ndb - Handle connections without corresponding node · 63b36352
unknown authored Dec 14, 2004
```
ndb/src/mgmsrv/ConfigInfo.cpp:
  Handle connections without corresponding node
```
63b36352
Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 249772a2
unknown authored Dec 14, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
249772a2
ndb - fix protection wrt shm · ebee4cfa
unknown authored Dec 14, 2004
```
ndb/include/transporter/TransporterRegistry.hpp:
  fix protection
```
ebee4cfa

merge · f6296657

unknown authored Dec 14, 2004


ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged

f6296657

ndb - shm transporter benchmark result · 7e7a2b32

unknown authored Dec 14, 2004


ndb/docs/wl2077.txt:
  Add result from micro benchmark with shm-transporter
ndb/include/transporter/TransporterRegistry.hpp:
  Move pid into transporter registry
ndb/src/common/transporter/SHM_Transporter.cpp:
  Move pid into transporter registry
ndb/src/common/transporter/TransporterRegistry.cpp:
  Move pid into transporter registry
ndb/src/kernel/main.cpp:
  Move pid into transporter registry
ndb/src/ndbapi/TransporterFacade.cpp:
  Move pid into transporter registry

7e7a2b32

13 Dec, 2004 6 commits

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 629153d4
unknown authored Dec 13, 2004
```
into mysql.com:/space/pekka/ndb/version/my50-cc
```
629153d4

Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 8ff19719

unknown authored Dec 13, 2004

into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged

8ff19719

ndb - Handle shm-transporter wo/ busy-wait + also · f507b377

unknown authored Dec 13, 2004

      handled mixed tcp/shm transporters
+ bug#7124


ndb/src/common/transporter/SHM_Transporter.cpp:
  Add remote/own pid for signaling availability of data on shm-segment
ndb/src/common/transporter/SHM_Transporter.hpp:
  Add remote/own pid for signaling availability of data on shm-segment
ndb/src/common/transporter/TransporterRegistry.cpp:
  Add remote/own pid for signaling availability of data on shm-segment
ndb/src/kernel/main.cpp:
  Set pid to use for shm-signaling
ndb/src/mgmsrv/ConfigInfo.cpp:
  bug#7124
ndb/src/ndbapi/TransporterFacade.cpp:
  Set pid to use for shm-signaling

f507b377

ndb: nothing · a2649d0d
unknown authored Dec 13, 2004
```
ndb/test/ndbapi/Makefile.am:
  foo
```
a2649d0d
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 756572e1
unknown authored Dec 13, 2004
```
into mysql.com:/space/pekka/ndb/version/my50-cc
```
756572e1
ndb - Fix memory leak in HugoLoad · a59a6361
unknown authored Dec 13, 2004
```
ndb/test/src/HugoTransactions.cpp:
  Fix memory leak in HugoLoad
```
a59a6361

12 Dec, 2004 9 commits

Merge mysql.com:/home/jonas/src/mysql-5.0 · 286387d3
unknown authored Dec 12, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
286387d3
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · c0564421
unknown authored Dec 12, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0
```
c0564421
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b9520662
unknown authored Dec 12, 2004
```
into mysql.com:/home/cps/mysql/trees/autofail/mysql-5.0
```
b9520662

fix autobuild failures · 596876f9

unknown authored Dec 12, 2004


server-tools/instance-manager/buffer.cc:
  fix typo
server-tools/instance-manager/commands.cc:
  get rid of compiler warnings
server-tools/instance-manager/guardian.cc:
  fix compiler warning
server-tools/instance-manager/instance.cc:
  fix warnings
server-tools/instance-manager/instance_map.cc:
  fix return value
server-tools/instance-manager/instance_map.h:
  fix problem, caused autobuild failure. Looks like a gcc problem - 
  "friend class <name>" doesn't work if specified before enclosed class
  <name> (this is not present in newer gcc versions)

596876f9

Fix test results that may change from run to run · 5ae35e32

unknown authored Dec 12, 2004

Added comments (from code review on pull)


mysql-test/r/heap.result:
  Fix results that may change from run to run
mysql-test/r/ps_5merge.result:
  Fix wrong result
mysql-test/t/heap.test:
  Make results predictable
sql/sql_show.cc:
  Add comments
  Fixed typo

5ae35e32

ndb: wl-1732 support all charsets · a7fe1c39

unknown authored Dec 12, 2004


ndb/include/kernel/AttributeDescriptor.hpp:
  wl-1732 support all charsets
ndb/include/kernel/ndb_limits.h:
  wl-1732 support all charsets
ndb/include/kernel/signaldata/TuxBound.hpp:
  wl-1732 support all charsets
ndb/include/util/NdbSqlUtil.hpp:
  wl-1732 support all charsets
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  wl-1732 support all charsets
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1732 support all charsets
ndb/src/ndbapi/NdbOperationDefine.cpp:
  wl-1732 support all charsets
ndb/src/ndbapi/NdbOperationSearch.cpp:
  wl-1732 support all charsets
ndb/src/ndbapi/NdbScanOperation.cpp:
  wl-1732 support all charsets
ndb/src/ndbapi/ndberror.c:
  wl-1732 support all charsets
ndb/test/ndbapi/Makefile.am:
  wl-1732 support all charsets
ndb/test/ndbapi/testOIBasic.cpp:
  wl-1732 support all charsets
ndb/tools/desc.cpp:
  wl-1732 support all charsets

a7fe1c39

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 47c39015
unknown authored Dec 12, 2004
```
into mysql.com:/home/my/mysql-5.0
```
47c39015
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · bd1fc18b
unknown authored Dec 12, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
bd1fc18b
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 93978350
unknown authored Dec 12, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0
```
93978350

10 Dec, 2004 6 commits

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 3879b149
unknown authored Dec 10, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
3879b149
fix char(0) to use ndb bit format · 4d83b7a5
unknown authored Dec 10, 2004

4d83b7a5
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 57867f07
unknown authored Dec 10, 2004
```
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.n
```
57867f07
fix according to review · 6bcee4f1
unknown authored Dec 10, 2004

6bcee4f1

ndb - bitfields - more tests, now passes all api tests!! · 07735208

unknown authored Dec 10, 2004


ndb/include/kernel/ndb_limits.h:
  #define for max null bits
ndb/include/kernel/signaldata/TupFrag.hpp:
  Error code for too many nullbits
ndb/include/util/Bitmask.hpp:
  Cosmetic fix
ndb/src/common/util/Bitmask.cpp:
  handle (pos % 32) == 0
  more unit tests
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Check bitmask overflow
ndb/src/ndbapi/ndberror.c:
  New error code
ndb/test/ndbapi/testBitfield.cpp:
  Update test program
ndb/test/run-test/daily-basic-tests.txt:
  Add testBitfield to autotest

07735208

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · ed683a7a
unknown authored Dec 10, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
ed683a7a