diff options
| author | Alexander Nozdrin <alik@ibmvm> | 2010-08-04 12:18:32 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@ibmvm> | 2010-08-04 12:18:32 +0400 |
| commit | aeeafbb39656fc4678c72b00f958215754b32dc7 (patch) | |
| tree | 512613b578f3b028a4c6b6272b2dc4820676ad8b /sql/sql_lex.cc | |
| parent | efc8a279356bd2afd8d6af341f7cf80860475efd (diff) | |
| parent | 81906cdf3805fe5fcea47fef11945f9adbcef4d8 (diff) | |
| download | mariadb-git-aeeafbb39656fc4678c72b00f958215754b32dc7.tar.gz | |
Auto-merge from mysql-5.5.
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 79d91a461db..424dba78d39 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -41,7 +41,6 @@ sys_var *trg_new_row_fake_var= (sys_var*) 0x01; LEX_STRING constant for null-string to be used in parser and other places. */ const LEX_STRING null_lex_str= {NULL, 0}; -const LEX_STRING empty_lex_str= { (char*) "", 0 }; /** @note The order of the elements of this array must correspond to the order of elements in enum_binlog_stmt_unsafe. @@ -450,6 +449,9 @@ void lex_end(LEX *lex) } reset_dynamic(&lex->plugins); + delete lex->sphead; + lex->sphead= NULL; + DBUG_VOID_RETURN; } |