Commits · de87e3174cfd0d2c8ec0bc4e1067ac932bfa8ea1 · Kirill Smelkov / mariadb

30 Dec, 2006 1 commit
- Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines · de87e317
  svoj@april.(none) authored Dec 30, 2006
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
```
  de87e317
29 Dec, 2006 7 commits
- Merge mysql.com:/home/svoj/devel/mysql/BUG23526/mysql-5.0-engines2 · bcbb50c1
  svoj@mysql.com/april.(none) authored Dec 30, 2006
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  bcbb50c1
- Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines · 5344932e
  svoj@mysql.com/april.(none) authored Dec 30, 2006
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  5344932e
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 45aeb7f0
  svoj@mysql.com/april.(none) authored Dec 30, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG23196/mysql-4.1-engines
```
  45aeb7f0
- Merge mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines · 9d106f7a
  svoj@june.mysql.com authored Dec 29, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.1-engines
```
  9d106f7a
- Merge mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-4.1-engines · a86ee0c1
  svoj@mysql.com/june.mysql.com authored Dec 29, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines
```
  a86ee0c1
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 441f5069
  svoj@mysql.com/june.mysql.com authored Dec 29, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines
```
  441f5069
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 63670828
  svoj@mysql.com/june.mysql.com authored Dec 29, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-4.1-engines
```
  63670828
27 Dec, 2006 14 commits
- Merge chilla.local:/home/mydev/mysql-5.0-axmrg · c8ed519a
  istruewing@chilla.local authored Dec 27, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  c8ed519a
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 249f799d
  istruewing@chilla.local authored Dec 27, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  249f799d
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines · d63fa843
  istruewing@chilla.local authored Dec 27, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  d63fa843
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 3765d8a0
  istruewing@chilla.local authored Dec 27, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  3765d8a0
- After merge fix. · fb01230a
  svoj@mysql.com/april.(none) authored Dec 27, 2006
  
  fb01230a
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 2fc0bca6
  svoj@mysql.com/april.(none) authored Dec 27, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines
```
  2fc0bca6
- ndb: remove compiler warnings · 7b9a5f6d
  tomas@poseidon. authored Dec 27, 2006
  
  7b9a5f6d
- Merge mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-5.0-engines · e0a433e1
  svoj@june.mysql.com authored Dec 27, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-5.1-engines
```
  e0a433e1
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 19ba64de
  svoj@mysql.com/april.(none) authored Dec 27, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-4.1-engines
```
  19ba64de
- Merge chilla.local:/home/mydev/mysql-5.0-axmrg · 23ae7792
  istruewing@chilla.local authored Dec 27, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  23ae7792
- Merge mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-4.1-engines · c72d93b0
  svoj@mysql.com/june.mysql.com authored Dec 27, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-5.0-engines
```
  c72d93b0
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 28b1bb36
  svoj@mysql.com/june.mysql.com authored Dec 27, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-4.1-engines
```
  28b1bb36
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 044c4109
  tomas@poseidon. authored Dec 27, 2006
```
into  poseidon.:/home/tomas/mysql-5.1-new-ndb
```
  044c4109
- Merge xiphis.org:/home/antony/work2/mysql-5.0-engines · 82b03f29
  acurtis/antony@xiphis.org/ltamd64.xiphis.org authored Dec 26, 2006
```
into  xiphis.org:/home/antony/work2/mysql-5.0-engines-merge
```
  82b03f29
26 Dec, 2006 4 commits

Merge xiphis.org:/home/antony/work2/mysql-5.1-engines · 54133c7e
acurtis/antony@ltamd64.xiphis.org authored Dec 26, 2006
```
into  xiphis.org:/home/antony/work2/mysql-5.1-engines-merge
```
54133c7e
After merge fix. · 28d3ee65
svoj@mysql.com/june.mysql.com authored Dec 26, 2006

28d3ee65
Merge mysql.com:/home/svoj/devel/mysql/BUG25048/mysql-5.0-engines · 838fe3a0
svoj@june.mysql.com authored Dec 26, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG25048/mysql-5.1-engines
```
838fe3a0

BUG#25048 - ERROR 126 : Incorrect key file for table '.XXXX.MYI'; try to · 591712f5

svoj@mysql.com/june.mysql.com authored Dec 26, 2006

            repair it

Multi-table delete that is optimized with QUICK_RANGE reports table
corruption.

DELETE statement must not use KEYREAD optimization, and sets
table->no_keyread to 1. This was ignored in QUICK_RANGE optimization.

With this fix QUICK_RANGE optimization honors table->no_keyread
value and does not enable KEYREAD when it is requested.

591712f5

23 Dec, 2006 3 commits
- Merge mysql.com:/home/kent/bk/main/mysql-5.0 · be15e3bc
  kent@kent-amd64.(none) authored Dec 23, 2006
```
into  mysql.com:/home/kent/bk/main/mysql-5.1
```
  be15e3bc
- Many files: · 226a5c83
  kent@mysql.com/kent-amd64.(none) authored Dec 23, 2006
```
  Changed header to GPL version 2 only
```
  226a5c83
- Merge mysql.com:/home/kent/bk/main/mysql-5.0 · 33687305
  kent@kent-amd64.(none) authored Dec 23, 2006
```
into  mysql.com:/home/kent/bk/main/mysql-5.1
```
  33687305
22 Dec, 2006 8 commits
- Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch · edc6cfa2
  patg@radha.patg.net authored Dec 22, 2006
```
into  radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge
```
  edc6cfa2
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · abef3751
  baker@bk-internal.mysql.com authored Dec 22, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
```
  abef3751
- Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 2e538b41
  patg@radha.patg.net authored Dec 22, 2006
```
into  radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge
```
  2e538b41
- Potential use of NULL pointer in 'plugin_for_each_with_mask', check pointer · fa339712
  msvensson@pilot.mysql.com authored Dec 22, 2006
```
before referencing it.
```
  fa339712
- Merge pilot.mysql.com:/home/msvensson/mysql/my51-ndb-gca-my51-m · 791a5cf7
  msvensson@pilot.mysql.com authored Dec 22, 2006
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-ndb
```
  791a5cf7
- Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061220175325|03033 · eb7500f4
  msvensson@pilot.mysql.com authored Dec 22, 2006
  
  eb7500f4
- Bug#22694 "function plugin_foreach_with_mask() uses an uninitialized pointer" · abe43135
  msvensson@pilot.mysql.com authored Dec 22, 2006
```
   Fix uninitialized memory.
```
  abe43135
- WL #3031 · efefea6a
  patg@radha.patg.net authored Dec 21, 2006
```
* Various windows errors fixed
* Increased max key length for federated
```
  efefea6a
21 Dec, 2006 3 commits
- Merge chilla.local:/home/mydev/mysql-5.0-axmrg · bd929199
  istruewing@chilla.local authored Dec 21, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  bd929199
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · dee46f91
  istruewing@chilla.local authored Dec 21, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  dee46f91
- Merge bk-internal:/home/bk/mysql-5.1-ndb · 045a9539
  msvensson@pilot.mysql.com authored Dec 21, 2006
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-ndb
```
  045a9539