diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-08-18 11:48:38 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-08-18 11:48:38 +0400 |
| commit | e28d6ee66a8404dd0f8fe3aaabb9d72544e5d42e (patch) | |
| tree | ca30b82c7f6cd44e80283058f48c8e2d0603e3c5 /sql/sql_lex.cc | |
| parent | 932285774ba4ad10c199953d47fc0f688fd12c10 (diff) | |
| parent | 8c4d4cc3a6f1fd9852e11e16926a5e98cca5ee03 (diff) | |
| download | mariadb-git-e28d6ee66a8404dd0f8fe3aaabb9d72544e5d42e.tar.gz | |
Auto-merge from mysql-5.5.
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 140cdb21eef..57417acdd93 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1439,8 +1439,6 @@ int lex_one_token(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). @@ -1449,7 +1447,6 @@ int lex_one_token(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. */ |