diff options
| author | unknown <holyfoot/hf@deer.(none)> | 2006-11-01 16:51:49 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@deer.(none)> | 2006-11-01 16:51:49 +0400 |
| commit | 022da394dc4e0551f9a83663591ab29d85225b59 (patch) | |
| tree | c1d09d1ef971ac38f8624abb5c869029aca572e6 /sql/handler.cc | |
| parent | decb5791a37c727a685a776605cdc00e836e4b57 (diff) | |
| parent | c5453a83a7ab6f99ce0853003748cf61fdc66ddb (diff) | |
| download | mariadb-git-022da394dc4e0551f9a83663591ab29d85225b59.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-opt
into mysql.com:/home/hf/work/21790/my51-21790
mysql-test/t/gis-rtree.test:
Auto merged
sql/handler.cc:
Auto merged
mysql-test/r/gis-rtree.result:
merging
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index ccf1a1ef8d9..70c90b01495 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2115,8 +2115,8 @@ void handler::print_error(int error, myf errflag) break; } case HA_ERR_NULL_IN_SPATIAL: - textno= ER_UNKNOWN_ERROR; - break; + my_error(ER_CANT_CREATE_GEOMETRY_OBJECT, MYF(0)); + DBUG_VOID_RETURN; case HA_ERR_FOUND_DUPP_UNIQUE: textno=ER_DUP_UNIQUE; break; |