Commits · 102d4decb10a7c76a0cdc634e56fcb62fe799433 · Kirill Smelkov / mariadb

23 Jan, 2008 19 commits

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge · 102d4dec
unknown authored Jan 23, 2008
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
102d4dec
Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 · 6aa6e966
unknown authored Jan 23, 2008
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
6aa6e966
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 34f792c3
unknown authored Jan 23, 2008
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
34f792c3

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj · 1c1a17e2

unknown authored Jan 23, 2008

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


storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged
storage/ndb/src/common/util/Bitmask.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBitfield.cpp:
  Auto merged

1c1a17e2

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · 55b09d63
unknown authored Jan 23, 2008
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
55b09d63
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 44236981
unknown authored Jan 23, 2008
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
44236981

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

unknown authored Jan 23, 2008

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


storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged
storage/ndb/src/common/util/Bitmask.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBitfield.cpp:
  Auto merged

efe8fd91

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj · 957d2e11

unknown authored Jan 23, 2008

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj


mysql-test/r/view.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged
storage/ndb/src/common/util/Bitmask.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBitfield.cpp:
  Auto merged

957d2e11

Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 · b6921d02
unknown authored Jan 23, 2008
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
b6921d02

Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 · e69bf055

unknown authored Jan 23, 2008

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  manual merge

e69bf055

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · e95e266d
unknown authored Jan 23, 2008
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj
```
e95e266d

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

unknown authored Jan 23, 2008

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


storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged

78ac242f

Merge perch.ndb.mysql.com:/home/jonas/src/50-telco-gca · e2ba0ab9

unknown authored Jan 23, 2008

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


storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged

e2ba0ab9

Merge perch.ndb.mysql.com:/home/jonas/src/50-telco-gca · aa7b1b54

unknown authored Jan 23, 2008

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


ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged

aa7b1b54

ndb - bug#34005 · ac632f5c

unknown authored Jan 23, 2008

  make sure whole send buffer is flushed, even when wrapping around end


ndb/src/common/transporter/TCP_Transporter.cpp:
  ndb - bug#34005
    make sure whole send buffer is flush, even when wrapping around end

ac632f5c

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · bd70a104
unknown authored Jan 23, 2008
```
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb


storage/ndb/src/common/util/Bitmask.cpp:
  merge
