diff options
author | unknown <msvensson@neptunus.(none)> | 2006-10-03 20:28:59 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-10-03 20:28:59 +0200 |
commit | 9cd171e2dc8743f96c710039e7348426e9bff045 (patch) | |
tree | cf5c75ae32d43145e6aabe382f84c222a2328a7d /mysql-test/r/ndb_gis.result | |
parent | 1535da6592ed6e0ca63a06c46a123a77b30879b3 (diff) | |
parent | 48759d7ae9522b2dc03d058c33e8b45471263fc3 (diff) | |
download | mariadb-git-9cd171e2dc8743f96c710039e7348426e9bff045.tar.gz |
Merge bk-internal:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'mysql-test/r/ndb_gis.result')
0 files changed, 0 insertions, 0 deletions