diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_class.cc | 2 | ||||
| -rw-r--r-- | sql/sql_class.h | 6 | ||||
| -rw-r--r-- | sql/sql_insert.cc | 4 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 1 |
4 files changed, 5 insertions, 8 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 2deb879eca7..7b7d34c6bc0 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -803,7 +803,7 @@ THD::THD(my_thread_id id, bool is_wsrep_applier, bool skip_global_sys_var_lock) security_ctx= &main_security_ctx; no_errors= 0; password= 0; - query_start_used= query_start_sec_part_used= 0; + query_start_sec_part_used= 0; count_cuted_fields= CHECK_FIELD_IGNORE; killed= NOT_KILLED; killed_err= 0; diff --git a/sql/sql_class.h b/sql/sql_class.h index 434bc9c1416..2c201b63a4f 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3116,7 +3116,7 @@ public: Reset to FALSE when we leave the sub-statement mode. */ bool is_fatal_sub_stmt_error; - bool query_start_used, rand_used, time_zone_used; + bool rand_used, time_zone_used; bool query_start_sec_part_used; /* for IS NULL => = last_insert_id() fix in remove_eq_conds() */ bool substitute_null_with_insert_id; @@ -3429,7 +3429,7 @@ public: const Type_handler *type_handler_for_date() const; bool timestamp_to_TIME(MYSQL_TIME *ltime, my_time_t ts, ulong sec_part, ulonglong fuzzydate); - inline my_time_t query_start() { query_start_used=1; return start_time; } + inline my_time_t query_start() { return start_time; } inline ulong query_start_sec_part() { query_start_sec_part_used=1; return start_time_sec_part; } MYSQL_TIME query_start_TIME(); @@ -3441,7 +3441,7 @@ public: } system_time; ulong systime_sec_part() { query_start_sec_part_used=1; return system_time.sec_part; } - my_time_t systime() { query_start_used=1; return system_time.sec; } + my_time_t systime() { return system_time.sec; } private: void set_system_time() diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 5a603bf16fe..8f7da0fbdfc 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -2095,7 +2095,7 @@ public: ulong start_time_sec_part; sql_mode_t sql_mode; bool auto_increment_field_not_null; - bool query_start_used, ignore, log_query, query_start_sec_part_used; + bool ignore, log_query, query_start_sec_part_used; bool stmt_depends_on_first_successful_insert_id_in_prev_stmt; ulonglong first_successful_insert_id_in_prev_stmt; ulonglong forced_insert_id; @@ -2706,7 +2706,6 @@ int write_delayed(THD *thd, TABLE *table, enum_duplicates duplic, goto err; memcpy(row->record, table->record[0], table->s->reclength); row->start_time= thd->start_time; - row->query_start_used= thd->query_start_used; row->start_time_sec_part= thd->start_time_sec_part; row->query_start_sec_part_used= thd->query_start_sec_part_used; /* @@ -3294,7 +3293,6 @@ bool Delayed_insert::handle_inserts(void) set_delayed_insert_blobs(table); thd.start_time=row->start_time; - thd.query_start_used=row->query_start_used; thd.start_time_sec_part=row->start_time_sec_part; thd.query_start_sec_part_used=row->query_start_sec_part_used; /* diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index b89d78874f5..a4d2850e19c 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -7578,7 +7578,6 @@ void THD::reset_for_next_command(bool do_clear_error) global_system_variables.auto_increment_increment; } #endif /* WITH_WSREP */ - query_start_used= 0; query_start_sec_part_used= 0; is_fatal_error= time_zone_used= 0; log_current_statement= 0; |