diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-03-06 19:53:31 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-03-06 19:53:31 +0200 |
| commit | b707a1ab6b3e1c1fed2570f91da0e22715542493 (patch) | |
| tree | 2b4665ab89a9c440f5e2f451d1d745df1c15288d /sql/sql_yacc.yy | |
| parent | a5deff2bc90a17f4c3c19937b08660a78a085060 (diff) | |
| parent | d6998363afc004fd92248af521ed40fa52027954 (diff) | |
| download | mariadb-git-b707a1ab6b3e1c1fed2570f91da0e22715542493.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-all-build-steps:
Auto merged
Build-tools/Do-compile:
Auto merged
Build-tools/Do-rpm:
Auto merged
Docs/manual.texi:
Auto merged
include/hash.h:
Auto merged
include/my_sys.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/type_date.test:
Auto merged
mysys/array.c:
Auto merged
mysys/hash.c:
Auto merged
mysys/mf_qsort.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
scripts/mysqlhotcopy.sh:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql-bench/server-cfg.sh:
Auto merged
strings/Makefile.am:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index b12dd07777f..f01c2892edc 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -32,7 +32,7 @@ extern void yyerror(const char*); int yylex(void *yylval); -#define yyoverflow(A,B,C,D,E,F) if (my_yyoverflow((B),(D),(F))) { yyerror((char*) (A)); return 2; } +#define yyoverflow(A,B,C,D,E,F) if (my_yyoverflow((B),(D),(int*) (F))) { yyerror((char*) (A)); return 2; } inline Item *or_or_concat(Item* A, Item* B) { |