Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
1caee393
Commit
1caee393
authored
Dec 02, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
disable mroonga temporarily: see MDEV-7246
parent
853077ad
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
10 deletions
+4
-10
debian/dist/Debian/mariadb-server-10.1.files.in
debian/dist/Debian/mariadb-server-10.1.files.in
+0
-1
debian/dist/Ubuntu/mariadb-server-10.1.files.in
debian/dist/Ubuntu/mariadb-server-10.1.files.in
+0
-1
storage/mroonga/CMakeLists.txt
storage/mroonga/CMakeLists.txt
+4
-8
No files found.
debian/dist/Debian/mariadb-server-10.1.files.in
View file @
1caee393
usr/lib/mysql/plugin/auth_pam.so
usr/lib/mysql/plugin/auth_pam.so
usr/lib/mysql/plugin/auth_socket.so
usr/lib/mysql/plugin/auth_socket.so
usr/lib/mysql/plugin/ha_mroonga.so
usr/lib/mysql/plugin/ha_sequence.so
usr/lib/mysql/plugin/ha_sequence.so
usr/lib/mysql/plugin/ha_sphinx.so
usr/lib/mysql/plugin/ha_sphinx.so
usr/lib/mysql/plugin/ha_innodb.so
usr/lib/mysql/plugin/ha_innodb.so
...
...
debian/dist/Ubuntu/mariadb-server-10.1.files.in
View file @
1caee393
usr/lib/mysql/plugin/auth_pam.so
usr/lib/mysql/plugin/auth_pam.so
usr/lib/mysql/plugin/auth_socket.so
usr/lib/mysql/plugin/auth_socket.so
usr/lib/mysql/plugin/ha_mroonga.so
usr/lib/mysql/plugin/ha_sequence.so
usr/lib/mysql/plugin/ha_sequence.so
usr/lib/mysql/plugin/ha_sphinx.so
usr/lib/mysql/plugin/ha_sphinx.so
usr/lib/mysql/plugin/ha_innodb.so
usr/lib/mysql/plugin/ha_innodb.so
...
...
storage/mroonga/CMakeLists.txt
View file @
1caee393
...
@@ -240,16 +240,12 @@ link_directories(
...
@@ -240,16 +240,12 @@ link_directories(
if
(
MRN_BUNDLED
)
if
(
MRN_BUNDLED
)
if
(
GROONGA_NORMALIZER_MYSQL_FOUND AND MRN_GROONGA_BUNDLED
)
if
(
GROONGA_NORMALIZER_MYSQL_FOUND AND MRN_GROONGA_BUNDLED
)
mysql_add_plugin
(
mroonga
set
(
sources
"
${
MROONGA_SOURCES
}
;
${
MRN_UDF_SOURCES
}
;
${
MRN_GRN_NORMALIZER_MYSQL_SOURCES
}
;
${
LIBMRN_NEED_MYSQL_SOURCES
}
;
${
LIBMRN_NO_MYSQL_SOURCES
}
"
)
"
${
MROONGA_SOURCES
}
;
${
MRN_UDF_SOURCES
}
;
${
MRN_GRN_NORMALIZER_MYSQL_SOURCES
}
;
${
LIBMRN_NEED_MYSQL_SOURCES
}
;
${
LIBMRN_NO_MYSQL_SOURCES
}
"
STORAGE_ENGINE MODULE_ONLY
LINK_LIBRARIES
${
GROONGA_LIBRARIES
}
)
else
()
else
()
mysql_add_plugin
(
mroonga
set
(
sources
"
${
MROONGA_SOURCES
}
;
${
MRN_UDF_SOURCES
}
;
${
LIBMRN_NEED_MYSQL_SOURCES
}
;
${
LIBMRN_NO_MYSQL_SOURCES
}
"
)
"
${
MROONGA_SOURCES
}
;
${
MRN_UDF_SOURCES
}
;
${
LIBMRN_NEED_MYSQL_SOURCES
}
;
${
LIBMRN_NO_MYSQL_SOURCES
}
"
STORAGE_ENGINE MODULE_ONLY
LINK_LIBRARIES
${
GROONGA_LIBRARIES
}
)
endif
()
endif
()
mysql_add_plugin
(
mroonga
${
sources
}
STORAGE_ENGINE MODULE_ONLY LINK_LIBRARIES
${
GROONGA_LIBRARIES
}
DISABLED
)
else
()
else
()
else
()
else
()
add_library
(
mroonga MODULE
add_library
(
mroonga MODULE
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment