summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2010-07-30 17:33:10 -0300
committerDavi Arnaut <davi.arnaut@oracle.com>2010-07-30 17:33:10 -0300
commit9899e690f06e275e8c7b2e39dba96b46701fd949 (patch)
tree1a9767a3084652e439db979604526e25c1ac24f6 /sql/sql_lex.cc
parent655d913bfcda4155a8158fd311bf8dd72f3bee92 (diff)
downloadmariadb-git-9899e690f06e275e8c7b2e39dba96b46701fd949.tar.gz
Bug#45288: pb2 returns a lot of compilation warnings on linux
Fix compiler warnings. mysys/stacktrace.c: Tag unused parameters. sql/sql_lex.cc: Variable becomes unused in non-debug builds. Also, no need to assert the obvious.
Diffstat (limited to 'sql/sql_lex.cc')
-rw-r--r--sql/sql_lex.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 2bff036b1f1..24c51be2512 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -1303,8 +1303,6 @@ int MYSQLlex(void *arg, void *yythd)
}
else
{
- const char* version_mark= lip->get_ptr() - 1;
- DBUG_ASSERT(*version_mark == '!');
/*
Patch and skip the conditional comment to avoid it
being propagated infinitely (eg. to a slave).
@@ -1313,7 +1311,6 @@ int MYSQLlex(void *arg, void *yythd)
comment_closed= ! consume_comment(lip, 1);
if (! comment_closed)
{
- DBUG_ASSERT(pcom == version_mark);
*pcom= '!';
}
/* version allowed to have one level of comment inside. */