Commits · 8001dd1b86f89080ebb79f174e871a8320086d8a · Kirill Smelkov / mariadb

14 Mar, 2008 4 commits

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 11 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

Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 69d49bca

unknown authored Mar 12, 2008

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

69d49bca

Merge kaamos.(none):/data/src/mysql-5.1 · d6df18dd

unknown authored Mar 12, 2008

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/func_time.result:
  Manual merge.
mysql-test/r/view.result:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
scripts/mysql_config.sh:
  Manual merge.
sql-common/client.c:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.

d6df18dd

Merge kaamos.(none):/data/src/opt/mysql-4.1-opt · 66507ba8
unknown authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
```
66507ba8

Merge kaamos.(none):/data/src/mysql-5.0 · 09f8a4af

unknown authored Mar 12, 2008

into  kaamos.(none):/data/src/opt/mysql-5.0-opt


client/mysql.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/view.result:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
scripts/mysql_config.sh:
  Manual merge.

09f8a4af

Merge kaamos.(none):/data/src/mysql-4.1 · 6dfe411c
unknown authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-4.1-opt
```
6dfe411c

11 Mar, 2008 4 commits

Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · a5e775b4

unknown authored Mar 11, 2008

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/null_key.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_select.cc:
  Manual merge.

a5e775b4

Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt · f9bbd753
unknown authored Mar 11, 2008
```
into  riffraff.(none):/data0/martin/bug34367/my51-bug34367-pushee
```
f9bbd753
Merge stella.local:/home2/mydev/mysql-5.1-ateam · 28eb7e60
unknown authored Mar 11, 2008
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
28eb7e60
Merge bk@192.168.21.1:mysql-5.1-opt · 74783c57
unknown authored Mar 11, 2008
```
into  mysql.com:/home/hf/work/32801/my51-32801
```
74783c57

10 Mar, 2008 7 commits

Bug#31331 - MyISAM or Merge Table upgrade incompatibility with 5.1 · 06db9c0e
unknown authored Mar 10, 2008
```
Post-pushbuild fixes. Added purecov comments.
```
06db9c0e

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · ccf7f74e

unknown authored Mar 10, 2008

into  mysql.com:/misc/mysql/34749/51-34749


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

ccf7f74e

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 0abcb8ca

unknown authored Mar 10, 2008

into  mysql.com:/misc/mysql/34749/50-34749


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

0abcb8ca

Merge mysql.com:/misc/mysql/34749/50-34749 · 111de516

unknown authored Mar 10, 2008

into  mysql.com:/misc/mysql/34749/51-34749


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

111de516

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · d9850aae
unknown authored Mar 10, 2008
```
into  mysql.com:/misc/mysql/29645/51-29645
```
d9850aae
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 9ddecde4
unknown authored Mar 10, 2008
```
into  mysql.com:/misc/mysql/29645/50-29645
```
9ddecde4
Merge mysql.com:/misc/mysql/29645/50-29645 · 230c7a4c
unknown authored Mar 10, 2008
```
into  mysql.com:/misc/mysql/29645/51-29645


scripts/mysql_config.sh:
  Auto merged
```
230c7a4c

08 Mar, 2008 3 commits
- Merge kaamos.(none):/data/src/opt/bug34889/my51 · 87a866ef
  unknown authored Mar 08, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


sql/sql_insert.cc:
  Auto merged
```
  87a866ef
- Merge kaamos.(none):/data/src/opt/bug34889/my50 · 319cd7e4
  unknown authored Mar 08, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
```
  319cd7e4
- Merge kaamos.(none):/data/src/opt/bug34889/my50 · 92e0fbbe
  unknown authored Mar 08, 2008
```
into  kaamos.(none):/data/src/opt/bug34889/my51


sql/sql_insert.cc:
  Null merge.
tests/mysql_client_test.c:
  Manual merge.
```
  92e0fbbe
07 Mar, 2008 8 commits

Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 1bffc510
unknown authored Mar 07, 2008
```
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
```
1bffc510

Merge... · fd826522

unknown authored Mar 07, 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


sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

fd826522

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

unknown authored Mar 07, 2008

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


configure.in:
  Auto merged
include/mysql/plugin.h:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/partition_innodb.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/partition_innodb.test:
  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/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged

7b5da0aa

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

unknown authored Mar 07, 2008

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


sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

1e8b11c6

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 0f5c6669
unknown authored Mar 08, 2008
```
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b27580
```
0f5c6669
After merge fix · 215c9456
unknown authored Mar 08, 2008

215c9456
Merge mysql.com:/home/svoj/devel/mysql/BUG34656/mysql-5.1-engines · e0075179
unknown authored Mar 07, 2008
```
into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines
```
e0075179
Merge mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines · 0d4fb8b4
unknown authored Mar 07, 2008
```
into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines
```
0d4fb8b4