Commits · 1547a738788a7605ce12e59964c010607e70d4dc · Kirill Smelkov / mariadb

18 Oct, 2006 17 commits
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 1547a738
  msvensson@neptunus.(none) authored Oct 18, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  1547a738
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · ecccb89c
  msvensson@neptunus.(none) authored Oct 18, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  ecccb89c
- Merge 192.168.0.4:mysql/mysql-4.1-maint · a755fae8
  msvensson@neptunus.(none) authored Oct 18, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
```
  a755fae8
- Merge 192.168.0.4:mysql/mysql-5.1-maint · 96c0c995
  msvensson@neptunus.(none) authored Oct 18, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  96c0c995
- Merge 192.168.0.4:mysql/mysql-5.0-maint · d4d84a88
  msvensson@neptunus.(none) authored Oct 18, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  d4d84a88
- Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · 3d42998c
  msvensson@shellback.(none) authored Oct 18, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  3d42998c
- Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · f83e9e4f
  msvensson@shellback.(none) authored Oct 18, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  f83e9e4f
- Put the printf of failed ratio on itäs only line, printf was tricked · 4cefd49b
  msvensson@shellback.(none) authored Oct 18, 2006
```
into thinking the escaped % + w was a format specifier
```
  4cefd49b
- Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · d71d1a64
  msvensson@shellback.(none) authored Oct 18, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  d71d1a64
- Don't stop the time in mtr_timer_timeout, that will be done after testcase or when program exit · 770a1f91
  msvensson@shellback.(none) authored Oct 18, 2006
  
  770a1f91
- Merge bk-internal:/home/bk/mysql-5.0-maint · 09d069fa
  msvensson@shellback.(none) authored Oct 18, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  09d069fa
- Remove some junk · dd6a9307
  msvensson@shellback.(none) authored Oct 18, 2006
  
  dd6a9307
- Stop all timers before exiting when --start-and-exit · 1feac4d4
  msvensson@shellback.(none) authored Oct 18, 2006
  
  1feac4d4
- Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · a5561176
  msvensson@shellback.(none) authored Oct 18, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  a5561176
- Fix bug where a timer was stopped by calling mtr_timer_stop with a "timer" instead of it's name · 4890ed26
  msvensson@shellback.(none) authored Oct 18, 2006
  
  4890ed26
- Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · ae10cfc0
  msvensson@shellback.(none) authored Oct 18, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  ae10cfc0
- Make --with-ndbcluster only be valid together with --bench · 8d72bf94
  msvensson@shellback.(none) authored Oct 18, 2006
```
Improve code that detects if ndb shuold be installed
Remove call to stop_all_servers after install db, if any servers are still running 
and need to be stopped they will be stopped atuomatically
```
  8d72bf94
17 Oct, 2006 18 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 0fdfb362
  cmiller@zippy.cornsilk.net authored Oct 17, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  0fdfb362
- Merge fixes. · cf9f5b8b
  cmiller@zippy.cornsilk.net authored Oct 17, 2006
  
  cf9f5b8b
- Update ps and show_check results to account for new -master.opt settings. · a42a06cf
  tsmith/tim@siva.hindu.god authored Oct 17, 2006
  
  a42a06cf
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 7714fea9
  cmiller@zippy.cornsilk.net authored Oct 17, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016
```
  7714fea9
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016 · 91c4edfb
  cmiller@zippy.cornsilk.net authored Oct 17, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  91c4edfb
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 184467a2
  cmiller@zippy.cornsilk.net authored Oct 17, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  184467a2
- Fix previous bad patch for Bug#14262. · 3a709f50
  cmiller@zippy.cornsilk.net authored Oct 17, 2006
```
Remove table engine qualification where it's unnecessary.
```
  3a709f50
- Merge naruto.:C:/cpp/bug23010/my51-bug23010 · cda2a113
  Kristofer.Pettersson@naruto. authored Oct 17, 2006
```
into  naruto.:C:/cpp/mysql-5.1-new-maint
```
  cda2a113
- Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · 84d455b4
  msvensson@shellback.(none) authored Oct 17, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  84d455b4
- Merge naruto.:C:/cpp/bug23010/my50-bug23010 · 550c9e55
  Kristofer.Pettersson@naruto. authored Oct 17, 2006
```
into  naruto.:C:/cpp/mysql-5.0-maint
```
  550c9e55
- Merge naruto.:C:/cpp/bug23010/my50-bug23010 · 44e01d41
  Kristofer.Pettersson@naruto. authored Oct 17, 2006
```
into  naruto.:C:/cpp/bug23010/my51-bug23010
```
  44e01d41
- Remove warnings · d45b61b1
  msvensson@shellback.(none) authored Oct 17, 2006
```
Set comment properly before calling mtr_report_test failed and report_failure_restart 
```
  d45b61b1
- When calculating what features to use for _this_ test run, don't look at test... · 3f46c5cd
  msvensson@shellback.(none) authored Oct 17, 2006
```
When calculating what features to use for _this_ test run, don't look at test that already are deterined to be skipped
```
  3f46c5cd
- Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/51 · 60de8b58
  tsmith/tim@siva.hindu.god authored Oct 16, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/51
```
  60de8b58
- Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50 · df200bd0
  tsmith/tim@siva.hindu.god authored Oct 16, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/50
```
  df200bd0
- Merge siva.hindu.god:/usr/home/tim/m/bk/b4053/51 · 285c14d3
  tsmith/tim@siva.hindu.god authored Oct 16, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/51
```
  285c14d3
- Merge siva.hindu.god:/usr/home/tim/m/bk/b4053/50 · 93d351f4
  tsmith/tim@siva.hindu.god authored Oct 16, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/50
```
  93d351f4
- Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50 · 97113339
  tsmith/tim@siva.hindu.god authored Oct 16, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/b19764/51
```
  97113339
16 Oct, 2006 5 commits
- Merge dator5.(none):/home/pappa/clean-mysql-5.1 · 4a7cd3a1
  mikael/pappa@dator5.(none) authored Oct 16, 2006
```
into  dator5.(none):/home/pappa/bug18198
```
  4a7cd3a1
- Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · f105e16b
  msvensson@neptunus.(none) authored Oct 16, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  f105e16b
- Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · b2a98c53
  msvensson@neptunus.(none) authored Oct 16, 2006
```
into  neptunus.(none):/home/msvensson/mysql/work/my51-work
```
  b2a98c53
- yassl build fixes for hpux and netware · 85fb3817
  msvensson@neptunus.(none) authored Oct 16, 2006
  
  85fb3817
- Merge bk-internal:/home/bk/mysql-5.0-maint · 82b6ac52
  msvensson@neptunus.(none) authored Oct 16, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  82b6ac52