```
bd70a104

Merge perch.ndb.mysql.com:/home/jonas/src/50-telco-gca · 71377f41

unknown authored Jan 23, 2008

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


storage/ndb/include/util/Bitmask.hpp:
  Auto merged
storage/ndb/src/common/util/Bitmask.cpp:
  merge
storage/ndb/test/ndbapi/testBitfield.cpp:
  merge

71377f41

Merge perch.ndb.mysql.com:/home/jonas/src/50-telco-gca · 472fe417

unknown authored Jan 23, 2008

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


ndb/src/common/util/Bitmask.cpp:
  merge
ndb/test/ndbapi/testBitfield.cpp:
  merge

472fe417

ndb - bug#33750 · a79ebb85

unknown authored Jan 23, 2008

    make sure that getField does not write after supplied buffer
    (recommit to correct clone, for easy merging)


ndb/include/util/Bitmask.hpp:
  ndb- bug#33750
        make sure that getField does not write after supplied buffer
ndb/src/common/util/Bitmask.cpp:
  ndb- bug#33750
        make sure that getField does not write after supplied buffer
ndb/test/ndbapi/testBitfield.cpp:
  move test from Bitmask.cpp into testBitfield
        for automatic testing

a79ebb85

19 Jan, 2008 1 commit
- Raise version number after cloning 5.1.23-rc · 37ff91b3
  unknown authored Jan 19, 2008
  
  37ff91b3
18 Jan, 2008 1 commit

Add SqlResultSet · 4789e3f6

unknown authored Jan 18, 2008


storage/ndb/test/include/DbUtil.hpp:
  Add support for SqlResultSet
storage/ndb/test/ndbapi/Makefile.am:
  Add testNDBT
storage/ndb/test/src/DbUtil.cpp:
  Add support for SqlResultSet
storage/ndb/test/src/Makefile.am:
  Build AtrtClient
storage/ndb/test/include/AtrtClient.hpp:
  New BitKeeper file ``storage/ndb/test/include/AtrtClient.hpp''
storage/ndb/test/ndbapi/testNDBT.cpp:
  New BitKeeper file ``storage/ndb/test/ndbapi/testNDBT.cpp''
storage/ndb/test/src/AtrtClient.cpp:
  New BitKeeper file ``storage/ndb/test/src/AtrtClient.cpp''

4789e3f6

17 Jan, 2008 2 commits
- DBU_TRUE and DBU_FALSE => TRUE/FALSE · 24e10360
  unknown authored Jan 17, 2008
  
  24e10360
- Remove "#pragma once" it's already done by "#ifndef DBUTIL_HPP" · 29baec8a
  unknown authored Jan 17, 2008
  
  29baec8a
14 Jan, 2008 1 commit

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug29851 · 20a7ea72

unknown authored Jan 14, 2008

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug29851


mysql-test/suite/ndb/r/ndb_alter_table2.result:
  C
  ul.
  C
sql/ha_ndbcluster.cc:
  c

20a7ea72

11 Jan, 2008 3 commits

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 12855ff2
unknown authored Jan 11, 2008
```
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
```
12855ff2

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

unknown authored Jan 11, 2008

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


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

b64f9dbe

ndb - bug#33793 · e9849563

unknown authored Jan 11, 2008

  dont assume that page is "all empty"
  only as gci is acked, as release_gci might not have processed it yet


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  new error codes
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  dont assume that page is "all empty"
  only as gci is acked, as release_gci might not have processed it yet
storage/ndb/test/ndbapi/test_event.cpp:
  testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
  testcase

e9849563

10 Jan, 2008 13 commits

Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 8a757010
unknown authored Jan 10, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
```
8a757010

Makefile.am: · ed6d97c8

unknown authored Jan 10, 2008

  Updated to build NdbRepStress


storage/ndb/test/ndbapi/Makefile.am:
  Updated to build NdbRepStress

ed6d97c8

Makefile.am: · 2f220684

unknown authored Jan 10, 2008

  Updated for name chance on dbutil


storage/ndb/test/src/Makefile.am:
  Updated for name chance on dbutil

2f220684

Merge kaamos.(none):/data/src/mysql-5.1 · 824ced46

unknown authored Jan 10, 2008

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
sql/log.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

824ced46

Merge kaamos.(none):/data/src/mysql-5.0 · 84762ce2
unknown authored Jan 10, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.0-opt


client/mysql.cc:
  Auto merged
```
84762ce2
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt · cd6dc10c
unknown authored Jan 10, 2008
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


sql/filesort.cc:
  Auto merged
```
cd6dc10c
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · eb80c468
unknown authored Jan 10, 2008
```
into  moonbone.local:/work/33675-bug-5.0-opt-mysql
```
eb80c468

filesort.cc: · 1a8bcceb

unknown authored Jan 10, 2008

  Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
  server crash.
  Free smaller buffer before allocating bigger one.


sql/filesort.cc:
  Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
  server crash.
  Free smaller buffer before allocating bigger one.

1a8bcceb

Post-merge fix after merging 5.0 -> 5.1. Replaced 'byte' with 'uchar'. · 0c49363d
unknown authored Jan 10, 2008

0c49363d

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb · da11be81

unknown authored Jan 10, 2008

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bj


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

da11be81

Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj · 69ddcb8c
unknown authored Jan 10, 2008
```
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
```
69ddcb8c

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb · d8d857e0

unknown authored Jan 10, 2008

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/lgman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/tsman.cpp:
  Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  SCCS merged
storage/ndb/src/ndbapi/ndberror.c:
  SCCS merged

d8d857e0

Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 1040bea9

unknown authored Jan 10, 2008

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


sql/field.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
mysql-test/r/subselect.result:
  Manual merge.
mysql-test/t/subselect.test:
  Manual merge.
sql/filesort.cc:
  Manual merge.

1040bea9