Commits · 2742e6f3479bdbd7805432b10a9a953086e5a0c6 · nexedi / MariaDB

10 Apr, 2006 1 commit

unknown authored Apr 10, 2006

  5.0->5.1 merge


storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  merge

2742e6f3

08 Apr, 2006 1 commit

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

unknown authored Apr 08, 2006

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


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbLinHash.hpp:
  Auto merged

65327933

07 Apr, 2006 9 commits

ndb - bug#11034 · 8dcec7b0

unknown authored Apr 07, 2006

  fix mem leak (not during running of transactions, but a few bytes when shutting down)


ndb/src/ndbapi/NdbLinHash.hpp:
  Make sure that getNext(0) actually finds first element

8dcec7b0

ndb - bug#11033 · 58bd74c3

unknown authored Apr 07, 2006

  silent valgrind warnings 5.0, ndb_autodiscover


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  append 4 bytes of 0's to end of buffer to shut valgrind up

58bd74c3

Merge perch.ndb.mysql.com:/home/jonas/src/50-jonas · 322a9d7e

unknown authored Apr 07, 2006

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


libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql-common/client.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StopReq.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged

322a9d7e

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-jonas · 91028ccc

unknown authored Apr 07, 2006

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


ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

91028ccc

multi node shutdown adabtions for restart of management servers · 49bcc3ed
unknown authored Apr 07, 2006

49bcc3ed

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 · a956401f

unknown authored Apr 07, 2006

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


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

a956401f

Support for ndb multi-node shutdown · 5eb42010
unknown authored Apr 07, 2006

5eb42010
Merge perch.ndb.mysql.com:/home/jonas/src/50-work · f3a2ec12
unknown authored Apr 07, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/50-jonas
```
f3a2ec12

ndb - · 88751baf

unknown authored Apr 07, 2006

  remove debug prinouts in Qmgr


ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  remove debug prinouts

88751baf

06 Apr, 2006 25 commits

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 8225d2fd
unknown authored Apr 06, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/50-jonas
```
8225d2fd

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

unknown authored Apr 06, 2006

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


storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  merge
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  merge

6ac04992

Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 462ef4b1

unknown authored Apr 06, 2006

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


ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

462ef4b1

ndb - bug#18612 - post review fixes · 1a12de71

unknown authored Apr 06, 2006

  1) make sure that check_multi_node_shutdown does not proceed (in stop case)
  2) Fix printout


ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  make sure that check_multi_node_shutdown does not proceed (in stop case)
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  make sure that check_multi_node_shutdown does not proceed (in stop case)

1a12de71

Merge perch.ndb.mysql.com:/home/jonas/src/51-jonas · 446c98d7
unknown authored Apr 06, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/51-work
```
446c98d7

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

unknown authored Apr 06, 2006

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


storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/FailRep.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StopReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/WaitGCP.hpp:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/src/NdbRestarts.cpp:
  Auto merged
storage/ndb/include/mgmapi/ndb_logevent.h:
  merge
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  merge
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  merge
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

b1ba41cd

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 · c7b757b7
unknown authored Apr 06, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/50-jonas
```
c7b757b7

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

unknown authored Apr 06, 2006

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


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

7192c646

post merge fixes · 833fd6c8
unknown authored Apr 06, 2006

833fd6c8

ndb - wl1760/bug#18216 · 9a864f19

unknown authored Apr 06, 2006

  add two new start options that will decrease likelyhood of bug#18612
  push cntr-sp2 logic down into qmgr-sp1 to decrease likelyhood of bug#18612


ndb/include/kernel/signaldata/CmRegSignalData.hpp:
  Expand CmRegReq with lots of stuff
ndb/include/mgmapi/ndb_logevent.h:
  Add Start report during sp1
ndb/src/common/debugger/EventLogger.cpp:
  Add Start report during sp1
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Init cntrref
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix small bugs related to partial initial start
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Remove timeouts as they are handled in QMGR nowadays
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Push cntr sp2 logic down to QMGR to prevent the forming of multiple QMGR cluster
    that will lead to start problems (crashes...)
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Push cntr sp2 logic down to QMGR to prevent the forming of multiple QMGR cluster
    that will lead to start problems (crashes...)
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Push cntr sp2 logic down to QMGR to prevent the forming of multiple QMGR cluster
    that will lead to start problems (crashes...)
ndb/src/kernel/vm/Configuration.cpp:
  Add new flags
    --initial-start
    --nowait-nodes

9a864f19

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7e12728a

unknown authored Apr 06, 2006

into  shellback.(none):/home/msvensson/mysql/mysql-5.1


