Bug #29717909 MEMORY LIFETIME OF VARIABLES BETWEEN CHECK AND UPDATE INCORRECTLY MANAGED

Post push fix

1) innodb_buffer_pool_filename variable cannot be set to null in Windows. The behavior
   is not consistent with Linux where there is no check function and it allows it be set
   as NULL. It is better not to allow it to be set as NULL in Linux as well for the following reasons

    (i)  The purpose of the  innodb_buffer_pool_filename is to specify the name of the file
          where the list of tablespace IDs and page IDs produced by innodb_buffer_pool_dump_at_shutdown
          or innodb_buffer_pool_dump_now should go.
    (ii)  When set as NULL in Linux and when we turn on  innodb_buffer_pool_dump_now it creates a file called "(null)"
          which is not correct.
    So as a fix we will not allow innodb_buffer_pool_filename to be set as NULL


2) Doxygen failure in declaring the function name

Reviewed-by: Debarun Banerjee <debarun.banerjee@oracle.com>

Author: Aditya A

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

@@ -28,7 +28,8 @@ drop table user_stopword_1, user_stopword_2;
 select @@innodb_buffer_pool_filename;
 @@innodb_buffer_pool_filename
 ib_buffer_pool
-set global innodb_buffer_pool_filename="hello";
+set @blah='hello';
+set global innodb_buffer_pool_filename = @blah;
 select @@innodb_buffer_pool_filename;
 @@innodb_buffer_pool_filename
 hello
@@ -37,9 +38,7 @@ select @@innodb_buffer_pool_filename;
 @@innodb_buffer_pool_filename
 bye
 set global innodb_buffer_pool_filename=NULL;
-select @@innodb_buffer_pool_filename;
-@@innodb_buffer_pool_filename
-NULL
+ERROR 42000: Variable 'innodb_buffer_pool_filename' can't be set to the value of 'NULL'
 set global innodb_buffer_pool_filename=default;
 select @@innodb_buffer_pool_filename;
 @@innodb_buffer_pool_filename

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

@@ -26,14 +26,16 @@ drop table user_stopword_1, user_stopword_2;
 #Test innodb_buffer_pool_filename (global variable)
 
 select @@innodb_buffer_pool_filename;
-set global innodb_buffer_pool_filename="hello";
+
+set @blah='hello';
+set global innodb_buffer_pool_filename = @blah;
 select @@innodb_buffer_pool_filename;
 
 set global innodb_buffer_pool_filename="bye";
 select @@innodb_buffer_pool_filename;
 
+--error ER_WRONG_VALUE_FOR_VAR
 set global innodb_buffer_pool_filename=NULL;
-select @@innodb_buffer_pool_filename;
 
 set global innodb_buffer_pool_filename=default;
 select @@innodb_buffer_pool_filename;

storage/innobase/handler/ha_innodb.cc

@@ -494,20 +494,21 @@ ib_cb_t innodb_api_cb[] = {
 	(ib_cb_t) ib_trx_read_only
 };
 
-/*************************************************************//**
-Check whether valid argument given to innodb_ft_*_stopword_table.
+/**Check whether valid argument given to innobase_*_stopword_table.
 This function is registered as a callback with MySQL.
+@param[in]	thd		thread handle
+@param[in]	var		pointer to system variable
+@param[out]	save		immediate result for update function
+@param[in]	value		incoming string
 @return 0 for valid stopword table */
 static
 int
 innodb_stopword_table_validate(
 /*===========================*/
-	THD*				thd,	/*!< in: thread handle */
-	struct st_mysql_sys_var*	var,	/*!< in: pointer to system
-						variable */
-	void*				save,	/*!< out: immediate result
-						for update function */
-	struct st_mysql_value*		value);	/*!< in: incoming string */
+	THD*				thd,
+	struct st_mysql_sys_var*	var,
+	void*				save,
+	struct st_mysql_value*		value);
 
 /** Validate passed-in "value" is a valid directory name.
 This function is registered as a callback with MySQL.
@@ -15271,7 +15272,6 @@ innodb_monitor_update(
 	return;
 }
 
-#ifdef __WIN__
 /** Validate if passed-in "value" is a valid value for
 innodb_buffer_pool_filename. On Windows, file names with colon (:)
 are not allowed.
@@ -15297,32 +15297,33 @@ innodb_srv_buf_dump_filename_validate(
 
 	buf_name = value->val_str(value, buff, &len);
 
-	if (buf_name) {
-
-		if (buf_name == buff) {
-			ut_ad(len <= OS_FILE_MAX_PATH);
-			/* Allocate from thd's memroot */
-			buf_name = thd_strmake(thd, buf_name, len);
-		}
-
-		if (is_filename_allowed(buf_name, len, FALSE)){
-			*static_cast<const char**>(save) = buf_name;
-			return(0);
-		} else {
-			push_warning_printf(thd,
-				Sql_condition::WARN_LEVEL_WARN,
-				ER_WRONG_ARGUMENTS,
-				"InnoDB: innodb_buffer_pool_filename "
-				"cannot have colon (:) in the file name.");
+	if (buf_name == NULL) {
+		return(1);
+	}
 
-		}
+	if (buf_name == buff) {
+		ut_ad(len <= OS_FILE_MAX_PATH);
+		/* Allocate from thd's memroot */
+		buf_name = thd_strmake(thd, buf_name, len);
 	}
 
-	return(1);
+#ifdef __WIN__
+	if (is_filename_allowed(buf_name, len, FALSE)){
+		*static_cast<const char**>(save) = buf_name;
+		return(0);
+	} else {
+		push_warning_printf(thd,
+			Sql_condition::WARN_LEVEL_WARN,
+			ER_WRONG_ARGUMENTS,
+			"InnoDB: innodb_buffer_pool_filename "
+			"cannot have colon (:) in the file name.");
+		return(1);
+	}
+#else
+	*static_cast<const char**>(save) = buf_name;
+	return(0);
+#endif
 }
-#else /* __WIN__ */
-# define innodb_srv_buf_dump_filename_validate NULL
-#endif /* __WIN__ */
 
 #ifdef UNIV_DEBUG
 static char* srv_buffer_pool_evict;