Commits · 79f536a4b89037dc3bfbc8d22d94ec9e48fb64fd · Kirill Smelkov / mariadb

26 Apr, 2006 27 commits

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
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

25 Apr, 2006 13 commits

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f14bb14c
unknown authored Apr 26, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
```
f14bb14c

ndb: break out ndb backup compatability test, so that it can be disabled on mac · 261136c0

unknown authored Apr 26, 2006


mysql-test/include/have_case_sensitive_file_system.inc:
  New BitKeeper file ``mysql-test/include/have_case_sensitive_file_system.inc''
mysql-test/r/case_sensitive_file_system.require:
  New BitKeeper file ``mysql-test/r/case_sensitive_file_system.require''
mysql-test/r/ndb_restore_compat.result:
  New BitKeeper file ``mysql-test/r/ndb_restore_compat.result''
mysql-test/t/ndb_restore_compat.test:
  New BitKeeper file ``mysql-test/t/ndb_restore_compat.test''

261136c0

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 23669046
unknown authored Apr 26, 2006
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
```
23669046

Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-new · 249ff249

unknown authored Apr 25, 2006

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged

249ff249

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 77869308

unknown authored Apr 25, 2006

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


mysql-test/t/disabled.def:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

77869308

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · d36a35a4
unknown authored Apr 25, 2006
```
into lmy004.:/work/mysql-5.1-new-clean


mysql-test/t/disabled.def:
  Auto merged
```
d36a35a4
BUG#17263: incorrect DROP query in temporary tables replication · b6f42918
unknown authored Apr 25, 2006
```
the fix from 5.0 with necessary modifications applied.


sql/sql_base.cc:
  Manual merge with 5.0.
```
b6f42918

Merge mysql.com:/home/elkin/MySQL/BARE/5.0 · 3b6263b8

unknown authored Apr 25, 2006

into  mysql.com:/home/elkin/MySQL/MERGE/5.1-new


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/case.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/t/case.test:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
storage/myisam/myisam_ftdump.c:
  Auto merged
sql/sql_base.cc:
  manual merge use local. Another changeset for 5.1 is following.

3b6263b8

BUG#19340 small leak in ndbd · 9f5cec76

unknown authored Apr 25, 2006

small cleanup fixes in kernel/vm/Configuration


ndb/src/kernel/vm/Configuration.cpp:
  clean up m_logLevel
  
  free the connectstring if we allocated one

9f5cec76

Post-merge fixes from 5.0. · 1e869b0e

unknown authored Apr 25, 2006


mysql-test/extra/rpl_tests/rpl_insert_id.test:
  Post-merge fix. Added new 5.0 test case manually.
sql/sql_yacc.yy:
  Post-merge fix. Removed GOTO/LABEL from parser.

1e869b0e

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

unknown authored Apr 25, 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

730880a8

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb · f4ffd773
unknown authored Apr 25, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
```
f4ffd773
reenable ndb_cache2 & ndb_cach_multi2 as I've fixed bug-18597 · cb495066
unknown authored Apr 25, 2006

cb495066