diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-22 16:28:51 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-22 16:28:51 +0300 |
| commit | 7ac059ba8f136676eb217e7e3e2861e669a7da5e (patch) | |
| tree | 1fef9d45dab47fa4d783abace538a791c958b006 /mysql-test/t/bug47671.test | |
| parent | acc2b9e3662cd868f5108b1b4ee7257d95582f02 (diff) | |
| parent | a4332c256edded6a6d2378ad3edca945ea57a77f (diff) | |
| download | mariadb-git-7ac059ba8f136676eb217e7e3e2861e669a7da5e.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:
Text conflict in mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
Text conflict in sql/item_func.cc
Diffstat (limited to 'mysql-test/t/bug47671.test')
0 files changed, 0 insertions, 0 deletions