Commits · 16f0bd712e184deda90f91a0e9ec2a13a6db22bf · Kirill Smelkov / mariadb

15 Dec, 2007 5 commits
- Try to fix assertion failures at slave shutdown when running · 16f0bd71
  kostja@bodhi.(none) authored Dec 15, 2007
```
rpl_ndb tests on sapsrv1.
```
  16f0bd71
- Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · 2e82e666
  kostja@bodhi.(none) authored Dec 15, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
```
  2e82e666
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4bb50356
  kostja@bodhi.(none) authored Dec 15, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
```
  4bb50356
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · bffc615e
  kostja@bodhi.(none) authored Dec 15, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
```
  bffc615e
- WL#4165 (Prepared statements: validation) · 0488056c
  malff@lambda.hsd1.co.comcast.net. authored Dec 14, 2007
```
Adding the tests cases alone for WL#4165, disabled
```
  0488056c
14 Dec, 2007 10 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · 2db74257
  tomas@whalegate.ndb.mysql.com authored Dec 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
  2db74257
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 1a3bf733
  tomas@whalegate.ndb.mysql.com authored Dec 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
```
  1a3bf733
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · d2a93fd6
  tomas@whalegate.ndb.mysql.com authored Dec 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
  d2a93fd6
- Raise version number after cloning 5.0.54 · 028ed336
  kent/mysqldev@mysql.com/production.mysql.com authored Dec 14, 2007
  
  028ed336
- Merge station.:/mnt/raid/alik/MySQL/devel/5.0-rt · 6ebedc86
  anozdrin/alik@station. authored Dec 14, 2007
```
into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-5.0-rt
```
  6ebedc86
- Merge station.:/mnt/raid/alik/MySQL/devel/5.1 · 151444c6
  anozdrin/alik@station. authored Dec 14, 2007
```
into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt
```
  151444c6
- Merge station.:/mnt/raid/alik/MySQL/devel/5.0 · 61b903f8
  anozdrin/alik@station. authored Dec 14, 2007
```
into  station.:/mnt/raid/alik/MySQL/devel/5.0-rt
```
  61b903f8
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge · 0f58ed97
  tomas@whalegate.ndb.mysql.com authored Dec 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
  0f58ed97
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 0bd2a86e
  tomas@whalegate.ndb.mysql.com authored Dec 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
  0bd2a86e
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 70902cdd
  tomas@whalegate.ndb.mysql.com authored Dec 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
  70902cdd
13 Dec, 2007 25 commits
- Remove an unused argument of sql_update::do_updates(). · 614b0f68
  kostja@bodhi.(none) authored Dec 14, 2007
  
  614b0f68
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 7c8fe302
  kostja@bodhi.(none) authored Dec 13, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
```
  7c8fe302
- Fix broken embedded build (broken by the patch for Bug#12713, first part). · 5b80d6a1
  kostja@bodhi.(none) authored Dec 13, 2007
  
  5b80d6a1
- Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 · a2486e0d
  tomas@whalegate.ndb.mysql.com authored Dec 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
  a2486e0d
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 4bc90fe4
  tomas@whalegate.ndb.mysql.com authored Dec 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
  4bc90fe4
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · e9466462
  tomas@whalegate.ndb.mysql.com authored Dec 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
```
  e9466462
- Bug #33168 Incorrectly handled parameters can make the TC crash during node failure · 3a891982
  tomas@whalegate.ndb.mysql.com authored Dec 13, 2007
```
- during commit deadlock timeout needs to be at least 5 times db hearbeat
```
  3a891982
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 27dcbc25
  gluh@eagle.(none) authored Dec 13, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  27dcbc25
- additional fix · 8be07b88
  gluh@mysql.com/eagle.(none) authored Dec 13, 2007
  
  8be07b88
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · af6db482
  dkatz@damien-katzs-computer.local authored Dec 13, 2007
```
into  damien-katzs-computer.local:/Users/dkatz/51runtime
```
  af6db482
- Merge mysql.com:/Users/davi/mysql/bugs/32395-5.1 · d099e6a2
  davi@endora.local authored Dec 13, 2007
```
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
```
  d099e6a2
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · b98f9527
  gluh@eagle.(none) authored Dec 13, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  b98f9527
- additional after merge fix · b371f638
  gluh@mysql.com/eagle.(none) authored Dec 13, 2007
  
  b371f638
- valgrind error fix · 2627f775
  gluh@mysql.com/eagle.(none) authored Dec 13, 2007
  
  2627f775
- after merge fix · 5244d7dc
  gluh@mysql.com/eagle.(none) authored Dec 13, 2007
  
  5244d7dc
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 6821f368
  tomas@whalegate.ndb.mysql.com authored Dec 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
  6821f368
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · 4b5e9edd
  tomas@whalegate.ndb.mysql.com authored Dec 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
  4b5e9edd
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · f84b4524
  tomas@whalegate.ndb.mysql.com authored Dec 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
  f84b4524
- after merge fix · 3b227392
  gluh@mysql.com/eagle.(none) authored Dec 13, 2007
  
  3b227392
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · d504588e
  gluh@eagle.(none) authored Dec 13, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  d504588e
- Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 4f586811
  gluh@eagle.(none) authored Dec 13, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  4f586811
- after merge fix · 9df070ed
  gluh@mysql.com/eagle.(none) authored Dec 13, 2007
  
  9df070ed
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 6bc455e3
  tomas@whalegate.ndb.mysql.com authored Dec 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
```
  6bc455e3
- Bug #33206 signal not reset properly in ndb · b009d97f
  tomas@whalegate.ndb.mysql.com authored Dec 13, 2007
  
  b009d97f
- Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · ffeb563d
  gluh@eagle.(none) authored Dec 13, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
  ffeb563d