Bug #19183565 CREATE DYNAMIC INNODB_TMPDIR VARIABLE TO CONTROL

		WHERE INNODB WRITES TEMP FILES
		- Reverting the patch.

Author: Thirunarayanan

include/mysql/plugin.h

@@ -578,23 +578,6 @@ int thd_allow_batch(MYSQL_THD thd);
 */
 int mysql_tmpfile(const char *prefix);
 
-/**
-  Create a temporary file.
-
-  @details
-  The temporary file is created in a location specified by the parameter
-  path. if path is null, then it will be created on the location given
-  by the mysql server configuration (--tmpdir option).  The caller
-  does not need to delete the file, it will be deleted automatically.
-
-  @param path    location for creating temporary file
-  @param prefix  prefix for temporary file name
-  @retval -1    error
-  @retval >= 0  a file handle that can be passed to dup or my_close
-*/
-int mysql_tmpfile_path(const char *path, const char *prefix);
-
-
 /**
   Check the killed state of a connection
 

include/mysql/plugin_audit.h.pp

@@ -235,7 +235,6 @@
 void thd_inc_row_count(void* thd);
 int thd_allow_batch(void* thd);
 int mysql_tmpfile(const char *prefix);
-int mysql_tmpfile_path(const char *path, const char *prefix);
 int thd_killed(const void* thd);
 void thd_binlog_pos(const void* thd,
                     const char **file_var,

include/mysql/plugin_auth.h.pp

@@ -235,7 +235,6 @@
 void thd_inc_row_count(void* thd);
 int thd_allow_batch(void* thd);
 int mysql_tmpfile(const char *prefix);
-int mysql_tmpfile_path(const char *path, const char *prefix);
 int thd_killed(const void* thd);
 void thd_binlog_pos(const void* thd,
                     const char **file_var,

include/mysql/plugin_ftparser.h.pp

@@ -188,7 +188,6 @@
 void thd_inc_row_count(void* thd);
 int thd_allow_batch(void* thd);
 int mysql_tmpfile(const char *prefix);
-int mysql_tmpfile_path(const char *path, const char *prefix);
 int thd_killed(const void* thd);
 void thd_binlog_pos(const void* thd,
                     const char **file_var,

mysql-test/suite/innodb/r/tmpdir.result

@@ -527,16 +527,8 @@ ulong get_max_connections(void)
 
 extern "C" int mysql_tmpfile(const char *prefix)
 {
-  return mysql_tmpfile_path(mysql_tmpdir, prefix);
-}
-
-int mysql_tmpfile_path(const char *path, const char *prefix)
-{
-  DBUG_ASSERT(path != NULL);
-  DBUG_ASSERT((strlen(path) + strlen(prefix)) <= FN_REFLEN);
-
   char filename[FN_REFLEN];
-  File fd = create_temp_file(filename, path, prefix,
+  File fd = create_temp_file(filename, mysql_tmpdir, prefix,
 #ifdef __WIN__
                              O_BINARY | O_TRUNC | O_SEQUENTIAL |
                              O_SHORT_LIVED |
@@ -557,6 +549,7 @@ int mysql_tmpfile_path(const char *path, const char *prefix)
   return fd;
 }
 
+
 extern "C"
 int thd_in_lock_tables(const THD *thd)
 {

mysql-test/suite/innodb/t/tmpdir.test

@@ -983,7 +983,7 @@ dict_init(void)
 		       &dict_operation_lock, SYNC_DICT_OPERATION);
 
 	if (!srv_read_only_mode) {
-		dict_foreign_err_file = os_file_create_tmpfile(NULL);
+		dict_foreign_err_file = os_file_create_tmpfile();
 		ut_a(dict_foreign_err_file);
 
 		mutex_create(dict_foreign_err_mutex_key,