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

Merge branch '3.1' into 3.3

Browse Source
This commit is contained in:
Georg Richter
2023-04-25 15:08:28 +02:00
parent 8749251f1b b0ec2101bf
commit dd8962a4b5
6 changed files with 77 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
unittest/libmariadb/connection.c
View File

@@ -617,6 +617,12 @@ int test_conc21(MYSQL *mysql)
int major=0, minor= 0, patch=0;
SKIP_MAXSCALE;
if (strlen(mysql_get_server_info(mysql)) > 63)
{
diag("server name is too long - skip until rpl hack was removed");
return SKIP;
}
rc= mysql_query(mysql, "SELECT @@version");
check_mysql_rc(rc, mysql);
@@ -1199,6 +1205,7 @@ static int test_auth256(MYSQL *my)
if (!my_test_connect(mysql, hostname, "sha256user", "foo", NULL, port, socketname, 0))
{
diag("error: %s", mysql_error(mysql));
diag("host: %s", this_host);
mysql_close(mysql);
return FAIL;
}
@@ -2269,7 +2276,9 @@ static int test_conc632(MYSQL *my __attribute__((unused)))
return FAIL;
}
rc= mysql_query(mysql, "CREATE OR REPLACE PROCEDURE conc632() "
rc= mysql_query(mysql, "DROP PROCEDURE conc632");
rc= mysql_query(mysql, "CREATE PROCEDURE conc632() "
"BEGIN "
" SELECT 1;"
" SELECT 2;"