diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-07-03 11:27:53 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-07-03 12:17:00 +0300 |
| commit | cf2789bf0b8ddd6bbe4c90bbfe9a70492a3b4fb4 (patch) | |
| tree | 05fc04fcf5ab353288a366d7a302f48d75f38bd6 | |
| parent | 92f1837a27f4b78a3e6c74ca33c3052211069af5 (diff) | |
| download | mariadb-git-cf2789bf0b8ddd6bbe4c90bbfe9a70492a3b4fb4.tar.gz | |
ha_innobase::write_row(): Test the cheaper condition first
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 14b1cb477f4..e4684719ff3 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -8496,15 +8496,15 @@ ha_innobase::write_row( || sql_command == SQLCOM_OPTIMIZE || sql_command == SQLCOM_CREATE_INDEX #ifdef WITH_WSREP - || (wsrep_on(m_user_thd) && wsrep_load_data_splitting && - sql_command == SQLCOM_LOAD && - !thd_test_options( - m_user_thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)) + || (sql_command == SQLCOM_LOAD + && wsrep_load_data_splitting && wsrep_on(m_user_thd) + && !thd_test_options( + m_user_thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)) #endif /* WITH_WSREP */ || sql_command == SQLCOM_DROP_INDEX) && m_num_write_row >= 10000) { #ifdef WITH_WSREP - if (wsrep_on(m_user_thd) && sql_command == SQLCOM_LOAD) { + if (sql_command == SQLCOM_LOAD && wsrep_on(m_user_thd)) { WSREP_DEBUG("forced trx split for LOAD: %s", wsrep_thd_query(m_user_thd)); } |