summaryrefslogtreecommitdiff
path: root/sql/sql_connect.cc
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2020-07-22 17:57:07 +0300
committerMonty <monty@mariadb.org>2020-07-23 10:54:33 +0300
commitce699df9050cb5c906f9382b57ea1dc928b4e6fd (patch)
tree1c410aa01852584f0965210fc875342af88e840c /sql/sql_connect.cc
parentdbcd3384e0799ee99a966edaff2c0f135ef51a29 (diff)
downloadmariadb-git-ce699df9050cb5c906f9382b57ea1dc928b4e6fd.tar.gz
thd->m_transaction_psi was not properly cleared for new connections
This happend when using XA transactions. I also added some extra asserts to ensure that m_transactions are properly cleared. Other things: - Removed set_time() from THD::init_for_queries() as dispatch_command() is already doing that. - Removed duplicate init_for_queries() from prepare_new_connection_state(). The init_for_queries() functions should only be called once per connection.
Diffstat (limited to 'sql/sql_connect.cc')
-rw-r--r--sql/sql_connect.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
index 420a054a1b2..83f4de1b5df 100644
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
@@ -1279,7 +1279,6 @@ void prepare_new_connection_state(THD* thd)
}
thd->proc_info=0;
- thd->init_for_queries();
}
}