Commits · 4774c40089be40f70620d799d2578ea88d1c324b · Kirill Smelkov / mariadb

11 Apr, 2007 7 commits
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 4774c400
  msvensson@pilot.blaudden authored Apr 11, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  4774c400
- Print warning to log when SSL setup fails · d631f119
  msvensson@pilot.blaudden authored Apr 11, 2007
  
  d631f119
- Merge pilot.blaudden:/home/msvensson/mysql/bug21611/my50-bug21611 · 900e0d68
  msvensson@pilot.blaudden authored Apr 11, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  900e0d68
- Add test for connect using different ssl ciphers · e81cb869
  msvensson@pilot.blaudden authored Apr 11, 2007
  
  e81cb869
- Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508 · 2218fafa
  msvensson@pilot.blaudden authored Apr 11, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  2218fafa
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · bbed1434
  msvensson@pilot.blaudden authored Apr 11, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  bbed1434
- Add replace_result for things that are not tested · 4e17e06a
  msvensson@pilot.blaudden authored Apr 11, 2007
  
  4e17e06a
10 Apr, 2007 25 commits
- Merge pilot.blaudden:/home/msvensson/mysql/bug25337/my51-bug25337 · 8abdae6b
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  8abdae6b
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 6015d283
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  6015d283
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 610ff38e
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  610ff38e
- Update result(which mysterioulsy got lost) · 8d0755ba
  msvensson@pilot.blaudden authored Apr 10, 2007
  
  8d0755ba
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 19f379b8
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  19f379b8
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 3d847358
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  3d847358
- Take into account wether vertical_results are in effect · 9917d018
  msvensson@pilot.blaudden authored Apr 10, 2007
  
  9917d018
- Init dying to 1 just after passing the guard · 73c6cde9
  msvensson@pilot.blaudden authored Apr 10, 2007
  
  73c6cde9
- Add OPT_LOG_DIR · da2a2168
  msvensson@pilot.blaudden authored Apr 10, 2007
  
  da2a2168
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · a5ef5c93
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  a5ef5c93
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · c30b6880
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  c30b6880
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 18345305
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  18345305
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 · 448a6778
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  448a6778
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 · d549e480
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  d549e480
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1 · f194cbe6
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
```
  f194cbe6
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · d4f01284
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  d4f01284
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 829ca34d
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  829ca34d
- Add --logdir option ot mysqltest · 5c527175
  msvensson@pilot.blaudden authored Apr 10, 2007
  
  5c527175
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 4496a8f5
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  4496a8f5
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 34a784f3
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  34a784f3
- Merge 192.168.0.4:mysql/mysql-4.1-maint · 60eb839e
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
```
  60eb839e
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · d08e3529
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  d08e3529
- Give the "sync_slave_with_master" something to do · 9f11d74c
  msvensson@pilot.blaudden authored Apr 10, 2007
  
  9f11d74c
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · 60682755
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  60682755
- Merge bk-internal:/home/bk/mysql-5.0-maint · 7cf3a2a6
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  7cf3a2a6
09 Apr, 2007 5 commits
- Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 26d2908c
  holyfoot/hf@hfmain.(none) authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  26d2908c
- Merge bk@192.168.21.1:mysql-5.0-opt · bd461b01
  holyfoot/hf@mysql.com/hfmain.(none) authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
  bd461b01
- Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 87daef26
  holyfoot/hf@hfmain.(none) authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  87daef26
- Merge bk@192.168.21.1:mysql-5.1 · 33ed2ead
  holyfoot/hf@hfmain.(none) authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  33ed2ead
- Merge bk@192.168.21.1:mysql-5.0 · 65535824
  holyfoot/hf@mysql.com/hfmain.(none) authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
  65535824
08 Apr, 2007 2 commits
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · a16289d5
  kent@kent-amd64.(none) authored Apr 08, 2007
```
into  mysql.com:/home/kent/bk/tmp4/mysql-5.1-engines
```
  a16289d5
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · c282dd37
  kent@mysql.com/kent-amd64.(none) authored Apr 08, 2007
```
into  mysql.com:/home/kent/bk/tmp4/mysql-5.0-engines
```
  c282dd37
07 Apr, 2007 1 commit
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · d8e6b38e
  evgen@moonbone.local authored Apr 07, 2007
```
into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
```
  d8e6b38e