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.11 into 11.4

Browse Source
This commit is contained in:
Marko Mäkelä
2024-12-02 11:35:34 +02:00
parent 866a8ea673 3d23adb766
commit 2719cc4925
420 changed files with 6452 additions and 4162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql-common/client.c
View File

@@ -3938,12 +3938,13 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg)
/**
A function to return the key from a connection attribute
*/
uchar *
get_attr_key(LEX_STRING *part, size_t *length,
const uchar *
get_attr_key(const void *part_, size_t *length,
my_bool not_used __attribute__((unused)))
{
const LEX_STRING *part= part_;
*length= part[0].length;
return (uchar *) part[0].str;
return (const uchar *) part[0].str;
}
int STDCALL
@@ -3992,7 +3993,7 @@ mysql_options4(MYSQL *mysql,enum mysql_option option,
{
if (my_hash_init(key_memory_mysql_options,
&mysql->options.extension->connection_attributes,
&my_charset_bin, 0, 0, 0, (my_hash_get_key)
&my_charset_bin, 0, 0, 0,
get_attr_key, my_free, HASH_UNIQUE))
{
set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);