database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge bk@192.168.21.1:mysql-5.0-opt

Browse Source 
into  mysql.com:/home/hf/work/mysql-5.0-0mrg
This commit is contained in:
holyfoot/hf@mysql.com/deer.(none)
2006-11-17 10:30:16 +04:00
parent 497ccd6b87 5198354584
commit e95e23b0f3
57 changed files with 1856 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/handler.cc
View File

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