Commits · bf5d0eaa0a2ad04cbbe22df8969727c142f94ad7 · nexedi / MariaDB

16 Jan, 2007 1 commit
- Changed Dictionary::Table::setTablespace/getTablespace to setTablespaceName/getTablespaceName · bf5d0eaa
  unknown authored Jan 16, 2007
  
  bf5d0eaa
12 Jan, 2007 2 commits

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

unknown authored Jan 12, 2007

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


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

b9a2f91b

ndb - bug#25587 · c823b6e5

unknown authored Jan 12, 2007

  fix not aligned or non 32-bit values in "smart" scan


mysql-test/r/ndb_partition_key.result:
  testcase
mysql-test/t/ndb_partition_key.test:
  ndb - bug
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Fix unaligned or non-32-bit values in "smart scan"

c823b6e5

11 Jan, 2007 5 commits

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 6999f6a0

unknown authored Jan 11, 2007

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


storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/include/kernel/NodeInfo.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/include/ndb_version.h.in:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp:
  Auto merged
storage/ndb/src/kernel/vm/GlobalData.hpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

6999f6a0

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

unknown authored Jan 11, 2007

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


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

05d23eef

fix merge error · b2bb44a4
unknown authored Jan 11, 2007

b2bb44a4

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

unknown authored Jan 11, 2007

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


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

2f88b6a5

ndb - bug#25554 · ab07c477

unknown authored Jan 11, 2007

  fix bug when master failure during nr
  (recommit against 5.0)


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  recommit against 5.0
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  recommit against 5.0
ndb/test/ndbapi/testNodeRestart.cpp:
  recommit against 5.0
ndb/test/run-test/daily-basic-tests.txt:
  recommit against 5.0

ab07c477

10 Jan, 2007 1 commit

ndb - bug#25468 · 9b9ac0f0

unknown authored Jan 10, 2007

  handle partially transfered LCP_FRAG_REP after node failure
  recommit to 51-work


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  handle partially transfered LCP_FRAG_REP after node failure
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  handle partially transfered LCP_FRAG_REP after node failure
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
  testcase

9b9ac0f0

08 Jan, 2007 8 commits

bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not... · c1ec0269
unknown authored Jan 08, 2007
```
bug#24820  CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index: Merged up test 5.0 case
```
c1ec0269

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · 09525c3a

unknown authored Jan 08, 2007

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


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

09525c3a

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 740edce0
unknown authored Jan 08, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
```
740edce0

bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not... · c2f92def

unknown authored Jan 08, 2007

bug#24820  CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index: Changed test since error mesage wasn't predictable

c2f92def

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · beec5636

unknown authored Jan 08, 2007

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


mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

beec5636

bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not... · 8347cc2a
unknown authored Jan 08, 2007
```
bug#24820  CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index: Added error checking
```
8347cc2a
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 4ecb53f5
unknown authored Jan 08, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
```
4ecb53f5
bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not... · c29d844c
unknown authored Jan 08, 2007
```
bug#24820  CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index: Added error checking
```
c29d844c

04 Jan, 2007 7 commits

ha_ndbcluster.h, ndb_dd_alter.result, ha_ndbcluster.cc: · a96ba6a9

unknown authored Jan 04, 2007

bug#25296 Truncate table converts NDB disk based tables to in-memory tables: Changed fix to use get_tablespace_name directly instead

sql/ha_ndbcluster.h:
bug#25296 Truncate table converts NDB disk based tables to in-memory tables: Changed fix to use get_tablespace_name directly instead
mysql-test/r/ndb_dd_alter.result:
bug#25296 Truncate table converts NDB disk based tables to in-memory tables: Changed fix to use get_tablespace_name directly instead
sql/ha_ndbcluster.cc:
bug#25296 Truncate table converts NDB disk based tables to in-memory tables: Changed fix to use get_tablespace_name directly instead

a96ba6a9

ndb - bug#25329 · bdb3e3e2

unknown authored Jan 04, 2007

  extra sledge hammer, (real 51)
  use dicklock to prevent SUB_START_REQ during node recovery


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  use dicklock to prevent SUB_START_REQ during node recovery

bdb3e3e2

ndb - recommit extra version info to real-51 · 34a72aaa

unknown authored Jan 04, 2007


storage/ndb/include/kernel/GlobalSignalNumbers.h:
  add extra version info to main clone
storage/ndb/include/kernel/NodeInfo.hpp:
  add extra version info to main clone
storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp:
  add extra version info to main clone
storage/ndb/include/ndb_version.h.in:
  add extra version info to main clone
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  add extra version info to main clone
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  add extra version info to main clone
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  add extra version info to main clone
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  add extra version info to main clone
storage/ndb/src/kernel/vm/GlobalData.hpp:
  add extra version info to main clone
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  add extra version info to main clone

34a72aaa

ndb - bug#25329 · d8969887

unknown authored Jan 04, 2007

  Fix most obvious error in dict/suma error handling of events


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fix most obvious error in dict/suma error handling of events
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Fix most obvious error in dict/suma error handling of events
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Fix most obvious error in dict/suma error handling of events
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp:
  Fix most obvious error in dict/suma error handling of events

