Commits · 9d579c95877b70f0d53147ab947dfbd1e4889c58 · nexedi / MariaDB

08 May, 2006 1 commit
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-jonas · 9d579c95
  unknown authored May 08, 2006
```
into  eel.(none):/home/jonas/src/51-jonas
```
  9d579c95
07 May, 2006 2 commits

ndb - dbacc - unused variables · e65c68fc

unknown authored May 07, 2006


storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  more unused variables
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  more unused variables

e65c68fc

ndb - dbacc - remove some unused variables · 133c2d7b

unknown authored May 07, 2006


storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  remove unused variables
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  remove unused variables

133c2d7b

04 May, 2006 4 commits

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 28ac9ba2
unknown authored May 04, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
```
28ac9ba2

ndb dd - · 40bb7cde

unknown authored May 04, 2006

  fix buglet when nr-delete-op gets page fault


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  fix buglet when nr-delete-op gets page fault

40bb7cde

ndb dd - · 809e31f8

unknown authored May 04, 2006

Fix bug where page is read, modified and then transaction abort
  and then puge is flushed causing lsn on page to be 0


storage/ndb/src/kernel/blocks/pgman.cpp:
  Fix bug where page is read, modified and then transaction abort
    and then puge is flushed causing lsn on page to be 0

809e31f8

ndb dd - Impl. support for using delayed page request, to simulate "full" page buffer cache · ab868ebb

unknown authored May 04, 2006

storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Impl. support for using delayed page request, to simulate "full" page buffer cache
storage/ndb/src/kernel/blocks/pgman.cpp:
Impl. support for using delayed page request, to simulate "full" page buffer cache
storage/ndb/src/kernel/blocks/pgman.hpp:
Impl. support for using delayed page request, to simulate "full" page buffer cache

ab868ebb

26 Apr, 2006 33 commits

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 1f57e154
unknown authored Apr 26, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
```
1f57e154

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb · 79f536a4

unknown authored Apr 26, 2006

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


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

79f536a4

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new · ea899e27
unknown authored Apr 26, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
```
ea899e27
Merge mysql.com:/home/mydev/mysql-5.1 · f94b1db4
unknown authored Apr 26, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-bug18129
```
f94b1db4
Merge mysql.com:/home/mydev/mysql-5.1 · 14fd0720
unknown authored Apr 26, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-bug18129
```
14fd0720
Corrected include path to work under Windows · 09999bc2
unknown authored Apr 26, 2006

09999bc2
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · fb0f88aa
unknown authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
```
fb0f88aa
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 6e905d06
unknown authored Apr 26, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
6e905d06

ndb - backup 5.0->5.1 merge · bbe7563a

unknown authored Apr 26, 2006


storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  backup 5.0->5.1 merge

bbe7563a

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

unknown authored Apr 26, 2006

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


storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  merge

754f1c0e

ndb - backup 4.1->5.0 merge · f0b7821a
unknown authored Apr 26, 2006
```
ndb/src/kernel/blocks/backup/Backup.cpp:
  merge
```
f0b7821a

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

unknown authored Apr 26, 2006

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


ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  merge

8bc693a9

ndb - · 60873234

unknown authored Apr 26, 2006

  Unleash backup to write more than 32k at a time
  Using parameter BackupMaxWriteSize
  (greatly affect LCP time in 5.1, set default value to 256k)


ndb/include/mgmapi/mgmapi_config_parameters.h:
  Add config fro max write size in backup
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Unleash backup to write more than 32k at a time
ndb/src/mgmsrv/ConfigInfo.cpp:
  Add config fro max write size in backup

