diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-31 00:26:38 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-31 00:26:38 +0300 |
| commit | 077e7c9a87df7ccb1e665a59838fd4054dc04719 (patch) | |
| tree | 47cd0f017d8fe7dc11238110ab3745bdc9179272 /mysql-test/suite/perfschema/t/selects.test | |
| parent | 2cdad6c3eb353cc4d986c274caad2dad5eaa6494 (diff) | |
| parent | 22be2783f2cc61c2190b2cc9eed7f5d35856ce55 (diff) | |
| download | mariadb-git-077e7c9a87df7ccb1e665a59838fd4054dc04719.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- mysql-test/collections/default.experimental
- mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
- mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
Diffstat (limited to 'mysql-test/suite/perfschema/t/selects.test')
0 files changed, 0 insertions, 0 deletions