database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00
Code Activity

Various typo fixes

Browse Source 
Includes fixes from PR-201.
This commit is contained in:
Georg Richter
2022-07-03 13:45:37 +02:00
parent 35826cd51c
commit 5f1f517cfa
12 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/ma_global.h
View File

@@ -226,7 +226,7 @@
#endif #endif
/* #define USE_some_charset 1 was deprecated by changes to configure */ /* #define USE_some_charset 1 was deprecated by changes to configure */
/* my_ctype my_to_upper, my_to_lower, my_sort_order gain theit right value */ /* my_ctype my_to_upper, my_to_lower, my_sort_order gain their right value */
/* automagically during configuration */ /* automagically during configuration */
/* Does the system remember a signal handler after a signal ? */ /* Does the system remember a signal handler after a signal ? */
@@ -578,7 +578,7 @@ typedef long my_ptrdiff_t;
#define STDCALL #define STDCALL
#endif #endif
/* Typdefs for easyier portability */ /* Typedefs for easyier portability */
#if defined(VOIDTYPE) #if defined(VOIDTYPE)
typedef void *gptr; /* Generic pointer */ typedef void *gptr; /* Generic pointer */
@@ -741,7 +741,7 @@ typedef char bool; /* Ordinary boolean values 0 1 */
#endif /* L64 */ #endif /* L64 */
#endif /* _WIN32 */ #endif /* _WIN32 */
/* /*
** Define-funktions for reading and storing in machine independent format ** Define-functions for reading and storing in machine independent format
** (low byte first) ** (low byte first)
*/ */

2
include/ma_sys.h
View File

@@ -209,7 +209,7 @@ extern char *defaults_extra_file;
typedef struct wild_file_pack /* Struct to hold info when selecting files */ typedef struct wild_file_pack /* Struct to hold info when selecting files */
{ {
uint wilds; /* How many wildcards */ uint wilds; /* How many wildcards */
uint not_pos; /* Start of not-theese-files */ uint not_pos; /* Start of not-these-files */
my_string *wild; /* Pointer to wildcards */ my_string *wild; /* Pointer to wildcards */
} WF_PACK; } WF_PACK;

3
include/mariadb_rpl.h
View File

@@ -96,13 +96,14 @@ enum mariadb_rpl_event {
TRANSACTION_CONTEXT_EVENT= 36, TRANSACTION_CONTEXT_EVENT= 36,
VIEW_CHANGE_EVENT= 37, VIEW_CHANGE_EVENT= 37,
XA_PREPARE_LOG_EVENT= 38, XA_PREPARE_LOG_EVENT= 38,
PARTIAL_UPDATE_ROWS_EVENT = 39,
/* /*
Add new events here - right above this comment! Add new events here - right above this comment!
Existing events (except ENUM_END_EVENT) should never change their numbers Existing events (except ENUM_END_EVENT) should never change their numbers
*/ */
/* New MySQL/Sun events are to be added right above this comment */ /* New MySQL events are to be added right above this comment */
MYSQL_EVENTS_END, MYSQL_EVENTS_END,
MARIA_EVENTS_BEGIN= 160, MARIA_EVENTS_BEGIN= 160,

2
include/mysql.h
View File

@@ -859,7 +859,7 @@ struct st_mariadb_methods {
const char *db, unsigned int port, const char *unix_socket, unsigned long clientflag); const char *db, unsigned int port, const char *unix_socket, unsigned long clientflag);
void (*db_close)(MYSQL *mysql); void (*db_close)(MYSQL *mysql);
int (*db_command)(MYSQL *mysql,enum enum_server_command command, const char *arg, int (*db_command)(MYSQL *mysql,enum enum_server_command command, const char *arg,
size_t length, my_bool skipp_check, void *opt_arg); size_t length, my_bool skip_check, void *opt_arg);
void (*db_skip_result)(MYSQL *mysql); void (*db_skip_result)(MYSQL *mysql);
int (*db_read_query_result)(MYSQL *mysql); int (*db_read_query_result)(MYSQL *mysql);
MYSQL_DATA *(*db_read_rows)(MYSQL *mysql,MYSQL_FIELD *fields, unsigned int field_count); MYSQL_DATA *(*db_read_rows)(MYSQL *mysql,MYSQL_FIELD *fields, unsigned int field_count);

