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

Merge branch '3.3' into 3.4

Browse Source
This commit is contained in:
Georg Richter
2024-12-21 08:10:04 +01:00
parent 0d2d49eb26 30bd00796e
commit 4039e5c18c
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmariadb/ma_stmt_codec.c
View File

@@ -993,7 +993,7 @@ static void convert_from_double(MYSQL_BIND *r_param, const MYSQL_FIELD *field, d
if (field->length < length || field->length > MAX_DOUBLE_STRING_REP_LENGTH - 1) if (field->length < length || field->length > MAX_DOUBLE_STRING_REP_LENGTH - 1)
break; break;
ma_bmove_upp(buff + field->length, buff + length, length); ma_bmove_upp(buff + field->length, buff + length, length);
/* coverity [bad_memset] */ /* coverity[bad_memset] */
memset((void*) buff, (int) '0', field->length - length); memset((void*) buff, (int) '0', field->length - length);
length= field->length; length= field->length;
} }

5
libmariadb/mariadb_lib.c
View File

@@ -914,10 +914,7 @@ static int parse_connection_string(MYSQL *mysql, const char *unused __attribute_
pos += 2; pos += 2;
continue; continue;
} }
if (in_curly_brace) in_curly_brace= 0;
in_curly_brace= 0;
else
goto error;
*pos++= 0; *pos++= 0;
continue; continue;
} }

2
travis.sh
View File

@@ -51,7 +51,7 @@ if [ -n "$server_branch" ] ; then
make -j9 make -j9
cd mysql-test/ cd mysql-test/
./mysql-test-run.pl --suite=main ${TEST_OPTION} --parallel=auto --skip-test=session_tracker_last_gtid ./mysql-test-run.pl --suite=main,unit ${TEST_OPTION} --parallel=auto --skip-test=session_tracker_last_gtid
else else

4
unittest/libmariadb/connection.c
View File

@@ -2433,8 +2433,8 @@ static int test_conc748(MYSQL *my __attribute__((unused)))
mysql_ssl_set(mysql, NULL, NULL, NULL, NULL, NULL); mysql_ssl_set(mysql, NULL, NULL, NULL, NULL, NULL);
mysql_optionsv(mysql, MYSQL_OPT_SSL_CIPHER, ciphers[i]); mysql_optionsv(mysql, MYSQL_OPT_SSL_CIPHER, ciphers[i]);
if (!my_test_connect(mysql, hostname, NULL, if (!my_test_connect(mysql, hostname, username,
NULL, schema, port, socketname, 0, 0)) password, schema, port, socketname, 0))
{ {
diag("error: %s", mysql_error(mysql)); diag("error: %s", mysql_error(mysql));
return FAIL; return FAIL;