diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-02-21 17:19:46 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-02-21 17:19:46 +0100 |
| commit | 9eca58895b9c62b5c15fa23cc9aabce43cfed7e9 (patch) | |
| tree | a13bf1f17948964b997cc983ad9dac394a37c6aa /sql/sp_head.cc | |
| parent | c9d8cb49baff94e3647a38e80eb8cab9103592d6 (diff) | |
| parent | 1f12107f00c8a6ce946dccd60e53f0de66736a1e (diff) | |
| download | mariadb-git-9eca58895b9c62b5c15fa23cc9aabce43cfed7e9.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug16878/my50-bug16878
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
sql/sp_head.cc:
Auto merged
mysql-test/r/mysqldump.result:
Merge
mysql-test/t/mysqldump.test:
Merge
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index aff773a32bc..f7572a374f1 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1603,6 +1603,8 @@ sp_head::reset_lex(THD *thd) sublex->trg_table_fields.empty(); sublex->sp_lex_in_use= FALSE; + sublex->in_comment= oldlex->in_comment; + /* Reset type info. */ sublex->charset= NULL; |