database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-01 06:27:04 +03:00
Code Activity

Fix miscellaneous typos

Browse Source
This commit is contained in:
Vasilii Lakhin
2025-07-13 18:42:30 +03:00
parent c58dce932a
commit 40be423f08
23 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/ma_context.h
View File

@ -301,7 +301,7 @@ struct mysql_async_context {
void (*suspend_resume_hook)(my_bool suspend, void *user_data);
void *suspend_resume_hook_user_data;
/* If non-NULL, this is a poitner to the result of getaddrinfo() currently
/* If non-NULL, this is a pointer to the result of getaddrinfo() currently
* under traversal in pvio_socket_connect(). It gets reset to NULL when a
* connection has been established to a server. The main objective is to
* free this memory resource in mysql_close() while an initiated connection

6
include/ma_global.h
View File

@ -290,8 +290,8 @@ typedef unsigned short ushort;
/* From old s-system.h */
/*
Support macros for non ansi & other old compilers. Since such
things are no longer supported we do nothing. We keep then since
Support macros for non-ansi & other old compilers. Since such
things are no longer supported we do nothing. We keep them since
some of our code may still be needed to upgrade old customers.
*/
#define _VARARGS(X) X
@ -394,7 +394,7 @@ typedef SOCKET_SIZE_TYPE size_socket;
#define FN_EXTCHAR '.'
#define FN_HOMELIB '~' /* ~/ is used as abbrev for home dir */
#define FN_CURLIB '.' /* ./ is used as abbrev for current dir */
#define FN_PARENTDIR ".." /* Parentdirectory; Must be a string */
#define FN_PARENTDIR ".." /* Parent directory; Must be a string */
#define FN_DEVCHAR ':'
#ifndef FN_LIBCHAR

2
include/ma_pvio.h
View File

@ -9,7 +9,7 @@
#endif
/* CONC-492: Allow to build plugins outside of MariaDB Connector/C
source tree wnen ma_global.h was not included. */
source tree when ma_global.h was not included. */
#if !defined(_global_h) && !defined(MY_GLOBAL_INCLUDED)
typedef unsigned char uchar;
#endif

2
include/mariadb_com.h
View File

@ -170,7 +170,7 @@ enum enum_server_command
#define CLIENT_SSL_VERIFY_SERVER_CERT_OBSOLETE CLIENT_SSL_VERIFY_SERVER_CERT
#define CLIENT_REMEMBER_OPTIONS (1UL << 31)
/* MariaDB specific capabilities */
/* MariaDB-specific capabilities */
#define MARIADB_CLIENT_FLAGS 0xFFFFFFFF00000000ULL
#define MARIADB_CLIENT_PROGRESS (1ULL << 32)
#define MARIADB_CLIENT_RESERVED_1 (1ULL << 33) /* Former COM_MULTI, don't use */

2
include/mysql.h
View File

@ -225,7 +225,7 @@ extern const char *SQLSTATE_UNKNOWN;
MYSQL_OPT_TLS_VERSION,
MYSQL_OPT_ZSTD_COMPRESSION_LEVEL,
/* MariaDB specific */
/* MariaDB-specific */
MYSQL_PROGRESS_CALLBACK=5999,
MYSQL_OPT_NONBLOCK,
/* MariaDB Connector/C specific */

4
libmariadb/ma_charset.c
View File

@ -1212,7 +1212,7 @@ size_t mysql_cset_escape_slashes(const MARIADB_CHARSET_INFO * cset, char *newstr
escape_overflow = TRUE;
break;
}
/* copy non escaped character */
/* copy non-escaped character */
*newstr++ = *escapestr;
}
}
@ -1394,7 +1394,7 @@ struct st_madb_os_charset MADB_OS_CHARSET[]=
{"57011", "ISCII Punjabi", NULL, NULL, MADB_CS_UNSUPPORTED},
{"65000", "utf-7 Unicode (UTF-7)", NULL, NULL, MADB_CS_UNSUPPORTED},
{"65001", "utf-8 Unicode (UTF-8)", "utf8", NULL, MADB_CS_EXACT},
/* non Windows */
/* non-Windows */
#else
/* iconv encodings */
{"ASCII", "US-ASCII", "ascii", "ASCII", MADB_CS_APPROX},

2
libmariadb/ma_client_plugin.c.in
View File

