Commits · b55edc6b867471ae84bb1145ed689bd735cf6ccf · nexedi / MariaDB

04 Oct, 2006 4 commits

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

unknown authored Oct 04, 2006

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


storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/include/ndb_version.h.in:
  merge

b55edc6b

Merge bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-ndb-bj · 6fd692ee

unknown authored Oct 04, 2006

into  bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-new-ndb


client/mysqltest.c:
  Auto merged
include/config-netware.h:
  Auto merged
mysql-test/r/csv.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
storage/csv/ha_tina.cc:
  manual merge.
storage/innobase/btr/btr0btr.c:
  SCCS merged
storage/innobase/buf/buf0buf.c:
  SCCS merged
storage/innobase/dict/dict0dict.c:
  SCCS merged
storage/innobase/fil/fil0fil.c:
  SCCS merged
storage/innobase/fsp/fsp0fsp.c:
  SCCS merged
storage/innobase/handler/ha_innodb.cc:
  SCCS merged
storage/innobase/include/btr0cur.ic:
  use local
storage/innobase/include/buf0buf.ic:
  SCCS merged
storage/innobase/log/log0log.c:
  SCCS merged
storage/innobase/log/log0recv.c:
  SCCS merged
storage/innobase/os/os0file.c:
  SCCS merged
storage/innobase/row/row0mysql.c:
  SCCS merged
storage/innobase/row/row0sel.c:
  SCCS merged
storage/innobase/srv/srv0start.c:
  SCCS merged
storage/innobase/ut/ut0dbg.c:
  SCCS merged

6fd692ee

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

unknown authored Oct 04, 2006

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


storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  SCCS merged

8b34df03

Merge willster.(none):/home/stewart/Documents/MySQL/5.1/cleanup · 18f36984

unknown authored Oct 04, 2006

into  willster.(none):/home/stewart/Documents/MySQL/5.1/pending


storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  merge

18f36984

03 Oct, 2006 1 commit
- Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb · 38d204ae
  unknown authored Oct 04, 2006
```
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20809
```
  38d204ae
28 Sep, 2006 3 commits

Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-19651 · 7282cb45

unknown authored Sep 28, 2006

into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-19651


storage/ndb/include/util/ndb_opts.h:
  Auto merged
storage/ndb/test/ndbapi/flexScan.cpp:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/tools/restore/consumer.hpp:
  merged for push bug#19651
storage/ndb/tools/restore/consumer_restore.cpp:
  merged for push bug#19651
storage/ndb/tools/restore/consumer_restore.hpp:
  merged for push bug#19651
storage/ndb/tools/restore/restore_main.cpp:
  merged for push bug#19651

7282cb45

Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-4.1/mysql-4.1-bug-19651 · de98d199

unknown authored Sep 28, 2006

into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-19651


ndb/test/ndbapi/flexScan.cpp:
  Auto merged
ndb/tools/ndb_config.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.hpp:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  Auto merged
ndb/include/util/ndb_opts.h:
  C

de98d199

Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-4.1/mysql-4.1-ndb-bj · adcaf0c1
unknown authored Sep 28, 2006
```
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-4.1/mysql-4.1-bug-19651
```
adcaf0c1

26 Sep, 2006 12 commits

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

unknown authored Sep 26, 2006

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


storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged

de44e766

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

unknown authored Sep 26, 2006

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/dbtc/DbtcMain.cpp:
  Auto merged

fefe8925

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

unknown authored Sep 26, 2006

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


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

c437142c

ndb - bug#15303 · 53c55c52

unknown authored Sep 26, 2006

  Fix take-over during SR, remove coupling to lcp/gcp (if systemRestartOngoing())


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix take-over during SR

53c55c52

Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 0bb4ab64

unknown authored Sep 26, 2006

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


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

0bb4ab64

ndb - bug#22672 · 63f72ecc

unknown authored Sep 26, 2006

  handle also CS_CONNECTED as "abort" in handleFailedApi to keep from falling on assertion in releaseApiCon
    in case of committed dirtyRead


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  handle also CS_CONNECTED as "abort" to keep from falling on assertion in releaseApiCon
    in case of committed dirtyRead

63f72ecc

ndb - bug#21690: cleanup: set column properties in any order before create · 23bdcf23

unknown authored Sep 26, 2006


storage/ndb/include/ndbapi/NdbDictionary.hpp:
  compute aggregates only before create table or by user request.
  remove distribution key hacks (set by user/set by us..)
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  compute aggregates only before create table or by user request.
  remove distribution key hacks (set by user/set by us..)
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  compute aggregates only before create table or by user request.
  remove distribution key hacks (set by user/set by us..)
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  compute aggregates only before create table or by user request.
  remove distribution key hacks (set by user/set by us..)
storage/ndb/test/include/NDBT_Table.hpp:
  compute aggregates only before create table or by user request.
  remove distribution key hacks (set by user/set by us..)
storage/ndb/test/src/NDBT_Tables.cpp:
  compute aggregates only before create table or by user request.
  remove distribution key hacks (set by user/set by us..)

23bdcf23

ndb - post merge fixes... · 6588a025

unknown authored Sep 26, 2006


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  merge

6588a025

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

unknown authored Sep 26, 2006

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


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  merge
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  merge
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  merge

