summaryrefslogtreecommitdiff
path: root/unittest
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2019-06-28 13:21:39 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2019-06-30 17:48:19 +0200
commit6dc71d4f1060ac50fb5d48daa7424039c4e8f9df (patch)
tree8eb192e18b347bd4b8479fa0318a00054af506fb /unittest
parenta89f1faf7b55dad33c40c840917c30ca9234cc06 (diff)
downloadmariadb-git-6dc71d4f1060ac50fb5d48daa7424039c4e8f9df.tar.gz
improve build, allow sql library to be built in parallel with builtins
Diffstat (limited to 'unittest')
-rw-r--r--unittest/sql/CMakeLists.txt8
-rw-r--r--unittest/sql/dummy_builtins.cc26
2 files changed, 31 insertions, 3 deletions
diff --git a/unittest/sql/CMakeLists.txt b/unittest/sql/CMakeLists.txt
index a4ba1019e49..987e78433a4 100644
--- a/unittest/sql/CMakeLists.txt
+++ b/unittest/sql/CMakeLists.txt
@@ -21,10 +21,12 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql
${CMAKE_SOURCE_DIR}/extra/yassl/include)
IF(WIN32)
- ADD_EXECUTABLE(explain_filename-t explain_filename-t.cc
- ../../sql/nt_servc.cc)
+ ADD_EXECUTABLE(explain_filename-t
+ explain_filename-t.cc
+ dummy_builtins.cc
+ ../../sql/nt_servc.cc)
ELSE()
- ADD_EXECUTABLE(explain_filename-t explain_filename-t.cc)
+ ADD_EXECUTABLE(explain_filename-t explain_filename-t.cc dummy_builtins.cc)
ENDIF()
TARGET_LINK_LIBRARIES(explain_filename-t sql mytap)
diff --git a/unittest/sql/dummy_builtins.cc b/unittest/sql/dummy_builtins.cc
new file mode 100644
index 00000000000..31d043d19ec
--- /dev/null
+++ b/unittest/sql/dummy_builtins.cc
@@ -0,0 +1,26 @@
+/* 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
+};