Commit 9df615b7 authored by guilhem@mysql.com's avatar guilhem@mysql.com

Tiny optimisation for a (boolean || boolean) test, as SQL_LOG_BIN is set to 1 by default

parent 654410a3
...@@ -111,7 +111,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, ...@@ -111,7 +111,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list,
By default, both logs are enabled (this won't cause problems if the server By default, both logs are enabled (this won't cause problems if the server
runs without --log-update or --log-bin). runs without --log-update or --log-bin).
*/ */
bool log_on= (!(thd->master_access & SUPER_ACL)) || (thd->options & OPTION_BIN_LOG); bool log_on= (thd->options & OPTION_BIN_LOG) || (!(thd->master_access & SUPER_ACL));
bool transactional_table, log_delayed, bulk_insert; bool transactional_table, log_delayed, bulk_insert;
uint value_count; uint value_count;
ulong counter = 1; ulong counter = 1;
......
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