mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Windows warnings and tests for -DPLUGIN_PERFSCHEMA=NO

Browse source
This commit is contained in:
Vladislav Vaintroub 2021-09-05 20:22:39 +02:00
parent ae85835cc7
commit 12c3d1e1d7
5 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mysql-test/main/mysql_install_db_win.result
View file

@ -26,12 +26,6 @@ tmpdir=BASEDIR/temp
innodb_data_file_path=ibdata1:10M;ibdata2:10M:autoextend innodb_data_file_path=ibdata1:10M;ibdata2:10M:autoextend
innodb_log_group_home_dir=BASEDIR/data innodb_log_group_home_dir=BASEDIR/data
skip-name-resolve skip-name-resolve
#*********************************************************
# performance_schema
#*********************************************************
performance_schema=OFF
[client] [client]
port=3307 port=3307
# restart # restart

1
mysql-test/main/mysql_upgrade_noengine.test
View file

@ -1,6 +1,7 @@
# #
# MDEV-11942 BLACKHOLE is no longer active in 10.1 by default, mysql_upgrade not handling the situation # MDEV-11942 BLACKHOLE is no longer active in 10.1 by default, mysql_upgrade not handling the situation
# #
source include/mysql_upgrade_preparation.inc;
source include/have_innodb.inc; source include/have_innodb.inc;
source include/not_embedded.inc; source include/not_embedded.inc;

6
mysql-test/std_data/mysql_install_db_win.ini
View file

@ -10,9 +10,3 @@ tmpdir=BASEDIR/temp
innodb_data_file_path=ibdata1:10M;ibdata2:10M:autoextend innodb_data_file_path=ibdata1:10M;ibdata2:10M:autoextend
innodb_log_group_home_dir=BASEDIR/data innodb_log_group_home_dir=BASEDIR/data
skip-name-resolve skip-name-resolve
#*********************************************************
# performance_schema
#*********************************************************
performance_schema=OFF

4
sql/mdl.cc
View file

@ -2336,11 +2336,13 @@ MDL_context::acquire_lock(MDL_request *mdl_request, double lock_wait_timeout)
mysql_prlock_unlock(&lock->m_rwlock); mysql_prlock_unlock(&lock->m_rwlock);
#ifdef HAVE_PSI_INTERFACE
PSI_metadata_locker_state state __attribute__((unused)); PSI_metadata_locker_state state __attribute__((unused));
PSI_metadata_locker *locker= NULL; PSI_metadata_locker *locker= NULL;
if (ticket->m_psi != NULL) if (ticket->m_psi != NULL)
locker= PSI_CALL_start_metadata_wait(&state, ticket->m_psi, __FILE__, __LINE__); locker= PSI_CALL_start_metadata_wait(&state, ticket->m_psi, __FILE__, __LINE__);
#endif
will_wait_for(ticket); will_wait_for(ticket);
@ -2387,8 +2389,10 @@ MDL_context::acquire_lock(MDL_request *mdl_request, double lock_wait_timeout)
done_waiting_for(); done_waiting_for();
#ifdef HAVE_PSI_INTERFACE
if (locker != NULL) if (locker != NULL)
PSI_CALL_end_metadata_wait(locker, 0); PSI_CALL_end_metadata_wait(locker, 0);
#endif
if (wait_status != MDL_wait::GRANTED) if (wait_status != MDL_wait::GRANTED)
{ {

10
storage/innobase/include/btr0sea.h
View file

@ -243,10 +243,20 @@ struct btr_search_sys_t
/** memory heap for table */ /** memory heap for table */
mem_heap_t *heap; mem_heap_t *heap;
#ifdef _MSC_VER
#pragma warning(push)
// nonstandard extension - zero sized array, if perfschema is not compiled
#pragma warning(disable : 4200)
#endif
char pad[(CPU_LEVEL1_DCACHE_LINESIZE - sizeof(srw_lock) - char pad[(CPU_LEVEL1_DCACHE_LINESIZE - sizeof(srw_lock) -
sizeof(hash_table_t) - sizeof(mem_heap_t)) & sizeof(hash_table_t) - sizeof(mem_heap_t)) &
(CPU_LEVEL1_DCACHE_LINESIZE - 1)]; (CPU_LEVEL1_DCACHE_LINESIZE - 1)];
#ifdef _MSC_VER
#pragma warning(pop)
#endif
void init() void init()
{ {
memset((void*) this, 0, sizeof *this); memset((void*) this, 0, sizeof *this);