Commits · c01d3593626ef6720e2ca95a7ca539bcd2508032 · nexedi / MariaDB

29 Sep, 2006 6 commits
- Merge bk-internal:/home/bk/mysql-5.1-maint · c01d3593
  msvensson@shellback.(none) authored Sep 29, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  c01d3593
- Merge rama.(none):/home/jimw/my/mysql-5.0-clean · 7a23b1ba
  jimw@rama.(none) authored Sep 28, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.1-clean
```
  7a23b1ba
- Fix merge of __attribute__ cleanup. · d5d89bcf
  jimw@rama.(none) authored Sep 28, 2006
  
  d5d89bcf
- Merge rama.(none):/home/jimw/my/mysql-4.1-clean · 68eadc8a
  jimw@rama.(none) authored Sep 28, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-clean
```
  68eadc8a
- Merge rama.(none):/home/jimw/my/mysql-5.0-clean · c8801bce
  jimw@rama.(none) authored Sep 28, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.1-clean
```
  c8801bce
- Merge rama.(none):/home/jimw/my/mysql-5.0-18246 · 9c3012e6
  jimw@rama.(none) authored Sep 28, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-clean
```
  9c3012e6
28 Sep, 2006 30 commits
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my51-bug20305 · 78154af6
  iggy@rolltop.ignatz42.dyndns.org authored Sep 28, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
```
  78154af6
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug22224/my50-bug22224 · ff66360d
  iggy@rolltop.ignatz42.dyndns.org authored Sep 28, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug22224/my51-bug22224
```
  ff66360d
- Bug#22224: Windows build depends on ib_config.h · e89c10e9
  iggy@rolltop.ignatz42.dyndns.org authored Sep 28, 2006
```
  
This change has already been made to 5.1.
```
  e89c10e9
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305 · 70dcbe3e
  iggy@rolltop.ignatz42.dyndns.org authored Sep 28, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my51-bug20305
```
  70dcbe3e
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my41-bug20305 · d36444a9
  iggy@rolltop.ignatz42.dyndns.org authored Sep 28, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305
```
  d36444a9
- Bug#20305: PROCEDURE ANALYSE() returns wrong M for FLOAT(M, D) and DOUBLE(M, D) · f063bee3
  iggy@rolltop.ignatz42.dyndns.org authored Sep 28, 2006
  
  f063bee3
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21449/my50-bug21449 · e58341f5
  iggy@rolltop.ignatz42.dyndns.org authored Sep 28, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21449/my51-bug21449
```
  e58341f5
- Bug #21449 How to Resolve Stack Trace URL in MySQLD error log is incorrect. · b7e15782
  iggy@rolltop.ignatz42.dyndns.org authored Sep 28, 2006
  
  b7e15782
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 43bdd2c2
  cmiller@zippy.cornsilk.net authored Sep 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  43bdd2c2
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · e72bc639
  cmiller@zippy.cornsilk.net authored Sep 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  e72bc639
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 2deb2bfc
  cmiller@zippy.cornsilk.net authored Sep 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476
```
  2deb2bfc
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my50-bug21476 · ce24cb2d
  cmiller@zippy.cornsilk.net authored Sep 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476
```
  ce24cb2d
- Additional patch to Bug#21476: Free newly-allocated memory in mysqltest. · 75a1d1d5
  cmiller@zippy.cornsilk.net authored Sep 28, 2006
  
  75a1d1d5
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · 5f099df3
  msvensson@neptunus.(none) authored Sep 28, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  5f099df3
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 6042eebd
  cmiller@zippy.cornsilk.net authored Sep 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  6042eebd
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint · ca7ade88
  cmiller@zippy.cornsilk.net authored Sep 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  ca7ade88
- Merge bk-internal:/home/bk/mysql-5.1-maint · 9157b046
  msvensson@shellback.(none) authored Sep 28, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  9157b046
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 290bb8ec
  cmiller@zippy.cornsilk.net authored Sep 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  290bb8ec
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · a627b528
  cmiller@zippy.cornsilk.net authored Sep 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  a627b528
- Increase time to wait for mysqld to get restarted(it will take some time when running in valgrind) · 648a9ae1
  msvensson@neptunus.(none) authored Sep 28, 2006
  
  648a9ae1
- Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware_libmysql_imp · 3f59918e
  msvensson@neptunus.(none) authored Sep 28, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  3f59918e
- Merge neptunus.(none):/home/msvensson/mysql/work/my51-work · 8399b9e1
  msvensson@neptunus.(none) authored Sep 28, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  8399b9e1
- Directory mySTL has moved from extra/yassl/mySTL to extra/yassl/taocrypt/mySTL · d4799d9e
  msvensson@neptunus.(none) authored Sep 28, 2006
  
  d4799d9e
- Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · d0bdc01a
  msvensson@neptunus.(none) authored Sep 28, 2006
```
into  neptunus.(none):/home/msvensson/mysql/work/my51-work
```
  d0bdc01a
- Increase test suite timeout to 3 hours · 712a937e
  msvensson@neptunus.(none) authored Sep 28, 2006
  
  712a937e
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 47c2c590
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Sep 28, 2006
```
into  mysql.com:/usr/home/ram/work/5.0-maint.b22227
```
  47c2c590
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 64c2c0cb
  petr/cps@owlet.local authored Sep 28, 2006
```
into  mysql.com:/home/cps/mysql/trees/5.1-runtime-new
```
  64c2c0cb
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my50-bug21476 · 33bf71e9
  cmiller@zippy.cornsilk.net authored Sep 27, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  33bf71e9
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 95ccad5e
  cmiller@zippy.cornsilk.net authored Sep 27, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  95ccad5e
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476 · 150740cf
  cmiller@zippy.cornsilk.net authored Sep 27, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  150740cf
27 Sep, 2006 4 commits
- Merge mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.0-maint · 194f12ff
  elliot/emurphy@mysql.com/lost.local authored Sep 27, 2006
```
into  mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.0-maint-gca
```
  194f12ff
- Merge mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.0-maint-gca · d5c98585
  elliot/emurphy@lost.local authored Sep 27, 2006
```
into  mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.1-new-maint
```
  d5c98585
- Temporary fix for bug#22268 (official patch will come soon) · d1fb415a
  elliot/emurphy@mysql.com/lost.local authored Sep 27, 2006
```
Don't cap threads at 1000 on Windows any more.
```
  d1fb415a
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my50-bug21476 · d34940c9
  cmiller@zippy.cornsilk.net authored Sep 27, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476
```
  d34940c9