diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-03-01 21:49:06 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-03-01 21:49:06 +0300 |
| commit | c575b15a12a21c83c6726d45d05dd63418867da2 (patch) | |
| tree | 422a33492d29803eb19f3827c53a1a272bebbe38 /mysql-test/r/subselect.result | |
| parent | 128a2b865afb1e69578d18c81a2703c1630bc253 (diff) | |
| parent | dec83dd2820d0b897c2df289cf65a93d88c72af1 (diff) | |
| download | mariadb-git-c575b15a12a21c83c6726d45d05dd63418867da2.tar.gz | |
Manual merge from mysql-5.1.
Conflicts:
- support-files/mysql.spec.sh
- configure.in
Diffstat (limited to 'mysql-test/r/subselect.result')
0 files changed, 0 insertions, 0 deletions