diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c index 6feffbeb..6e1ee05c 100644 --- a/libmariadb/mariadb_lib.c +++ b/libmariadb/mariadb_lib.c @@ -1484,7 +1484,7 @@ MYSQL *mthd_my_real_connect(MYSQL *mysql, const char *host, const char *user, { my_set_error(mysql, CR_SERVER_LOST, SQLSTATE_UNKNOWN, ER(CR_SERVER_LOST_EXTENDED), - "handshake: waiting for inital communication packet", + "handshake: waiting for initial communication packet", errno); goto error; } @@ -1494,7 +1494,7 @@ MYSQL *mthd_my_real_connect(MYSQL *mysql, const char *host, const char *user, if (mysql->net.last_errno == CR_SERVER_LOST) my_set_error(mysql, CR_SERVER_LOST, SQLSTATE_UNKNOWN, ER(CR_SERVER_LOST_EXTENDED), - "handshake: reading inital communication packet", + "handshake: reading initial communication packet", errno); goto error; diff --git a/plugins/auth/caching_sha2_pw.c b/plugins/auth/caching_sha2_pw.c index 3b3d866c..ff681201 100644 --- a/plugins/auth/caching_sha2_pw.c +++ b/plugins/auth/caching_sha2_pw.c @@ -314,7 +314,7 @@ static int auth_caching_sha2_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql) { #if defined(HAVE_GNUTLS) mysql->methods->set_error(mysql, CR_AUTH_PLUGIN_ERR, "HY000", - "RSA Encrytion not supported - caching_sha2_password plugin was built with GnuTLS support"); + "RSA Encryption not supported - caching_sha2_password plugin was built with GnuTLS support"); return CR_ERROR; #else /* read public key file (if specified) */ diff --git a/unittest/libmariadb/ps.c b/unittest/libmariadb/ps.c index a0e04057..423cd4a8 100644 --- a/unittest/libmariadb/ps.c +++ b/unittest/libmariadb/ps.c @@ -2543,7 +2543,7 @@ static int test_pure_coverage(MYSQL *mysql) FAIL_IF(!rc, "Error expected"); mysql_stmt_close(stmt); - /* Query without params and result should allow to bind 0 arrays */ + /* Query without params and result should allow one to bind 0 arrays */ stmt= mysql_stmt_init(mysql); FAIL_IF(!stmt, mysql_error(mysql)); rc= mysql_stmt_prepare(stmt, SL("insert into test_pure(c2) values(10)"));