summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
diff options
context:
space:
mode:
authorunknown <hf@deer.(none)>2004-03-12 18:51:03 +0400
committerunknown <hf@deer.(none)>2004-03-12 18:51:03 +0400
commit3bf2e442abf45f2a61f44f2b499b5a54eb116ac1 (patch)
tree416c45416bcc8605ff5754473476ddabbd22fe2f /sql/sql_yacc.yy
parent54042aa975b8ef37bf379942bb134f040246cf86 (diff)
downloadmariadb-git-3bf2e442abf45f2a61f44f2b499b5a54eb116ac1.tar.gz
WL#1163 To make spatial code optional
myisam spatial code isolated myisam/mi_create.c: spatial code ifdef-ed myisam/mi_key.c: spatial code ifdef-ed myisam/mi_open.c: spatial code ifdef-ed myisam/mi_range.c: spatial code ifdef-ed myisam/mi_rkey.c: spatial code ifdef-ed myisam/mi_rnext.c: spatial code ifdef-ed myisam/mi_rnext_same.c: spatial code ifdef-ed myisam/rt_index.c: spatial code ifdef-ed myisam/rt_index.h: spatial code ifdef-ed myisam/rt_key.c: spatial code ifdef-ed myisam/rt_key.h: spatial code ifdef-ed myisam/rt_mbr.c: spatial code ifdef-ed myisam/rt_mbr.h: spatial code ifdef-ed myisam/rt_split.c: spatial code ifdef-ed myisam/rt_test.c: spatial code ifdef-ed myisam/sp_defs.h: spatial code ifdef-ed myisam/sp_key.c: spatial code ifdef-ed myisam/sp_test.c: spatial code ifdef-ed sql/spatial.cc: spatial code ifdef-ed sql/spatial.h: spatial code ifdef-ed sql/sql_yacc.yy: wrong error messages fixed
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r--sql/sql_yacc.yy8
1 files changed, 0 insertions, 8 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index f317219bd38..2b960423526 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1303,7 +1303,6 @@ type:
$$=FIELD_TYPE_GEOMETRY;
#else
net_printf(Lex->thd, ER_FEATURE_DISABLED,
- ER(ER_FEATURE_DISABLED),
sym_group_geom.name,
sym_group_geom.needed_define);
YYABORT;
@@ -1595,7 +1594,6 @@ key_type:
$$= Key::SPATIAL;
#else
net_printf(Lex->thd, ER_FEATURE_DISABLED,
- ER(ER_FEATURE_DISABLED),
sym_group_geom.name, sym_group_geom.needed_define);
YYABORT;
#endif
@@ -1629,7 +1627,6 @@ opt_unique_or_fulltext:
$$= Key::SPATIAL;
#else
net_printf(Lex->thd, ER_FEATURE_DISABLED,
- ER(ER_FEATURE_DISABLED),
sym_group_geom.name, sym_group_geom.needed_define);
YYABORT;
#endif
@@ -2582,7 +2579,6 @@ simple_expr:
if (!$1.symbol->create_func)
{
net_printf(Lex->thd, ER_FEATURE_DISABLED,
- ER(ER_FEATURE_DISABLED),
$1.symbol->group->name,
$1.symbol->group->needed_define);
YYABORT;
@@ -2594,7 +2590,6 @@ simple_expr:
if (!$1.symbol->create_func)
{
net_printf(Lex->thd, ER_FEATURE_DISABLED,
- ER(ER_FEATURE_DISABLED),
$1.symbol->group->name,
$1.symbol->group->needed_define);
YYABORT;
@@ -2606,7 +2601,6 @@ simple_expr:
if (!$1.symbol->create_func)
{
net_printf(Lex->thd, ER_FEATURE_DISABLED,
- ER(ER_FEATURE_DISABLED),
$1.symbol->group->name,
$1.symbol->group->needed_define);
YYABORT;
@@ -2618,7 +2612,6 @@ simple_expr:
if (!$1.symbol->create_func)
{
net_printf(Lex->thd, ER_FEATURE_DISABLED,
- ER(ER_FEATURE_DISABLED),
$1.symbol->group->name,
$1.symbol->group->needed_define);
YYABORT;
@@ -2713,7 +2706,6 @@ simple_expr:
$$= $1;
#else
net_printf(Lex->thd, ER_FEATURE_DISABLED,
- ER(ER_FEATURE_DISABLED),
sym_group_geom.name, sym_group_geom.needed_define);
YYABORT;
#endif