Commits · e33a591a50f298b7eea0852a06c16f8fe11a5f4a · nexedi / MariaDB

16 Mar, 2008 1 commit

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

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

e33a591a

15 Mar, 2008 5 commits

Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 69476af8

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

69476af8

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

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

e119b8c6

make pushbuild green · eef61457

unknown authored Mar 15, 2008


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

eef61457

make pushbuild green · fe227c80
unknown authored Mar 14, 2008

fe227c80

fix results after merge · 4a206fcd

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

4a206fcd

14 Mar, 2008 25 commits

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

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

b83a9972

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

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

89ba6b3f

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

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

b0da95d4

Post-merge fixes · da97d58c
unknown authored Mar 14, 2008

da97d58c
BUG#28248 - mysqldump results with MERGE ... UNION=() cannot be executed · 3a23d660
unknown authored Mar 15, 2008
```
After merge fix.
```
3a23d660
Post-merge fix · 706a00fc
unknown authored Mar 14, 2008

706a00fc

Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 735d00c8

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

735d00c8

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

Merge... · e1c6a503

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

e1c6a503

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

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

cfb8268a

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

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

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

c1e10141

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


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

Post-merge fixes · 9f0242f4

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.

9f0242f4

Merge mysql.com:/home/svoj/devel/mysql/BUG28248/mysql-5.0-engines · 80ed8583

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.

80ed8583

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

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

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=().

c0a50251

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

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

addeb300

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

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.

db911b4c

Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 6844cf6b

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

6844cf6b

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

Manual merge · e14420bf

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().

e14420bf

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

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

178a4fe3

13 Mar, 2008 3 commits

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

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.

39352d27

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


tests/mysql_client_test.c:
  Null merge.
```
f36c8297

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

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.

ecc147f2

12 Mar, 2008 6 commits
- Bug#35247 - rpl_transaction.test produces warnings files · 01b24520
  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'.
```
  01b24520
- Fixed test failures caused by insufficient cleanups in the tests for · eefc19c5
  unknown authored Mar 12, 2008
```
bug12713.
```
  eefc19c5
- Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt · 0d35eafc
  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
```
  0d35eafc
- Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · df7268dc
  unknown authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


tests/mysql_client_test.c:
  Manual merge.
```
  df7268dc
- Post-merge fix. · 821d164b
  unknown authored Mar 12, 2008
  
  821d164b
- Re-enabled the test for mysql_insert_id() after merging from main. · 6927cb04
  unknown authored Mar 12, 2008
  
  6927cb04