Commits · 32d0850823cdf5cebfdd14bc3bd81ee9d807cd83 · nexedi / MariaDB

15 Dec, 2006 10 commits

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 32d08508
unknown authored Dec 15, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
32d08508

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · ba0e1d01

unknown authored Dec 15, 2006

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

ba0e1d01

merge fix · c632e93e
unknown authored Dec 15, 2006

c632e93e

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · c5301c5a

unknown authored Dec 15, 2006

into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
  merge

c5301c5a

ndb - bug#25059 · 9a79c0dc

unknown authored Dec 15, 2006

  incorrect handling of commit/ignore error in unique index code


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  1) handle potential ptr error
  2) remove incorrect commit-handling in uk code
ndb/src/ndbapi/NdbTransaction.cpp:
  1) force 4012
  2) handle AO_IgnoreError in uk code
ndb/src/ndbapi/Ndbif.cpp:
  force 4012
ndb/test/ndbapi/testIndex.cpp:
  test program for 25059
ndb/test/run-test/daily-basic-tests.txt:
  add testcase

9a79c0dc

ndb - bug#25090 · 04ce9e4b

unknown authored Dec 15, 2006

  add testcase


ndb/test/ndbapi/testBasic.cpp:
  add testcase for bug#25090
ndb/test/run-test/daily-basic-tests.txt:
  add testcase for bug#25090

04ce9e4b

ndb - bug#25090 · 52fad145

unknown authored Dec 15, 2006

  make sure apicon timer is reset when setting CS_CONNECTED


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  make sure apicon timer is reset when setting CS_CONNECTED

52fad145

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · 17472067
unknown authored Dec 15, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
17472067

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 4d440ab0

unknown authored Dec 15, 2006

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/r/ndb_read_multi_range.result:
  Auto merged
mysql-test/t/ndb_read_multi_range.test:
  Auto merged

4d440ab0

bug#19956 Problems with VARCHAR primary key and BLOB fields:added test case · 386b3817
unknown authored Dec 15, 2006

386b3817

14 Dec, 2006 4 commits
- bug#19956 Problems with VARCHAR primary key and BLOB fields:put back removed... · a4712f9f
  unknown authored Dec 14, 2006
```
bug#19956  Problems with VARCHAR primary key and BLOB fields:put back removed error handling for HA_ERR_KEY_NOT_FOUND
```
  a4712f9f
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · 10727348
  unknown authored Dec 14, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
  10727348
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · f8505697
  unknown authored Dec 14, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.cc:
  Merge (using local, will merge manually)
