Commits · 89c00e426de2e0dc521b3adf7f3371fc258dae1b · nexedi / MariaDB

16 Mar, 2008 1 commit

Merge stella.local:/home2/mydev/mysql-5.1-ateam · 89c00e42

unknown authored Mar 16, 2008

into  stella.local:/home2/mydev/mysql-5.1-axmrg


configure.in:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/partition_not_windows.result:
  Auto merged
mysql-test/r/partition_symlink.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/suite/parts/inc/partition_basic.inc:
  Auto merged
mysql-test/suite/parts/r/partition_basic_innodb.result:
  Auto merged
mysql-test/suite/parts/r/partition_basic_myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_create_table.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/partition_info.h:
  Auto merged
sql/rpl_rli.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
mysql-test/t/partition_symlink.test:
  Manual merge

89c00e42

15 Mar, 2008 5 commits

Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 17d6824a

unknown authored Mar 15, 2008

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

17d6824a

Merge stella.local:/home2/mydev/mysql-5.0-ateam · 33822381

unknown authored Mar 15, 2008

into  stella.local:/home2/mydev/mysql-5.0-axmrg


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

33822381

make pushbuild green · d3a0f852

unknown authored Mar 15, 2008


mysql-test/t/disabled.def:
  make pushbuild green, entry added to wrong disabled.def file.

d3a0f852

make pushbuild green · 6bceb154
unknown authored Mar 14, 2008

6bceb154

fix results after merge · 6bc335e6

unknown authored Mar 14, 2008


mysql-test/r/partition_not_windows.result:
  fix results from merge
mysql-test/t/disabled.def:
  disable test partition_symlink

6bc335e6

14 Mar, 2008 25 commits

Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 4f72bf0e

unknown authored Mar 14, 2008

into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1


sql/sql_yacc.yy:
  Auto merged

4f72bf0e

Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-engines · eda0b52c

unknown authored Mar 14, 2008

into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0


sql/sql_yacc.yy:
  Auto merged

eda0b52c

Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 1a3c2810

unknown authored Mar 14, 2008

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/r/type_set.result:
  Auto merged
mysql-test/t/type_set.test:
  Manual merge

1a3c2810

Post-merge fixes · 4e7979fe
unknown authored Mar 14, 2008

4e7979fe
BUG#28248 - mysqldump results with MERGE ... UNION=() cannot be executed · 931558ee
unknown authored Mar 15, 2008
```
After merge fix.
```
931558ee
Post-merge fix · 451de554
unknown authored Mar 14, 2008

451de554

Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 54d26e02

unknown authored Mar 14, 2008

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
sql/sql_yacc.yy:
  Manual merge

54d26e02

Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines · 51cb15ff
unknown authored Mar 14, 2008
```
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
```
51cb15ff
Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines · 3834f421
unknown authored Mar 14, 2008
```
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0
```
3834f421

Merge... · b6496ef1

unknown 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


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

b6496ef1

Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1 · 4801c682

unknown authored Mar 14, 2008

into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1


configure.in:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/partition_symlink.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/partition_info.h:
  Auto merged
sql/rpl_rli.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/symlink.result:
  manual merge
mysql-test/suite/parts/inc/partition_basic.inc:
  manual merge
mysql-test/suite/parts/r/partition_basic_innodb.result:
  manual merge
mysql-test/suite/parts/r/partition_basic_myisam.result:
  manual merge
mysql-test/t/partition_symlink.test:
  manual merge
mysql-test/t/symlink.test:
  manual merge
sql/sql_parse.cc:
  manual merge

4801c682

Merge stella.local:/home2/mydev/mysql-5.1-ateam · 851534b5
unknown authored Mar 14, 2008
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
851534b5

Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0 · b09254f0

unknown authored Mar 14, 2008

into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

b09254f0

Merge stella.local:/home2/mydev/mysql-5.0-ateam · 7a10ede8
unknown authored Mar 14, 2008
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg


sql/sql_yacc.yy:
  Auto merged
