database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2022-12-13 14:39:18 +02:00
parent da5d349935 fdf43b5c78
commit 1dc2f35598
179 changed files with 1890 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_connect.cc
View File

@ -1270,7 +1270,8 @@ void prepare_new_connection_state(THD* thd)
and the main Diagnostics Area contains an error condition.
*/
if (packet_length != packet_error)
my_error(ER_NEW_ABORTING_CONNECTION, MYF(0),
my_error(ER_NEW_ABORTING_CONNECTION,
(thd->db.str || sctx->user) ? MYF(0) : MYF(ME_WARNING),
thd->thread_id,
thd->db.str ? thd->db.str : "unconnected",
sctx->user ? sctx->user : "unauthenticated",