Bug#17774971 MOVE "THD_MARK_TRANSACTION_FOR_ROLLBACK"

DEFINITION FROM HA_INNODB.H TO PLUGIN.H

A post push fix for bug#16041903 modified ha_ndbcluster.cc to
call THD::mark_transaction_to_rollback instead. The Cluster
team requested that the function should be defined as part of
the API in include/mysql/plugin.h. 

There is a corresponding function in sql/sql_class.cc. The
function is used by InnoDB, and is defined in ha_innodb.h.

Thus, the suggested refactoring is to:

1. Move the definition of thd_mark_transaction_to_rollback
   from ha_innodb.h to plugin.h
2. Change the type of the paramter "all" from bool to int,
   because it is now defined in plugin.h which is compiled
   as both C and C++, and the type "my_bool" is not available
   in plugin.h
3. Change ha_ndbcluster.cc to call the above function.
4. Change ha_innodb.cc to submit int rather than ibool for
   the "all" parameter
5. Change the implemntation in sql_class.cc to test for
   (all != 0) explicitly when calling the THD member
   function

Author: ssorumgard

include/mysql/plugin.h

@@ -564,6 +564,17 @@ char *thd_security_context(MYSQL_THD thd, char *buffer, unsigned int length,
 void thd_inc_row_count(MYSQL_THD thd);
 int thd_allow_batch(MYSQL_THD thd);
 
+
+/**
+  Mark transaction to rollback and mark error as fatal to a
+  sub-statement if in sub statement mode.
+
+  @param thd  user thread connection handle
+  @param all  if all != 0, rollback the main transaction
+*/
+
+void thd_mark_transaction_to_rollback(MYSQL_THD thd, int all);
+
 /**
   Create a temporary file.
 

include/mysql/plugin_audit.h.pp

@@ -265,6 +265,7 @@
                            unsigned int max_query_len);
 void thd_inc_row_count(void* thd);
 int thd_allow_batch(void* thd);
+void thd_mark_transaction_to_rollback(void* thd, int all);
 int mysql_tmpfile(const char *prefix);
 int thd_killed(const void* thd);
 void thd_binlog_pos(const void* thd,

include/mysql/plugin_auth.h.pp

@@ -265,6 +265,7 @@
                            unsigned int max_query_len);
 void thd_inc_row_count(void* thd);
 int thd_allow_batch(void* thd);
+void thd_mark_transaction_to_rollback(void* thd, int all);
 int mysql_tmpfile(const char *prefix);
 int thd_killed(const void* thd);
 void thd_binlog_pos(const void* thd,

include/mysql/plugin_ftparser.h.pp

@@ -217,6 +217,7 @@
                            unsigned int max_query_len);
 void thd_inc_row_count(void* thd);
 int thd_allow_batch(void* thd);
+void thd_mark_transaction_to_rollback(void* thd, int all);
 int mysql_tmpfile(const char *prefix);
 int thd_killed(const void* thd);
 void thd_binlog_pos(const void* thd,

sql/ha_ndbcluster.cc

@@ -8393,7 +8393,7 @@ static int ndbcluster_rollback(handlerton *hton, THD *thd, bool all)
       of the transaction
     */
     DBUG_PRINT("info", ("Rollback before start or end-of-statement only"));
-    thd->mark_transaction_to_rollback(1);
+    thd_mark_transaction_to_rollback(thd, 1);
     my_error(ER_WARN_ENGINE_TRANSACTION_ROLLBACK, MYF(0), "NDB");
     DBUG_RETURN(0);
   }

sql/sql_class.cc

@@ -4000,10 +4000,17 @@ extern "C" int thd_binlog_format(const MYSQL_THD thd)
     return BINLOG_FORMAT_UNSPEC;
 }
 
-extern "C" void thd_mark_transaction_to_rollback(MYSQL_THD thd, bool all)
+extern "C" void thd_mark_transaction_to_rollback(MYSQL_THD thd, int all)
 {
   DBUG_ASSERT(thd);
-  thd->mark_transaction_to_rollback(all);
+  /*
+    The parameter "all" has type int since the function is defined
+    in plugin.h. The corresponding parameter in the call below has
+    type bool. The comment in plugin.h states that "all != 0"
+    means to rollback the main transaction. Thus, check this
+    specifically.
+  */
+  thd->mark_transaction_to_rollback((all != 0));
 }
 
 extern "C" bool thd_binlog_filter_ok(const MYSQL_THD thd)

storage/innobase/handler/ha_innodb.cc

@@ -1376,7 +1376,7 @@ convert_error_code_to_mysql(
 		cached binlog for this transaction */
 
 		if (thd) {
-			thd_mark_transaction_to_rollback(thd, true);
+			thd_mark_transaction_to_rollback(thd, 1);
 		}
 
 		return(HA_ERR_LOCK_DEADLOCK);
@@ -1388,7 +1388,7 @@ convert_error_code_to_mysql(
 
 		if (thd) {
 			thd_mark_transaction_to_rollback(
-				thd, (bool) row_rollback_on_timeout);
+				thd, (int) row_rollback_on_timeout);
 		}
 
 		return(HA_ERR_LOCK_WAIT_TIMEOUT);
@@ -1463,7 +1463,7 @@ convert_error_code_to_mysql(
 		cached binlog for this transaction */
 
 		if (thd) {
-			thd_mark_transaction_to_rollback(thd, true);
+			thd_mark_transaction_to_rollback(thd, 1);
 		}
 
 		return(HA_ERR_LOCK_TABLE_FULL);
@@ -10236,7 +10236,7 @@ ha_innobase::records()
 	case DB_DEADLOCK:
 	case DB_LOCK_TABLE_FULL:
 	case DB_LOCK_WAIT_TIMEOUT:
-		thd_mark_transaction_to_rollback(user_thd, true);
+		thd_mark_transaction_to_rollback(user_thd, 1);
 		DBUG_RETURN(HA_POS_ERROR);
 	case DB_INTERRUPTED:
 		my_error(ER_QUERY_INTERRUPTED, MYF(0));

storage/innobase/handler/ha_innodb.h

@@ -394,11 +394,6 @@ int thd_non_transactional_update(const MYSQL_THD thd);
 @return Value to be used as index into the binlog_format_names array */
 int thd_binlog_format(const MYSQL_THD thd);
 
-/** Mark transaction to rollback and mark error as fatal to a sub-statement.
-@param thd Thread handle
-@param all TRUE <=> rollback main transaction. */
-void thd_mark_transaction_to_rollback(MYSQL_THD thd, bool all);
-
 /** Check if binary logging is filtered for thread's current db.
 @param thd Thread handle
 @retval 1 the query is not filtered, 0 otherwise. */