Commits · d21b5e70c41729006fb76a038c51a4a18e7233d0 · Kirill Smelkov / mariadb

19 Dec, 2006 6 commits
- Merge chilla.local:/home/mydev/mysql-5.0-axmrg · d21b5e70
  istruewing@chilla.local authored Dec 19, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  d21b5e70
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · d17a8096
  istruewing@chilla.local authored Dec 19, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  d17a8096
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · d29f865d
  svoj@april.(none) authored Dec 19, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG23255/mysql-5.1-engines
```
  d29f865d
- Merge chilla.local:/home/mydev/mysql-4.1-axmrg · deeeeb4f
  istruewing@chilla.local authored Dec 19, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  deeeeb4f
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 6649a387
  istruewing@chilla.local authored Dec 19, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  6649a387
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · f3f5eb5c
  istruewing@chilla.local authored Dec 19, 2006
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
  f3f5eb5c
15 Dec, 2006 1 commit
- Raise version number after cloning 5.0.32 · 1d6ff3a2
  bteam/mysqldev@mysql.com/production.mysql.com authored Dec 15, 2006
  
  1d6ff3a2
14 Dec, 2006 9 commits
- Merge trift2.:/MySQL/M41/spec-4.1 · 9b8c7ffc
  joerg@trift2. authored Dec 14, 2006
```
into  trift2.:/MySQL/M41/push-4.1
```
  9b8c7ffc
- Merge trift2.:/MySQL/M50/spec-5.0 · daba0ecb
  joerg@trift2. authored Dec 14, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
  daba0ecb
- Merge trift2.:/MySQL/M50/spec-5.0 · 436aa807
  joerg@trift2. authored Dec 14, 2006
```
into  trift2.:/MySQL/M51/spec-5.1
```
  436aa807
- support-files/mysql.spec.sh · a62051b7
  joerg@trift2. authored Dec 14, 2006
```
    The "mysqlmanager" man page got moved from section 1 to 8.
```
  a62051b7
- Merge trift2.:/MySQL/M41/spec-4.1 · 8bdcf736
  joerg@trift2. authored Dec 14, 2006
```
into  trift2.:/MySQL/M50/spec-5.0
```
  8bdcf736
- support-files/mysql.spec.sh · 5582d601
  joerg@trift2. authored Dec 14, 2006
```
    The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".
```
  5582d601
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1 · 9497df0b
  df@kahlann.erinye.com authored Dec 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
```
  9497df0b
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 · 95564bfe
  df@kahlann.erinye.com authored Dec 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
```
  95564bfe
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1 · e0f9996e
  df@kahlann.erinye.com authored Dec 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
  e0f9996e
13 Dec, 2006 4 commits
- After merge fix. · a708a3b5
  svoj@mysql.com/april.(none) authored Dec 13, 2006
  
  a708a3b5
- Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.0-engines · 35e7dea8
  svoj@april.(none) authored Dec 13, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.1-engines
```
  35e7dea8
- Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-4.1-engines · db88cf3d
  svoj@mysql.com/april.(none) authored Dec 13, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.0-engines
```
  db88cf3d
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines · f92ae8d6
  svoj@mysql.com/april.(none) authored Dec 13, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-4.1-engines
```
  f92ae8d6
12 Dec, 2006 6 commits
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 6a49f0cd
  gluh@gluh.(none) authored Dec 12, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  6a49f0cd
- Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · c6d9cf1b
  gluh@gluh.(none) authored Dec 12, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  c6d9cf1b
- BUG#24902 in 5.0 · bd44245e
  df@kahlann.erinye.com authored Dec 12, 2006
  
  bd44245e
- Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · 635a5641
  gluh@mysql.com/gluh.(none) authored Dec 12, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
  635a5641
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 118a0c7f
  gluh@mysql.com/gluh.(none) authored Dec 12, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
  118a0c7f
- BUG#24902 · 682f8fe2
  df@kahlann.erinye.com authored Dec 12, 2006
  
  682f8fe2
11 Dec, 2006 4 commits
- Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · f0f4d3c0
  gluh@mysql.com/gluh.(none) authored Dec 11, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
```
  f0f4d3c0
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1 · 78e1df3e
  df@kahlann.erinye.com authored Dec 11, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
```
  78e1df3e
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 · 476632aa
  df@kahlann.erinye.com authored Dec 11, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
```
  476632aa
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1 · 024597b3
  df@kahlann.erinye.com authored Dec 11, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
  024597b3
08 Dec, 2006 5 commits
- Merge chilla.local:/home/mydev/mysql-5.0-axmrg · 5c062b2b
  istruewing@chilla.local authored Dec 08, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  5c062b2b
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 05dde1f3
  istruewing@chilla.local authored Dec 08, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  05dde1f3
- Merge chilla.local:/home/mydev/mysql-4.1-axmrg · c583a7ba
  istruewing@chilla.local authored Dec 08, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  c583a7ba
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · df2b9343
  istruewing@chilla.local authored Dec 08, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  df2b9343
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · ca62c942
  istruewing@chilla.local authored Dec 08, 2006
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
  ca62c942
07 Dec, 2006 5 commits
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · 8fffa20a
  df@kahlann.erinye.com authored Dec 07, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
  8fffa20a
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · 75c71141
  df@kahlann.erinye.com authored Dec 07, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  75c71141
- do not autorelease build ids when a child of mysql-test-run.pl dies · 19ec379b
  df@kahlann.erinye.com authored Dec 07, 2006
  
  19ec379b
- BUG#23404 - ROW_FORMAT=FIXED option is lost is an index is added to the · e17d7bce
  svoj@mysql.com/april.(none) authored Dec 07, 2006
```
            table

ROW_FORMAT option is lost during CREATE/DROP INDEX.

This fix forces CREATE/DROP INDEX to retain ROW_FORMAT by instructing
mysql_alter_table() that ROW_FORMAT is not used during creating/dropping
indexes.
```
  e17d7bce
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · 01395b1d
  df@kahlann.erinye.com authored Dec 07, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
  01395b1d