Commits · 419a51c5a510b59c63f311daf57a666c492b2b29 · Kirill Smelkov / mariadb

18 Sep, 2006 1 commit
- Merge april.(none):/home/svoj/devel/bk/mysql-5.1 · 419a51c5
  svoj@april.(none) authored Sep 18, 2006
```
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
```
  419a51c5
16 Sep, 2006 2 commits
- Merge 5.1 -> 5.1-engines · 33acddb5
  istruewing@chilla.local authored Sep 16, 2006
```
Disabled im_instance_conf to get autopush through
```
  33acddb5
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 343e0839
  baker@bk-internal.mysql.com authored Sep 16, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
```
  343e0839
15 Sep, 2006 37 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 5.1 -> 5.1-engines · 06b721f1
  istruewing@chilla.local authored Sep 15, 2006
```
Disabled innodb_mysql to get autopush through
```
  06b721f1
- Merge 5.1 -> 5.1-engines · e88cd60f
  istruewing@chilla.local authored Sep 15, 2006
```
Disabled index_merge_myisam to get autopush through
```
  e88cd60f
- Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 · f79ddec1
  brian@zim.(none) authored Sep 15, 2006
```
into  zim.(none):/home/brian/mysql/merge-5.1
```
  f79ddec1
- Merge 5.1 -> 5.1-engines · 92e5f116
  istruewing@chilla.local authored Sep 15, 2006
```
Disabled index_merge_innodb to get autopush through
```
  92e5f116
- This changes the order of the universe, black is now the new white. · 7194b6d7
  brian@zim.(none) authored Sep 15, 2006
```
In practice this means that handlerton is now created by the server and is passed to the engine. Plugin startups can now also control how plugins are inited (and can optionally pass values). Bit more flexibility to those who want to write plugin interfaces to the database. 
```
  7194b6d7
- 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.mysql.com:/home/bk/mysql-5.1-engines · c62c1a54
  istruewing@chilla.local authored Sep 15, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-toteam
```
  c62c1a54
- Merge 5.1 -> 5.1-engines · 525ff082
  istruewing@chilla.local authored Sep 15, 2006
```
Disabled im_daemon_life_cycle with permission by Calvin
```
  525ff082
- 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