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 remote-tracking branch 'origin/3.3' into 3.4-serg

Browse Source
This commit is contained in:
Sergei Golubchik
2024-05-13 16:00:45 +02:00
parent 11168e8798 cba62ec2be
commit def5dee9d5
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libmariadb/ma_errmsg.c
View File

@@ -120,6 +120,7 @@ const char *mariadb_client_errors[] =
/* 5023 */ "Semi sync request error: %s",
/* 5024 */ "Invalid client flags (%lu) specified. Supported flags: %lu",
/* 5025 */ "Statement has no result set",
""
};
const char ** NEAR my_errmsg[MAXMAPS]={0,0,0,0};

9
unittest/libmariadb/charset.c
View File

@@ -794,6 +794,10 @@ static int test_conc223(MYSQL *mysql)
MYSQL_ROW row;
int found= 0;
int mdev27266= 0;
int unsupported[]= {
579, /* utf8mb3_general1400_as_ci added in 11.5 */
611, /* utf8mb4_general1400_as_ci added in 11.5 */
0};
SKIP_MYSQL(mysql);
@@ -839,8 +843,11 @@ static int test_conc223(MYSQL *mysql)
id= atoi(row[0]);
if (!mariadb_get_charset_by_nr(id))
{
diag("%04d %s %s", id, row[1], row[2]);
int j=0;
found++;
for (j=0; unsupported[j]; j++)
if (unsupported[j] == id)
found--;
}
}
}