diff options
| author | unknown <hf@deer.(none)> | 2004-05-27 16:32:49 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-05-27 16:32:49 +0500 |
| commit | 7f49646cf3be49c0f9a9a9f8599e9bea2223e08a (patch) | |
| tree | 019f859000d45cddee40cd07a8a14076fcfa4c6f /sql/sql_yacc.yy | |
| parent | aa6ff1cf682437d3e083bc25617fdc57d3a149d3 (diff) | |
| parent | 805897cdb81f36b775eb4917f606afdef36c63a8 (diff) | |
| download | mariadb-git-7f49646cf3be49c0f9a9a9f8599e9bea2223e08a.tar.gz | |
Merging
myisam/mi_create.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/rt_test.c:
Auto merged
myisam/sp_test.c:
Auto merged
sql/spatial.cc:
Auto merged
sql/spatial.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
myisam/mi_range.c:
merging
myisam/mi_rnext.c:
merging
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 6b8fb78bd00..6a40dc3c23a 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1312,7 +1312,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; @@ -1630,7 +1629,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 @@ -1664,7 +1662,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 @@ -2676,7 +2673,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; @@ -2688,7 +2684,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; @@ -2700,7 +2695,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; @@ -2712,7 +2706,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; @@ -2809,7 +2802,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 |