diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-08-02 14:03:20 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-08-02 14:03:20 +0500 |
| commit | bf13c68e5d44b43de992feac67d487808ae672d4 (patch) | |
| tree | d1f6e590a95d1d1a94f87caa41e2dbbb21fff391 /sql/sql_lex.cc | |
| parent | 859b055076c693d038289d72c29873ed3819007e (diff) | |
| parent | 8e1162f830c3b7a19e8632ffc7e1a94a84e171c5 (diff) | |
| download | mariadb-git-bf13c68e5d44b43de992feac67d487808ae672d4.tar.gz | |
Merge bk@192.168.21.1:mysql-5.0-kt
into mysql.com:/home/hf/work/mysql-5.0.14807
mysql-test/r/gis.result:
Auto merged
mysql-test/t/gis.test:
Auto merged
sql/item_geofunc.h:
Auto merged
Diffstat (limited to 'sql/sql_lex.cc')
0 files changed, 0 insertions, 0 deletions