diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-04-25 21:38:12 -0600 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-04-25 21:38:12 -0600 |
| commit | 034c11f3cdac8b2b39dd8593d1fbad5b92f98879 (patch) | |
| tree | f8e46975bbaed334eddc4cc2ab0c1b752a7b321d /sql/sql_partition.cc | |
| parent | 5e414cd222b1d39eb49371ba28fb990a963017c5 (diff) | |
| download | mariadb-git-034c11f3cdac8b2b39dd8593d1fbad5b92f98879.tar.gz | |
manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index d445c8bfbe0..47260b945fc 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -3718,7 +3718,11 @@ bool mysql_unpack_partition(THD *thd, thd->lex= &lex; thd->variables.character_set_client= system_charset_info; - lex_start(thd, part_buf, part_info_len); + + Lex_input_stream lip(thd, part_buf, part_info_len); + thd->m_lip= &lip; + + lex_start(thd); /* We need to use the current SELECT_LEX since I need to keep the Name_resolution_context object which is referenced from the |