diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-24 15:06:06 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-24 15:06:06 +0400 |
| commit | 5b555c36f32be3370709871ba2ae98405d66f320 (patch) | |
| tree | ff73de826d41ff528c7e5ddcc2593445a1ba5c1c /mysql-test/r | |
| parent | 16d1b984684b39b387a75c41247bd7e5eac820ee (diff) | |
| parent | c3b8457ea381ba65917aba51578bd38cb3f8a91f (diff) | |
| download | mariadb-git-5b555c36f32be3370709871ba2ae98405d66f320.tar.gz | |
Merge mysql.com:/home/hf/work/30284/my50-30284
into mysql.com:/home/hf/work/30284/my51-30284
mysql-test/r/gis.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/gis.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'mysql-test/r')
0 files changed, 0 insertions, 0 deletions