9bbafed2

Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 6032e445

unknown authored Sep 26, 2006

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


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

6032e445

ndb - bug#20895 · 99e84383

unknown authored Sep 26, 2006

  Fix occational LCP hang!!!
  Make sure only to consider alive nodes in startNextChkpt


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Make sure only to consider alive nodes in startNextChkpt

99e84383

fix for bug#19651, if temporary error occured while retoring, report it in the restore result. · 999b0303

unknown authored Sep 26, 2006


ndb/tools/restore/consumer.hpp:
  added a function to judge whether there is temporary error.
ndb/tools/restore/consumer_restore.cpp:
  record when temporary error occured in restore.
ndb/tools/restore/consumer_restore.hpp:
  added a member to record temporary error in restore.
ndb/tools/restore/restore_main.cpp:
  report temporary error in restore.

999b0303

22 Sep, 2006 6 commits

Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-ndb-bj · 9c111ab4
unknown authored Sep 22, 2006
```
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug21585
```
9c111ab4
Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/mysql-5.0-ndb-bj · 11832f0e
unknown authored Sep 22, 2006
```
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/bug21585
```
11832f0e

BUG@21585 The --help option shows a screen of command options for the ndbd, ndb_mgmd, ndb_mgm · 5a7ee967

unknown authored Sep 22, 2006

and other commands related to ndb. For all of these, the help screen contains
"Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete.

storage/ndb/include/util/ndb_opts.h:
Change help information from including "Ndb.cfg" to "my.cnf" in the header file.
storage/ndb/test/ndbapi/flexScan.cpp:
Change help information from including "Ndb.cfg" to "my.cnf".
storage/ndb/tools/ndb_condig.cpp:
Change help information from including "Ndb.cfg" to "my.cnf".

5a7ee967

BUG#21585 The --help option shows a screen of command options for ndbd, ndb_mgmd, ndb_mgm · 5c999b22

unknown authored Sep 22, 2006

          and other commands related to ndb. For all of these, the help screen contains
          "Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete.


ndb/include/util/ndb_opts.h:
  Change help info from "Ndb.cfg" string to "my.cnf" string in the header file.
ndb/test/ndbapi/flexScan.cpp:
  Change help info from including "Ndb.cfg" to "my.cnf".
ndb/tools/ndb_config.cpp:
  Change help info from including "Ndb.cfg" to "my.cnf".

5c999b22

Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/bug20575 · 648656ca

unknown authored Sep 22, 2006

into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug20575


storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

648656ca

Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/mysql-5.0-ndb-bj · 4a7a2a67

unknown authored Sep 22, 2006

into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/bug20575


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

4a7a2a67

21 Sep, 2006 3 commits

Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb · 394dc75d
unknown authored Sep 21, 2006
```
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20809
```
394dc75d

Merge qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.0/bug21036-mysql-5.0 · 19844c01

unknown authored Sep 21, 2006

into  qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1/mysql-5.1-ndb-bj


storage/ndb/src/ndbapi/NdbOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  change error message to more appropriate

19844c01

Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj · d1eddd01

unknown authored Sep 21, 2006

into  qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.0/bug21036-mysql-5.0


ndb/src/ndbapi/ndberror.c:
  Auto merged

d1eddd01

20 Sep, 2006 10 commits

bug#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE,... · d2268b70

unknown authored Sep 20, 2006

bug#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS,: Updated reslt file

mysql-test/r/rpl_ndb_dd_advance.result:
bug#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS,: Updated result file

d2268b70

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 57dc86ac
unknown authored Sep 20, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
57dc86ac
Bug#18976 CRBR: multiple binlog, second binlog may miss schema log... · 067ca0a2
unknown authored Sep 20, 2006
```
Bug#18976  CRBR: multiple binlog, second binlog may miss schema log events:Change test back to verify again
```
067ca0a2
Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-ndb-bj · 292e3031
unknown authored Sep 20, 2006
```
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-20395
```
292e3031
BUG#21799 manual modify variable name. · 07b8464f
unknown authored Sep 20, 2006
```
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  manual modify variable name.
```
07b8464f

BUG #21036, myOperation->getBlobHandle(..) on non-existing column cause segmentation fault · 09e69eeb

unknown authored Sep 20, 2006

add judgement to avoid NULL pointer's operation(segmentaion fault)


ndb/src/ndbapi/NdbOperation.cpp:
  if getColumn return NULL, set error code and return NULL in getBlobHandle
ndb/src/ndbapi/ndberror.c:
  change the err message more appropriate

09e69eeb

Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb · 64634690
unknown authored Sep 20, 2006
```
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20809


client/mysqldump.c:
  Auto merged
```
64634690
Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb · 5727be56
unknown authored Sep 20, 2006
```
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20073
```
5727be56
Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-ndb-bj · 8eeb96a3
unknown authored Sep 20, 2006
```
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-20395
```
8eeb96a3

Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-20395 · 27f49667

unknown authored Sep 20, 2006

into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-20395


storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp:
  Auto merged
storage/ndb/include/ndb_version.h.in:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
  merge for bug#20395.

27f49667

19 Sep, 2006 1 commit

Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21799 · d9fd8043

unknown authored Sep 19, 2006

into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21799


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged

d9fd8043