diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-19 15:21:54 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-19 15:22:24 +0000 |
| commit | 0ea45725d85c8426c62f4d6707ae2029b49ceb3d (patch) | |
| tree | 84f30c757525b3dfb153f6bcbd428aff14c333f5 | |
| parent | 852c35f571b1b7454aab5768899e2faee8f941d4 (diff) | |
| download | mariadb-git-0ea45725d85c8426c62f4d6707ae2029b49ceb3d.tar.gz | |
Fix 2 more VS2015 warnings
| -rw-r--r-- | sql/slave.cc | 19 | ||||
| -rw-r--r-- | win/upgrade_wizard/CMakeLists.txt | 2 |
2 files changed, 10 insertions, 11 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 9c6e8ebc200..5534ddb1b49 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2626,7 +2626,6 @@ bool show_master_info(THD *thd, Master_info *mi, bool full) void show_master_info_get_fields(THD *thd, List<Item> *field_list, bool full, size_t gtid_pos_length) { - Master_info *mi; MEM_ROOT *mem_root= thd->mem_root; DBUG_ENTER("show_master_info_get_fields"); @@ -2645,10 +2644,10 @@ void show_master_info_get_fields(THD *thd, List<Item> *field_list, Item_empty_string(thd, "Slave_IO_State", 30), mem_root); field_list->push_back(new (mem_root) - Item_empty_string(thd, "Master_Host", sizeof(mi->host)), + Item_empty_string(thd, "Master_Host", sizeof(Master_info::host)), mem_root); field_list->push_back(new (mem_root) - Item_empty_string(thd, "Master_User", sizeof(mi->user)), + Item_empty_string(thd, "Master_User", sizeof(Master_info::user)), mem_root); field_list->push_back(new (mem_root) Item_return_int(thd, "Master_Port", 7, MYSQL_TYPE_LONG), @@ -2733,23 +2732,23 @@ void show_master_info_get_fields(THD *thd, List<Item> *field_list, mem_root); field_list->push_back(new (mem_root) Item_empty_string(thd, "Master_SSL_CA_File", - sizeof(mi->ssl_ca)), + sizeof(Master_info::ssl_ca)), mem_root); field_list->push_back(new (mem_root) Item_empty_string(thd, "Master_SSL_CA_Path", - sizeof(mi->ssl_capath)), + sizeof(Master_info::ssl_capath)), mem_root); field_list->push_back(new (mem_root) Item_empty_string(thd, "Master_SSL_Cert", - sizeof(mi->ssl_cert)), + sizeof(Master_info::ssl_cert)), mem_root); field_list->push_back(new (mem_root) Item_empty_string(thd, "Master_SSL_Cipher", - sizeof(mi->ssl_cipher)), + sizeof(Master_info::ssl_cipher)), mem_root); field_list->push_back(new (mem_root) Item_empty_string(thd, "Master_SSL_Key", - sizeof(mi->ssl_key)), + sizeof(Master_info::ssl_key)), mem_root); field_list->push_back(new (mem_root) Item_return_int(thd, "Seconds_Behind_Master", 10, @@ -2783,11 +2782,11 @@ void show_master_info_get_fields(THD *thd, List<Item> *field_list, mem_root); field_list->push_back(new (mem_root) Item_empty_string(thd, "Master_SSL_Crl", - sizeof(mi->ssl_crl)), + sizeof(Master_info::ssl_crl)), mem_root); field_list->push_back(new (mem_root) Item_empty_string(thd, "Master_SSL_Crlpath", - sizeof(mi->ssl_crlpath)), + sizeof(Master_info::ssl_crlpath)), mem_root); field_list->push_back(new (mem_root) Item_empty_string(thd, "Using_Gtid", diff --git a/win/upgrade_wizard/CMakeLists.txt b/win/upgrade_wizard/CMakeLists.txt index dc4ef67387d..5f415e4960d 100644 --- a/win/upgrade_wizard/CMakeLists.txt +++ b/win/upgrade_wizard/CMakeLists.txt @@ -24,7 +24,7 @@ ELSE() SET(CMAKE_MFC_FLAG 1) ENDIF() # Enable exception handling (avoids warnings) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc -DNO_WARN_MBCS_MFC_DEPRECATION") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql) MYSQL_ADD_EXECUTABLE(mysql_upgrade_wizard |