diff options
| author | Sergei Krivonos <sergei.krivonos@mariadb.com> | 2021-11-09 15:43:10 +0200 |
|---|---|---|
| committer | Sergei Krivonos <sergei.krivonos@mariadb.com> | 2021-11-09 15:44:07 +0200 |
| commit | f7c6c02a06149aa4f41dd01173f2020a0756f8db (patch) | |
| tree | 90ba8b05b13d592bf6dcaca68dd11e6111ed3efb /unittest | |
| parent | ff08e948d3708a3e9ab40bb492d6d18b8914ecff (diff) | |
| download | mariadb-git-f7c6c02a06149aa4f41dd01173f2020a0756f8db.tar.gz | |
Revert "improve build, allow sql library to be built in parallel with builtins"
This reverts commit 1a3570dec35733e725cc6000a06ec666facf4235.
Diffstat (limited to 'unittest')
| -rw-r--r-- | unittest/sql/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | unittest/sql/dummy_builtins.cc | 26 |
2 files changed, 3 insertions, 31 deletions
diff --git a/unittest/sql/CMakeLists.txt b/unittest/sql/CMakeLists.txt index caeac841a5c..2a765c44cb1 100644 --- a/unittest/sql/CMakeLists.txt +++ b/unittest/sql/CMakeLists.txt @@ -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) diff --git a/unittest/sql/dummy_builtins.cc b/unittest/sql/dummy_builtins.cc deleted file mode 100644 index 31d043d19ec..00000000000 --- a/unittest/sql/dummy_builtins.cc +++ /dev/null @@ -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 -}; |