Commits · 2aba358b68d9f5ed8857b37cc9840662bcdde6ea · nexedi / MariaDB

01 Dec, 2006 21 commits

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


sql/ha_ndbcluster.cc:
  Auto merged
```
2aba358b

Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to... · b97d63a4

unknown authored Dec 01, 2006

Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema

b97d63a4

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

unknown authored Dec 01, 2006

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


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

cdc7797a

ndb - bug#24655 · 94b35be5

unknown authored Dec 01, 2006

  Handle events "differently" so that dict doesnt get lock too often


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Handle event separatly as they dont set block_state :-(
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Handle event separatly as they dont set block_state :-(
storage/ndb/src/kernel/vm/KeyTable2.hpp:
  Handle event separatly as they dont set block_state :-(

94b35be5

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

unknown authored Dec 01, 2006

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


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

2330c5c0

ndb - bug#24752 · 6dc8ad60

unknown authored Dec 01, 2006

  This prevent any subsequent node restarts, but it's better than crashing an alive node


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fix for bug#24752
  This prevent any subsequent node restarts, but it's better than crashing an alive node

6dc8ad60

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

unknown authored Dec 01, 2006

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


storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
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/dbtc/DbtcMain.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/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

308f2346

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

unknown authored Dec 01, 2006

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


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

01a0bec2

ndb - bug#24748 · 8c8e27ba

unknown authored Dec 01, 2006

  Skip rollback if only committedRead in transaction


ndb/src/ndbapi/NdbTransaction.cpp:
  Skip rollback if only committedRead in transaction

8c8e27ba

ndb - bug#24717 · ca99e7f5

unknown authored Dec 01, 2006

  fixes to testprogram to test new impl. in 5.1


storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  move tsman dumps
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  add more support for connection handling using dumps
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  port testprogram to 5.1 to avoid "extra" safety net in LQH

ca99e7f5

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

unknown authored Dec 01, 2006

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


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

51df41d1

ndb - · 6a446ee5

unknown authored Dec 01, 2006

  fix merge error


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  fix merge error

6a446ee5

ndb - · 4723c479

unknown authored Dec 01, 2006

  add testcase for bug#24717
 + fix typo


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Add new error insert 9002
    which is 9000, but will auto enable when started
ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
  Add new error insert 9002
    which is 9000, but will auto enable when started
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Fix typo
ndb/test/ndbapi/testNodeRestart.cpp:
  add testcase for bug#24717
ndb/test/run-test/daily-basic-tests.txt:
  add testcase for bug#24717

4723c479

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 3601daf7
unknown authored Dec 01, 2006
```
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
```
3601daf7

ndb - bug#24717 · 86616d62

unknown authored Dec 01, 2006

  5.1 version
  remove 5.0 version
  add general routing signal
  send tckeyref routed if needed...


storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Add general routing signal
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Add general routing signal
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  send TCKEYREF routed if needed
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  add general routing 
  remove node started state
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  add general routing 
  remove node started state
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  add general routing 
  remove node started state
  remove "avoid sending committed read to early" as it now should be handled correctly
storage/ndb/include/kernel/signaldata/RouteOrd.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/RouteOrd.hpp''

86616d62

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

unknown authored Dec 01, 2006

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


storage/ndb/src/common/util/NdbSqlUtil.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  merge
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  merge
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  merge
storage/ndb/src/ndbapi/ndberror.c:
  merge

206b2514

ndb - bug#24717 · c4565431

unknown authored Dec 01, 2006

  5.0 version
  Add some extra state to try to prevent sending committedread to node too early


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  remove extra virtual-indirection
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  remove extra virtual-indirection
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  remove extra virtual-indirection
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Add retry mechanism to send TCKEYREF
    (as extra safety)
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Add retry mechanism to send TCKEYREF
    (as extra safety)
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Add extra state to prevent sending committed reads to node to early
    (before connection establishment)
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Add extra state to prevent sending committed reads to node to early
    (before connection establishment)
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Add extra state to prevent sending committed reads to node to early
    (before connection establishment)
ndb/src/kernel/vm/SimulatedBlock.cpp:
  remove extra virtual-indirection
ndb/src/kernel/vm/SimulatedBlock.hpp:
  remove extra virtual-indirection

c4565431

ndb - bug#24476 · d193af54

unknown authored Dec 01, 2006

  Fix typo that yeilded rare crash in ACC


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  fix typo, where elementptr was sent as elementheader
  yeilded very rare crashes as only 1 bit is checked
    and it's only checked under certatin rare circumstances

d193af54

For merging mysql-5.1-new-ndb-bj tree into mysql-5.1-new-ndb tree · 2e8184d1

unknown authored Dec 01, 2006


storage/ndb/src/mgmsrv/ParamInfo.cpp:
  delete CFG_OSE_PRIO_A_SIZE, CFG_OSE_PRIO_B_SIZE and CFG_OSE_RECEIVE_ARRAY_SIZE defination

2e8184d1

Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj · 518c703a

unknown authored Dec 01, 2006

into  ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged
BitKeeper/deleted/.del-OSE_Receiver.cpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged

518c703a

ndb - bug#21690: fix typo which changed blob parts distribution · a54ad193

unknown authored Dec 01, 2006


storage/ndb/src/ndbapi/NdbBlob.cpp:
  fix typo which made blob PART part of distribution key
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  fix typo which made blob PART part of distribution key

a54ad193

30 Nov, 2006 17 commits

bug#18487 UPDATE IGNORE not supported for unique constraint violation of... · 70c70c15

unknown authored Nov 30, 2006

bug#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key: only check pk if it is updated

70c70c15

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

unknown authored Nov 30, 2006

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

e219d8d4

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · e65dc13f
unknown authored Nov 30, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
```
e65dc13f

