summaryrefslogtreecommitdiff
path: root/vio
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-04-12 09:26:02 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-04-12 09:26:02 +0300
commitca3bbf4c0c40c784a464485eb660e88949203db9 (patch)
treeabe28da3ea31e1bf14c265441ad458a982801dbc /vio
parentbc75f7ed6d81138f8c2d8d2c800b9cf55bbaff7d (diff)
parentbf70532e3d64011e0d5319317fc938539fc42c28 (diff)
downloadmariadb-git-ca3bbf4c0c40c784a464485eb660e88949203db9.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'vio')
-rw-r--r--vio/viosocket.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c
index f63c76c9c79..002ff274b74 100644
--- a/vio/viosocket.c
+++ b/vio/viosocket.c
@@ -613,7 +613,7 @@ enum enum_vio_type vio_type(Vio* vio)
static const LEX_CSTRING vio_type_names[] =
{
- { STRING_WITH_LEN("Error") }, // cannot happen
+ { STRING_WITH_LEN("") }, // internal threads
{ STRING_WITH_LEN("TCP/IP") },
{ STRING_WITH_LEN("Socket") },
{ STRING_WITH_LEN("Named Pipe") },