Commits · 10a497a623f9b5b7176e9edad8b077597471e284 · Kirill Smelkov / mariadb

01 Dec, 2006 19 commits

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

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

10a497a6

ndb - bug#24655 · 3a7bb77d

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 :-(

3a7bb77d

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

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

cca1a6a4

ndb - bug#24752 · f8c69117

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

f8c69117

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

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

2b1df537

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

unknown authored Dec 01, 2006

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


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

fae72af5

ndb - bug#24748 · a29f5276

unknown authored Dec 01, 2006

  Skip rollback if only committedRead in transaction


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

a29f5276

ndb - bug#24717 · b642e268

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

b642e268

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

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

9a22200e

ndb - · 1360c578

unknown authored Dec 01, 2006

  fix merge error


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

1360c578

ndb - · 61c5b80e

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

61c5b80e

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

ndb - bug#24717 · aeb2d457

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''

aeb2d457

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

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

e958b49e

ndb - bug#24717 · cc00d542

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

cc00d542

ndb - bug#24476 · bfc5a0cc

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

bfc5a0cc

For merging mysql-5.1-new-ndb-bj tree into mysql-5.1-new-ndb tree · 7f63e8f2

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

7f63e8f2

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

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

02818a00

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

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

fe4192c4

30 Nov, 2006 17 commits

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

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

bae9fc07

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

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

910b5c59

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

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

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

ece3c40b

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

unknown authored Nov 30, 2006

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


sql/ha_ndbcluster.cc:
  Auto merged

8ee58b54

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


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

bug#18487 UPDATE IGNORE not supported for unique constraint violation of... · 1cc765b3

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

1cc765b3

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

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

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

bbfa47d0

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

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

b9d51b15

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

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

d6e2895d

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

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

a6a0aa42

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


sql/ha_ndbcluster.cc:
  Auto merged
```
10e81056

Removed return of illegal pointer, changed signatures to... · 9253140b

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

9253140b

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

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

46fd7dec

A post-merge fix: fix the failing trigger-grant.test. · 6949b042

unknown authored Nov 30, 2006


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

6949b042

29 Nov, 2006 4 commits

A post-merge fix. · 21fdaf5e

unknown authored Nov 30, 2006


mysql-test/r/func_str.result:
  Update results (a post-merge fix).

21fdaf5e

A post-merge fix. · 0717e6c3
unknown authored Nov 30, 2006

0717e6c3

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 126375b1

unknown authored Nov 30, 2006

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/r/rpl_trigger.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
mysql-test/t/im_utils.imtest:
  Auto merged
mysql-test/t/rpl_trigger.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Use local.
mysql-test/r/func_str.result:
  SCCS merged
mysql-test/t/func_str.test:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
sql/sql_yacc.yy:
  Manual merge.

126375b1

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 4ec84721
unknown authored Nov 30, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
4ec84721