Commits · d4804e07e450ea13463f7ce99a031bfcc85ad1ec · nexedi / MariaDB

18 Sep, 2006 2 commits
- Merge mysql.com:/usr/home/ram/work/mysql-5.0-maint · d4804e07
  ramil/ram@myoffice.izhnet.ru authored Sep 18, 2006
```
into  mysql.com:/usr/home/ram/work/mysql-5.1-maint
```
  d4804e07
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · ad1c1592
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Sep 18, 2006
```
into  mysql.com:/usr/home/ram/work/5.0.b18267
```
  ad1c1592
15 Sep, 2006 38 commits
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · dc844988
  cmiller@zippy.cornsilk.net authored Sep 15, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  dc844988
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 66808ead
  cmiller@zippy.cornsilk.net authored Sep 15, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  66808ead
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · d8e27606
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  d8e27606
- Add definition of SHUT_RDWR for compiling on windows · 6a0841a1
  msvensson@shellback.(none) authored Sep 15, 2006
  
  6a0841a1
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 895bf055
  cmiller@zippy.cornsilk.net authored Sep 15, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  895bf055
- Merge bk-internal:/home/bk/mysql-5.0-maint · b0fc6840
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  b0fc6840
- Merge shellback.(none):/home/msvensson/mysql/work/my51-work · 8f7eac7a
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  8f7eac7a
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 27d85458
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  27d85458
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · f1e91ec7
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my51-work
```
  f1e91ec7
- Merge shellback.(none):/home/msvensson/mysql/bug20602/my50-bug20602 · b178e40c
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my50-work
```
  b178e40c
- Merge msvensson.mysql.internal:mysql/my50-m-bug16574 · bfc3cfd4
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my50-work
```
  bfc3cfd4
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · cda04e76
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my51-work
```
  cda04e76
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 557a8f50
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  557a8f50
- Merge msvensson.mysql.internal:mysql/my50-m-bug16576 · fb89352b
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my50-work
```
  fb89352b
- Merge shellback.(none):/home/msvensson/mysql/work/my51-work · e9dab214
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  e9dab214
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 59c80b41
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my51-work
```
  59c80b41
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 223c82fd
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  223c82fd
- Merge msvensson.mysql.internal:mysql/my50-m-bug21222 · a297c292
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my50-work
```
  a297c292
- Merge shellback.(none):/home/msvensson/mysql/bug22139/my51-bug22139 · ec7b20c3
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  ec7b20c3
- Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139 · 2c301549
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  2c301549
- Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139 · 211aceca
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/bug22139/my51-bug22139
```
  211aceca
- Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 4e65deb2
  hartmut@mysql.com/linux.site authored Sep 15, 2006
```
into  mysql.com:/home/hartmut/projects/mysql/dev/teamtrees/mysql-5.0-maint
```
  4e65deb2
- Add SSL specific linker flags to --libmysqld-libs (Bug #21239) · 871eeadc
  hartmut@mysql.com/linux.site authored Sep 15, 2006
  
  871eeadc
- Merge shellback.(none):/home/msvensson/mysql/work/my51-work · a265bb9b
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  a265bb9b
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · e03619ce
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my51-work
```
  e03619ce
- Merge bk-internal:/home/bk/mysql-5.0-maint · 2ce0da62
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  2ce0da62
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · faeb59cb
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  faeb59cb
- Bug#22326 Build problems on hurd-i386: conflicting declaration of socklen_t · c3e2d543
  msvensson@shellback.(none) authored Sep 15, 2006
  
  c3e2d543
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 47483245
  cmiller@zippy.cornsilk.net authored Sep 15, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  47483245
- Merge shellback.(none):/home/msvensson/mysql/work/my51-work · d4cb04fc
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  d4cb04fc
- Merge msvensson.mysql.internal:mysql/mysql-5.1-maint · 9fc503e0
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  9fc503e0
- Merge msvensson.mysql.internal:mysql/mysql-5.0-maint · bdc78373
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  bdc78373
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · cebd7d9d
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  cebd7d9d
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 2b79a6bc
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my51-work
```
  2b79a6bc
- Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown · c4177ec4
  msvensson@shellback.(none) authored Sep 15, 2006
  
  c4177ec4
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 8445f3e3
  ramil/ram@myoffice.izhnet.ru authored Sep 15, 2006
```
into  mysql.com:/usr/home/ram/work/mysql-5.1-maint
```
  8445f3e3
- Merge bk-internal:/home/bk/mysql-5.0-maint · a989d352
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  a989d352
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 10221798
  dlenev@mockturtle.local authored Sep 15, 2006
```
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
```
  10221798