diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 17:48:24 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 17:48:24 +0400 |
| commit | f84b3f5c21c62ebe3b489250a09aca0ffde1313c (patch) | |
| tree | bad36a3866fc1f57ed09d6de5a590fa2e12bacfe /sql/sql_partition.cc | |
| parent | 26a034959299cb72d04d92ab330dfb83ef6082a6 (diff) | |
| parent | e5cf56ef80391caca2f06b34fc1de1313196e91f (diff) | |
| download | mariadb-git-f84b3f5c21c62ebe3b489250a09aca0ffde1313c.tar.gz | |
Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
conflicts:
conflict mysys/safemalloc.c
conflict sql/mysqld.cc
conflict sql/sp.cc
conflict sql/sql_lex.cc
conflict sql/sql_lex.h
conflict sql/sql_parse.cc
conflict sql/sql_prepare.cc
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index fa9c698622b..bc9a7d8ee65 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -4199,7 +4199,9 @@ bool mysql_unpack_partition(THD *thd, thd->variables.character_set_client= system_charset_info; - Parser_state parser_state(thd, part_buf, part_info_len); + Parser_state parser_state; + if (parser_state.init(thd, part_buf, part_info_len)) + goto end; if (init_lex_with_single_table(thd, table, &lex)) goto end; |