12
libmariadb/mariadb_lib.c
View File

@@ -373,7 +373,7 @@ void free_rows(MYSQL_DATA *cur)
int int
mthd_my_send_cmd(MYSQL *mysql,enum enum_server_command command, const char *arg, mthd_my_send_cmd(MYSQL *mysql,enum enum_server_command command, const char *arg,
size_t length, my_bool skipp_check, void *opt_arg) size_t length, my_bool skip_check, void *opt_arg)
{ {
NET *net= &mysql->net; NET *net= &mysql->net;
int result= -1; int result= -1;
@@ -392,7 +392,7 @@ mthd_my_send_cmd(MYSQL *mysql,enum enum_server_command command, const char *arg,
if (IS_CONNHDLR_ACTIVE(mysql)) if (IS_CONNHDLR_ACTIVE(mysql))
{ {
result= mysql->extension->conn_hdlr->plugin->set_connection(mysql, command, arg, length, skipp_check, opt_arg); result= mysql->extension->conn_hdlr->plugin->set_connection(mysql, command, arg, length, skip_check, opt_arg);
if (result== -1) if (result== -1)
return(result); return(result);
} }
@@ -443,9 +443,9 @@ mthd_my_send_cmd(MYSQL *mysql,enum enum_server_command command, const char *arg,
result=0; result=0;
if (net->extension->multi_status > COM_MULTI_OFF) if (net->extension->multi_status > COM_MULTI_OFF)
skipp_check= 1; skip_check= 1;
if (!skipp_check) if (!skip_check)
{ {
result= ((mysql->packet_length=ma_net_safe_read(mysql)) == packet_error ? result= ((mysql->packet_length=ma_net_safe_read(mysql)) == packet_error ?
1 : 0); 1 : 0);
@@ -456,9 +456,9 @@ mthd_my_send_cmd(MYSQL *mysql,enum enum_server_command command, const char *arg,
int int
ma_simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg, ma_simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg,
size_t length, my_bool skipp_check, void *opt_arg) size_t length, my_bool skip_check, void *opt_arg)
{ {
return mysql->methods->db_command(mysql, command, arg, length, skipp_check, opt_arg); return mysql->methods->db_command(mysql, command, arg, length, skip_check, opt_arg);
} }
int ma_multi_command(MYSQL *mysql, enum enum_multi_status status) int ma_multi_command(MYSQL *mysql, enum enum_multi_status status)

2
unittest/libmariadb/CMakeLists.txt
View File

@@ -33,7 +33,7 @@ ENDIF()
SET(API_TESTS ${API_TESTS} "async") SET(API_TESTS ${API_TESTS} "async")
#exclude following tests from ctests, since we need to run them maually with different credentials #exclude following tests from ctests, since we need to run them manually with different credentials
SET(MANUAL_TESTS "t_conc173" "rpl_api") SET(MANUAL_TESTS "t_conc173" "rpl_api")
# Get finger print from server certificate # Get finger print from server certificate
IF(WITH_SSL) IF(WITH_SSL)

4
unittest/libmariadb/cursor.c
View File

@@ -755,7 +755,7 @@ static int test_bug11656(MYSQL *mysql)
return OK; return OK;
} }
/* Cursors: opening a cursor to a compilicated query with ORDER BY */ /* Cursors: opening a cursor to a complicated query with ORDER BY */
static int test_bug11901(MYSQL *mysql) static int test_bug11901(MYSQL *mysql)
{ {
@@ -1700,7 +1700,7 @@ static int test_bug9478(MYSQL *mysql)
return OK; return OK;
} }
/* Crash when opening a cursor to a query with DISTICNT and no key */ /* Crash when opening a cursor to a query with DISTINCT and no key */
static int test_bug9520(MYSQL *mysql) static int test_bug9520(MYSQL *mysql)
{ {

4
unittest/libmariadb/fetch.c
View File

@@ -607,7 +607,7 @@ static int test_fetch_null(MYSQL *mysql)
strcpy((char *)query , "SELECT * FROM test_fetch_null"); strcpy((char *)query , "SELECT * FROM test_fetch_null");
rc= my_stmt_result(mysql, query); rc= my_stmt_result(mysql, query);
FAIL_UNLESS(rc == 3, "Exoected 3 rows"); FAIL_UNLESS(rc == 3, "Expected 3 rows");
stmt = mysql_stmt_init(mysql); stmt = mysql_stmt_init(mysql);
FAIL_IF(!stmt, mysql_error(mysql)); FAIL_IF(!stmt, mysql_error(mysql));
@@ -630,7 +630,7 @@ static int test_fetch_null(MYSQL *mysql)
FAIL_IF(!is_null[i], "Expected is_null"); FAIL_IF(!is_null[i], "Expected is_null");
} }
FAIL_UNLESS(nData == 1000 || nData == 88 || nData == 389789, "Wrong value for nData"); FAIL_UNLESS(nData == 1000 || nData == 88 || nData == 389789, "Wrong value for nData");
FAIL_UNLESS(is_null[i] == 0, "Exoected !is_null"); FAIL_UNLESS(is_null[i] == 0, "Expected !is_null");
FAIL_UNLESS(length[i] == 4, "Expected length=4"); FAIL_UNLESS(length[i] == 4, "Expected length=4");
} }
FAIL_UNLESS(rc == 3, "Expected 3 rows"); FAIL_UNLESS(rc == 3, "Expected 3 rows");

2
unittest/libmariadb/ps.c
View File

@@ -4382,7 +4382,7 @@ static int test_set_option(MYSQL *mysql)
rc= 0; rc= 0;
while (mysql_fetch_row(result)) while (mysql_fetch_row(result))
rc++; rc++;
FAIL_UNLESS(rc == 2, "rowcunt != 2"); FAIL_UNLESS(rc == 2, "rowcount != 2");
mysql_free_result(result); mysql_free_result(result);
stmt= mysql_stmt_init(mysql); stmt= mysql_stmt_init(mysql);

2
unittest/libmariadb/ps_bugs.c
View File

@@ -3262,7 +3262,7 @@ static int test_mem_overun(MYSQL *mysql)
int rc, i, length; int rc, i, length;
/* /*
Test a memory ovverun bug when a table had 1000 fields with Test a memory overrun bug when a table had 1000 fields with
a row of data a row of data
*/ */
rc= mysql_query(mysql, "drop table if exists t_mem_overun"); rc= mysql_query(mysql, "drop table if exists t_mem_overun");

2
unittest/libmariadb/result.c
View File

@@ -1060,7 +1060,7 @@ static int test_conc160(MYSQL *mysql)
result= mysql_store_result(mysql); result= mysql_store_result(mysql);
field= mysql_fetch_field(result); field= mysql_fetch_field(result);
FAIL_UNLESS(field->flags & NUM_FLAG, "Numceric flag not set"); FAIL_UNLESS(field->flags & NUM_FLAG, "Numeric flag not set");
mysql_free_result(result); mysql_free_result(result);
return OK; return OK;

2
unittest/mytap/tap.c
View File

@@ -365,7 +365,7 @@ int exit_status() {
This is to test that the component have the expected behaviour. This is to test that the component have the expected behaviour.
This is just plain simple: test that it works. For example, test This is just plain simple: test that it works. For example, test
that you can unpack what you packed, adding gives the sum, pincing that you can unpack what you packed, adding gives the sum, pinching
the duck makes it quack. the duck makes it quack.
This is what everybody does when they write tests. This is what everybody does when they write tests.