diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-08-02 21:26:16 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-08-02 21:26:16 +0200 |
commit | 1c6ad62a269a3a03d8a343e1412876e04e9e9c37 (patch) | |
tree | 1e837eb728452ebaf749b5f9eedc018404798ed6 /sql/sql_yacc.yy | |
parent | 14200dfa43756a0f9cb50c0b5d47d99b4fb1b6fa (diff) | |
parent | e9b2f5bf15281583b38a56b12f9ae2420c46a6d1 (diff) | |
download | mariadb-git-1c6ad62a269a3a03d8a343e1412876e04e9e9c37.tar.gz |
mysql-5.5.39 merge
~40% bugfixed(*) applied
~40$ bugfixed reverted (incorrect or we're not buggy)
~20% bugfixed applied, despite us being not buggy
(*) only changes in the server code, e.g. not cmakefiles
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r-- | sql/sql_yacc.yy | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 0a116b41308..47bd3994fd3 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -72,7 +72,7 @@ int yylex(void *yylval, void *yythd); ulong val= *(F); \ if (my_yyoverflow((B), (D), &val)) \ { \ - yyerror(current_thd, (char*) (A)); \ + yyerror(thd, (char*) (A)); \ return 2; \ } \ else \ @@ -5764,7 +5764,8 @@ spatial_type: | GEOMETRYCOLLECTION { $$= Field::GEOM_GEOMETRYCOLLECTION; } | POINT_SYM { - Lex->length= (char*)"25"; + Lex->length= const_cast<char*>(STRINGIFY_ARG + (MAX_LEN_GEOM_POINT_FIELD)); $$= Field::GEOM_POINT; } | MULTIPOINT { $$= Field::GEOM_MULTIPOINT; } |