Commits · 8c0300dae9a38451fc6516c0328207ab3dc9082c · Kirill Smelkov / mariadb

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 24 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 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 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
- Merge mysql.com:/home/svoj/devel/mysql/BUG28248/mysql-5.0-engines · 54d097c4
  svoj@june.mysql.com authored Mar 14, 2008
```
into  mysql.com:/home/svoj/devel/mysql/BUG28248/mysql-5.1-engines
```
  54d097c4
- Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines · c3c1fd4d
  svoj@june.mysql.com authored Mar 14, 2008
```
into  mysql.com:/home/svoj/devel/mysql/BUG28248/mysql-5.0-engines
```
  c3c1fd4d
- BUG#28248 - mysqldump results with MERGE ... UNION=() cannot be executed · 1f0e9f5a
  svoj@mysql.com/june.mysql.com authored Mar 14, 2008
```
When there are no underlying tables specified for a merge table,
SHOW CREATE TABLE outputs a statement that cannot be executed. The
same is true for mysqldump (it generates dumps that cannot be
executed).

This happens because SQL parser does not accept empty UNION() clause.

This patch changes the following:
- it is now possible to execute CREATE/ALTER statement with
  empty UNION() clause.
- the same as above, but still worth noting: it is now possible to
  remove underlying tables mapping using ALTER TABLE ... UNION=().
- SHOW CREATE TABLE does not output UNION() clause if there are
  no underlying tables specified for a merge table. This makes
  mysqldump slightly smaller.
```
  1f0e9f5a
- Merge mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines · 3a7bcaf7
  svoj@april.(none) authored Mar 14, 2008
```
into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines
```
  3a7bcaf7
- BUG#13861 - START SLAVE UNTIL may stop 1 evnt too late if · 243ca22b
  svoj@mysql.com/april.(none) authored Mar 14, 2008
```
            log-slave-updates and circul repl

This is a test case fix for BUG#13861.
```
  243ca22b
- Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 857dd49a
  istruewing@stella.local authored Mar 14, 2008
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
  857dd49a
- Post-merge fix. Moved the symlink handling from sql_parse.cc here. · ed89b81b
  istruewing@stella.local authored Mar 14, 2008
  
  ed89b81b
- Manual merge · eabe082d
  istruewing@stella.local authored Mar 14, 2008
  
  eabe082d