diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-07 19:40:59 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-07 19:40:59 +0300 |
| commit | 6e7b8b6a7ab2b58016403304b1c49cf908a6479d (patch) | |
| tree | 395144ff597d9d1ea027cb0f57f50c5a6e6ab90c /mysql-test/r/compare.result | |
| parent | 61bd9ef6487829ae8106387dd4a1f5b32b67b4bb (diff) | |
| parent | 63a88e137365c4158e22c1c8aba7847b5a0ffe86 (diff) | |
| download | mariadb-git-6e7b8b6a7ab2b58016403304b1c49cf908a6479d.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:
Text conflict in .bzr-mysql/default.conf
Text conflict in mysql-test/r/explain.result
Text conflict in mysql-test/r/having.result
Text conflict in mysql-test/suite/rpl/t/disabled.def
Text conflict in mysql-test/suite/rpl/t/rpl_slave_skip.test
Text conflict in storage/federated/ha_federated.cc
Diffstat (limited to 'mysql-test/r/compare.result')
0 files changed, 0 insertions, 0 deletions