summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorunknown <holyfoot@mysql.com>2006-05-03 16:42:39 +0500
committerunknown <holyfoot@mysql.com>2006-05-03 16:42:39 +0500
commit83c8e2c910a9f07c473aaa2d254f0571d574aa89 (patch)
treec59d637e1d3d7b81ff0e680ba83046ad4f19773e /sql/share
parent0a9c02f106239afcdb6da40d9ddfb3cec1d42049 (diff)
parentf01b0ac2212a8e8c4192842ddba123198353c591 (diff)
downloadmariadb-git-83c8e2c910a9f07c473aaa2d254f0571d574aa89.tar.gz
merging
sql/handler.h: Auto merged sql/sql_table.cc: Auto merged
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 7665a7425cd..2892c5c8b01 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5617,3 +5617,5 @@ ER_VIEW_RECURSIVE
eng "`%-.64s`.`%-.64s` contains view recursion"
ER_NON_GROUPING_FIELD_USED 42000
eng "non-grouping field '%-.64s' is used in %-.64s clause"
+ER_TABLE_CANT_HANDLE_SPKEYS
+ eng "The used table type doesn't support SPATIAL indexes"