bug#18487 UPDATE IGNORE not supported for unique constraint violation of... · 0d6db38f

unknown authored Nov 30, 2006

bug#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key: only check pk if it is updated

0d6db38f

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

unknown authored Nov 30, 2006

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


sql/ha_ndbcluster.cc:
  Auto merged

d88c2f24

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · d66171ae
unknown authored Nov 30, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
```
d66171ae

bug#18487 UPDATE IGNORE not supported for unique constraint violation of... · 7c44ec9e

unknown authored Nov 30, 2006

bug#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key: handle INSERT ... ON DUPLICATE KEY UPDATE

7c44ec9e

bug#18487 UPDATE IGNORE not supported for unique constraint violation of... · 842b8636
unknown authored Nov 30, 2006
```
bug#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key: updated test result
```
842b8636

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · e8e67e5a

unknown authored Nov 30, 2006

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


storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged

e8e67e5a

bug#24303 Wrong result for UPDATE IGNORE for NDB table: bug fix reverted, fix... · 73014a29

unknown authored Nov 30, 2006

bug#24303  Wrong result for UPDATE IGNORE for NDB table: bug fix reverted, fix for bug#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key, solves it a better way

73014a29

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

unknown authored Nov 30, 2006

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


configure.in:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/ndb_update.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/ndb/include/util/OutputStream.hpp:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql/sql_cache.cc:
  Merge

9d137d0f

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

unknown authored Nov 30, 2006

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


sql/ha_ndbcluster.cc:
  Auto merged
mysql-test/r/ndb_update.result:
  Using local, will regenerate

7ea50143

#18487 UPDATE IGNORE not supported for unique constraint violation of... · d4efa758
unknown authored Nov 30, 2006
```
#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key: call peek_index_rows
```
d4efa758
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · d7c315a1
unknown authored Nov 30, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
```
d7c315a1

Removed return of illegal pointer, changed signatures to... · 8f20d330

unknown authored Nov 30, 2006

Removed return of illegal pointer, changed signatures to ndb_mgm_get_clusterlog_severity_filter and ndb_mgm_get_clusterlog_loglevel

8f20d330

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · f513b974

unknown authored Nov 30, 2006

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

f513b974

A post-merge fix: fix the failing trigger-grant.test. · 2002e4bc

unknown authored Nov 30, 2006


sql/sql_trigger.cc:
  Another post-merge fix: make TRIGGER privilege work again, after
  IF EXISTS refactoring.

2002e4bc

29 Nov, 2006 2 commits
- A post-merge fix. · c7c560f6
  unknown authored Nov 30, 2006
```
mysql-test/r/func_str.result:
  Update results (a post-merge fix).
```
  c7c560f6
- A post-merge fix. · 400b094c
  unknown authored Nov 30, 2006
  
  400b094c