Commits · clone-5.1.17-build · nexedi / MariaDB

22 Mar, 2007 11 commits

Merge siva.hindu.god:/home/tsmith/m/bk/maint/50 · b266417b

unknown authored Mar 22, 2007

into  siva.hindu.god:/home/tsmith/m/bk/maint/51


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Manual merge (res.waitNodesStartPhase -> NdbSleep_SecSleep)

b266417b

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 74ef4a53
unknown authored Mar 22, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
```
74ef4a53

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

unknown authored Mar 22, 2007

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


ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged

890b9cce

ndb - · 3ad18a30

unknown authored Mar 22, 2007

  fix test prg


ndb/test/ndbapi/testNodeRestart.cpp:
  fix test prg

3ad18a30

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

unknown authored Mar 22, 2007

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


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

977d6c76

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · f66b2278
unknown authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
f66b2278

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 4fd148b4

unknown authored Mar 22, 2007

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


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

4fd148b4

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 400337ad
unknown authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
400337ad
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7f274b5b
unknown authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
7f274b5b
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · b2af7b90
unknown authored Mar 22, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
b2af7b90

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · cd7f48b7

unknown authored Mar 22, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/help.result:
  Auto merged
mysql-test/t/help.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

cd7f48b7

21 Mar, 2007 29 commits

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · b22f62a4
unknown authored Mar 21, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
b22f62a4
Update the result file with an updated comment. · 0aed5c8b
unknown authored Mar 22, 2007

0aed5c8b
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 6e8fd718
unknown authored Mar 22, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
6e8fd718

Try to fix events_logs_tests race on Windows. · ddc644f4

unknown authored Mar 22, 2007


mysql-test/t/events_logs_tests.test:
  Try to fix a race condition that breaks this test on Windows.

ddc644f4

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 7e6fd07c
unknown authored Mar 21, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
7e6fd07c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 5351224e
unknown authored Mar 21, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
5351224e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · de72e4c1
unknown authored Mar 21, 2007
```
into  recycle.(none):/src/bug27144/my50-bug27144
```
de72e4c1

Merge recycle.(none):/src/bug27144/my50-bug27144 · e5c91b02

unknown authored Mar 21, 2007

into  recycle.(none):/src/bug27144/my51-bug27144


mysql-test/t/sp-destruct.test:
  SCCS merged

e5c91b02

Bug#27144 sp-destruct.test is disabled on Windows · 1e28904b

unknown authored Mar 21, 2007

- Update test to run properly on Windows.


mysql-test/t/sp-destruct.test:
  Bug#27144 sp-destruct.test is disabled on Windows
  - Enabled test on Windows.
  - Replaced non-portable system commands (mkdir, rmdir, mv, cp, echo) 
  with the mysqltest builtin commands.
  - Replace Windows directory seperator in error ER_NOT_FROM_FILE with
  posix directory seperator for single test/result pair.

1e28904b

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 4f10e5bf
unknown authored Mar 21, 2007
```
into  recycle.(none):/src/bug23736/my50-bug23736
```
4f10e5bf
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 30d48e92
unknown authored Mar 21, 2007
```
into  recycle.(none):/src/bug23736/my51-bug23736
```
30d48e92

Fix warnings on Windows. · 7cd0fc43

unknown authored Mar 21, 2007


sql/event_data_objects.cc:
  Fix Windows 64 bit build warnings. No better fix exists at the moment.

7cd0fc43

Fix a broken merge. · 5c528d4a

unknown authored Mar 21, 2007


scripts/mysql_system_tables.sql:
  Add time_zone to the list of mysql.event columns.
scripts/mysql_system_tables_fix.sql:
  Update after a bad merge: now mysql_system_tables_fix contains
  only alter definitions, no CREATE definitions (single definition
  source approach that was implemented by Magnus).

5c528d4a

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

unknown authored Mar 21, 2007

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


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

ba755856

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 27995017
unknown authored Mar 21, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
27995017

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

unknown authored Mar 21, 2007

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


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

7ddf6698

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

unknown authored Mar 21, 2007

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


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

d454cea9

ndb - bug#27283 · 897a01fa

unknown authored Mar 21, 2007

    Additional fix for 2-node case


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Add error insert ref for errcode = 7181
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it

897a01fa

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · d48f836c

unknown authored Mar 21, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
  Auto merged
BitKeeper/deleted/.del-test_db.sql:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.h:
  Auto merged
mysql-test/install_test_db.sh:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge
netware/Makefile.am:
  Manual merge

d48f836c

Merge bk-internal:/home/bk/mysql-5.0-maint · eedbddb6

unknown authored Mar 21, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
  Auto merged
BitKeeper/deleted/.del-test_db.sql:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.h:
  Auto merged
netware/Makefile.am:
  Manual merge

eedbddb6

Merge bk-internal:/home/bk/mysql-5.1-new-maint · 2b9bcb8c

unknown authored Mar 21, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
  Auto merged
BitKeeper/deleted/.del-test_db.sql:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.h:
  Auto merged
mysql-test/install_test_db.sh:
  Manual merge
mysql-test/r/flush2.result:
  Manual merge
netware/Makefile.am:
  Manual merge

2b9bcb8c

Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-build · 5352c1ca
unknown authored Mar 21, 2007
```
into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint
```
5352c1ca

Merge... · 75ca9ccb

unknown authored Mar 21, 2007

Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug26079_binlog_max_innodb
into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint


sql/log.cc:
  Auto merged

75ca9ccb

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 764be136
unknown authored Mar 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
764be136
mysqlbinlog-cp932.test: · 386a2148
unknown authored Mar 21, 2007
```
  merging


mysql-test/t/mysqlbinlog-cp932.test:
  merging
```
386a2148
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · d867df56
unknown authored Mar 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
d867df56
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 938867cd
unknown authored Mar 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
938867cd
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · 109ea90e
unknown authored Mar 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
109ea90e
Bug #26825 MySQL Server Crashes in high load · a64458d9
unknown authored Mar 21, 2007
```
  - initialize to NULL, to avoid call of free on uninitialized variable
```
a64458d9