Commits · c481446873ba34c85090836cd1ee8c37eacc5e8a · nexedi / MariaDB

06 Feb, 2007 24 commits
- Fix merge error · c4814468
  msvensson@pilot.mysql.com authored Feb 06, 2007
  
  c4814468
- Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · 836f777b
  msvensson@pilot.mysql.com authored Feb 06, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
```
  836f777b
- Correct the non working check for --skip-log-bin in "extra_opt" · b6bd53aa
  msvensson@pilot.mysql.com authored Feb 06, 2007
  
  b6bd53aa
- Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · d9439eda
  msvensson@pilot.mysql.com authored Feb 06, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
```
  d9439eda
- Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint · 69510b70
  msvensson@pilot.mysql.com authored Feb 06, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
```
  69510b70
- Merge 192.168.0.10:mysql/mysql-5.1-maint · 6ba81ba5
  msvensson@pilot.mysql.com authored Feb 06, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
```
  6ba81ba5
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 15008f67
  msvensson@neptunus.(none) authored Feb 06, 2007
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  15008f67
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 · e4001b3b
  msvensson@neptunus.(none) authored Feb 06, 2007
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  e4001b3b
- Fix windows build · f7e566c9
  msvensson@pilot.mysql.com authored Feb 06, 2007
  
  f7e566c9
- Merge 192.168.0.10:mysql/mysql-5.0-maint · d018030b
  msvensson@pilot.mysql.com authored Feb 06, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
```
  d018030b
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · ede3afe4
  msvensson@neptunus.(none) authored Feb 06, 2007
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  ede3afe4
- Merge 192.168.0.10:mysql/mysql-4.1-maint · 256cb08b
  msvensson@pilot.mysql.com authored Feb 06, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
```
  256cb08b
- Merge neptunus.(none):/home/msvensson/mysql/my41-nmj · 6502f430
  msvensson@neptunus.(none) authored Feb 06, 2007
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
```
  6502f430
- Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · f6d3ac52
  msvensson@pilot.mysql.com authored Feb 06, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
```
  f6d3ac52
- Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805 · 61686e85
  msvensson@pilot.mysql.com authored Feb 06, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
```
  61686e85
- Merge bk-internal:/home/bk/mysql-4.1-maint · 36207f80
  msvensson@pilot.mysql.com authored Feb 06, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
```
  36207f80
- Merge 192.168.0.10:mysql/mysql-4.1-maint · 3f06339d
  msvensson@pilot.mysql.com authored Feb 06, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
```
  3f06339d
- Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805 · 3a48e8ee
  msvensson@pilot.mysql.com authored Feb 06, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/bug24805/my51-bug24805
```
  3a48e8ee
- Bug#24805 mtr.pl can't handle test with --disable-log-bin · 958308a5
  msvensson@pilot.mysql.com authored Feb 06, 2007
```
- Don't give mysqld the --log-bin argument if .opt file
  contains --skip-log-bin
- Enable flush2 test
```
  958308a5
- Bug#8983 one place that isn't strict-aliasing-safe · 8c37b28c
  msvensson@neptunus.(none) authored Feb 06, 2007
```
 - Backport fix from 5.0
```
  8c37b28c
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 72fbdf29
  msvensson@neptunus.(none) authored Feb 06, 2007
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  72fbdf29
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · d69e5063
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Feb 06, 2007
```
into  mysql.com:/usr/home/ram/work/bug23938/my41-bug23938
```
  d69e5063
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · a4bbd5bf
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Feb 06, 2007
```
into  mysql.com:/usr/home/ram/work/bug23938/my50-bug23938
```
  a4bbd5bf
- Merge mysql.com:/usr/home/ram/work/bug23938/my41-bug23938 · f103fde2
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Feb 06, 2007
```
into  mysql.com:/usr/home/ram/work/bug23938/my50-bug23938
```
  f103fde2
05 Feb, 2007 6 commits
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 · 4a6770e0
  svoj@june.mysql.com authored Feb 05, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
```
  4a6770e0
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 64a728ce
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Feb 05, 2007
```
into  mysql.com:/usr/home/ram/work/bug10798/my41-bug10798
```
  64a728ce
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 9e36baa9
  ramil/ram@myoffice.izhnet.ru authored Feb 05, 2007
```
into  mysql.com:/usr/home/ram/work/bug10798/my51-bug10798
```
  9e36baa9
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 47ae650a
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Feb 05, 2007
```
into  mysql.com:/usr/home/ram/work/bug10798/my50-bug10798
```
  47ae650a
- Merge mysql.com:/usr/home/ram/work/bug10798/my50-bug10798 · 0974b9fa
  ramil/ram@myoffice.izhnet.ru authored Feb 05, 2007
```
into  mysql.com:/usr/home/ram/work/bug10798/my51-bug10798
```
  0974b9fa
- Merge mysql.com:/usr/home/ram/work/bug10798/my41-bug10798 · b0977714
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Feb 05, 2007
```
into  mysql.com:/usr/home/ram/work/bug10798/my50-bug10798
```
  b0977714
04 Feb, 2007 2 commits
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · a602d4a5
  baker@bk-internal.mysql.com authored Feb 05, 2007
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
```
  a602d4a5
- Fixed bug#26027 · 08be7c33
  brian@zim.(none) authored Feb 04, 2007
```
Just a bad copy/paste of help info
```
  08be7c33
03 Feb, 2007 3 commits
- Merge chilla.local:/home/mydev/mysql-5.0-axmrg · dde4f421
  istruewing@chilla.local authored Feb 03, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  dde4f421
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · bdf18a85
  istruewing@chilla.local authored Feb 03, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  bdf18a85
- After merge fix · b4445664
  istruewing@chilla.local authored Feb 03, 2007
  
  b4445664
02 Feb, 2007 5 commits
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 · cd75806b
  jani@a88-113-38-195.elisa-laajakaista.fi authored Feb 03, 2007
```
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
```
  cd75806b
- Merge chilla.local:/home/mydev/mysql-4.1-axmrg · 77e99fe2
  istruewing@chilla.local authored Feb 02, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  77e99fe2
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 41b6b32e
  istruewing@chilla.local authored Feb 02, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  41b6b32e
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 972df14c
  istruewing@chilla.local authored Feb 02, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
  972df14c
- After merge fix · 177a366e
  istruewing@chilla.local authored Feb 02, 2007
  
  177a366e