diff options
| author | unknown <ibabaev@bk-internal.mysql.com> | 2007-06-02 00:57:25 +0200 |
|---|---|---|
| committer | unknown <ibabaev@bk-internal.mysql.com> | 2007-06-02 00:57:25 +0200 |
| commit | 5697c0c10ceeace7e14f47dd6e9c2d2e0552e78b (patch) | |
| tree | 5339c6747631cb919dd972d0b8a25a0958bceba5 /sql/sp_head.cc | |
| parent | 865f294fcfe14bf69a85eb8ba1260b7a4af45d7d (diff) | |
| parent | e21076463c4c1721bfd7150ff2350d634009755a (diff) | |
| download | mariadb-git-5697c0c10ceeace7e14f47dd6e9c2d2e0552e78b.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
mysql-test/t/subselect3.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Manual merge
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index a3c3566926a..a98fe5027c9 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -539,7 +539,7 @@ sp_head::init_strings(THD *thd, LEX *lex) Trim "garbage" at the end. This is sometimes needed with the "/ * ! VERSION... * /" wrapper in dump files. */ - endp= skip_rear_comments((char*) m_body_begin, (char*) endp); + endp= skip_rear_comments(thd->charset(), (char*) m_body_begin, (char*) endp); m_body.length= endp - m_body_begin; m_body.str= strmake_root(root, m_body_begin, m_body.length); |