Commits · 44fbe74e1e7c6055f10f5eb7ab6f467e0c4aa966 · Kirill Smelkov / mariadb

26 Mar, 2008 1 commit
- Merge stella.local:/home2/mydev/mysql-5.1-amain · 44fbe74e
  istruewing@stella.local authored Mar 26, 2008
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
  44fbe74e
25 Mar, 2008 2 commits

Bug#35559 - plugin_load.test creates warnings · 97531cad

istruewing@stella.local authored Mar 25, 2008

plugin_load.test created lines in the warnings files and made
pushbuild cells yellow. Some pushbuild systems are configured
so that they don't build the ha_example plugin. Trying to load
them creates error messages in the error log. These were copied
to the warnings file.

Fixed by ignoring expected error messages for non-existent
ha_example.

97531cad

Eliminating compiler warnings. · bc683c64
mkindahl@dl145h.mysql.com authored Mar 25, 2008

bc683c64

20 Mar, 2008 4 commits
- Merge stella.local:/home2/mydev/mysql-5.1-ateam · 8c0300da
  istruewing@stella.local authored Mar 20, 2008
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
  8c0300da
- Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 7157f0d2
  istruewing@stella.local authored Mar 20, 2008
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
  7157f0d2
- Merge stella.local:/home2/mydev/mysql-5.0-ateam · 0efc834e
  istruewing@stella.local authored Mar 20, 2008
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
  0efc834e
- Merge stella.local:/home2/mydev/mysql-4.1-axmrg · f560b8c8
  istruewing@stella.local authored Mar 20, 2008
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
  f560b8c8
18 Mar, 2008 2 commits
- Merge mysql.com:/home/svoj/devel/mysql/cov/mysql-5.0-engines · 65992efc
  svoj@april.(none) authored Mar 18, 2008
```
into  mysql.com:/home/svoj/devel/mysql/cov/mysql-5.1-engines
```
  65992efc
- Make gcov happy. · 70ca2ae2
  svoj@mysql.com/april.(none) authored Mar 18, 2008
  
  70ca2ae2
17 Mar, 2008 4 commits
- Raise version number after cloning 4.1.24 · 2536f331
  kent/mysqldev@mysql.com/production.mysql.com authored Mar 18, 2008
  
  2536f331
- Bug#35306: partition_basic_symlink test failures · 7586a4c6
  mattiasj@witty. authored Mar 17, 2008
```
Have changed the DATA/INDEX dir to not be a database dir.
(and made some changes for better result files.)
```
  7586a4c6
- Bug#35305: partition_symlink test failures · d7333511
  mattiasj@witty. authored Mar 17, 2008
```
Updated the test due to bug 32167

Corrected spelling of error message
```
  d7333511
- Valgrind warnings found after bug#32943 and after merge from -main · d918fa6e
  mattiasj@witty. authored Mar 17, 2008
```
into -engines tree.

hander::table_share was not updated after changing table->s.
```
  d918fa6e
16 Mar, 2008 1 commit
- Merge stella.local:/home2/mydev/mysql-5.1-ateam · 59a2f7b4
  istruewing@stella.local authored Mar 16, 2008
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
  59a2f7b4
15 Mar, 2008 5 commits
- Merge stella.local:/home2/mydev/mysql-5.0-axmrg · e1efd067
  istruewing@stella.local authored Mar 15, 2008
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
  e1efd067
- Merge stella.local:/home2/mydev/mysql-5.0-ateam · 07ca4d03
  istruewing@stella.local authored Mar 15, 2008
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
  07ca4d03
- make pushbuild green · c400abe8
  antony@pcg5ppc.xiphis.org authored Mar 15, 2008
  
  c400abe8
- make pushbuild green · 287d1efe
  antony@pcg5ppc.xiphis.org authored Mar 14, 2008
  
  287d1efe
- fix results after merge · 532dc9a2
  antony@pcg5ppc.xiphis.org authored Mar 14, 2008
  
  532dc9a2
14 Mar, 2008 21 commits
- Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · e6b027f6
  antony@pcg5ppc.xiphis.org authored Mar 14, 2008
```
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
```
  e6b027f6
- Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 0b4da8a3
  antony@pcg5ppc.xiphis.org authored Mar 14, 2008
```
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0
```
  0b4da8a3
- Merge stella.local:/home2/mydev/mysql-5.0-axmrg · cbdd0d2d
  istruewing@stella.local authored Mar 14, 2008
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
  cbdd0d2d
- Post-merge fixes · b67add66
  istruewing@stella.local authored Mar 14, 2008
  
  b67add66
- BUG#28248 - mysqldump results with MERGE ... UNION=() cannot be executed · 2f4bb0f1
  svoj@mysql.com/june.mysql.com authored Mar 15, 2008
```
After merge fix.
```
  2f4bb0f1
- Post-merge fix · 26ed736a
  istruewing@stella.local authored Mar 14, 2008
  
  26ed736a
- Merge stella.local:/home2/mydev/mysql-5.0-axmrg · ee9ee8f4
  istruewing@stella.local authored Mar 14, 2008
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
  ee9ee8f4
- Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines · b8b178c4
  antony@pcg5ppc.xiphis.org authored Mar 14, 2008
```
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
```
  b8b178c4
- Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines · 80d742ea
  antony@pcg5ppc.xiphis.org authored Mar 14, 2008
```
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0
```
  80d742ea
- Merge... · a05aac7e
  antony@pcg5ppc.xiphis.org authored Mar 14, 2008
```
Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
```
  a05aac7e
- Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1 · 91e44529
  antony@pcg5ppc.xiphis.org authored Mar 14, 2008
```
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
```
  91e44529
- Merge stella.local:/home2/mydev/mysql-5.1-ateam · 397c1783
  istruewing@stella.local authored Mar 14, 2008
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
  397c1783
- Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0 · 98eccfbe
  antony@pcg5ppc.xiphis.org authored Mar 14, 2008
```
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0
```
  98eccfbe
- Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl · 6c0dcad8
  mkindahl@dl145h.mysql.com authored Mar 14, 2008
```
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
```
  6c0dcad8
- Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 · 9baeb72e
  mkindahl@dl145h.mysql.com authored Mar 14, 2008
```
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
```
  9baeb72e
- Merge stella.local:/home2/mydev/mysql-5.0-ateam · 21e2a000
  istruewing@stella.local authored Mar 14, 2008
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
  21e2a000
- Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0 · 6a4c4b18
  mkindahl@dl145h.mysql.com authored Mar 14, 2008
```
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
```
  6a4c4b18
- Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · f48aa05f
  mkindahl@dl145h.mysql.com authored Mar 14, 2008
```
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
```
  f48aa05f
- Post-merge fixes. · c5fefc68
  mkindahl@dl145h.mysql.com authored Mar 14, 2008
  
  c5fefc68
- Merge stella.local:/home2/mydev/mysql-5.0-ateam · 6beb16ed
  istruewing@stella.local authored Mar 14, 2008
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
  6beb16ed
- Post-merge fixes · 4ea73773
  istruewing@stella.local authored Mar 14, 2008
  
  4ea73773