diff options
| author | unknown <tsmith@maint1.mysql.com> | 2007-06-21 18:58:31 +0200 |
|---|---|---|
| committer | unknown <tsmith@maint1.mysql.com> | 2007-06-21 18:58:31 +0200 |
| commit | a1c0a4b45d5d60322e8615ae7407e90cfcebb576 (patch) | |
| tree | f2b8dc257630c43d5656c14d2fc4a352f295fc34 /sql/sql_partition.cc | |
| parent | 02faba53a67cb78905148c06917bf00e9140a382 (diff) | |
| parent | 72253445131fa3033243a9b663f4d88af019c547 (diff) | |
| download | mariadb-git-a1c0a4b45d5d60322e8615ae7407e90cfcebb576.tar.gz | |
Merge maint1.mysql.com:/data/localhome/tsmith/bk/51
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
configure.in:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/query_cache.result:
SCCS merged
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 04e7645a8aa..407a0b3dcf2 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -3696,7 +3696,6 @@ bool mysql_unpack_partition(THD *thd, thd->variables.character_set_client= system_charset_info; Lex_input_stream lip(thd, part_buf, part_info_len); - thd->m_lip= &lip; lex_start(thd); /* @@ -3725,7 +3724,7 @@ bool mysql_unpack_partition(THD *thd, lex.part_info->part_state= part_state; lex.part_info->part_state_len= part_state_len; DBUG_PRINT("info", ("Parse: %s", part_buf)); - if (MYSQLparse((void*)thd) || thd->is_fatal_error) + if (parse_sql(thd, &lip)) { thd->free_items(); goto end; |