Commits · 8991a269f1f2233365519deb1339e21f3b36b674 · nexedi / MariaDB

06 Sep, 2006 5 commits
- Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx · 8991a269
  tsmith@maint1.mysql.com authored Sep 07, 2006
```
into  maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my51-bfx
```
  8991a269
- Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx · b5f67a64
  tsmith@maint1.mysql.com authored Sep 07, 2006
```
into  maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx
```
  b5f67a64
- Force conflict to avoid bk automerge behavior; will be undone during merge. · 2480ec8e
  tsmith@maint1.mysql.com authored Sep 07, 2006
  
  2480ec8e
- Bug #21054: myisam_stats_method ignored in my.cnf and cmdline · b6cd727e
  tsmith@maint1.mysql.com authored Sep 07, 2006
```
Fix OPT_MYISAM_STATS_METHOD case, where the NULLS_EQUAL and NULLS_NOT_EQUAL methods were mixed up
```
  b6cd727e
- Bug #21250: esolve stack traces on AMD64 (backport to mysql-4.1) · f4265f7a
  tsmith@maint1.mysql.com authored Sep 07, 2006
  
  f4265f7a
05 Sep, 2006 35 commits
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · ba1bb7ba
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  ba1bb7ba
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 060f3bd0
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  060f3bd0
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 843c5576
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  843c5576
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 4b7a5974
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  4b7a5974
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · d346580f
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  d346580f
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · ba3829dc
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  ba3829dc
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · a4d39c75
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  a4d39c75
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 02b40b04
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  02b40b04
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 869be903
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  869be903
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 47982eba
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  47982eba
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 4c1e9c58
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  4c1e9c58
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · d58cd1de
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  d58cd1de
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · bae80733
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  bae80733
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 7ca1a494
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  7ca1a494
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 954256c3
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  954256c3
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · b023f5d3
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  b023f5d3
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · fa13c321
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  fa13c321
- Fix bad manual merge. · 298917eb
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
  
  298917eb
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · e5669a65
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  e5669a65
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 1b603774
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  1b603774
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 114bea41
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  114bea41
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 4a62b02d
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  4a62b02d
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · f5e24555
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  f5e24555
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 6691b314
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  6691b314
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 7001078c
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  7001078c
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 18027283
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  18027283
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 6dd8667b
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  6dd8667b
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 079b6ee8
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  079b6ee8
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 469e85e3
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  469e85e3
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · ddbbc7fd
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  ddbbc7fd
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 085bee2f
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  085bee2f
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 9dd2f452
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  9dd2f452
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · d8696194
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  d8696194
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 5579393c
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  5579393c
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 5415dcf4
  cmiller@zippy.cornsilk.net authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  5415dcf4