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
989dd4d9
Commit
989dd4d9
authored
Sep 18, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Plain Diff
5.5 merge
parents
152f1cd0
e41bca00
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
11 deletions
+24
-11
cmake/build_configurations/mysql_release.cmake
cmake/build_configurations/mysql_release.cmake
+1
-1
cmake/jemalloc.cmake
cmake/jemalloc.cmake
+19
-6
debian/dist/Debian/control
debian/dist/Debian/control
+2
-2
debian/dist/Ubuntu/control
debian/dist/Ubuntu/control
+2
-2
No files found.
cmake/build_configurations/mysql_release.cmake
View file @
989dd4d9
...
@@ -124,7 +124,7 @@ IF(UNIX)
...
@@ -124,7 +124,7 @@ IF(UNIX)
SET
(
WITH_EXTRA_CHARSETS all CACHE STRING
""
)
SET
(
WITH_EXTRA_CHARSETS all CACHE STRING
""
)
IF
(
CMAKE_SYSTEM_NAME STREQUAL
"Linux"
)
IF
(
CMAKE_SYSTEM_NAME STREQUAL
"Linux"
)
SET
(
WITH_JEMALLOC
"
yes
"
CACHE STRING
""
)
SET
(
WITH_JEMALLOC
"
static
"
CACHE STRING
""
)
IF
(
NOT IGNORE_AIO_CHECK
)
IF
(
NOT IGNORE_AIO_CHECK
)
# Ensure aio is available on Linux (required by InnoDB)
# Ensure aio is available on Linux (required by InnoDB)
...
...
cmake/jemalloc.cmake
View file @
989dd4d9
...
@@ -12,13 +12,26 @@ MACRO (CHECK_JEMALLOC)
...
@@ -12,13 +12,26 @@ MACRO (CHECK_JEMALLOC)
SET
(
WITH_JEMALLOC
"yes"
)
SET
(
WITH_JEMALLOC
"yes"
)
ENDIF
()
ENDIF
()
IF
(
WITH_JEMALLOC STREQUAL
"yes"
OR WITH_JEMALLOC STREQUAL
"auto"
)
IF
(
WITH_JEMALLOC STREQUAL
"yes"
OR WITH_JEMALLOC STREQUAL
"auto"
OR
CHECK_LIBRARY_EXISTS
(
jemalloc malloc_stats_print
""
HAVE_JEMALLOC
)
WITH_JEMALLOC STREQUAL
"static"
)
IF
(
WITH_JEMALLOC STREQUAL
"static"
)
SET
(
libname jemalloc_pic
)
SET
(
CMAKE_REQUIRED_LIBRARIES pthread dl m
)
SET
(
what bundled
)
ELSE
()
SET
(
libname jemalloc
)
SET
(
what system
)
ENDIF
()
CHECK_LIBRARY_EXISTS
(
${
libname
}
malloc_stats_print
""
HAVE_JEMALLOC
)
SET
(
CMAKE_REQUIRED_LIBRARIES
)
IF
(
HAVE_JEMALLOC
)
IF
(
HAVE_JEMALLOC
)
SET
(
LIBJEMALLOC
jemalloc
)
SET
(
LIBJEMALLOC
${
libname
}
)
SET
(
MALLOC_LIBRARY
"
system
jemalloc"
)
SET
(
MALLOC_LIBRARY
"
${
what
}
jemalloc"
)
ELSEIF
(
WITH_JEMALLOC STREQUAL
"yes
"
)
ELSEIF
(
NOT WITH_JEMALLOC STREQUAL
"auto
"
)
MESSAGE
(
FATAL_ERROR
"
jemalloc
is not found"
)
MESSAGE
(
FATAL_ERROR
"
${
libname
}
is not found"
)
ENDIF
()
ENDIF
()
ENDIF
()
ENDIF
()
ENDMACRO
()
ENDMACRO
()
debian/dist/Debian/control
View file @
989dd4d9
...
@@ -147,7 +147,7 @@ Description: MariaDB database client binaries
...
@@ -147,7 +147,7 @@ Description: MariaDB database client binaries
Package
:
mariadb
-
server
-
core
-
10.0
Package
:
mariadb
-
server
-
core
-
10.0
Architecture
:
any
Architecture
:
any
Depends
:
${
shlibs
:
Depends
},
${
misc
:
Depends
},
libmariadbclient18
(>=
${
binary
:
Version
})
,
libjemalloc1
(>=
3.0.0
)
Depends
:
${
shlibs
:
Depends
},
${
misc
:
Depends
},
libmariadbclient18
(>=
${
binary
:
Version
})
Provides
:
mysql
-
server
-
core
,
mysql
-
server
-
core
-
5.1
,
mysql
-
server
-
core
-
5.5
Provides
:
mysql
-
server
-
core
,
mysql
-
server
-
core
-
5.1
,
mysql
-
server
-
core
-
5.5
Conflicts
:
mariadb
-
server
-
5.1
(<<
5.1.60
),
Conflicts
:
mariadb
-
server
-
5.1
(<<
5.1.60
),
mariadb
-
server
-
5.2
(<<
5.2.10
),
mariadb
-
server
-
5.2
(<<
5.2.10
),
...
@@ -192,7 +192,7 @@ Architecture: any
...
@@ -192,7 +192,7 @@ Architecture: any
Suggests
:
tinyca
,
mailx
,
mariadb
-
test
Suggests
:
tinyca
,
mailx
,
mariadb
-
test
Recommends
:
libhtml
-
template
-
perl
Recommends
:
libhtml
-
template
-
perl
Pre
-
Depends
:
mariadb
-
common
,
adduser
(>=
3.40
),
debconf
Pre
-
Depends
:
mariadb
-
common
,
adduser
(>=
3.40
),
debconf
Depends
:
mariadb
-
client
-
10.0
(>=
${
source
:
Version
}),
libdbi
-
perl
,
perl
(>=
5.6
),
${
shlibs
:
Depends
},
${
misc
:
Depends
},
psmisc
,
passwd
,
lsb
-
base
(>=
3.0
-
10
),
mariadb
-
server
-
core
-
10.0
(>=
${
binary
:
Version
})
,
libjemalloc1
(>=
3.0.0
)
Depends
:
mariadb
-
client
-
10.0
(>=
${
source
:
Version
}),
libdbi
-
perl
,
perl
(>=
5.6
),
${
shlibs
:
Depends
},
${
misc
:
Depends
},
psmisc
,
passwd
,
lsb
-
base
(>=
3.0
-
10
),
mariadb
-
server
-
core
-
10.0
(>=
${
binary
:
Version
})
Provides
:
mariadb
-
server
,
mysql
-
server
,
virtual
-
mysql
-
server
Provides
:
mariadb
-
server
,
mysql
-
server
,
virtual
-
mysql
-
server
Conflicts
:
mariadb
-
server
(<<
${
source
:
Version
}),
mysql
-
server
(<<
${
source
:
Version
}),
Conflicts
:
mariadb
-
server
(<<
${
source
:
Version
}),
mysql
-
server
(<<
${
source
:
Version
}),
mysql
-
server
-
4.1
,
mysql
-
server
-
5.0
,
mysql
-
server
-
5.1
,
mysql
-
server
-
5.5
,
mysql
-
server
-
4.1
,
mysql
-
server
-
5.0
,
mysql
-
server
-
5.1
,
mysql
-
server
-
5.5
,
...
...
debian/dist/Ubuntu/control
View file @
989dd4d9
...
@@ -147,7 +147,7 @@ Description: MariaDB database client binaries
...
@@ -147,7 +147,7 @@ Description: MariaDB database client binaries
Package
:
mariadb
-
server
-
core
-
10.0
Package
:
mariadb
-
server
-
core
-
10.0
Architecture
:
any
Architecture
:
any
Depends
:
${
shlibs
:
Depends
},
${
misc
:
Depends
},
libmariadbclient18
(>=
${
binary
:
Version
})
,
libjemalloc1
(>=
3.0.0
)
Depends
:
${
shlibs
:
Depends
},
${
misc
:
Depends
},
libmariadbclient18
(>=
${
binary
:
Version
})
Provides
:
mysql
-
server
-
core
,
mysql
-
server
-
core
-
5.1
,
mysql
-
server
-
core
-
5.5
Provides
:
mysql
-
server
-
core
,
mysql
-
server
-
core
-
5.1
,
mysql
-
server
-
core
-
5.5
Conflicts
:
mysql
-
server
-
5.0
,
Conflicts
:
mysql
-
server
-
5.0
,
mysql
-
server
-
core
-
5.0
,
mysql
-
server
-
core
-
5.1
,
mysql
-
server
-
core
-
5.5
,
mysql
-
server
-
core
-
5.0
,
mysql
-
server
-
core
-
5.1
,
mysql
-
server
-
core
-
5.5
,
...
@@ -186,7 +186,7 @@ Architecture: any
...
@@ -186,7 +186,7 @@ Architecture: any
Suggests
:
tinyca
,
mailx
,
mariadb
-
test
Suggests
:
tinyca
,
mailx
,
mariadb
-
test
Recommends
:
libhtml
-
template
-
perl
Recommends
:
libhtml
-
template
-
perl
Pre
-
Depends
:
mariadb
-
common
,
adduser
(>=
3.40
),
debconf
Pre
-
Depends
:
mariadb
-
common
,
adduser
(>=
3.40
),
debconf
Depends
:
mariadb
-
client
-
10.0
(>=
${
source
:
Version
}),
libdbi
-
perl
,
perl
(>=
5.6
),
${
shlibs
:
Depends
},
${
misc
:
Depends
},
psmisc
,
passwd
,
lsb
-
base
(>=
3.0
-
10
),
mariadb
-
server
-
core
-
10.0
(>=
${
binary
:
Version
})
,
libjemalloc1
(>=
3.0.0
)
Depends
:
mariadb
-
client
-
10.0
(>=
${
source
:
Version
}),
libdbi
-
perl
,
perl
(>=
5.6
),
${
shlibs
:
Depends
},
${
misc
:
Depends
},
psmisc
,
passwd
,
lsb
-
base
(>=
3.0
-
10
),
mariadb
-
server
-
core
-
10.0
(>=
${
binary
:
Version
})
Provides
:
mariadb
-
server
,
mysql
-
server
,
virtual
-
mysql
-
server
Provides
:
mariadb
-
server
,
mysql
-
server
,
virtual
-
mysql
-
server
Conflicts
:
mariadb
-
server
(<<
${
source
:
Version
}),
mysql
-
server
(<<
${
source
:
Version
}),
Conflicts
:
mariadb
-
server
(<<
${
source
:
Version
}),
mysql
-
server
(<<
${
source
:
Version
}),
mysql
-
server
-
4.1
,
mysql
-
server
-
5.0
,
mysql
-
server
-
5.1
,
mysql
-
server
-
5.5
,
mysql
-
server
-
4.1
,
mysql
-
server
-
5.0
,
mysql
-
server
-
5.1
,
mysql
-
server
-
5.5
,
...
...
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