From 494a75c851949091c9822a200a8a148c48c93c67 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Sun, 3 Jul 2022 15:49:41 +0200 Subject: MDEV-28888 : Embedded MariaDB does not build on Windows Add limited support for building embedded library (DLL only). --- libmysqld/CMakeLists.txt | 1 + libmysqld/lib_sql.cc | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'libmysqld') diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index c8e75c897b9..85456f91500 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -148,6 +148,7 @@ ADD_DEPENDENCIES(sql_embedded GenError GenServerSource) IF(TARGET pcre2) ADD_DEPENDENCIES(sql_embedded pcre2) ENDIF() +TARGET_LINK_LIBRARIES(sql_embedded LINK_PRIVATE tpool ${CRC32_LIBRARY}) # On Windows, static embedded server library is called mysqlserver.lib # On Unix, it is libmysqld.a diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index b563d8ea2f4..b37a3d99f4a 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -485,7 +485,7 @@ MYSQL_METHODS embedded_methods= char **copy_arguments(int argc, char **argv) { - uint length= 0; + size_t length= 0; char **from, **res, **end= argv+argc; for (from=argv ; from != end ; from++) @@ -1100,11 +1100,11 @@ bool Protocol_text::store_field_metadata(const THD * thd, client_field->flags= (uint16) server_field.flags; client_field->decimals= server_field.decimals; - client_field->db_length= strlen(client_field->db); - client_field->table_length= strlen(client_field->table); - client_field->name_length= strlen(client_field->name); - client_field->org_name_length= strlen(client_field->org_name); - client_field->org_table_length= strlen(client_field->org_table); + client_field->db_length= (uint)strlen(client_field->db); + client_field->table_length= (uint)strlen(client_field->table); + client_field->name_length= (uint)strlen(client_field->name); + client_field->org_name_length= (uint)strlen(client_field->org_name); + client_field->org_table_length= (uint)strlen(client_field->org_table); client_field->catalog= dup_str_aux(field_alloc, "def", 3, cs, thd_cs); client_field->catalog_length= 3; @@ -1378,12 +1378,12 @@ bool Protocol::net_store_data(const uchar *from, size_t length) if (!(field_buf= (char*) alloc_root(alloc, length + sizeof(uint) + 1))) return TRUE; - *(uint *)field_buf= length; + *(uint *)field_buf= (uint)length; *next_field= field_buf + sizeof(uint); memcpy((uchar*) *next_field, from, length); (*next_field)[length]= 0; if (next_mysql_field->max_length < length) - next_mysql_field->max_length=length; + next_mysql_field->max_length=(ulong)length; ++next_field; ++next_mysql_field; return FALSE; @@ -1393,7 +1393,7 @@ bool Protocol::net_store_data(const uchar *from, size_t length) bool Protocol::net_store_data_cs(const uchar *from, size_t length, CHARSET_INFO *from_cs, CHARSET_INFO *to_cs) { - uint conv_length= to_cs->mbmaxlen * length / from_cs->mbminlen; + size_t conv_length= length * to_cs->mbmaxlen / from_cs->mbminlen; uint dummy_error; char *field_buf; if (!thd->mysql) // bootstrap file handling @@ -1404,10 +1404,10 @@ bool Protocol::net_store_data_cs(const uchar *from, size_t length, *next_field= field_buf + sizeof(uint); length= copy_and_convert(*next_field, conv_length, to_cs, (const char*) from, length, from_cs, &dummy_error); - *(uint *) field_buf= length; + *(uint *) field_buf= (uint)length; (*next_field)[length]= 0; if (next_mysql_field->max_length < length) - next_mysql_field->max_length= length; + next_mysql_field->max_length= (ulong)length; ++next_field; ++next_mysql_field; return false; -- cgit v1.2.1