diff options
| author | unknown <msvensson@pilot.mysql.com> | 2008-02-20 08:42:03 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2008-02-20 08:42:03 +0100 |
| commit | 6ad4269c33f2acc3c44402ab3e12f680ab30ac9f (patch) | |
| tree | 4e75a00e098da74229e302c20f1734b28d818b30 /mysql-test/r/federated_transactions.result | |
| parent | 0480b40f443c9cec2fbdf7a4ef25401badbb5fe7 (diff) | |
| parent | 5d1e8e12c3a2c606eb5072bc7c85fc719fbf30fb (diff) | |
| download | mariadb-git-6ad4269c33f2acc3c44402ab3e12f680ab30ac9f.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-rpl
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
client/mysqltest.c:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
Diffstat (limited to 'mysql-test/r/federated_transactions.result')
0 files changed, 0 insertions, 0 deletions