Commit d9ff256f authored by michael's avatar michael

branches/zip: rb://53

Final version of rb://53, fixes the styling of a comment, makes
the definition and the declaration of thd_supports_xa() identical commentwise.
parent f1030783
...@@ -608,7 +608,8 @@ thd_is_select( ...@@ -608,7 +608,8 @@ thd_is_select(
} }
/********************************************************************** /**********************************************************************
Returns true if the thread has XA support. */ Returns true if the thread supports XA,
global value of innodb_supports_xa if thd is NULL. */
extern "C" UNIV_INTERN extern "C" UNIV_INTERN
ibool ibool
thd_supports_xa( thd_supports_xa(
......
...@@ -214,7 +214,8 @@ ibool ...@@ -214,7 +214,8 @@ ibool
thd_supports_xa( thd_supports_xa(
/*============*/ /*============*/
/* out: true if thd supports XA */ /* out: true if thd supports XA */
void* thd); /* in: thread handle (THD*) */ void* thd); /* in: thread handle (THD*), or NULL to query
the global innodb_supports_xa */
/********************************************************************** /**********************************************************************
Returns true if the thread is executing in innodb_strict_mode. */ Returns true if the thread is executing in innodb_strict_mode. */
......
...@@ -699,8 +699,7 @@ trx_start( ...@@ -699,8 +699,7 @@ trx_start(
from thd so any changes in the value take effect in the next from thd so any changes in the value take effect in the next
transaction. This is to avoid a scenario where some undo transaction. This is to avoid a scenario where some undo
generated by a transaction, has XA stuff, and other undo, generated by a transaction, has XA stuff, and other undo,
generated by the same transaction, doesn't generated by the same transaction, doesn't. */
*/
trx->support_xa = thd_supports_xa(trx->mysql_thd); trx->support_xa = thd_supports_xa(trx->mysql_thd);
mutex_enter(&kernel_mutex); mutex_enter(&kernel_mutex);
......
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