database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge mysql.com:/home/hf/work/21790/my50-21790

Browse Source 
into  mysql.com:/home/hf/work/21790/my51-21790


mysql-test/r/gis-rtree.result:
  Auto merged
sql/handler.cc:
  Auto merged
This commit is contained in:
unknown
2006-11-01 16:44:00 +04:00
parent d0ab146b7e b8ab82a629
commit c5453a83a7
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/handler.cc
View File

@@ -2092,8 +2092,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;