database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.2_warnings' of https://github.com/kevgs/server into kevgs-10.2_warnings

Browse Source 
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.
This commit is contained in:
Marko Mäkelä
2016-11-25 14:28:31 +02:00
parent d247d64988 780db8e252
commit cc3aba26ff
26 changed files with 28 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_partition.cc
View File

@ -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;
}