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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
6c5d3649
Commit
6c5d3649
authored
Feb 08, 2018
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-14953 - rename libmysqld.so to libmariadbd.so
parent
bbdb47ff
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
debian/libmariadbd-dev.install
debian/libmariadbd-dev.install
+2
-0
debian/libmariadbd19.install
debian/libmariadbd19.install
+1
-1
libmysqld/CMakeLists.txt
libmysqld/CMakeLists.txt
+6
-3
No files found.
debian/libmariadbd-dev.install
View file @
6c5d3649
usr
/
lib
/*/libmysqld.a
usr/lib/*/
libmariadbd
.
a
usr
/
lib
/*/libmysqld.so
usr/lib/*/
libmariadbd
.
so
debian/libmariadbd19.install
View file @
6c5d3649
usr
/
lib
/*/
libm
ysql
d
.
so
.*
usr
/
lib
/*/
libm
ariadb
d
.
so
.*
libmysqld/CMakeLists.txt
View file @
6c5d3649
...
...
@@ -138,7 +138,7 @@ IF(WIN32)
SET
(
COMPONENT_MYSQLSERVER
"Embedded"
)
SET
(
COMPONENT_LIBMYSQLD
"Embedded"
)
ELSE
()
SET
(
MYSQLSERVER_OUTPUT_NAME m
ysql
d
)
SET
(
MYSQLSERVER_OUTPUT_NAME m
ariadb
d
)
SET
(
COMPONENT_MYSQLSERVER
"Development"
)
SET
(
COMPONENT_LIBMYSQLD
"Server"
)
ENDIF
()
...
...
@@ -166,7 +166,9 @@ ENDFOREACH()
MERGE_LIBRARIES
(
mysqlserver STATIC
${
EMBEDDED_LIBS
}
OUTPUT_NAME
${
MYSQLSERVER_OUTPUT_NAME
}
COMPONENT
${
COMPONENT_MYSQLSERVER
}
)
IF
(
UNIX
)
INSTALL_SYMLINK
(
libmysqld.a mysqlserver
${
INSTALL_LIBDIR
}
${
COMPONENT_MYSQLSERVER
}
)
ENDIF
()
INSTALL
(
FILES embedded_priv.h DESTINATION
${
INSTALL_INCLUDEDIR
}
/server/private COMPONENT
${
COMPONENT_MYSQLSERVER
}
)
...
...
@@ -438,8 +440,9 @@ IF(NOT DISABLE_SHARED)
# Name the shared library, handle versioning (provides same api as client
# library hence the same version)
SET_TARGET_PROPERTIES
(
libmysqld PROPERTIES
OUTPUT_NAME m
ysqld
OUTPUT_NAME m
ariadbd
SOVERSION
"
${
SHARED_LIB_MAJOR_VERSION
}
"
)
INSTALL_SYMLINK
(
libmysqld.so libmysqld
${
INSTALL_LIBDIR
}
${
COMPONENT_LIBMYSQLD
}
)
# Clean direct output flags, as 2 targets have the same base name
# libmysqld
SET_TARGET_PROPERTIES
(
libmysqld PROPERTIES CLEAN_DIRECT_OUTPUT 1
)
...
...
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