diff options
| author | unknown <pgalbraith/patg@govinda.patg.net> | 2006-08-15 09:02:53 -0700 |
|---|---|---|
| committer | unknown <pgalbraith/patg@govinda.patg.net> | 2006-08-15 09:02:53 -0700 |
| commit | 1d3a13a95d730b8d1c9123aeeb886cee7513f80a (patch) | |
| tree | 6675eb82317cc891e2c4b6a3d980a5ded521d332 /mysql-test/t/federated_transactions-slave.opt | |
| parent | c372c94e745652548243371004deb1fb9392d960 (diff) | |
| parent | 0c96f52f4e94470b668f7b7bf320c85cdac86622 (diff) | |
| download | mariadb-git-1d3a13a95d730b8d1c9123aeeb886cee7513f80a.tar.gz | |
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
mysql-test/r/federated.result:
Auto merged
mysql-test/r/strict.result:
Auto merged
sql/sql_base.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/federated_transactions-slave.opt')
0 files changed, 0 insertions, 0 deletions