database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-04-21 11:45:00 +03:00
parent 502b769561 d104fe6f73
commit 4930f9c94b
187 changed files with 2121 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/mysql_client_test.c
View File

@@ -1,5 +1,5 @@
/* Copyright (c) 2002, 2014, Oracle and/or its affiliates.
Copyright (c) 2008, 2020, MariaDB
Copyright (c) 2008, 2021, MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -14328,8 +14328,8 @@ static void test_client_character_set()
DIE_UNLESS(rc == 0);
mysql_get_character_set_info(mysql, &cs);
DIE_UNLESS(!strcmp(cs.csname, "utf8"));
DIE_UNLESS(!strcmp(cs.name, "utf8_general_ci"));
DIE_UNLESS(!strcmp(cs.csname, "utf8mb3"));
DIE_UNLESS(!strcmp(cs.name, "utf8mb3_general_ci"));
/* Restore the default character set */
rc= mysql_set_character_set(mysql, csdefault);
myquery(rc);
@@ -17110,7 +17110,7 @@ static void test_bug30472()
/* Check that we have UTF8 on the server and on the client. */
DIE_UNLESS(strcmp(character_set_name_4, "utf8") == 0);
DIE_UNLESS(strcmp(character_set_name_4, "utf8mb3") == 0);
DIE_UNLESS(strcmp(character_set_client_4, "utf8") == 0);
DIE_UNLESS(strcmp(character_set_results_4, "utf8") == 0);
DIE_UNLESS(strcmp(collation_connnection_4, "utf8_general_ci") == 0);