@ -302,7 +302,7 @@ int mysql_client_plugin_init()
/**
Deinitializes the client plugin layer.
Unloades all client plugins and frees any associated resources.
Unloads all client plugins and frees any associated resources.
*/
void mysql_client_plugin_deinit()

2
libmariadb/ma_decimal.c
View File

@ -19,7 +19,7 @@
/*
=======================================================================
NOTE: this library implements SQL standard "exact numeric" type
and is not at all generic, but rather intentinally crippled to
and is not at all generic, but rather intentionally crippled to
follow the standard :)
=======================================================================
Quoting the standard

2
libmariadb/ma_dtoa.c
View File

@ -597,7 +597,7 @@ typedef struct Bigint
} Bigint;
/* A simple stack-memory based allocator for Bigints */
/* A simple stack-memory-based allocator for Bigints */
typedef struct Stack_alloc
{

2
libmariadb/ma_io.c
View File

@ -56,7 +56,7 @@ MA_FILE *ma_open(const char *location, const char *mode, MYSQL *mysql)
}
}
#ifdef _WIN32
/* See CONC-44: we need to support non ascii filenames too, so we convert
/* See CONC-44: we need to support non-ascii filenames too, so we convert
current character set to wchar_t and try to open the file via _wsopen */
else
{

4
libmariadb/ma_net.c
View File

@ -362,7 +362,7 @@ int ma_net_real_write(NET *net, const char *packet, size_t len)
}
/*****************************************************************************
** Read something from server/clinet
** Read something from server/client
*****************************************************************************/
static ulong ma_real_read(NET *net, size_t *complen)
{
@ -381,7 +381,7 @@ static ulong ma_real_read(NET *net, size_t *complen)
{
while (remain > 0)
{
/* First read is done with non blocking mode */
/* First read is done with non-blocking mode */
if ((length=ma_pvio_cache_read(net->pvio, pos,remain)) <= 0L)
{
len= packet_error;

6
libmariadb/mariadb_lib.c
View File

@ -325,7 +325,7 @@ static int cli_report_progress(MYSQL *mysql, uchar *packet, uint length)
return 0;
}
/* Get the length of next field. Change parameter to point at fieldstart */
/* Get the length of next field. Change parameter to point at field start */
ulong
net_field_length(uchar **packet)
{
@ -1917,7 +1917,7 @@ restart:
mysql->server_capabilities|= (unsigned int)(uint2korr(end + 5)) << 16;
pkt_scramble_len= uint1korr(end + 7);
/* check if MariaD2B specific capabilities are available */
/* check if MariaDB-specific capabilities are available */
if (mariadb_connection(mysql) && !(mysql->server_capabilities & CLIENT_MYSQL))
{
mysql->extension->mariadb_server_capabilities= (ulonglong) uint4korr(end + 14);
@ -3004,7 +3004,7 @@ mysql_store_result(MYSQL *mysql)
/**************************************************************************
** Alloc struct for use with unbuffered reads. Data is fetched by domand
** Alloc struct for use with unbuffered reads. Data is fetched by demand
** when calling to mysql_fetch_row.
** mysql_data_seek is a noop.
**

8
libmariadb/mariadb_rpl.c
View File

@ -964,7 +964,7 @@ static uint8_t mariadb_rpl_send_semisync_ack(MARIADB_RPL* rpl, MARIADB_RPL_EVENT
}
if (!event->is_semi_sync || (event->semi_sync_flags != SEMI_SYNC_ACK_REQ))
{
rpl_set_error(rpl, CR_BINLOG_SEMI_SYNC_ERROR, 0, "This event doesn't require to send semi synchronous acknoledgement");
rpl_set_error(rpl, CR_BINLOG_SEMI_SYNC_ERROR, 0, "This event doesn't require to send semi synchronous acknowledgement");
return 1;
}
@ -1109,7 +1109,7 @@ MARIADB_RPL_EVENT * STDCALL mariadb_rpl_fetch(MARIADB_RPL *rpl, MARIADB_RPL_EVEN
RPL_CHECK_POS(ev, ev_end, 1);
rpl_event->ok= *ev++;
/* CONC-470: add support for semi snychronous replication */
/* CONC-470: add support for semi synchronous replication */
if (rpl->is_semi_sync && (rpl_event->is_semi_sync= (*ev == SEMI_SYNC_INDICATOR)))
{
RPL_CHECK_POS(ev, ev_end, 1);
@ -1299,7 +1299,7 @@ MARIADB_RPL_EVENT * STDCALL mariadb_rpl_fetch(MARIADB_RPL *rpl, MARIADB_RPL_EVEN
ev+= 4;
rpl->fd_header_len= rpl_event->event.format_description.header_len= *ev;
ev+= 1;
/*Post header lengths: 1 byte for each event, non used events/gaps in enum should
/*Post header lengths: 1 byte for each event, non-used events/gaps in enum should
have a zero value */
len= ev_end - ev - 5;
rpl_set_string_and_len(&rpl_event->event.format_description.post_header_lengths, ev, len);
@ -1765,7 +1765,7 @@ MARIADB_RPL_EVENT * STDCALL mariadb_rpl_fetch(MARIADB_RPL *rpl, MARIADB_RPL_EVEN
WRITE/UPDATE/DELETE_ROWS_EVENT_COMPRESSED_V1 (MariaDB only)
WRITE/UPDATE/DELETE_ROWS_EVENT (MySQL only)
ROWS events are written for row based replicatoin if data is
ROWS events are written for row-based replication if data is
inserted, deleted or updated.
Header

2
libmariadb/secure/ma_schannel.c
View File

@ -295,7 +295,7 @@ SECURITY_STATUS ma_schannel_client_handshake(MARIADB_TLS *ctls)
pvio= ctls->pvio;
sctx= (SC_CTX *)ctls->ssl;
/* Initialie securifty context */
/* Initialize security context */
BuffersOut.BufferType= SECBUFFER_TOKEN;
BuffersOut.cbBuffer= 0;
BuffersOut.pvBuffer= NULL;

2
libmariadb/secure/openssl.c
View File

@ -471,7 +471,7 @@ my_bool ma_tls_connect(MARIADB_TLS *ctls)
mysql= (MYSQL *)SSL_get_app_data(ssl);
pvio= mysql->net.pvio;
/* Set socket to non blocking if not already set */
/* Set socket to non-blocking if not already set */
if (!(blocking= pvio->methods->is_blocking(pvio)))
pvio->methods->blocking(pvio, FALSE, 0);

2
libmariadb/secure/schannel.c
View File

@ -410,7 +410,7 @@ typedef struct _MA_SCHANNEL_CREDENTIALS {
Take care of specific TLS versions and cipher suites.
This function choses between the legacy and new credential structures
This function chooses between the legacy and new credential structures
(SCHANNEL_CRED rsp SCH_CREDENTIALS) based on the OS version and the
requested cipher suite.

2
plugins/auth/auth_gssapi_client.c
View File

@ -110,7 +110,7 @@ struct st_mysql_client_plugin_AUTHENTICATION _mysql_client_plugin_declaration_ =
MYSQL_CLIENT_AUTHENTICATION_PLUGIN_INTERFACE_VERSION,
"auth_gssapi_client",
"Shuang Qiu, Robbie Harwood, Vladislav Vaintroub, Georg Richter",
"GSSAPI/SSPI based authentication",
"GSSAPI/SSPI-based authentication",
{0, 1, 0},
"BSD",
NULL,

2
plugins/auth/caching_sha2_pw.c
View File

@ -62,7 +62,7 @@
#define CACHED_LOGIN_SUCCEEDED 3
#define RSA_LOGIN_REQUIRED 4
/* MySQL server allows requesting public key only for non secure connections.
/* MySQL server allows requesting public key only for non-secure connections.
secure connections are:
- TLS/SSL connections
- unix_socket connections

6
plugins/pvio/pvio_socket.c
View File

@ -359,7 +359,7 @@ ssize_t pvio_socket_async_read(MARIADB_PVIO *pvio, uchar *buffer, size_t length)
r= recv(csock->socket,(void *)buffer, length, read_flags);
#else
/* Windows doesn't support MSG_DONTWAIT, so we need to set
socket to non blocking */
socket to non-blocking */
pvio_socket_blocking(pvio, 0, 0);
r= recv(csock->socket, (char *)buffer, (int)length, 0);
#endif
@ -435,7 +435,7 @@ ssize_t pvio_socket_async_write(MARIADB_PVIO *pvio, const uchar *buffer, size_t
r= ma_send(csock->socket, buffer, length, write_flags);
#else
/* Windows doesn't support MSG_DONTWAIT, so we need to set
socket to non blocking */
socket to non-blocking */
pvio_socket_blocking(pvio, 0, 0);
r= send(csock->socket, (const char *)buffer, (int)length, 0);
#endif
@ -638,7 +638,7 @@ static int pvio_socket_internal_connect(MARIADB_PVIO *pvio,
csock= (struct st_pvio_socket *)pvio->data;
timeout= pvio->timeout[PVIO_CONNECT_TIMEOUT];
/* set non blocking */
/* set non-blocking */
pvio_socket_blocking(pvio, 0, 0);
#ifndef _WIN32

4
unittest/libmariadb/my_test.h
View File

@ -143,7 +143,7 @@ do {\
do {\
if (!mariadb_connection(mysql))\
{\
diag("Skip test for non MariaDB server");\
diag("Skip test for non-MariaDB server");\
return OK;\
}\
} while(0)
@ -423,7 +423,7 @@ my_bool query_int_variable(MYSQL *con, const char *var_name, int *var_value)
(const char *) var_name);
FAIL_IF(mysql_query(con, query_buffer), "Query failed");
FAIL_UNLESS(rs= mysql_store_result(con), "Invaliid result set");
FAIL_UNLESS(rs= mysql_store_result(con), "Invalid result set");
FAIL_UNLESS(row= mysql_fetch_row(rs), "Nothing to fetch");
is_null= row[0] == NULL;

2
unittest/libmariadb/ps.c
View File

@ -4030,7 +4030,7 @@ static int test_rename(MYSQL *mysql)
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
FAIL_IF(!rc, "Errr expected");
FAIL_IF(!rc, "Error expected");
rc= mysql_query(mysql, "rename table t2 to t1, t4 to t3");
check_mysql_rc(rc, mysql);

10
unittest/libmariadb/ps_bugs.c
View File

@ -2343,7 +2343,7 @@ static int test_bug4030(MYSQL *mysql)
rc= mysql_stmt_fetch(stmt);
FAIL_UNLESS(rc == 0, "rc != 0");
FAIL_UNLESS(memcmp(&time_canonical, &time_out, sizeof(time_out)) == 0, "time_canonical != time_out");
FAIL_UNLESS(memcmp(&date_canonical, &date_out, sizeof(date_out)) == 0, "date_canoncical != date_out");
FAIL_UNLESS(memcmp(&date_canonical, &date_out, sizeof(date_out)) == 0, "date_canonical != date_out");
FAIL_UNLESS(memcmp(&datetime_canonical, &datetime_out, sizeof(datetime_out)) == 0, "datetime_canonical != datetime_out");
mysql_stmt_close(stmt);
return OK;
@ -4030,7 +4030,7 @@ static int test_conc154(MYSQL *mysql)
mysql_stmt_close(stmt);
/* 3rd: non empty result without free_result */
/* 3rd: non-empty result without free_result */
rc= mysql_query(mysql, "INSERT INTO t1 VALUES ('test_conc154')");
check_mysql_rc(rc, mysql);
@ -4052,7 +4052,7 @@ static int test_conc154(MYSQL *mysql)
mysql_stmt_close(stmt);
/* 4th non empty result set with free_result */
/* 4th non-empty result set with free_result */
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, SL(stmtstr));
check_stmt_rc(rc, stmt);
@ -5369,7 +5369,7 @@ static int test_conc525(MYSQL *mysql)
fclose(fp);
/* Test: prepare and execute
should fail due to non existing file */
should fail due to non-existing file */
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, SL("LOAD DATA LOCAL INFILE './test.notexist' INTO table t1"));
@ -5943,7 +5943,7 @@ static int test_conc762(MYSQL *mysql)
mysql_stmt_fetch(stmt);
FAIL_IF(is_null[0]==0, "Expected NULL value");
FAIL_IF(is_null[1]==1, "Expected non NULL value");
FAIL_IF(is_null[1]==1, "Expected non-NULL value");
FAIL_IF(length[0]!=0, "Expected length=0");
FAIL_IF(length[1]!=3, "Expected length=3");

2
unittest/mytap/tap.c
View File

@ -457,7 +457,7 @@ int exit_status() {
If you don't call the @c plan() function, the number of tests
executed will be printed at the end. This is intended to be used
while developing the unit and you are constantly adding tests. It
is not indented to be used after the unit has been released.
is not intended to be used after the unit has been released.
@subsection TestRunning Execute the test