Commits · 3f421aa4aca2e03cd1fdf4958291cbb2cc945520 · Kirill Smelkov / mariadb

11 Apr, 2007 13 commits

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 3f421aa4

unknown authored Apr 11, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  null merge

3f421aa4

remove warning · 1810062e
unknown authored Apr 11, 2007

1810062e
correct merge error · 96d1ae8b
unknown authored Apr 11, 2007

96d1ae8b
missing return · 48acb9de
unknown authored Apr 11, 2007

48acb9de
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · b96dae00
unknown authored Apr 11, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
b96dae00

Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11 · f8c9cef1

unknown authored Apr 11, 2007

- try to catch as many malloc failures as possible and give error messages
(more for 5.1)


storage/ndb/src/ndbapi/ObjectMap.cpp:
  Rename: ndb/src/ndbapi/ObjectMap.cpp -> storage/ndb/src/ndbapi/ObjectMap.cpp

f8c9cef1

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 2776a71b

unknown authored Apr 11, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbReceiver.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanFilter.cpp:
  Auto merged
storage/ndb/include/ndbapi/NdbReceiver.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/include/util/BaseString.hpp:
  Auto merged
storage/ndb/src/common/util/BaseString.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndblist.cpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/include/ndbapi/Ndb.hpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/include/util/Vector.hpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/DictCache.cpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/DictCache.hpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/Makefile.am:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/Ndb.cpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/ObjectMap.hpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1

2776a71b

Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11 · 8187aaa8

unknown authored Apr 11, 2007

- try to catch as many malloc failures as possible and give error messages


ndb/src/ndbapi/ObjectMap.cpp:
  New BitKeeper file ``ndb/src/ndbapi/ObjectMap.cpp''

8187aaa8

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

unknown authored Apr 11, 2007

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


ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged

b0cf0c2d

Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 16f8fa13

unknown authored Apr 11, 2007

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


ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged

16f8fa13

ndb - bug#27748 · a908db7b

unknown authored Apr 11, 2007

  fix commit trigger on multi-update


ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  fix commit trigger on multi-update

a908db7b

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 2d0939c0

unknown authored Apr 11, 2007

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


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

2d0939c0

ndb - bug#27748 · f159d066
unknown authored Apr 11, 2007
```
  testcase
```
f159d066

10 Apr, 2007 7 commits

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 58b65b77

unknown authored Apr 10, 2007

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


storage/ndb/test/tools/Makefile.am:
  Auto merged

58b65b77

ndb - · 05285a62

unknown authored Apr 10, 2007

  add event log listener test tool


storage/ndb/test/tools/Makefile.am:
  add event log listener test tool
storage/ndb/test/tools/log_listner.cpp:
  New BitKeeper file ``storage/ndb/test/tools/log_listner.cpp''

05285a62

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · b50f61e1
unknown authored Apr 10, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
b50f61e1

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · ec8a3c07

unknown authored Apr 10, 2007

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


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

ec8a3c07

ndb - bug#27651 (5.1) · 01a007a5

unknown authored Apr 10, 2007

  Only prepare "next" GCI if we're in the first 4 highest GCI's
    to avoid we can get several buckets with same GCI


storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Only prepare "next" GCI if we're in the first 4 highest GCI's
        to avoid we can get several buckets with same GCI

01a007a5

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 81aa1ca0

unknown authored Apr 10, 2007

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


storage/ndb/include/kernel/signaldata/SumaImpl.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged

81aa1ca0

ndb - bug#27728 (5.1) · eaff83cb

unknown authored Apr 10, 2007

  Make sure API is connected to nodes when subscribing


storage/ndb/include/kernel/signaldata/SumaImpl.hpp:
  new error code
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  make sure API is connected in SUB_START_REQ
storage/ndb/src/ndbapi/ndberror.c:
  new error code

eaff83cb

09 Apr, 2007 5 commits

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 37feda25

unknown authored Apr 09, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


mysql-test/t/loaddata.test:
  Auto merged
sql/sql_load.cc:
  Auto merged
mysql-test/r/loaddata.result:
  SCCS merged

37feda25

Merge bk@192.168.21.1:mysql-5.0-opt · d2667d1a
unknown authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
d2667d1a

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 7f993fa6

unknown authored Apr 09, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

7f993fa6

Merge bk@192.168.21.1:mysql-5.1 · 43d17730
unknown authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


sql/sql_table.cc:
  Auto merged
```
43d17730
Merge bk@192.168.21.1:mysql-5.0 · 6d9a7969
unknown authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


sql/sql_table.cc:
  Auto merged
```
6d9a7969

08 Apr, 2007 2 commits

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · fde3e9d4

unknown authored Apr 08, 2007

into  mysql.com:/home/kent/bk/tmp4/mysql-5.1-engines


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

fde3e9d4

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · ddaeead8

unknown authored Apr 08, 2007

into  mysql.com:/home/kent/bk/tmp4/mysql-5.0-engines


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

ddaeead8

07 Apr, 2007 11 commits

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 1f8dbdaf
unknown authored Apr 07, 2007
```
into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql


sql/sql_load.cc:
  Auto merged
```
1f8dbdaf
merging fix · a1576f92
unknown authored Apr 08, 2007
```
mysql-test/r/windows.result:
  result fixed
```
a1576f92

after-merging fix · 3f0c44c6

unknown authored Apr 07, 2007


mysql-test/r/events_trans.result:
  result fixed
mysql-test/r/windows.result:
  merging fix
mysql-test/t/events_trans.test:
  moved to events_trans_notembedded.test
mysql-test/r/events_trans_notembedded.result:
  New BitKeeper file ``mysql-test/r/events_trans_notembedded.result''
mysql-test/t/events_trans_notembedded.test:
  New BitKeeper file ``mysql-test/t/events_trans_notembedded.test''

3f0c44c6

Merge mysql.com:/home/hf/work/26074/my51-26074 · 156735bd
unknown authored Apr 07, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
156735bd

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · a748949d

unknown authored Apr 07, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


sql/field.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

a748949d

Merge bk@192.168.21.1:mysql-5.1-opt · 023ae2a0

unknown authored Apr 07, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


client/mysqldump.c:
  Auto merged
mysql-test/r/rpl_packet.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/rpl_packet.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
mysql-test/r/create.result:
  SCCS merged
mysql-test/t/create.test:
  merging
mysql-test/t/disabled.def:
  merging
sql/events.cc:
  merging
sql/sql_parse.cc:
  SCCS merged

023ae2a0

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · be3bc128
unknown authored Apr 07, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
```
be3bc128
Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt · a978d84c
unknown authored Apr 07, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
a978d84c

Merge bk@192.168.21.1:mysql-5.0 · b3f9c888

unknown authored Apr 07, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


sql/field.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

b3f9c888

Merge bk@192.168.21.1:mysql-4.1 · 2911bcd8
unknown authored Apr 07, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
```
2911bcd8
test temporarily disabled · 79512192
unknown authored Apr 07, 2007

79512192

06 Apr, 2007 2 commits
- disabled test and feature · 375bb35e
  unknown authored Apr 07, 2007
  
  375bb35e
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · b5cf43c9
  unknown authored Apr 07, 2007
```
into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
```
  b5cf43c9