Commits · 6f17f42c59e78e2bc618c7d00c661dea1d1c8a57 · Kirill Smelkov / mariadb

23 Mar, 2007 1 commit
- Raise version number after cloning 5.1.17-beta · 6f17f42c
  unknown authored Mar 23, 2007
  
  6f17f42c
22 Mar, 2007 11 commits

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

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)

0b7ba9c2

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

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

unknown authored Mar 22, 2007

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


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

39e7b560

ndb - · 4dee1e6a

unknown authored Mar 22, 2007

  fix test prg


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

4dee1e6a

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

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

7403890a

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

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

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

e4903c29

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 04c8e7e4
unknown authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
04c8e7e4
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8f69cbdb
unknown authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
8f69cbdb
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · fd2996ad
unknown authored Mar 22, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
fd2996ad

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

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

b636ad25

21 Mar, 2007 28 commits

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

8ed9a540
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · c4311efa
unknown authored Mar 22, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
c4311efa

Try to fix events_logs_tests race on Windows. · 20fd65ff

unknown authored Mar 22, 2007


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

20fd65ff

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 817442e8
unknown authored Mar 21, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
817442e8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 54a0f623
unknown authored Mar 21, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
54a0f623
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · e772a22d
unknown authored Mar 21, 2007
```
into  recycle.(none):/src/bug27144/my50-bug27144
```
e772a22d

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

unknown authored Mar 21, 2007

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


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

9e6d54e4

Bug#27144 sp-destruct.test is disabled on Windows · 65c34cc8

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.

65c34cc8

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

Fix warnings on Windows. · 858ff638

unknown authored Mar 21, 2007


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

858ff638

Fix a broken merge. · 33a51fd8

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

33a51fd8

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

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

f6681489

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

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

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

2d3b2458

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

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

b278b210

ndb - bug#27283 · f5acedb6

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

f5acedb6

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

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

d344d81c

Merge bk-internal:/home/bk/mysql-5.0-maint · 2176fef4

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

2176fef4

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

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

ed0badb1

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

Merge... · 6fb9ef87

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

6fb9ef87

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


mysql-test/t/mysqlbinlog-cp932.test:
  merging
```
f397b422
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 01fe2589
unknown authored Mar 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
01fe2589
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · a7d1bd9f
unknown authored Mar 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


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


sql/ha_ndbcluster.cc:
  Auto merged
```
447f5de1