database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-07 06:01:31 +03:00
Code Activity

Revert "improve build, allow sql library to be built in parallel with builtins"

Browse Source 
This reverts commit 1a3570dec3.
This commit is contained in:
Sergei Krivonos
2021-11-09 15:43:10 +02:00
parent ff08e948d3
commit f7c6c02a06
4 changed files with 8 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
unittest/sql/CMakeLists.txt
View File

@ -21,12 +21,10 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql
${CMAKE_SOURCE_DIR}/extra/yassl/include)
IF(WIN32)
ADD_EXECUTABLE(explain_filename-t
explain_filename-t.cc
dummy_builtins.cc
../../sql/nt_servc.cc)
ADD_EXECUTABLE(explain_filename-t explain_filename-t.cc
../../sql/nt_servc.cc)
ELSE()
ADD_EXECUTABLE(explain_filename-t explain_filename-t.cc dummy_builtins.cc)
ADD_EXECUTABLE(explain_filename-t explain_filename-t.cc)
ENDIF()
TARGET_LINK_LIBRARIES(explain_filename-t sql mytap)

26
unittest/sql/dummy_builtins.cc
View File

@ -1,26 +0,0 @@
/* 2018 MariaDB
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
the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include <mysql/plugin.h>
struct st_maria_plugin *mysql_optional_plugins[]=
{
0
};
struct st_maria_plugin *mysql_mandatory_plugins[]=
{
0
};