diff options
| author | unknown <evgen@moonbone.local> | 2007-03-16 00:15:16 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-03-16 00:15:16 +0300 |
| commit | 496f421a697568efcd8b47d746b3682a3e97fcf8 (patch) | |
| tree | a4b61939dbc03378f134271a27ee7b4714b7fc0e /mysql-test/r/federated_transactions.result | |
| parent | b42da2dd01b718766d8b0339f68399935de6dd9f (diff) | |
| parent | c6ab94bdf17340a57ec1f4575c644f27117b11cf (diff) | |
| download | mariadb-git-496f421a697568efcd8b47d746b3682a3e97fcf8.tar.gz | |
Merge moonbone.local:/mnt/gentoo64/work/27033-bug-5.0-opt-mysql
into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
mysql-test/r/insert_update.result:
Auto merged
mysql-test/t/insert_update.test:
Auto merged
sql/sql_class.h:
Manual merge
sql/sql_insert.cc:
Manual merge
Diffstat (limited to 'mysql-test/r/federated_transactions.result')
0 files changed, 0 insertions, 0 deletions