```
7a10ede8
Merge stella.local:/home2/mydev/mysql-5.0-ateam · c27e6178
unknown authored Mar 14, 2008
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
c27e6178

Post-merge fixes · 0c9946bc

unknown authored Mar 14, 2008


mysql-test/r/partition_not_windows.result:
  Post-merge fixes
  New warnings
mysql-test/r/symlink.result:
  Post-merge fixes
  Typo
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
  Post-merge fixes
  Defeated creation of a warnings file.
mysql-test/t/partition_symlink.test:
  Post-merge fixes
  Fixed directory to an allowed one.
mysql-test/t/type_set.test:
  Post-merge fixes
  Defeated creation of a warnings file.

0c9946bc

Merge mysql.com:/home/svoj/devel/mysql/BUG28248/mysql-5.0-engines · 3beb2d1a

unknown authored Mar 14, 2008

into  mysql.com:/home/svoj/devel/mysql/BUG28248/mysql-5.1-engines


mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
sql/sql_yacc.yy:
  After merge fix.

3beb2d1a

Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines · 7e01efff
unknown authored Mar 14, 2008
```
into  mysql.com:/home/svoj/devel/mysql/BUG28248/mysql-5.0-engines
```
7e01efff

BUG#28248 - mysqldump results with MERGE ... UNION=() cannot be executed · 196b616a

unknown 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.


mysql-test/r/merge.result:
  A test case for BUG#28248.
mysql-test/t/merge.test:
  A test case for BUG#28248.
sql/ha_myisammrg.cc:
  Do not output UNION clause in SHOW CREATE TABLE, when there are
  no underlying tables defined.
sql/sql_yacc.yy:
  Make underlying table list for MERGE engine optional.
  
  As for MERGE engine empty underlying tables list is valid, it should
  be valid for the parser as well.
  
  This change is mostly needed to restore dumps made by earlier MySQL
  versions. Also with this fix it is possible to remove underlying
  tables mapping by using ALTER TABLE ... UNION=().

196b616a

Merge mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines · 4afe3156

unknown authored Mar 14, 2008

into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines


mysql-test/suite/rpl/r/rpl_dual_pos_advance.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
  SCCS merged

4afe3156

BUG#13861 - START SLAVE UNTIL may stop 1 evnt too late if · 3ec86767

unknown authored Mar 14, 2008

            log-slave-updates and circul repl

This is a test case fix for BUG#13861.


mysql-test/r/rpl_dual_pos_advance.result:
  Fix for a test case for BUG#13861.
mysql-test/t/rpl_dual_pos_advance.test:
  Fix for a test case for BUG#13861.
  
  master_pos_wait() requires slave sql thread running. But it is not
  guaranteed for this test case. As we use start slave until it may
  execute all events and shutdown before master_pos_wait() is started.
  
  On the other hand it is safe just to wait for slave to stop here,
  as start slave returns _after_ sql thread is started.

3ec86767

Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 8001dd1b

unknown authored Mar 14, 2008

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
BitKeeper/deleted/.del-rpl_transaction.test:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
mysql-test/r/query_cache.result:
  Manual merge
mysql-test/t/query_cache.test:
  Manual merge

8001dd1b

Post-merge fix. Moved the symlink handling from sql_parse.cc here. · 9fa2d505
unknown authored Mar 14, 2008
```
mysql-test/r/symlink.result:
  Post-merge fix
mysql-test/t/symlink.test:
  Post-merge fix
```
9fa2d505

Manual merge · e79249f8

unknown authored Mar 14, 2008


configure.in:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/partition_symlink.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/partition_info.h:
  Auto merged
sql/rpl_rli.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_parse.cc:
  Manual merge. Needs later fix. New code in create table was not
  accepted. Needs to be added to mysql_create_table_no_lock().

e79249f8

Merge stella.local:/home2/mydev/mysql-5.0-amain · ce86b146

unknown authored Mar 14, 2008

into  stella.local:/home2/mydev/mysql-5.0-axmrg


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

ce86b146

13 Mar, 2008 3 commits

Bug#33756 - query cache with concurrent_insert=0 appears broken · e85d6a91

unknown authored Mar 13, 2008

When concurrent inserts were disabled, statements after an INSERT
were not put into the query cache. This happened because we do not
save the current data file length at statement start when
concurrent inserts are disabled. But we checked the always zero
local length against the real file length anyway.
  
Fixed by doing the check only if concurrent inserts are not diabled.


mysql-test/r/query_cache.result:
  Bug#33756 - query cache with concurrent_insert=0 appears broken
  Added test result.
mysql-test/t/query_cache.test:
  Bug#33756 - query cache with concurrent_insert=0 appears broken
  Added test.
sql/ha_myisam.cc:
  Bug#33756 - query cache with concurrent_insert=0 appears broken
  Changed code so that file length check is done only when
  concurrent inserts are possible.

e85d6a91

Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 269ebe54
unknown authored Mar 13, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


tests/mysql_client_test.c:
  Null merge.
```
269ebe54

Bug#35103 mysql_client_test::test_bug29948 causes sporadic failures · f20fe94b

unknown authored Mar 13, 2008

  
Disable test case for bug 29948, which is causing sporadically
failures in other tests inside mysql_client_test.


tests/mysql_client_test.c:
  Disable test case.

f20fe94b

12 Mar, 2008 6 commits
- Bug#35247 - rpl_transaction.test produces warnings files · b80afe52
  unknown authored Mar 12, 2008
```
The test file tried to use a mysqltest command '--warning'
but there is no such command.

Changed '--warning' to '#--warning'.


mysql-test/t/rpl_transaction.test:
  Bug#35247 - rpl_transaction.test produces warnings files
  Changed '--warning' to '#--warning'.
```
  b80afe52
- Fixed test failures caused by insufficient cleanups in the tests for · 3155a88d
  unknown authored Mar 12, 2008
```
bug12713.
```
  3155a88d
- Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt · 6c2f9bf5
  unknown authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
```
  6c2f9bf5
- Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 9fcf16a0
  unknown authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


tests/mysql_client_test.c:
  Manual merge.
```
  9fcf16a0
- Post-merge fix. · fe846378
  unknown authored Mar 12, 2008
  
  fe846378
- Re-enabled the test for mysql_insert_id() after merging from main. · 615db68d
  unknown authored Mar 12, 2008
  
  615db68d