diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 11:37:33 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 11:37:33 +0200 |
| commit | fdf43b5c78c4aeb26efdbef3172746e007ab6f1d (patch) | |
| tree | 7497fd0a024da01b2ade9c45e484a9d004a3f13b /sql/sql_connect.cc | |
| parent | 382e85fe70cfffb6c7190c627647c19aed3912a5 (diff) | |
| parent | 8f30973234de520d95dfccca8409e5802b845331 (diff) | |
| download | mariadb-git-fdf43b5c78c4aeb26efdbef3172746e007ab6f1d.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_connect.cc')
| -rw-r--r-- | sql/sql_connect.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index 0df727ba00c..0346e70a588 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -1278,7 +1278,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", |