```
  f8505697
- Removed check for impossible error return · 14f7ff00
  unknown authored Dec 14, 2006
  
  14f7ff00
13 Dec, 2006 1 commit
- Remove old hack to avoid reception of SUB_DATA signals to destroyed Ndb object · 6c5e6dab
  unknown authored Dec 13, 2006
  
  6c5e6dab
12 Dec, 2006 5 commits

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · ad53646d

unknown authored Dec 12, 2006

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged

ad53646d

ndb - bug#24949 · f62bab22

unknown authored Dec 12, 2006

  make sure not too poll to long, in case of hb-failure of last db-node


storage/ndb/src/ndbapi/Ndbif.cpp:
  Make sure not to poll too long
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Make sure not to poll too long

f62bab22

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 4c6c69ad
unknown authored Dec 12, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
4c6c69ad

ndb - bug#25001 · 5a6e23bc

unknown authored Dec 12, 2006

  make sure DISK flag is set on DATA column for blob table


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  maek sure DISK flag is set on DATA column fro blob table
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  maek sure DISK flag is set on DATA column fro blob table

5a6e23bc

ndb - style · bbb25676

unknown authored Dec 12, 2006

  split assignment into 2 lines


storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  remove bad assignment

bbb25676

11 Dec, 2006 2 commits

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 30401629
unknown authored Dec 11, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
30401629

ndb - bug#24664 · 231483d9

unknown authored Dec 11, 2006

  Fix in bug fix, make sure LCP_SKIP is only used for inserts...


storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Make sure LCP_SKIP is only used for inserts

231483d9

09 Dec, 2006 2 commits
- ya typo · b21a6b8b
  unknown authored Dec 09, 2006
  
  b21a6b8b
- fix bug in make install · 085c8ca6
  unknown authored Dec 09, 2006
  
  085c8ca6
08 Dec, 2006 7 commits

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 · 06eb5751

unknown authored Dec 08, 2006

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


mysql-test/r/ndb_update.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Auto merged
storage/ndb/src/common/util/InputStream.cpp:
  Auto merged
storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged

06eb5751

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · d6718d6a
unknown authored Dec 08, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
d6718d6a

ndb - bug#24917 · 0372d3b0

unknown authored Dec 08, 2006

  


storage/ndb/src/kernel/blocks/lgman.cpp:
  Hande LCP= 0 specially

0372d3b0

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 25cfd325
unknown authored Dec 08, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
25cfd325

ndb - bug#24914 · eff21a02

unknown authored Dec 08, 2006

  Fix start transaction with hint from ndbapi


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fix fragments array for API
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix fragments array for API
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fix fragments array for API

eff21a02

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · e86b5625
unknown authored Dec 08, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
e86b5625

ndb - bug#21948 · 3806777d

unknown authored Dec 08, 2006

  Fix bug in previous changeset...causing SR problems with disk


storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  fix some more strict-aliasing problems
storage/ndb/src/kernel/blocks/tsman.cpp:
  Fix newly introduced bug

3806777d

07 Dec, 2006 9 commits

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · a0219df5
unknown authored Dec 07, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
a0219df5
ps_7ndb problem now fixed · 6d4af574
unknown authored Dec 07, 2006

6d4af574
Bug#24818 CREATE UNIQUE INDEX (...) USING HASH on a NDB table crashes mysqld:... · 6fa52696
unknown authored Dec 07, 2006
```
Bug#24818 CREATE UNIQUE INDEX (...) USING HASH on a NDB table crashes mysqld: Re-generated test result
```
6fa52696
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · bdb6065d
unknown authored Dec 07, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
bdb6065d

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 0b2da8dc

unknown authored Dec 07, 2006

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged

0b2da8dc

Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 · d8ff6cdf

unknown authored Dec 07, 2006

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0


mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged

d8ff6cdf

Bug#24818 CREATE UNIQUE INDEX (...) USING HASH on a NDB table crashes mysqld: Added test case · 6e47c11c
unknown authored Dec 07, 2006

6e47c11c

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · dcc08d2d

unknown authored Dec 07, 2006

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/src/kernel/blocks/lgman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

dcc08d2d

ndb - bug#21948 & bug#17605 · 1121ca8f

unknown authored Dec 07, 2006

  fix alloc/free extent in undo log
  allow extent to be reused once a lcp is finished (instead of when next lcp starts)


storage/ndb/include/kernel/signaldata/Extent.hpp:
  Add lsn to alloc extent
storage/ndb/src/kernel/blocks/diskpage.hpp:
  Add (unused) undo entries for drop table, and alloc/free extent
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Notify TSMAN of both start and stop of LCP
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  1) Add unused undo entries for drop table, alloc/free extent
  2) handle create_table better (correct?) in undo log
  3) fix some typos/style
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  1) Add unused undo entries for drop table, alloc/free extent
  2) handle create_table better (correct?) in undo log
  3) fix some typos/style
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  fix style
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  fix typo/style
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Make sure regFragPtr.p->m_logfile_group_id = RNIL is applicable
storage/ndb/src/kernel/blocks/lgman.cpp:
  Add m_logfile_group_id to log callback
storage/ndb/src/kernel/blocks/print_file.cpp:
  Add (unused) undo entries for drop table, and alloc/free extent
storage/ndb/src/kernel/blocks/tsman.cpp:
  1) change so that LCP limit on resuse of extent is only for duration of lcp
  2) refactor so lookup_extent is put into subroutine
storage/ndb/src/kernel/blocks/tsman.hpp:
  refactor so lookup_extent is put into subroutine

1121ca8f