Commit fe27cef2 authored by osku's avatar osku

Forward port r115 from branches/5.0:

Fix bug #16157, a crash when innodb_log_group_home_dir is set to an empty
string. This patch is from Heikki.
parent bd816d37
...@@ -233,6 +233,13 @@ srv_parse_data_file_paths_and_sizes( ...@@ -233,6 +233,13 @@ srv_parse_data_file_paths_and_sizes(
} }
} }
if (i == 0) {
/* If innodb_data_file_path was defined it must contain
at least one data file definition */
return(FALSE);
}
*data_file_names = (char**)ut_malloc(i * sizeof(void*)); *data_file_names = (char**)ut_malloc(i * sizeof(void*));
*data_file_sizes = (ulint*)ut_malloc(i * sizeof(ulint)); *data_file_sizes = (ulint*)ut_malloc(i * sizeof(ulint));
*data_file_is_raw_partition = (ulint*)ut_malloc(i * sizeof(ulint)); *data_file_is_raw_partition = (ulint*)ut_malloc(i * sizeof(ulint));
...@@ -379,6 +386,13 @@ srv_parse_log_group_home_dirs( ...@@ -379,6 +386,13 @@ srv_parse_log_group_home_dirs(
} }
} }
if (i != 1) {
/* If innodb_log_group_home_dir was defined it must
contain exactly one path definition under current MySQL */
return(FALSE);
}
*log_group_home_dirs = (char**) ut_malloc(i * sizeof(void*)); *log_group_home_dirs = (char**) ut_malloc(i * sizeof(void*));
/* Then store the actual values to our array */ /* Then store the actual values to our array */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment