diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-07-29 16:32:11 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-07-29 16:32:11 +0400 |
| commit | 32f3ab7933240277e52f05e39e4d45f19f7ac3d7 (patch) | |
| tree | 16a66be92ba2603896b1b010600df021911be256 /sql/sql_partition.cc | |
| parent | d85c6281802c8f6ef7187518f9f4357d96134b3e (diff) | |
| parent | 6bd182e9f22e02f29e7f14e6dd8bf14eaeee084e (diff) | |
| download | mariadb-git-32f3ab7933240277e52f05e39e4d45f19f7ac3d7.tar.gz | |
Auto-merge from mysql-trunk-merge.
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 2c8b5d67d04..fb880cce8d3 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -1071,7 +1071,6 @@ static bool fix_fields_part_func(THD *thd, Item* func_expr, TABLE *table, partition_info *part_info= table->part_info; bool result= TRUE; int error; - const char *save_where; LEX *old_lex= thd->lex; LEX lex; uint8 saved_full_group_by_flag; @@ -1083,7 +1082,6 @@ static bool fix_fields_part_func(THD *thd, Item* func_expr, TABLE *table, func_expr->walk(&Item::change_context_processor, 0, (uchar*) &lex.select_lex.context); - save_where= thd->where; thd->where= "partition function"; /* In execution we must avoid the use of thd->change_item_tree since @@ -4185,7 +4183,7 @@ void get_partition_set(const TABLE *table, uchar *buf, const uint index, */ bool mysql_unpack_partition(THD *thd, - const char *part_buf, uint part_info_len, + char *part_buf, uint part_info_len, TABLE* table, bool is_create_table_ind, handlerton *default_db_type, bool *work_part_info_used) |