1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove unused THD::query_start_used

Browse Source
This commit is contained in:
Sergei Golubchik 2018-02-26 16:29:59 +01:00
parent 85194bd6ba
commit 09e6280147
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.cc
View File

@ -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; security_ctx= &main_security_ctx;
no_errors= 0; no_errors= 0;
password= 0; password= 0;
query_start_used= query_start_sec_part_used= 0; query_start_sec_part_used= 0;
count_cuted_fields= CHECK_FIELD_IGNORE; count_cuted_fields= CHECK_FIELD_IGNORE;
killed= NOT_KILLED; killed= NOT_KILLED;
killed_err= 0; killed_err= 0;

6
sql/sql_class.h
View File

@ -3116,7 +3116,7 @@ public:
Reset to FALSE when we leave the sub-statement mode. Reset to FALSE when we leave the sub-statement mode.
*/ */
bool is_fatal_sub_stmt_error; 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; bool query_start_sec_part_used;
/* for IS NULL => = last_insert_id() fix in remove_eq_conds() */ /* for IS NULL => = last_insert_id() fix in remove_eq_conds() */
bool substitute_null_with_insert_id; bool substitute_null_with_insert_id;
@ -3429,7 +3429,7 @@ public:
const Type_handler *type_handler_for_date() const; const Type_handler *type_handler_for_date() const;
bool timestamp_to_TIME(MYSQL_TIME *ltime, my_time_t ts, bool timestamp_to_TIME(MYSQL_TIME *ltime, my_time_t ts,
ulong sec_part, ulonglong fuzzydate); 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() inline ulong query_start_sec_part()
{ query_start_sec_part_used=1; return start_time_sec_part; } { query_start_sec_part_used=1; return start_time_sec_part; }
MYSQL_TIME query_start_TIME(); MYSQL_TIME query_start_TIME();
@ -3441,7 +3441,7 @@ public:
} system_time; } system_time;
ulong systime_sec_part() { query_start_sec_part_used=1; return system_time.sec_part; } 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: private:
void set_system_time() void set_system_time()

4
sql/sql_insert.cc
View File

@ -2095,7 +2095,7 @@ public:
ulong start_time_sec_part; ulong start_time_sec_part;
sql_mode_t sql_mode; sql_mode_t sql_mode;
bool auto_increment_field_not_null; 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; bool stmt_depends_on_first_successful_insert_id_in_prev_stmt;
ulonglong first_successful_insert_id_in_prev_stmt; ulonglong first_successful_insert_id_in_prev_stmt;
ulonglong forced_insert_id; ulonglong forced_insert_id;
@ -2706,7 +2706,6 @@ int write_delayed(THD *thd, TABLE *table, enum_duplicates duplic,
goto err; goto err;
memcpy(row->record, table->record[0], table->s->reclength); memcpy(row->record, table->record[0], table->s->reclength);
row->start_time= thd->start_time; 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->start_time_sec_part= thd->start_time_sec_part;
row->query_start_sec_part_used= thd->query_start_sec_part_used; 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); set_delayed_insert_blobs(table);
thd.start_time=row->start_time; 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.start_time_sec_part=row->start_time_sec_part;
thd.query_start_sec_part_used=row->query_start_sec_part_used; thd.query_start_sec_part_used=row->query_start_sec_part_used;
/* /*

1
sql/sql_parse.cc
View File

@ -7578,7 +7578,6 @@ void THD::reset_for_next_command(bool do_clear_error)
global_system_variables.auto_increment_increment; global_system_variables.auto_increment_increment;
} }
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
query_start_used= 0;
query_start_sec_part_used= 0; query_start_sec_part_used= 0;
is_fatal_error= time_zone_used= 0; is_fatal_error= time_zone_used= 0;
log_current_statement= 0; log_current_statement= 0;