mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Fixed compilations problems and warnings on windows
extra/yassl/include/openssl/ssl.h: Move things up to avoid problems with defines in winsock2 extra/yassl/include/socket_wrapper.hpp: Don't include winsock2.h twice include/config-win.h: Use winsock2.h instead of winsock.h (winsock2.h must be included before windows.h and will automaticly include windows.h) include/mysql.h: Use winsock2.h libmysqld/examples/builder-sample/emb_samples.cpp: Use winsock2.h server-tools/instance-manager/IMService.cpp: Use winsock2.h sql/item_strfunc.cc: Remove duplicate include sql/lex.h: Fixed conflict with external GROUP define sql/net_serv.cc: winsock.h is already included in my_global.h sql/sql_class.cc: Fixed compiler warning on windows sql/sql_table.cc: Fixed compiler warning sql/sql_yacc.yy: Fixed conflict with external GROUP define sql/udf_example.c: Use winsock2 instead of winsock.h win/README: Updated readme
This commit is contained in:
@@ -4597,7 +4597,7 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table,
|
||||
Table_ident *table_ident)
|
||||
{
|
||||
TABLE *tmp_table;
|
||||
char src_path[FN_REFLEN], dst_path[FN_REFLEN], tmp_path[FN_REFLEN];
|
||||
char src_path[FN_REFLEN], dst_path[FN_REFLEN];
|
||||
char src_table_name_buff[FN_REFLEN], src_db_name_buff[FN_REFLEN];
|
||||
uint dst_path_length;
|
||||
char *db= table->db;
|
||||
@@ -4608,7 +4608,9 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table,
|
||||
bool res= TRUE, unlock_dst_table= FALSE;
|
||||
enum legacy_db_type not_used;
|
||||
HA_CREATE_INFO *create_info;
|
||||
|
||||
#ifdef WITH_PARTITION_STORAGE_ENGINE
|
||||
char tmp_path[FN_REFLEN];
|
||||
#endif
|
||||
TABLE_LIST src_tables_list, dst_tables_list;
|
||||
DBUG_ENTER("mysql_create_like_table");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user