diff options
| author | unknown <kaa@polly.(none)> | 2007-11-16 14:00:57 +0300 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-11-16 14:00:57 +0300 |
| commit | 96f7e948d83d946e5416a44e2e2cba672cf4ec39 (patch) | |
| tree | 1907d7bbb683d24c3732bf8c4f92f72237f8de12 /mysql-test/r/merge.result | |
| parent | 84fbbf4d7d937df5d0cb9081ea73e9342b0ceae6 (diff) | |
| parent | 1c1dd1f25c42081c7bf72042ccfcb83896298aab (diff) | |
| download | mariadb-git-96f7e948d83d946e5416a44e2e2cba672cf4ec39.tar.gz | |
Merge polly.(none):/home/kaa/src/opt/bug32241/my50-bug29131
into polly.(none):/home/kaa/src/opt/bug32241/my51-bug29131
mysql-test/r/explain.result:
Auto merged
mysql-test/t/explain.test:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/merge.result')
0 files changed, 0 insertions, 0 deletions