60873234

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 821e7bb9
unknown authored Apr 26, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
```
821e7bb9

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

unknown authored Apr 26, 2006

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


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

60abfb1f

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

unknown authored Apr 26, 2006

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


support-files/mysql.spec.sh:
  Auto merged
storage/ndb/include/util/SocketServer.hpp:
  Auto merged
storage/ndb/src/common/transporter/Transporter.cpp:
  Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged

2d3209a0

ndb dd - · 1c74bfd8

unknown authored Apr 26, 2006

  fix dirty page handling during opt.nr


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  fix dirty page handling during opt.nr

1c74bfd8

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

unknown authored Apr 26, 2006

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


ndb/include/util/SocketServer.hpp:
  Auto merged
ndb/src/common/transporter/Transporter.cpp:
  Auto merged
ndb/src/common/util/SocketServer.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

1030d5c8

ndb - backport from 5.1 · a4e32d4e

unknown authored Apr 26, 2006

  Fix alignment of sockaddr(_in)


ndb/src/common/transporter/Transporter.cpp:
  Fix alignment of sockaddr(_in)
ndb/src/mgmsrv/Services.cpp:
  Fix alignment of sockaddr(_in)

a4e32d4e

Add ndb_config to rpm spec · 4191b8a3
unknown authored Apr 26, 2006

4191b8a3

ndb - bug#17150 · 96b42ea0

unknown authored Apr 26, 2006

  ndb_mgmd limited no of api nodes, by restricting no of mgmsessions
  (these are used for dynamic port allocation)


ndb/include/util/SocketServer.hpp:
  Increase default max session to ~0
ndb/src/common/util/SocketServer.cpp:
  Increase default max session to ~0

96b42ea0

Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 074cdd62
unknown authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
```
074cdd62
Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492 · 173f164b
unknown authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
```
173f164b
Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work · 0fc093fa
unknown authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
```
0fc093fa
Make innodb_mysql produce a non-empty output. · c2e6c898
unknown authored Apr 26, 2006
```
mysql-test/r/innodb_mysql.result:
  Fix result.
```
c2e6c898
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 65d9e36f
unknown authored Apr 26, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
```
65d9e36f
Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work · 8ea29220
unknown authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492-work


mysql-test/t/innodb.test:
  Auto merged
```
8ea29220
Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work · 47a04798
unknown authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work


mysql-test/t/innodb.test:
  Auto merged
```
47a04798

Files innodb.[test|result] are to be used by Innobase only. · a4c62dbb

unknown authored Apr 26, 2006

 Use files innodb_mysql.[test|result] instead.


mysql-test/t/innodb.test:
  This file is to be used by Innobase only.
mysql-test/r/innodb_mysql.result:
  New BitKeeper file ``mysql-test/r/innodb_mysql.result''
   Use this file instead of innodb.result.
mysql-test/t/innodb_mysql.test:
  New BitKeeper file ``mysql-test/t/innodb_mysql.test''
   Use this file instead of innodb.test.

a4c62dbb

Applied innodb-5.1-ss492 snapshot. · 67d23360

unknown authored Apr 26, 2006

 * Fix BUG#19217 "dict_load_indexes() may read the delete-mark incorrectly".
 * Remove obsolete and unused variables from srv0srv.c.
 * Remove srv_sys->operational since it is unused.
 * Make thread_id parameter in os_thread_create() optional.
 * Add platform-specific os_thread_ret_t and OS_THREAD_DUMMY_RETURN,
   and convert thread start functions to use them.


storage/innobase/dict/dict0dict.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/dict/dict0load.c:
  Applied innodb-5.1-ss492 snapshot.
   dict_load_indexes(): pass comp=0 to rec_get_deleted_flag(), because
   SYS_INDEXES always is in ROW_FORMAT=REDUNDANT (Bug #19217).
storage/innobase/include/os0thread.h:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/include/srv0srv.h:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/include/trx0roll.h:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/include/univ.i:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/log/log0recv.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/os/os0thread.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/que/que0que.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/srv/srv0srv.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/srv/srv0start.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/trx/trx0roll.c:
  Applied innodb-5.1-ss492 snapshot.

67d23360

disable before investigation why test case for 19170 is failing on · 34f1f0b5
unknown authored Apr 26, 2006
```
some platforms.
```
34f1f0b5

Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work · f13569a7

unknown authored Apr 26, 2006

into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492-work
 Null-merge.


storage/innobase/dict/dict0load.c:
  Null-merge.

f13569a7

Applied innodb-5.0-ss492 snapshot. · 0b64b882

unknown authored Apr 26, 2006

 Fixed BUG#19217 "dict_load_indexes() may read the delete-mark incorrectly".


innobase/dict/dict0load.c:
  Applied innodb-5.0-ss492 snapshot.
   dict_load_indexes(): pass comp=0 to rec_get_deleted_flag(), because
   SYS_INDEXES always is in ROW_FORMAT=REDUNDANT (Bug #19217).

0b64b882