diff options
| author | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-05-05 23:17:20 +0300 |
|---|---|---|
| committer | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-05-05 23:57:11 +0300 |
| commit | 3f55c569514679d98e09e71286ca28a8ac667a71 (patch) | |
| tree | 4347fbb2238d1a97e5e1166f9e7b7b7adba165ce /storage/perfschema | |
| parent | ca1dc0789b7e724128d1369977e2f70fb9d69bb5 (diff) | |
| parent | a4139f8d68bd31e80ff6202c093cd232c194ddfd (diff) | |
| download | mariadb-git-3f55c569514679d98e09e71286ca28a8ac667a71.tar.gz | |
Merge branch bb-10.4-release into bb-10.5-releasemariadb-10.5.10
Diffstat (limited to 'storage/perfschema')
| -rw-r--r-- | storage/perfschema/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | storage/perfschema/pfs_prepared_stmt.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/storage/perfschema/CMakeLists.txt b/storage/perfschema/CMakeLists.txt index b2388099328..98d3e2a401d 100644 --- a/storage/perfschema/CMakeLists.txt +++ b/storage/perfschema/CMakeLists.txt @@ -20,8 +20,7 @@ # along with this program; if not, write to the Free Software Foundation, # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/include +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql ${CMAKE_BINARY_DIR}/sql ${CMAKE_CURRENT_BINARY_DIR} diff --git a/storage/perfschema/pfs_prepared_stmt.h b/storage/perfschema/pfs_prepared_stmt.h index c163514ccc2..1b017b508a6 100644 --- a/storage/perfschema/pfs_prepared_stmt.h +++ b/storage/perfschema/pfs_prepared_stmt.h @@ -29,8 +29,8 @@ */ #include "pfs_stat.h" -#include "include/mysql/psi/psi.h" -#include "include/mysql/psi/mysql_ps.h" +#include "mysql/psi/psi.h" +#include "mysql/psi/mysql_ps.h" #include "pfs_program.h" #define PS_NAME_LENGTH NAME_LEN |