Commits · 2c66ac87a1fc0528189ae0449fd400f67031db22 · nexedi / MariaDB

20 Dec, 2006 2 commits

ndb_dd_ddl.test, ndb_dd_ddl.result, ha_ndbcluster.cc: · 2c66ac87

unknown authored Dec 20, 2006

bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: disallowed TABLESPACE declaration for STORAGE MEMORY
Makefile:
Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/Makefile -> storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile
mgmapi_logevent2.cpp:
Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent_dual.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp
Makefile:
Rename mgmapi_logevent_dual to mgmapi_logevent2
mgmapi_logevent2.cpp:
Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp

storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp:
Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp
storage/ndb/ndbapi-examples/Makefile:
Rename mgmapi_logevent_dual to mgmapi_logevent2
storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile:
Rename mgmapi_logevent_dual to mgmapi_logevent2
mysql-test/r/ndb_dd_ddl.result:
bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: disallowed TABLESPACE declaration for STORAGE MEMORY
mysql-test/t/ndb_dd_ddl.test:
bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: disallowed TABLESPACE declaration for STORAGE MEMORY
sql/ha_ndbcluster.cc:
bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: disallowed TABLESPACE declaration for STORAGE MEMORY

2c66ac87

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 71b72775
unknown authored Dec 20, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
71b72775

19 Dec, 2006 3 commits

bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: ALTER... · 21331830

unknown authored Dec 19, 2006

bug#24667  After ALTER TABLE operation ndb_dd table becomes regular ndb: ALTER TABLE must specify STORAGE explicitely to change it, + post review changes

21331830

bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: copy... · ccb76286

unknown authored Dec 19, 2006

bug#24667  After ALTER TABLE operation ndb_dd table becomes regular ndb: copy tablespace from old table in copying alter table

ccb76286

WL#2862 ndb_sp.test - removed unnecessary line · d930bb11
unknown authored Dec 19, 2006
```
mysql-test/r/ndb_sp.result:
  WL#2862
mysql-test/t/ndb_sp.test:
  WL#2862
```
d930bb11

18 Dec, 2006 2 commits
- fix for commit 1.2368 · b9741216
  unknown authored Dec 18, 2006
  
  b9741216
- fix for commit 1.2368 · 9f63a6e4
  unknown authored Dec 18, 2006
  
  9f63a6e4
17 Dec, 2006 1 commit
- WL#2862 · 04b3acc1
  unknown authored Dec 17, 2006
  
  04b3acc1
15 Dec, 2006 10 commits

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

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

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

edf84c0d

merge fix · cb81b24b
unknown authored Dec 15, 2006

cb81b24b

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

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

dffbe735

ndb - bug#25059 · 2e39b557

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

2e39b557

ndb - bug#25090 · 835a0ff6

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

835a0ff6

ndb - bug#25090 · bb0a8229

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

bb0a8229

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

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 11045c56

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

11045c56

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

9ceb6d8e

14 Dec, 2006 4 commits
- bug#19956 Problems with VARCHAR primary key and BLOB fields:put back removed... · bfcbf62c
  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
```
  bfcbf62c
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · d1b845bb
  unknown authored Dec 14, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
  d1b845bb
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 434536a8
  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)
```
  434536a8
- Removed check for impossible error return · 981ab340
  unknown authored Dec 14, 2006
  
  981ab340
13 Dec, 2006 1 commit
- Remove old hack to avoid reception of SUB_DATA signals to destroyed Ndb object · 8c664b3b
  unknown authored Dec 13, 2006
  
  8c664b3b
12 Dec, 2006 5 commits

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

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

efba22e1

ndb - bug#24949 · 1402f9ad

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

1402f9ad

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

ndb - bug#25001 · 79785fae

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

79785fae

ndb - style · dd2ca018

unknown authored Dec 12, 2006

  split assignment into 2 lines


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

dd2ca018

11 Dec, 2006 2 commits

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

ndb - bug#24664 · ee0bad0c

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

ee0bad0c

09 Dec, 2006 2 commits
- ya typo · 279c98b4
  unknown authored Dec 09, 2006
  
  279c98b4
- fix bug in make install · 840136ad
  unknown authored Dec 09, 2006
  
  840136ad
08 Dec, 2006 7 commits

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

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

c2037aff

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

ndb - bug#24917 · 247fde18

unknown authored Dec 08, 2006

  


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

247fde18

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

ndb - bug#24914 · e663444b

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

e663444b

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

ndb - bug#21948 · b01e4ecd

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

b01e4ecd

07 Dec, 2006 1 commit
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · cc552e52
  unknown authored Dec 07, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
  cc552e52