diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 11:45:00 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 11:45:00 +0300 |
commit | 4930f9c94bb610f4d76b73a8b6b351d9fa9c5d68 (patch) | |
tree | ed6b2754116233ca8a39515c7ba06e09b2a8cdc8 /sql/sql_class.cc | |
parent | 502b769561760f35d2b612ab984906c8a4bb9b51 (diff) | |
parent | d104fe6f734df2aebe24b3e5e3dbc189a5302920 (diff) | |
download | mariadb-git-4930f9c94bb610f4d76b73a8b6b351d9fa9c5d68.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index c7ad6ff90ad..9c1d1560955 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -822,7 +822,7 @@ THD::THD(my_thread_id id, bool is_wsrep_applier) net.reading_or_writing= 0; client_capabilities= 0; // minimalistic client system_thread= NON_SYSTEM_THREAD; - cleanup_done= free_connection_done= abort_on_warning= 0; + cleanup_done= free_connection_done= abort_on_warning= got_warning= 0; peer_port= 0; // For SHOW PROCESSLIST transaction= &default_transaction; transaction->m_pending_rows_event= 0; |