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

Merge 10.6 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2024-11-29 13:43:17 +02:00
parent 27c7e73f9a 7d4077cc11
commit 3d23adb766
397 changed files with 6215 additions and 4216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/mysql.cc
View File

@@ -3442,6 +3442,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;