Commits · 3af3e6963bd970b530fc16a0736e3fab53cc41f2 · Kirill Smelkov / mariadb

26 Mar, 2008 2 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build · 3af3e696
  cmiller@zippy.cornsilk.net authored Mar 26, 2008
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
```
  3af3e696
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build · cfb9c845
  cmiller@zippy.cornsilk.net authored Mar 26, 2008
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
```
  cfb9c845
25 Mar, 2008 5 commits
- Merge trift2.:/MySQL/M50/push-5.0 · 9ed9e12f
  joerg@trift2. authored Mar 25, 2008
```
into  trift2.:/MySQL/M51/push-5.1
```
  9ed9e12f
- Merge trift2.:/MySQL/M51/mysql-5.1 · e58f029f
  joerg@trift2. authored Mar 25, 2008
```
into  trift2.:/MySQL/M51/push-5.1
```
  e58f029f
- Merge trift2.:/MySQL/M51/mysql-5.1 · 99ae3b8a
  joerg@trift2. authored Mar 25, 2008
```
into  trift2.:/MySQL/M51/push-5.1
```
  99ae3b8a
- Eliminating compiler warnings. · bc683c64
  mkindahl@dl145h.mysql.com authored Mar 25, 2008
  
  bc683c64
- Merge trift2.:/MySQL/M50/mysql-5.0 · 099ef669
  joerg@trift2. authored Mar 25, 2008
```
into  trift2.:/MySQL/M50/push-5.0
```
  099ef669
22 Mar, 2008 3 commits
- Merge mysql.com:/home/kent/bk/build/mysql-5.0-build · 6968235d
  kent@kent-amd64.(none) authored Mar 22, 2008
```
into  mysql.com:/home/kent/bk/build/mysql-5.1-build
```
  6968235d
- Merge mysql.com:/home/kent/bk/build/mysql-4.1-build · 84705d26
  kent@kent-amd64.(none) authored Mar 22, 2008
```
into  mysql.com:/home/kent/bk/build/mysql-5.0-build
```
  84705d26
- Merge mysql.com:/home/kent/bk/mysql-4.1-release · fd97c5c9
  kent@mysql.com/kent-amd64.(none) authored Mar 22, 2008
```
into  mysql.com:/home/kent/bk/build/mysql-4.1-build
```
  fd97c5c9
19 Mar, 2008 14 commits
- Suggestion of Tim. Avoid unnecessary sleep. · 897f772c
  cmiller@zippy.cornsilk.net authored Mar 19, 2008
  
  897f772c
- Bug#30378: mysql.server needs to skip wait_for_pid() when mysqld \ · 955983a1
  cmiller@zippy.cornsilk.net authored Mar 19, 2008
```
	isn't running

Pass the process id of the manager as a parameter to "wait_for_pid"
and if the manager isn't running, then do not continue to wait.

Also, capture the error message of our process-existence test, 
"kill -0", as we expect errors and shouldn't pass them to the user.  
Additionally, be a bit more descriptive of what the problem is.
```
  955983a1
- Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50 · 2e2e904e
  tsmith@ramayana.hindu.god authored Mar 19, 2008
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
```
  2e2e904e
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 79365b94
  tsmith@ramayana.hindu.god authored Mar 19, 2008
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
```
  79365b94
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · c4ee11ba
  tsmith@ramayana.hindu.god authored Mar 19, 2008
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
```
  c4ee11ba
- Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50 · 1f06d215
  tsmith@ramayana.hindu.god authored Mar 19, 2008
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
```
  1f06d215
