summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <monty@mysql.com/narttu.mysql.fi>2007-02-27 20:06:37 +0200
committerunknown <monty@mysql.com/narttu.mysql.fi>2007-02-27 20:06:37 +0200
commitae72e394502e13b854b6e9bb00889fa6b69a7ed9 (patch)
tree389669bfbe051c9f1d67629fc93a60f8b3f279be
parent3956f5911e86bb9610f502832f5103530053e7ec (diff)
downloadmariadb-git-ae72e394502e13b854b6e9bb00889fa6b69a7ed9.tar.gz
Fix (last) compiler warnings
storage/innobase/pars/lexyy.c: Fix compiler warnings (fix is also in pars0lex.l) support-files/compiler_warnings.supp: Extra safety to ensure we really get rid of warning :)
-rw-r--r--storage/innobase/pars/lexyy.c2
-rw-r--r--support-files/compiler_warnings.supp1
2 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/pars/lexyy.c b/storage/innobase/pars/lexyy.c
index 70daf261186..b65de138573 100644
--- a/storage/innobase/pars/lexyy.c
+++ b/storage/innobase/pars/lexyy.c
@@ -1017,7 +1017,7 @@ YY_RULE_SETUP
yylval = sym_tab_add_bound_lit(pars_sym_tab_global,
yytext + 1, &type);
- return(type);
+ return((int) type);
}
YY_BREAK
case 4:
diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp
index f27b196aa1b..babc482976d 100644
--- a/support-files/compiler_warnings.supp
+++ b/support-files/compiler_warnings.supp
@@ -19,6 +19,7 @@ sql_yacc.cc : .*switch statement contains 'default' but no 'case' labels.*
#
pars0grm.tab.c: .*'yyerrorlab' : unreferenced label.*
_flex_tmp.c: .*not enough actual parameters for macro 'yywrap'.*
+pars0lex.l: .*conversion from 'ulint' to 'int', possible loss of data.*
#
# bdb is not critical to keep up to date