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 11.4 into 11.7

Browse Source
This commit is contained in:
Marko Mäkelä
2024-12-02 17:51:17 +02:00
parent 4d9548876e 2719cc4925
commit 33907f9ec6
449 changed files with 6775 additions and 4292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/mysql.cc
View File

@@ -3454,6 +3454,9 @@ static int com_charset(String *, char *line)
MYF(MY_UTF8_IS_UTF8MB3 | MY_WME));
if (new_cs)
{
if (new_cs->mbminlen > 1)
return put_info("Character sets with mbminlen>1 are not supported",
INFO_ERROR, 0);
charset_info= new_cs;
mysql_set_character_set(&mysql, charset_info->cs_name.str);
default_charset= (char *)charset_info->cs_name.str;