database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-13 13:47:59 +03:00
Code Activity

bugfix: compile InnoDB w/o P_S

Browse Source
This commit is contained in:
Sergei Golubchik
2016-11-08 20:04:09 +01:00
parent 75925f8fc1
commit 867809f23a
4 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/sys_vars/inc/sysvars_server.inc
View File

@@ -1,3 +1,4 @@
--source include/have_perfschema.inc
--source include/word_size.inc --source include/word_size.inc
--vertical_results --vertical_results

3
storage/innobase/include/srv0srv.h
View File

@@ -620,6 +620,9 @@ do { \
do { \ do { \
PSI_THREAD_CALL(delete_current_thread)(); \ PSI_THREAD_CALL(delete_current_thread)(); \
} while (0) } while (0)
# else
# define pfs_register_thread(key)
# define pfs_delete_thread()
# endif /* UNIV_PFS_THREAD */ # endif /* UNIV_PFS_THREAD */
#ifdef HAVE_PSI_STAGE_INTERFACE #ifdef HAVE_PSI_STAGE_INTERFACE

2
storage/innobase/include/univ.i
View File

@@ -122,6 +122,7 @@ support cross-platform development and expose comonly used SQL names. */
#include <unistd.h> #include <unistd.h>
#endif #endif
#include "my_pthread.h"
/* Following defines are to enable performance schema /* Following defines are to enable performance schema
instrumentation in each of five InnoDB modules if instrumentation in each of five InnoDB modules if
HAVE_PSI_INTERFACE is defined. */ HAVE_PSI_INTERFACE is defined. */
@@ -159,7 +160,6 @@ be excluded from instrumentation. */
#include "pfs_thread_provider.h" #include "pfs_thread_provider.h"
#endif #endif
#include "my_pthread.h"
#include "mysql/psi/mysql_thread.h" #include "mysql/psi/mysql_thread.h"
/* For PSI_FILE_CALL(). */ /* For PSI_FILE_CALL(). */
/* JAN: TODO: missing 5.7 header */ /* JAN: TODO: missing 5.7 header */

1
storage/innobase/include/ut0ut.h
View File

@@ -30,6 +30,7 @@ Created 1/20/1994 Heikki Tuuri
#include <ostream> #include <ostream>
#include <sstream> #include <sstream>
#include <string.h>
#ifndef UNIV_INNOCHECKSUM #ifndef UNIV_INNOCHECKSUM