1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#45288: pb2 returns a lot of compilation warnings on linux

Browse Source 
Fix compiler warnings.
This commit is contained in:
Davi Arnaut 2010-07-30 17:33:10 -03:00
parent 70928da9a6
commit e260cc3ff2
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysys/stacktrace.c
View File

@ -86,7 +86,9 @@ void my_print_stacktrace(uchar* stack_bottom __attribute__((unused)),
#if BACKTRACE_DEMANGLE #if BACKTRACE_DEMANGLE
char __attribute__ ((weak)) *my_demangle(const char *mangled_name, int *status) char __attribute__ ((weak)) *
my_demangle(const char *mangled_name __attribute__((unused)),
int *status __attribute__((unused)))
{ {
return NULL; return NULL;
} }

3
sql/sql_lex.cc
View File

@ -1303,8 +1303,6 @@ int MYSQLlex(void *arg, void *yythd)
} }
else else
{ {
const char* version_mark= lip->get_ptr() - 1;
DBUG_ASSERT(*version_mark == '!');
/* /*
Patch and skip the conditional comment to avoid it Patch and skip the conditional comment to avoid it
being propagated infinitely (eg. to a slave). being propagated infinitely (eg. to a slave).
@ -1313,7 +1311,6 @@ int MYSQLlex(void *arg, void *yythd)
comment_closed= ! consume_comment(lip, 1); comment_closed= ! consume_comment(lip, 1);
if (! comment_closed) if (! comment_closed)
{ {
DBUG_ASSERT(pcom == version_mark);
*pcom= '!'; *pcom= '!';
} }
/* version allowed to have one level of comment inside. */ /* version allowed to have one level of comment inside. */