Commits · aa417a63773d7ee3ba67393a8436469ef01c8121 · Kirill Smelkov / mariadb

15 Jan, 2007 2 commits

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

unknown authored Jan 15, 2007

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


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/pgman.cpp:
  Auto merged

aa417a63

ndb - bug#25636 · 9ec05de3

unknown authored Jan 15, 2007

  Fix DD problem during NR after 3 missed LCP's


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Send START_FRAGREQ also for fragments wo/ LCP
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  inform TUP that no LCP is restored (if no lcp is restored :-)
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  inform TUP that no LCP is restored (if no lcp is restored :-)
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  inform TUP that no LCP is restored (if no lcp is restored :-)
storage/ndb/src/kernel/blocks/pgman.cpp:
  Add error insert using dump

9ec05de3

12 Jan, 2007 2 commits

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

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

f97eae8a

ndb - bug#25587 · 6226586c

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"

6226586c

11 Jan, 2007 5 commits

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

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

f3488d3a

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

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

a41e4eda

fix merge error · 79899496
unknown authored Jan 11, 2007

79899496

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

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

d84d59b7

ndb - bug#25554 · 45b1bdb1

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

45b1bdb1

10 Jan, 2007 1 commit

ndb - bug#25468 · e5eee3fa

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

e5eee3fa

08 Jan, 2007 8 commits

bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not... · fb88a02d
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
```
fb88a02d

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

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

efb8265e

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

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

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

817ed402

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

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

662ee47e

bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not... · 81a32995
unknown authored Jan 08, 2007
```
bug#24820  CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index: Added error checking
```
81a32995
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 7f325a0f
unknown authored Jan 08, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
```
7f325a0f
bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not... · 672998ea
unknown authored Jan 08, 2007
```
bug#24820  CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index: Added error checking
```
672998ea

04 Jan, 2007 7 commits

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

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

a6cbee1d

ndb - bug#25329 · f0b50825

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

f0b50825

ndb - recommit extra version info to real-51 · db007003

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

db007003

ndb - bug#25329 · 3f8ab08b

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

3f8ab08b

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

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

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

c1195da3

Many files: · f0cd7348

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

f0cd7348

03 Jan, 2007 7 commits

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


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

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

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

47ecc444

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

6385ab68

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

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

fe05ec29

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

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

61fd9c3b

ndb - bug#25364 · 7a787690

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

7a787690

02 Jan, 2007 8 commits

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

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

3eb4d961

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

server-tools/instance-manager/Makefile.am · 18c6b504

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.

18c6b504

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


sql/mysqld.cc:
  Auto merged
```
58ae3082
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 583435fc
unknown authored Jan 02, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/mysqld.cc:
  Auto merged
```
583435fc
Added --ndb-use-transactions · 905b6416
unknown authored Jan 02, 2007

905b6416
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · a88254e3
unknown authored Jan 02, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
a88254e3
Merge mysql.com:/home/kent/bk/main/mysql-5.0 · 78fdfb07
unknown authored Jan 02, 2007
```
into  mysql.com:/home/kent/bk/main/mysql-5.1


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