client/mysqltest.c:
  Auto merged
include/config-win.h:
  Auto merged
include/m_ctype.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
storage/csv/ha_tina.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
storage/csv/ha_tina.cc:
  SCCS merged

7e12728a

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · bf803371
unknown authored Apr 06, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
```
bf803371

Moving mysql_get_server_version() from libmysql.c to client.c, · ba49c29d

unknown authored Apr 06, 2006

as it is now required by mysql_set_character_set()


libmysql/libmysql.c:
  Removing mysql_get_server_version()
sql-common/client.c:
  Adding mysql_get_server_version()

ba49c29d

client.c: · 1a6f7c6d

unknown authored Apr 06, 2006

  Bug#18830 incompatibility new libraries with old server
  Additional 5.0 fix:
  applying the same patch to client.c.


sql-common/client.c:
  Bug#18830 incompatibility new libraries with old server
  Additional 5.0 fix:
  applying the same patch to client.c.

1a6f7c6d

Merge mysql.com:/usr/home/bar/mysql-4.1 · efff3c00

unknown authored Apr 06, 2006

into  mysql.com:/usr/home/bar/mysql-5.0


libmysql/libmysql.c:
  Bug#18830 incompatibility new libraries with old server
  Mergeing from 4.1

efff3c00

Merge mysql.com:/home/stewart/Documents/MySQL/5.1/new · a0d6c7d7
unknown authored Apr 06, 2006
```
into  mysql.com:/home/stewart/Documents/MySQL/5.1/new-bug18831
```
a0d6c7d7

BUG#18831 Valgrind: cond jmp on uninit during ndb_dd_dump test · a0a7839e

unknown authored Apr 06, 2006

don't know why this didn't generate a warning, but let's fix it too.


storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  fix reversed memset

a0a7839e

BUG#18831 Valgrind: cond jmp on uninit during ndb_dd_dump test · 5592b787

unknown authored Apr 06, 2006


storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  fix memset call
  initialize LF_UndoFreeWords(Hi|Lo)

5592b787

Merge mysql.com:/usr/home/bar/mysql-5.0 · adfbca88
unknown authored Apr 06, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new


strings/ctype-extra.c:
  Auto merged
```
adfbca88

libmysql.c: · 82c1be05

unknown authored Apr 06, 2006

  Bug#18830: incompatibility new libraries with old server
  Don't execute SET NAMES with pre-4.1 server.


libmysql/libmysql.c:
  Bug#18830: incompatibility new libraries with old server
  Don't execute SET NAMES with pre-4.1 server.

82c1be05

Merge mysql.com:/usr/home/bar/mysql-4.1 · e6ab763c
unknown authored Apr 06, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.0
```
e6ab763c

This problem has already been fixed by one of the previous changes. · 6423230d

unknown authored Apr 06, 2006

Adding test case to cover queries which worked incorrectly earlier:
Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci

mysql-test/r/ctype_latin1.result:
Adding test case for Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci
mysql-test/t/ctype_latin1.test:
Adding test case for Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci

6423230d

ctype-extra.c: · 07b5476b
unknown authored Apr 06, 2006
```
  Using local.


strings/ctype-extra.c:
  Using local.
```
07b5476b
Merge mysql.com:/usr/home/bar/mysql-4.1 · 7bcff99e
unknown authored Apr 06, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.0


strings/conf_to_src.c:
  Auto merged
```
7bcff99e

conf_to_src.c: · 56dba198

unknown authored Apr 06, 2006

  Backporting a 5.0 change:
  MAX_BUF was too small for Index.xml
  Changeing MAX_BUF and adding assert to easier
  catch the same problem in the future.
ctype-extra.c:
  Regenerating ctype-extra.c with the fixed conf_to_src.


strings/ctype-extra.c:
  Regenerating ctype-extra.c with the fixed conf_to_src.
strings/conf_to_src.c:
  Backporting a 5.0 change:
  MAX_BUF was too small for Index.xml
  Changeing MAX_BUF and adding assert to easier
  catch the same problem in the future.

56dba198

05 Apr, 2006 4 commits

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 13eacb9d

unknown authored Apr 05, 2006

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


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

13eacb9d

Merge rurik.mysql.com:/home/igor/mysql-5.0 · aa482ce8
unknown authored Apr 05, 2006
```
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
```
aa482ce8

Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0 · 89d110fb

unknown authored Apr 05, 2006

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/opt_sum.cc:
  Auto merged

89d110fb

Merge mysql.com:/usr/home/bar/mysql-5.0 · 4243ecee
unknown authored Apr 05, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new


strings/ctype-extra.c:
  Auto merged
```
4243ecee