- Merge ramayana.hindu.god:/home/tsmith/m/bk/b25486/50 · 203de676
  tsmith@ramayana.hindu.god authored Mar 19, 2008
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
```
  203de676
- Merge trift2.:/MySQL/M50/push-5.0 · 34756947
  joerg@trift2. authored Mar 19, 2008
```
into  trift2.:/MySQL/M51/push-5.1
```
  34756947
- Merge trift2.:/MySQL/M50/man8-5.0 · 25c9fd59
  joerg@trift2. authored Mar 19, 2008
```
into  trift2.:/MySQL/M51/man8-5.1
```
  25c9fd59
- Merge trift2.:/MySQL/M41/push-4.1 · 2e77233a
  joerg@trift2. authored Mar 19, 2008
```
into  trift2.:/MySQL/M50/push-5.0
```
  2e77233a
- Merge trift2.:/MySQL/M41/man8-4.1 · 9ece3ac2
  joerg@trift2. authored Mar 19, 2008
```
into  trift2.:/MySQL/M50/man8-5.0
```
  9ece3ac2
- Merge trift2.:/MySQL/M41/man8-4.1 · 1137da47
  joerg@trift2. authored Mar 19, 2008
```
into  trift2.:/MySQL/M41/push-4.1
```
  1137da47
- support-files/mysql.spec.sh : Add the man pages for "ndbd" and "ndb_mgmd". · d4e7bf87
  joerg@trift2. authored Mar 19, 2008
  
  d4e7bf87
- Merge trift2.:/MySQL/M41/mysql-4.1 · c209b839
  joerg@trift2. authored Mar 19, 2008
```
into  trift2.:/MySQL/M41/push-4.1
```
  c209b839
17 Mar, 2008 2 commits
- Raise version number after cloning 4.1.24 · 2536f331
  kent/mysqldev@mysql.com/production.mysql.com authored Mar 18, 2008
  
  2536f331
- Merge bk-internal:/home/bk/mysql-4.1 · de2ec899
  kent/mysqldev@mysql.com/production.mysql.com authored Mar 17, 2008
```
into  mysql.com:/data0/mysqldev/my/build-200802282059-4.1.24/mysql-4.1-release
```
  de2ec899
14 Mar, 2008 11 commits
- Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl · 6c0dcad8
  mkindahl@dl145h.mysql.com authored Mar 14, 2008
```
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
```
  6c0dcad8
- Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 · 9baeb72e
  mkindahl@dl145h.mysql.com authored Mar 14, 2008
```
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
```
  9baeb72e
- Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0 · 6a4c4b18
  mkindahl@dl145h.mysql.com authored Mar 14, 2008
```
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
```
  6a4c4b18
- Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · f48aa05f
  mkindahl@dl145h.mysql.com authored Mar 14, 2008
```
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
```
  f48aa05f
- Post-merge fixes. · c5fefc68
  mkindahl@dl145h.mysql.com authored Mar 14, 2008
  
  c5fefc68
- Merge trift2.:/MySQL/M50/push-5.0 · f1298e4d
  joerg@trift2. authored Mar 14, 2008
```
into  trift2.:/MySQL/M51/push-5.1
```
  f1298e4d
- Merge trift2.:/MySQL/M41/push-4.1 · 566dab8f
  joerg@trift2. authored Mar 14, 2008
```
into  trift2.:/MySQL/M50/push-5.0
```
  566dab8f
- Merge trift2.:/MySQL/M50/clone-5.0 · 30f3d4ab
  joerg@trift2. authored Mar 14, 2008
```
into  trift2.:/MySQL/M50/push-5.0
```
  30f3d4ab
- Merge trift2.:/MySQL/M51/mysql-5.1 · e7848989
  joerg@trift2. authored Mar 14, 2008
```
into  trift2.:/MySQL/M51/push-5.1
```
  e7848989
- Merge trift2.:/MySQL/M50/mysql-5.0 · b399594a
  joerg@trift2. authored Mar 14, 2008
```
into  trift2.:/MySQL/M50/push-5.0
```
  b399594a
- Merge trift2.:/MySQL/M41/mysql-4.1 · 618e2aca
  joerg@trift2. authored Mar 14, 2008
```
into  trift2.:/MySQL/M41/push-4.1
```
  618e2aca
13 Mar, 2008 3 commits
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my50-bug34192 · 23ce2f51
  cmiller@zippy.cornsilk.net authored Mar 13, 2008
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
```
  23ce2f51
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my51-bug34192 · 8c1ba819
  cmiller@zippy.cornsilk.net authored Mar 13, 2008
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
```
  8c1ba819
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my50-bug34192 · e0af8674
  cmiller@zippy.cornsilk.net authored Mar 13, 2008
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my51-bug34192
```
  e0af8674