Commits · f7bbcb71ccbaf78944062095972b2df7de34ac37 · Kirill Smelkov / mariadb

29 Nov, 2006 25 commits
- Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · f7bbcb71
  msvensson@shellback.(none) authored Nov 29, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
```
  f7bbcb71
- Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 · 52146475
  msvensson@shellback.(none) authored Nov 29, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
```
  52146475
- Many files: · ea5c7f97
  kent@mysql.com/kent-amd64.(none) authored Nov 29, 2006
```
  Changed paths to ndb include directory to include "storage"
Makefile.am:
  Adjusted path to yaSSL libtool libraries
ssl.m4:
  Use libtool way of specifying yaSSL libraries
```
  ea5c7f97
- Merge fixes for new test cases · e9d526f5
  msvensson@shellback.(none) authored Nov 29, 2006
  
  e9d526f5
- Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 · 7ddc43e3
  msvensson@shellback.(none) authored Nov 29, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  7ddc43e3
- Merge mysql.com:/home/kent/bk/mysql-5.0-build · 3749d77c
  kent@kent-amd64.(none) authored Nov 29, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.1-build
```
  3749d77c
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · 65183d54
  kent@kent-amd64.(none) authored Nov 29, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.1-build
```
  65183d54
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · cc719564
  kent@kent-amd64.(none) authored Nov 29, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.1-build
```
  cc719564
- Merge mysql.com:/home/kent/bk/mysql-4.1-build · b67ff612
  kent@mysql.com/kent-amd64.(none) authored Nov 29, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.0-build
```
  b67ff612
- Merge shellback.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import · 97c9a7dd
  msvensson@shellback.(none) authored Nov 29, 2006
```
into  shellback.(none):/home/msvensson/mysql/yassl_import/mysql-5.0-maint
```
  97c9a7dd
- Merge bk-internal:/home/bk/mysql-5.1-maint · ebee55f4
  msvensson@shellback.(none) authored Nov 29, 2006
```
into  shellback.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
```
  ebee55f4
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · b1664c22
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Nov 29, 2006
```
into  mysql.com:/usr/home/ram/work/bug22229/my50-bug22229
```
  b1664c22
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build · 343e7795
  df@kahlann.erinye.com authored Nov 29, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
```
  343e7795
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · 756f1045
  df@kahlann.erinye.com authored Nov 29, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  756f1045
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · b6a83ccb
  df@kahlann.erinye.com authored Nov 29, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
  b6a83ccb
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · c134b8c3
  df@kahlann.erinye.com authored Nov 29, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  c134b8c3
- minor fix · 1c46f7d8
  df@kahlann.erinye.com authored Nov 29, 2006
  
  1c46f7d8
- Merge bk-internal:/home/bk/mysql-5.1 · 40684173
  gkodinov@dl145s.mysql.com authored Nov 29, 2006
```
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
```
  40684173
- Update result file for func_misc to 5.1 version format · 72ad912b
  msvensson@shellback.(none) authored Nov 29, 2006
  
  72ad912b
- Merge shellback.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import · 710e731e
  msvensson@shellback.(none) authored Nov 29, 2006
```
into  shellback.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
```
  710e731e
- Import version 1.50 of yaSSL · 838d1d53
  msvensson@shellback.(none) authored Nov 29, 2006
  
  838d1d53
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 · 32b88b0d
  df@kahlann.erinye.com authored Nov 29, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
  32b88b0d
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · e4c17c72
  ramil/ram@myoffice.izhnet.ru authored Nov 29, 2006
```
into  mysql.com:/usr/home/ram/work/bug22229/my51-bug22229
```
  e4c17c72
- Merge bk-internal:/home/bk/mysql-5.1-maint · 28441315
  msvensson@shellback.(none) authored Nov 29, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  28441315
- Merge mysql.com:/usr/home/ram/work/bug22229/my50-bug22229 · 726af26a
  ramil/ram@myoffice.izhnet.ru authored Nov 29, 2006
```
into  mysql.com:/usr/home/ram/work/bug22229/my51-bug22229
```
  726af26a
28 Nov, 2006 15 commits
- rpl_init_slave.result: · 2a0e2d1d
  tsmith/tim@siva.hindu.god authored Nov 28, 2006
```
  Update test result due to fix for bug 23883.
```
  2a0e2d1d
- Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · 3a505289
  msvensson@neptunus.(none) authored Nov 28, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  3a505289
- Remove the moved check a second time. · 2b98e19b
  msvensson@neptunus.(none) authored Nov 28, 2006
  
  2b98e19b
- Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · 6dd62468
  msvensson@neptunus.(none) authored Nov 28, 2006
```
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
```
  6dd62468
- Move the check that $opt_vardir could be created and was writable to the function · 7eb487ab
  msvensson@neptunus.(none) authored Nov 28, 2006
```
where we know how to creat the vardir 
Remove unused variable
```
  7eb487ab
- Merge bk-internal:/home/bk/mysql-5.0-maint · ef582b9f
  msvensson@neptunus.(none) authored Nov 28, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  ef582b9f
- Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · 9235e363
  msvensson@neptunus.(none) authored Nov 28, 2006
```
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
```
  9235e363
- Bug#24335 mysql-test-run.pl fails with ActiveState Perl on Windows · 05eb5325
  msvensson@neptunus.(none) authored Nov 28, 2006
```
 - Avoid use of mtr_run when executing "mysqld --verbose --help" to find
   version and supported features
```
  05eb5325
- Fix missing parameter declaration · 0c48000e
  msvensson@neptunus.(none) authored Nov 28, 2006
  
  0c48000e
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 627a0bf0
  msvensson@neptunus.(none) authored Nov 28, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  627a0bf0
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · cc747a02
  msvensson@neptunus.(none) authored Nov 28, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
```
  cc747a02
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · f983166c
  cmiller@zippy.cornsilk.net authored Nov 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  f983166c
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · b398110b
  kent@kent-amd64.(none) authored Nov 28, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.1-build
```
  b398110b
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 04d5a42b
  msvensson@neptunus.(none) authored Nov 28, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  04d5a42b
- Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · e61b7b9f
  msvensson@neptunus.(none) authored Nov 28, 2006
```
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
```
  e61b7b9f