diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-26 11:50:32 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-26 11:50:32 +0200 |
commit | 356c149603285086d964c8a51107be97b981c15c (patch) | |
tree | 932c4199fcd51bcda3052d6fbbfba7877a385330 /sql-common/client.c | |
parent | e9e1890162c2f75e399229f08dd9924d55d9655b (diff) | |
parent | 2e67b9f665875928605880661fc5aa1a15175f53 (diff) | |
download | mariadb-git-356c149603285086d964c8a51107be97b981c15c.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'sql-common/client.c')
-rw-r--r-- | sql-common/client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 95118fa1859..22ebd6dae00 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -2761,7 +2761,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, VIO_LOCALHOST | VIO_BUFFERED_READ); if (!net->vio) { - DBUG_PRINT("error",("Unknow protocol %d ", mysql->options.protocol)); + DBUG_PRINT("error",("Unknown protocol %d ", mysql->options.protocol)); set_mysql_error(mysql, CR_CONN_UNKNOW_PROTOCOL, unknown_sqlstate); closesocket(sock); goto error; @@ -2936,7 +2936,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, DBUG_PRINT("info", ("net->vio: %p", net->vio)); if (!net->vio) { - DBUG_PRINT("error",("Unknow protocol %d ",mysql->options.protocol)); + DBUG_PRINT("error",("Unknown protocol %d ",mysql->options.protocol)); set_mysql_error(mysql, CR_CONN_UNKNOW_PROTOCOL, unknown_sqlstate); goto error; } |