Commit 7b38f1c3 authored by unknown's avatar unknown

Minor whitespace/comment cleanup.

parent 524e2749
...@@ -737,12 +737,10 @@ struct handlerton ...@@ -737,12 +737,10 @@ struct handlerton
cannot invoke code that relies on thread local storage, in particular it cannot invoke code that relies on thread local storage, in particular it
cannot call my_error(). cannot call my_error().
When prepare_ordered() is called, the transaction coordinator has already prepare_ordered() cannot cause a rollback by returning an error, all
decided to commit (not rollback) the transaction. So prepare_ordered() possible errors must be handled in prepare() (the prepare_ordered()
cannot cause a rollback by returning an error, all possible errors must method returns void). In case of some fatal error, a record of the error
be handled in prepare() (the prepare_ordered() method returns void). In must be made internally by the engine and returned from commit() later.
case of some fatal error, a record of the error must be made internally
by the engine and returned from commit() later.
Note that for user-level XA SQL commands, no consistent ordering among Note that for user-level XA SQL commands, no consistent ordering among
prepare_ordered() and commit_ordered() is guaranteed (as that would prepare_ordered() and commit_ordered() is guaranteed (as that would
......
...@@ -330,7 +330,6 @@ class MYSQL_BIN_LOG: public TC_LOG, private MYSQL_LOG ...@@ -330,7 +330,6 @@ class MYSQL_BIN_LOG: public TC_LOG, private MYSQL_LOG
/* LOCK_log and LOCK_index are inited by init_pthread_objects() */ /* LOCK_log and LOCK_index are inited by init_pthread_objects() */
pthread_mutex_t LOCK_index; pthread_mutex_t LOCK_index;
pthread_mutex_t LOCK_prep_xids; pthread_mutex_t LOCK_prep_xids;
pthread_cond_t COND_prep_xids; pthread_cond_t COND_prep_xids;
pthread_cond_t update_cond; pthread_cond_t update_cond;
ulonglong bytes_written; ulonglong bytes_written;
......
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