diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2016-11-25 14:28:31 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2016-11-25 14:28:31 +0200 |
| commit | cc3aba26ffdf2e052a7f9f0a94707e0567833a43 (patch) | |
| tree | 2f5b02044b971b30efb2a07b5fd28b3d302aef35 /sql/sql_partition.cc | |
| parent | d247d64988fb3b5d348e412813593a13f3be91fa (diff) | |
| parent | 780db8e25239e5423cfab50c04c60b79ebc0224b (diff) | |
| download | mariadb-git-cc3aba26ffdf2e052a7f9f0a94707e0567833a43.tar.gz | |
Merge branch '10.2_warnings' of https://github.com/kevgs/server into kevgs-10.2_warnings
Revert the XtraDB changes, because 10.2 does not currently build with XtraDB.
Also omit some changes that need further investigation.
Ensure that all callers of partition_info::get_clone() are passing this!=NULL.
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 324eef09854..a2bc5000ec6 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -6649,7 +6649,8 @@ void handle_alter_part_error(ALTER_PARTITION_PARAM_TYPE *lpt, } } /* Ensure the share is destroyed and reopened. */ - part_info= lpt->part_info->get_clone(thd); + if (part_info) + part_info= part_info->get_clone(thd); close_all_tables_for_name(thd, table->s, HA_EXTRA_NOT_USED, NULL); } else @@ -6667,7 +6668,8 @@ err_exclusive_lock: the table cache. */ mysql_lock_remove(thd, thd->lock, table); - part_info= lpt->part_info->get_clone(thd); + if (part_info) + part_info= part_info->get_clone(thd); close_thread_table(thd, &thd->open_tables); lpt->table_list->table= NULL; } |