From f37545521b112444c5468fb37e00970c192000af Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 23 Jan 2006 23:20:23 -0600 Subject: bug #14354 - data directory and index directory not working for partitions mysql-test/r/partition_mgm_err.result: only the single drop table since we have disabled query logging for the create table mysql-test/t/partition_mgm_err.test: test for bug #14354 first make sure /tmp/bug14354 is not there, then make the dir create a partitioned table with the partition using /tmp/bug14354 as it's data dir we are disabling query logging since we are using $MYSQL_TEST_DIR and we are not certain where the tmp files will be created. sql/ha_partition.cc: pass partition filename with pathname into set_up_table_before_create. remove the path from the passed in value and then append the filename to the data_file_name or index_file_name if those values were specified. sql/ha_partition.h: added partition_name_with_path to set_up_table_before_create sql/mysql_priv.h: move append_file_to_dir to mysql_priv.h sql/sql_parse.cc: moving append_file_to_dir to mysql_priv.h sql/sql_partition.cc: add_keyword_string was not writing keyword value with quotes --- sql/sql_parse.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'sql/sql_parse.cc') diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index ecde4d01ae1..95b0ebdeead 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -68,8 +68,6 @@ static bool check_db_used(THD *thd,TABLE_LIST *tables); static bool check_multi_update_lock(THD *thd); static void remove_escape(char *name); static void refresh_status(THD *thd); -static bool append_file_to_dir(THD *thd, const char **filename_ptr, - const char *table_name); const char *any_db="*any*"; // Special symbol for check_access @@ -6733,8 +6731,8 @@ static void refresh_status(THD *thd) /* If pointer is not a null pointer, append filename to it */ -static bool append_file_to_dir(THD *thd, const char **filename_ptr, - const char *table_name) +bool append_file_to_dir(THD *thd, const char **filename_ptr, + const char *table_name) { char buff[FN_REFLEN],*ptr, *end; if (!*filename_ptr) -- cgit v1.2.1