diff options
| author | unknown <hf@deer.(none)> | 2004-12-10 16:06:49 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-12-10 16:06:49 +0400 |
| commit | 95056a0b657b6d4f3a9106e4f21dfdf348da3690 (patch) | |
| tree | fac5d0ecf6bba7008a8028e86bee3f9cee4960a1 /myisam/rt_index.c | |
| parent | 7a60d1558a89df5f198884d360a14bf2b48f2c49 (diff) | |
| download | mariadb-git-95056a0b657b6d4f3a9106e4f21dfdf348da3690.tar.gz | |
Fix for bug #6516 (Server crash loading spatial data)
(after discussion with SerG)
include/my_base.h:
Handler error code added
myisam/mi_write.c:
New error code handled
myisam/rt_index.c:
check for zero length added
myisam/sp_key.c:
zero length check added
mysql-test/r/gis-rtree.result:
appropriate test result
mysql-test/t/gis-rtree.test:
test case
sql/handler.cc:
new error code handling added
Diffstat (limited to 'myisam/rt_index.c')
| -rw-r--r-- | myisam/rt_index.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/myisam/rt_index.c b/myisam/rt_index.c index cfb2ca877f4..bdf5ee9c60f 100644 --- a/myisam/rt_index.c +++ b/myisam/rt_index.c @@ -710,7 +710,8 @@ err1: int rtree_insert(MI_INFO *info, uint keynr, uchar *key, uint key_length) { - return (rtree_insert_level(info, keynr, key, key_length, -1) == -1) ? -1 : 0; + return (!key_length || + (rtree_insert_level(info, keynr, key, key_length, -1) == -1)) ? -1 : 0; } |