diff options
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index d6196d8edbe..92e0796da76 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -5556,7 +5556,7 @@ void THD::set_query_and_id(char *query_arg, uint32 query_length_arg, query_id= new_query_id; #ifdef WITH_WSREP set_wsrep_next_trx_id(query_id); - WSREP_DEBUG("assigned new next query and trx id: %lu", wsrep_next_trx_id()); + WSREP_DEBUG("assigned new next query and trx id: %" PRIu64, wsrep_next_trx_id()); #endif /* WITH_WSREP */ } @@ -6158,16 +6158,18 @@ int THD::decide_logging_format(TABLE_LIST *tables) replicated_tables_count++; - if (table->lock_type <= TL_READ_NO_INSERT && - table->prelocking_placeholder != TABLE_LIST::PRELOCK_FK) - has_read_tables= true; - else if (table->table->found_next_number_field && - (table->lock_type >= TL_WRITE_ALLOW_WRITE)) + if (table->prelocking_placeholder != TABLE_LIST::PRELOCK_FK) { - has_auto_increment_write_tables= true; - has_auto_increment_write_tables_not_first= found_first_not_own_table; - if (table->table->s->next_number_keypart != 0) - has_write_table_auto_increment_not_first_in_pk= true; + if (table->lock_type <= TL_READ_NO_INSERT) + has_read_tables= true; + else if (table->table->found_next_number_field && + (table->lock_type >= TL_WRITE_ALLOW_WRITE)) + { + has_auto_increment_write_tables= true; + has_auto_increment_write_tables_not_first= found_first_not_own_table; + if (table->table->s->next_number_keypart != 0) + has_write_table_auto_increment_not_first_in_pk= true; + } } if (table->lock_type >= TL_WRITE_ALLOW_WRITE) |