diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-31 01:10:29 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-31 01:10:29 +0300 |
| commit | cb871224cd166887b368d43e2afc046819cb4996 (patch) | |
| tree | 2d5a44a3079a927b5466c426208b46806b233249 /.bzrignore | |
| parent | ddc8765a9e35a020446fc28712751fe62200ea11 (diff) | |
| parent | baa3a8f89e0e748d00b0e18d9773769e2ddff4ce (diff) | |
| download | mariadb-git-cb871224cd166887b368d43e2afc046819cb4996.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- mysql-test/collections/default.experimental
- mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
Diffstat (limited to '.bzrignore')
0 files changed, 0 insertions, 0 deletions