d8969887

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 66028f19
unknown authored Jan 04, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
66028f19

bug #25296 Truncate table converts NDB disk based tables to in-memory tables:... · e8fc77d7

unknown authored Jan 04, 2007

bug #25296  Truncate table converts NDB disk based tables to in-memory tables: ha_ndbcluster::update_create_info should only update for TRUNCATE since we need to detect change of STORAGE at ALTER TABLE

e8fc77d7

Many files: · 898fe8a5

unknown authored Jan 04, 2007

  Updated from Tomas review


mysql-test/t/rpl_ndb_do_db.test:
  Updated from Tomas review
mysql-test/t/rpl_ndb_do_table.test:
  Updated from Tomas review
mysql-test/r/rpl_ndb_do_db.result:
  Updated from Tomas review
mysql-test/r/rpl_ndb_do_table.result:
  Updated from Tomas review
mysql-test/r/rpl_ndb_rep_ignore.result:
  Updated from Tomas review
mysql-test/t/rpl_ndb_rep_ignore.test:
  Updated from Tomas review

898fe8a5

03 Jan, 2007 7 commits

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · bbb85ba8
unknown authored Jan 03, 2007
```
into  mysql.com:/data2/mysql-5.1-new-ndb
```
bbb85ba8
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · e91ff2df
unknown authored Jan 03, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/mysqld.cc:
  Auto merged
```
e91ff2df

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

unknown authored Jan 03, 2007

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


sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  SCCS merged

a6b72030

ndb_use_transactions is set from value for command line flag · 1a373b56
unknown authored Jan 03, 2007

1a373b56

bug #25296 Truncate table converts NDB disk based tables to in-memory tables:... · 4aa437a2

unknown authored Jan 03, 2007

bug #25296  Truncate table converts NDB disk based tables to in-memory tables: ha_ndbcluster::update_create_infohas to check for explicit STORAGE MEMORY

4aa437a2

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

unknown authored Jan 03, 2007

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


storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  merge
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  merge
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

ebeb1673

ndb - bug#25364 · 162a2e41

unknown authored Jan 03, 2007

  on master node failure during qmgr-commitreq
    make sure to remove all committed failed nodes from failed/prepfailed arrays


ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  new error code
ndb/src/kernel/blocks/ERROR_codes.txt:
  new error code
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  extra error insert variable
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  make sure to remove all committed failed nodes from failed/prepfailed arrays
ndb/test/ndbapi/testNodeRestart.cpp:
  testcase
ndb/test/run-test/daily-basic-tests.txt:
  testcase

162a2e41

02 Jan, 2007 9 commits

bug #25296 Truncate table converts NDB disk based tables to in-memory tables:... · 774a9003

unknown authored Jan 02, 2007

bug #25296 Truncate table converts NDB disk based tables to in-memory tables: implemented ha_ndbcluster::update_create_info

mysql-test/r/ndb_dd_alter.result:
ug #25296 Truncate table converts NDB disk based tables to in-memory tables: implemented ha_ndbcluster::update_create_info
mysql-test/t/ndb_dd_alter.test:
ug #25296 Truncate table converts NDB disk based tables to in-memory tables: implemented ha_ndbcluster::update_create_info
sql/ha_ndbcluster.cc:
ug #25296 Truncate table converts NDB disk based tables to in-memory tables: implemented ha_ndbcluster::update_create_info
sql/ha_ndbcluster.h:
ug #25296 Truncate table converts NDB disk based tables to in-memory tables: implemented ha_ndbcluster::update_create_info

774a9003

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 · d29c8a73
unknown authored Jan 02, 2007
```
into  trift2.:/MySQL/M51/mysql-5.1
```
d29c8a73

server-tools/instance-manager/Makefile.am · 10b4a25f

unknown authored Jan 02, 2007

Delete compiler-specific flag setting - it makes builds break.

server-tools/instance-manager/Makefile.am:
Delete compiler-specific flag setting - it makes builds break.
If this is really wanted, it must be done through "configure", caring about the compiler differences.

10b4a25f

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · 4af828c7
unknown authored Jan 02, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/mysqld.cc:
  Auto merged
```
4af828c7
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · ee2431d9
unknown authored Jan 02, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/mysqld.cc:
  Auto merged
```
ee2431d9
Added --ndb-use-transactions · 31fbcdf8
unknown authored Jan 02, 2007

31fbcdf8
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · 7e2f7938
unknown authored Jan 02, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
7e2f7938
Merge mysql.com:/home/kent/bk/main/mysql-5.0 · ee12ee53
unknown authored Jan 02, 2007
```
into  mysql.com:/home/kent/bk/main/mysql-5.1


mysql-test/r/view.result:
  Auto merged
```
ee12ee53

view.result: · 9cf787a9

unknown authored Jan 02, 2007

  Temporary work around for bug#25359


mysql-test/r/view.result:
  Temporary work around for bug#25359

9cf787a9