Commits · fb01ba8455f15e85dd097de7d1c6360a93f50e4a · Kirill Smelkov / mariadb

24 Oct, 2006 11 commits
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · fb01ba84
  msvensson@neptunus.(none) authored Oct 24, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  fb01ba84
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · ccc33b4e
  msvensson@neptunus.(none) authored Oct 24, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  ccc33b4e
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · e8881843
  msvensson@neptunus.(none) authored Oct 24, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  e8881843
- Merge bk-internal:/home/bk/mysql-5.0-maint · 4bd1021a
  msvensson@neptunus.(none) authored Oct 24, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  4bd1021a
- Use same type for local variables as arguments, avoid compile error on NetWare · 26183402
  msvensson@neptunus.(none) authored Oct 24, 2006
  
  26183402
- Enable the ATTRIBUTE_FORMAT macros to check format of variable arg parameters · c972edc6
  msvensson@neptunus.(none) authored Oct 24, 2006
  
  c972edc6
- Replace all refernces to .la libraries with direct references · e5bf79e6
  msvensson@neptunus.(none) authored Oct 24, 2006
```
to their .libs/*.a library
Add comment describing why mwldnlm is called with "x" flag
```
  e5bf79e6
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 33a200d7
  msvensson@neptunus.(none) authored Oct 24, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  33a200d7
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · 10f8cdef
  msvensson@neptunus.(none) authored Oct 24, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  10f8cdef
- Temporary fixes for building from source dist in pushbuild · 6b920ebd
  msvensson@neptunus.(none) authored Oct 24, 2006
  
  6b920ebd
- When using yaSSL on NetWare some of the OpenSSL specifix hacks can be skipped · 25abce02
  msvensson@neptunus.(none) authored Oct 24, 2006
  
  25abce02
23 Oct, 2006 23 commits
- Avoid matching the trailing carriage return when parsing the mysqld.spec file · e4df2aac
  msvensson@neptunus.(none) authored Oct 23, 2006
```
This fixes problem where --replace_result failed in rpl000015 because the MYSQL_TCP_PORT variable was "3306\r"
```
  e4df2aac
- The vardir trick can only bge used on platforms with native symlinks -... · 792adb7c
  msvensson@neptunus.(none) authored Oct 23, 2006
```
The vardir trick can only bge used on platforms with native symlinks - otherwise opt_vardir need to be set to default value.
```
  792adb7c
- Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · fd759850
  andrey@example.com authored Oct 23, 2006
```
into  example.com:/work/bug23037/my51
```
  fd759850
- Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 6237be99
  andrey@example.com authored Oct 23, 2006
```
into  example.com:/work/bug23037/my50
```
  6237be99
- after merge fix · 4e3ac17f
  andrey@example.com authored Oct 23, 2006
  
  4e3ac17f
- Merge example.com:/work/bug23037/my50 · d18cb100
  andrey@example.com authored Oct 23, 2006
```
into  example.com:/work/bug23037/my51
```
  d18cb100
- Don't use the "4.1 vardir trick" on OS that does not have native symlink(i.e windows) · 6b5ec539
  msvensson@neptunus.(none) authored Oct 23, 2006
  
  6b5ec539
- Netware uses size_t as socklen_t · 38c66b63
  msvensson@neptunus.(none) authored Oct 23, 2006
  
  38c66b63
- Fix for bug#23037 Bug in field "Default" of query "SHOW COLUMNS FROM table" · 389c6a01
  andrey@example.com authored Oct 23, 2006
```
  
To the documentor: The DEFAULT value in SHOW COLUMNS/SELECT FROM I_S.COLUMNS
was truncated to NAME_LEN (which effectively is 64) characters.
```
  389c6a01
- When looking for libc the path need to be converted from wine to unix format... · 377e21df
  msvensson@neptunus.(none) authored Oct 23, 2006
```
When looking for libc the path need to be converted from wine to unix format before test that directory exists
```
  377e21df
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · cad9d6b1
  msvensson@neptunus.(none) authored Oct 23, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  cad9d6b1
- Merge bk-internal:/home/bk/mysql-4.1-maint · e5c2351b
  msvensson@neptunus.(none) authored Oct 23, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
```
  e5c2351b
- If "var" is a symlink which does not point to anything, remove it before creating real var · 43aa130a
  msvensson@neptunus.(none) authored Oct 23, 2006
  
  43aa130a
- As both ndb and im are components that may be disabled as well as the binaries... · 962fe847
  msvensson@neptunus.(none) authored Oct 23, 2006
```
As both ndb and im are components that may be disabled as well as the binaries may not exist. Look for 
their binaries in a separate function and produce test casea failures for the test thet needs these components
```
  962fe847
- Copy *.cnf file from std_data/ when doing a binary distribution · 2459dd55
  msvensson@neptunus.(none) authored Oct 23, 2006
  
  2459dd55
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 7ad7d6e3
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Oct 23, 2006
```
into  mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
```
  7ad7d6e3
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 1f652426
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Oct 23, 2006
```
into  mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
```
  1f652426
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 6cb52242
  ramil/ram@myoffice.izhnet.ru authored Oct 23, 2006
```
into  mysql.com:/usr/home/ram/work/bug20732/my51-bug20732
```
  6cb52242
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · 4fbdbf1a
  msvensson@neptunus.(none) authored Oct 23, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  4fbdbf1a
- Merge mysql.com:/usr/home/ram/work/mysql-4.1-maint · dd2a1d1e
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Oct 23, 2006
```
into  mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
```
  dd2a1d1e
- Merge mysql.com:/usr/home/ram/work/mysql-5.0-maint · a67472f2
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Oct 23, 2006
```
into  mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
```
  a67472f2
- Merge mysql.com:/usr/home/ram/work/mysql-5.1-maint · d4c7b6da
  ramil/ram@myoffice.izhnet.ru authored Oct 23, 2006
```
into  mysql.com:/usr/home/ram/work/bug20732/my51-bug20732
```
  d4c7b6da
- Merge mysql.com:/usr/home/ram/work/bug20732/my50-bug20732 · 800d8054
  ramil/ram@myoffice.izhnet.ru authored Oct 23, 2006
```
into  mysql.com:/usr/home/ram/work/bug20732/my51-bug20732
```
  800d8054
21 Oct, 2006 1 commit
- Fix bad merge. · dae79f0a
  cmiller@zippy.cornsilk.net authored Oct 20, 2006
  
  dae79f0a
20 Oct, 2006 5 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 1965238b
  tsmith/tim@siva.hindu.god authored Oct 20, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/50
```
  1965238b
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 5a217c51
  tsmith/tim@siva.hindu.god authored Oct 20, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/51
```
  5a217c51
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-afterbreak · 5a39b273
  cmiller@zippy.cornsilk.net authored Oct 20, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  5a39b273
- Fix bad merge from #14262. · c2119709
  cmiller@zippy.cornsilk.net authored Oct 20, 2006
  
  c2119709
- Merge zippy.cornsilk.net:/home/cmiller/emergency/mysql-5.0.26a-release · 482712bf
  cmiller@zippy.cornsilk.net authored Oct 20, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  482712bf