diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-05-05 15:23:47 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-05-05 15:23:47 +0200 |
| commit | 1d3ea9ecd8c7f7e022eb4ee5e98326fc850d59b1 (patch) | |
| tree | f9abc493fa045bb684b884b81ae58c94e3e8ea38 /storage/perfschema/CMakeLists.txt | |
| parent | dd0207bda440c2e44ba5223d0635538bc2974890 (diff) | |
| parent | d71d4119055f0184f5edd24e86fa3d6a5c71aa89 (diff) | |
| download | mariadb-git-1d3ea9ecd8c7f7e022eb4ee5e98326fc850d59b1.tar.gz | |
perfschema 5.6.24
including the big commit
commit 305130361bf72726de220f3d2b2787395e10be61
Author: Marc Alff <marc.alff@oracle.com>
Date: Tue Feb 10 11:31:32 2015 +0100
WL#8354 BACKPORT DIGEST IMPROVEMENTS TO MYSQL 5.6
(with the following commits) and related changes in sql/
Diffstat (limited to 'storage/perfschema/CMakeLists.txt')
| -rw-r--r-- | storage/perfschema/CMakeLists.txt | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/storage/perfschema/CMakeLists.txt b/storage/perfschema/CMakeLists.txt index dcd0bbac15f..3b3ffae6357 100644 --- a/storage/perfschema/CMakeLists.txt +++ b/storage/perfschema/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,31 +21,11 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ADD_DEFINITIONS(-DMYSQL_SERVER) -# Gen_pfs_lex_token -IF(NOT CMAKE_CROSSCOMPILING) - ADD_EXECUTABLE(gen_pfs_lex_token gen_pfs_lex_token.cc) - # gen_pfs_lex_token itself depends on ${CMAKE_CURRENT_BINARY_DIR}/sql/sql_yacc.h - ADD_DEPENDENCIES(gen_pfs_lex_token GenServerSource) -ENDIF() - -ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pfs_lex_token.h - COMMAND gen_pfs_lex_token > pfs_lex_token.h - DEPENDS gen_pfs_lex_token -) - -SET(PFS_GEN_SOURCES - ${CMAKE_CURRENT_BINARY_DIR}/pfs_lex_token.h -) - -SET_SOURCE_FILES_PROPERTIES(${PFS_GEN_SOURCES} PROPERTIES GENERATED 1) - # # Maintainer: keep this list sorted, to avoid merge collisions. # Tip: ls -1 *.h, ls -1 *.cc # SET(PERFSCHEMA_SOURCES -${PFS_GEN_SOURCES} ha_perfschema.h cursor_by_account.h cursor_by_host.h |