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
265bbf5f
Commit
265bbf5f
authored
Sep 10, 2013
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
introduce sysconf2dir, install tokudb.conf there, both in rpm and deb
parent
3de56134
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
28 additions
and
9 deletions
+28
-9
cmake/cpack_rpm.cmake
cmake/cpack_rpm.cmake
+4
-4
cmake/install_layout.cmake
cmake/install_layout.cmake
+5
-2
debian/mariadb-tokudb-engine-5.5.files
debian/mariadb-tokudb-engine-5.5.files
+1
-0
storage/tokudb/CMakeLists.txt
storage/tokudb/CMakeLists.txt
+6
-0
storage/tokudb/tokudb.cnf
storage/tokudb/tokudb.cnf
+9
-0
support-files/CMakeLists.txt
support-files/CMakeLists.txt
+3
-3
No files found.
cmake/cpack_rpm.cmake
View file @
265bbf5f
...
...
@@ -86,10 +86,10 @@ SET(ignored
"%ignore
${
CMAKE_INSTALL_PREFIX
}
/share/man/man8*"
)
SET
(
CPACK_RPM_server_USER_FILELIST
${
ignored
}
"%config(noreplace)
/etc/my.cnf.d
/*"
)
SET
(
CPACK_RPM_common_USER_FILELIST
${
ignored
}
"%config(noreplace)
/etc
/my.cnf"
)
SET
(
CPACK_RPM_shared_USER_FILELIST
${
ignored
}
"%config(noreplace)
/etc/my.cnf.d
/*"
)
SET
(
CPACK_RPM_client_USER_FILELIST
${
ignored
}
"%config(noreplace)
/etc/my.cnf.d
/*"
)
SET
(
CPACK_RPM_server_USER_FILELIST
${
ignored
}
"%config(noreplace)
${
INSTALL_SYSCONF2DIR
}
/*"
)
SET
(
CPACK_RPM_common_USER_FILELIST
${
ignored
}
"%config(noreplace)
${
INSTALL_SYSCONFDIR
}
/my.cnf"
)
SET
(
CPACK_RPM_shared_USER_FILELIST
${
ignored
}
"%config(noreplace)
${
INSTALL_SYSCONF2DIR
}
/*"
)
SET
(
CPACK_RPM_client_USER_FILELIST
${
ignored
}
"%config(noreplace)
${
INSTALL_SYSCONF2DIR
}
/*"
)
SET
(
CPACK_RPM_compat_USER_FILELIST
${
ignored
}
)
SET
(
CPACK_RPM_devel_USER_FILELIST
${
ignored
}
)
SET
(
CPACK_RPM_test_USER_FILELIST
${
ignored
}
)
...
...
cmake/install_layout.cmake
View file @
265bbf5f
...
...
@@ -41,7 +41,8 @@
# - INSTALL_BINDIR (directory with client executables and scripts)
# - INSTALL_SBINDIR (directory with mysqld)
# - INSTALL_SCRIPTDIR (several scripts, rarely used)
# - INSTALL_SYSCONFDIR (config files. Usually /etc or nothing)
# - INSTALL_SYSCONFDIR (my.cnf config file. Usually /etc or nothing)
# - INSTALL_SYSCONF2DIR (additional config files, e.g. /etc/mysql/conf.d)
#
# - INSTALL_LIBDIR (directory with client end embedded libraries)
# - INSTALL_PLUGINDIR (directory for plugins)
...
...
@@ -145,6 +146,7 @@ SET(INSTALL_BINDIR_RPM "bin")
SET
(
INSTALL_SBINDIR_RPM
"sbin"
)
SET
(
INSTALL_SCRIPTDIR_RPM
"bin"
)
SET
(
INSTALL_SYSCONFDIR_RPM
"/etc"
)
SET
(
INSTALL_SYSCONF2DIR_RPM
"/etc/my.cnf.d"
)
#
IF
(
CMAKE_SYSTEM_PROCESSOR MATCHES
"x86_64"
)
SET
(
INSTALL_LIBDIR_RPM
"lib64"
)
...
...
@@ -178,6 +180,7 @@ SET(INSTALL_UNIX_ADDRDIR_RPM "${INSTALL_MYSQLDATADIR_RPM}/mysql.sock"
SET
(
INSTALL_BINDIR_DEB
"bin"
)
SET
(
INSTALL_SBINDIR_DEB
"sbin"
)
SET
(
INSTALL_SCRIPTDIR_DEB
"bin"
)
SET
(
INSTALL_SYSCONF2DIR_DEB
"/etc/mysql/conf.d"
)
#
SET
(
INSTALL_LIBDIR_DEB
"lib"
)
SET
(
INSTALL_PLUGINDIR_DEB
"lib/mysql/plugin"
)
...
...
@@ -238,7 +241,7 @@ SET(OLD_INSTALL_LAYOUT ${INSTALL_LAYOUT} CACHE INTERNAL "")
# Set INSTALL_FOODIR variables for chosen layout (for example, INSTALL_BINDIR
# will be defined as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE
# layout is chosen)
FOREACH
(
var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN SYSCONF
FOREACH
(
var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN SYSCONF
SYSCONF2
INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA PLUGINTEST UNIX_ADDR
)
SET
(
INSTALL_
${
var
}
DIR
${
INSTALL_
${
var
}
DIR_
${
INSTALL_LAYOUT
}}
CACHE STRING
"
${
var
}
installation directory"
${
FORCE
}
)
...
...
debian/mariadb-tokudb-engine-5.5.files
View file @
265bbf5f
etc/mysql/conf.d/tokudb.cnf
usr/bin/tokuftdump
usr/lib/mysql/plugin/ha_tokudb.so
usr/share/doc/mariadb-tokudb-engine-5.5/README-TOKUDB
...
...
storage/tokudb/CMakeLists.txt
View file @
265bbf5f
...
...
@@ -47,3 +47,9 @@ MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY
COMPONENT
"tokudb-engine"
LINK_LIBRARIES tokufractaltree_static tokuportability_static z stdc++
)
SET
(
CMAKE_MODULE_LINKER_FLAGS_RELEASE
"
${
CMAKE_MODULE_LINKER_FLAGS_RELEASE
}
-flto -fuse-linker-plugin"
)
IF
(
INSTALL_SYSCONF2DIR
)
INSTALL
(
FILES tokudb.cnf DESTINATION
${
INSTALL_SYSCONF2DIR
}
COMPONENT tokudb-engine
)
SET
(
CPACK_RPM_tokudb-engine_USER_FILELIST
${
ignored
}
"%config(noreplace)
${
INSTALL_SYSCONF2DIR
}
/*"
PARENT_SCOPE
)
ENDIF
(
INSTALL_SYSCONF2DIR
)
storage/tokudb/tokudb.cnf
0 → 100644
View file @
265bbf5f
[mariadb]
# See https://mariadb.com/kb/en/how-to-enable-tokudb-in-mariadb/
# for instructions how to enable TokuDB
#
# See https://mariadb.com/kb/en/tokudb-differences/ for differences
# between TokuDB in MariaDB and TokuDB from http://www.tokutek.com/
#plugin-load=ha_tokudb.so
support-files/CMakeLists.txt
View file @
265bbf5f
...
...
@@ -105,11 +105,11 @@ IF(UNIX)
INSTALL
(
FILES rpm/my.cnf DESTINATION
${
INSTALL_SYSCONFDIR
}
COMPONENT Common
)
INSTALL
(
FILES rpm/client.cnf DESTINATION
${
INSTALL_SYSCONF
DIR
}
/my.cnf.d
INSTALL
(
FILES rpm/client.cnf DESTINATION
${
INSTALL_SYSCONF
2DIR
}
COMPONENT SharedLibraries
)
INSTALL
(
FILES rpm/mysql-clients.cnf DESTINATION
${
INSTALL_SYSCONF
DIR
}
/my.cnf.d
INSTALL
(
FILES rpm/mysql-clients.cnf DESTINATION
${
INSTALL_SYSCONF
2DIR
}
COMPONENT Client
)
INSTALL
(
FILES rpm/server.cnf DESTINATION
${
INSTALL_SYSCONF
DIR
}
/my.cnf.d
INSTALL
(
FILES rpm/server.cnf DESTINATION
${
INSTALL_SYSCONF
2DIR
}
COMPONENT IniFiles
)
# This is for SuSE:
...
...
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