Merge lp:~percona-core/percona-server/percona-server-tokudb-rc into lp:percona-server/5.6
- percona-server-tokudb-rc
- Merge into 5.6
Proposed by
Tomislav Plavcic
Status: | Merged |
---|---|
Approved by: | Alexey Kopytov |
Approved revision: | no longer in the source branch. |
Merged at revision: | 614 |
Proposed branch: | lp:~percona-core/percona-server/percona-server-tokudb-rc |
Merge into: | lp:percona-server/5.6 |
Diff against target: |
1026 lines (+801/-13) (has conflicts) 12 files modified
VERSION (+5/-0) build-ps/build-binary.sh (+30/-3) build-ps/debian/changelog (+6/-0) build-ps/debian/control.tokudb (+266/-0) build-ps/debian/percona-server-tokudb-5.6.files (+3/-0) build-ps/debian/percona-server-tokudb-5.6.postinst (+18/-0) build-ps/debian/rules (+1/-1) build-ps/debian/rules.tokudb (+279/-0) build-ps/percona-server.spec (+178/-8) scripts/mysqld_safe.sh (+13/-0) sql/handler.h (+1/-0) storage/innobase/include/univ.i (+1/-1) Text conflict in VERSION |
To merge this branch: | bzr merge lp:~percona-core/percona-server/percona-server-tokudb-rc |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexey Kopytov (community) | Approve | ||
Laurynas Biveinis | Pending | ||
Review via email: mp+223199@code.launchpad.net |
This proposal supersedes a proposal from 2014-06-13.
Commit message
Description of the change
Release branch for Release 5.6.17-66.0 (TokuDB RC)
To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal | # |
review:
Needs Information
Revision history for this message
Tomislav Plavcic (tplavcic) wrote : Posted in a previous version of this proposal | # |
Hi Laurynas,
regarding the jemalloc loading I have sent you mail that I sent to Vadim and his response - as I had same concerns. But basically he says it's ok, although feel free to comment it more if you think different.
Revision history for this message
Tomislav Plavcic (tplavcic) wrote : | # |
The problem with change in sql/handler.h is that without it it won't compile (see link below):
http://
So we need to see what to do about it - will also write comment on the tokudb mailing list - there was some thread about this.
Revision history for this message
Alexey Kopytov (akopytov) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'VERSION' | |||
2 | --- VERSION 2014-06-11 13:45:54 +0000 | |||
3 | +++ VERSION 2014-06-16 07:08:31 +0000 | |||
4 | @@ -1,4 +1,9 @@ | |||
5 | 1 | MYSQL_VERSION_MAJOR=5 | 1 | MYSQL_VERSION_MAJOR=5 |
6 | 2 | MYSQL_VERSION_MINOR=6 | 2 | MYSQL_VERSION_MINOR=6 |
7 | 3 | <<<<<<< TREE | ||
8 | 3 | MYSQL_VERSION_PATCH=19 | 4 | MYSQL_VERSION_PATCH=19 |
9 | 4 | MYSQL_VERSION_EXTRA=-66.1 | 5 | MYSQL_VERSION_EXTRA=-66.1 |
10 | 6 | ======= | ||
11 | 7 | MYSQL_VERSION_PATCH=17 | ||
12 | 8 | MYSQL_VERSION_EXTRA=-66.0 | ||
13 | 9 | >>>>>>> MERGE-SOURCE | ||
14 | 5 | 10 | ||
15 | === modified file 'build-ps/build-binary.sh' | |||
16 | --- build-ps/build-binary.sh 2014-06-11 13:45:54 +0000 | |||
17 | +++ build-ps/build-binary.sh 2014-06-16 07:08:31 +0000 | |||
18 | @@ -24,6 +24,7 @@ | |||
19 | 24 | CRYPTO_LIBRARY='' | 24 | CRYPTO_LIBRARY='' |
20 | 25 | TAG='' | 25 | TAG='' |
21 | 26 | # | 26 | # |
22 | 27 | CMAKE_BUILD_TYPE='' | ||
23 | 27 | COMMON_FLAGS='' | 28 | COMMON_FLAGS='' |
24 | 28 | # | 29 | # |
25 | 29 | # Some programs that may be overriden | 30 | # Some programs that may be overriden |
26 | @@ -164,6 +165,24 @@ | |||
27 | 164 | export CC=${CC:-gcc} | 165 | export CC=${CC:-gcc} |
28 | 165 | export CXX=${CXX:-g++} | 166 | export CXX=${CXX:-g++} |
29 | 166 | 167 | ||
30 | 168 | # TokuDB cmake flags | ||
31 | 169 | if test -d "$SOURCEDIR/storage/tokudb" | ||
32 | 170 | then | ||
33 | 171 | CMAKE_OPTS="${CMAKE_OPTS:-} -DBUILD_TESTING=OFF -DUSE_GTAGS=OFF -DUSE_CTAGS=OFF -DUSE_ETAGS=OFF -DUSE_CSCOPE=OFF" | ||
34 | 172 | |||
35 | 173 | if test "x$CMAKE_BUILD_TYPE" != "xDebug" | ||
36 | 174 | then | ||
37 | 175 | CMAKE_OPTS="${CMAKE_OPTS:-} -DTOKU_DEBUG_PARANOID=OFF" | ||
38 | 176 | else | ||
39 | 177 | CMAKE_OPTS="${CMAKE_OPTS:-} -DTOKU_DEBUG_PARANOID=ON" | ||
40 | 178 | fi | ||
41 | 179 | |||
42 | 180 | if [[ $CMAKE_OPTS == *WITH_VALGRIND=ON* ]] | ||
43 | 181 | then | ||
44 | 182 | CMAKE_OPTS="${CMAKE_OPTS:-} -DUSE_VALGRIND=ON" | ||
45 | 183 | fi | ||
46 | 184 | fi | ||
47 | 185 | |||
48 | 167 | # | 186 | # |
49 | 168 | if [ -n "$(which rpm)" ]; then | 187 | if [ -n "$(which rpm)" ]; then |
50 | 169 | export COMMON_FLAGS=$(rpm --eval %optflags | sed -e "s|march=i386|march=i686|g") | 188 | export COMMON_FLAGS=$(rpm --eval %optflags | sed -e "s|march=i386|march=i686|g") |
51 | @@ -235,9 +254,17 @@ | |||
52 | 235 | ( | 254 | ( |
53 | 236 | cd "$INSTALLDIR/usr/local/" | 255 | cd "$INSTALLDIR/usr/local/" |
54 | 237 | 256 | ||
58 | 238 | $TAR czf "$WORKDIR_ABS/$PRODUCT_FULL.tar.gz" \ | 257 | find $PRODUCT_FULL ! -type d ! -iname "*tdb*.h" -a ! -iname "*toku*" | sort > $WORKDIR_ABS/tokudb_server.list |
59 | 239 | --owner=0 --group=0 "$PRODUCT_FULL/" | 258 | $TAR --owner=0 --group=0 -czf "$WORKDIR_ABS/$PRODUCT_FULL.tar.gz" -T $WORKDIR_ABS/tokudb_server.list |
60 | 240 | 259 | rm -f $WORKDIR_ABS/tokudb_server.list | |
61 | 260 | |||
62 | 261 | if test -e "$PRODUCT_FULL/lib/mysql/plugin/ha_tokudb.so" | ||
63 | 262 | then | ||
64 | 263 | TARGETTOKU=$(echo $PRODUCT_FULL | sed 's/.Linux/.TokuDB.Linux/') | ||
65 | 264 | find $PRODUCT_FULL ! -type d -iname "*toku*" -o -iname "*tdb*.h" > $WORKDIR_ABS/tokudb_plugin.list | ||
66 | 265 | $TAR --owner=0 --group=0 -czf "$WORKDIR_ABS/$TARGETTOKU.tar.gz" -T $WORKDIR_ABS/tokudb_plugin.list | ||
67 | 266 | rm -f $WORKDIR_ABS/tokudb_plugin.list | ||
68 | 267 | fi | ||
69 | 241 | ) | 268 | ) |
70 | 242 | 269 | ||
71 | 243 | # Clean up | 270 | # Clean up |
72 | 244 | 271 | ||
73 | === modified file 'build-ps/debian/changelog' | |||
74 | --- build-ps/debian/changelog 2014-06-11 13:45:54 +0000 | |||
75 | +++ build-ps/debian/changelog 2014-06-16 07:08:31 +0000 | |||
76 | @@ -1,3 +1,9 @@ | |||
77 | 1 | percona-server-5.6 (5.6.17-rel66.0) unstable; urgency=low | ||
78 | 2 | |||
79 | 3 | * Added packaging changes regarding TokuDB | ||
80 | 4 | |||
81 | 5 | -- Tomislav Plavcic <tomislav.plavcic@percona.com> Mon, 26 May 2014 08:28:27 +0200 | ||
82 | 6 | |||
83 | 1 | percona-server-5.6 (5.6.17-rel65.0) unstable; urgency=low | 7 | percona-server-5.6 (5.6.17-rel65.0) unstable; urgency=low |
84 | 2 | 8 | ||
85 | 3 | * Fixed provides/breaks/replaces for client/server debian packages | 9 | * Fixed provides/breaks/replaces for client/server debian packages |
86 | 4 | 10 | ||
87 | === added file 'build-ps/debian/control.tokudb' | |||
88 | --- build-ps/debian/control.tokudb 1970-01-01 00:00:00 +0000 | |||
89 | +++ build-ps/debian/control.tokudb 2014-06-16 07:08:31 +0000 | |||
90 | @@ -0,0 +1,266 @@ | |||
91 | 1 | Source: percona-server-5.6 | ||
92 | 2 | Section: database | ||
93 | 3 | Priority: extra | ||
94 | 4 | Maintainer: Percona Server Development Team <mysql-dev@percona.com> | ||
95 | 5 | Uploaders: George Lorch <george.lorch@percona.com>, | ||
96 | 6 | Alexey Bychko <alexey.bychko@percona.com> | ||
97 | 7 | Build-Depends: libtool (>= 1.4.2-7), | ||
98 | 8 | procps, | ||
99 | 9 | debhelper (>= 7.0.50~), | ||
100 | 10 | file (>= 3.28), | ||
101 | 11 | libncurses5-dev (>= 5.0-6), | ||
102 | 12 | perl (>= 5.6.0), | ||
103 | 13 | libwrap0-dev (>= 7.6-8.3), | ||
104 | 14 | zlib1g-dev (>= 1:1.1.3-5), | ||
105 | 15 | libreadline-dev, | ||
106 | 16 | psmisc, | ||
107 | 17 | po-debconf, | ||
108 | 18 | chrpath, | ||
109 | 19 | ghostscript, | ||
110 | 20 | gawk, | ||
111 | 21 | bison, | ||
112 | 22 | lsb-release, | ||
113 | 23 | cmake, | ||
114 | 24 | gcc (>= 4.4), | ||
115 | 25 | g++ (>= 4.4), | ||
116 | 26 | libaio-dev[linux-any], | ||
117 | 27 | libpam-dev, | ||
118 | 28 | libssl-dev | ||
119 | 29 | Standards-Version: 3.9.4 | ||
120 | 30 | Homepage: http://www.percona.com/software/percona-server/ | ||
121 | 31 | Vcs-Bzr: lp:percona-server/5.6 | ||
122 | 32 | |||
123 | 33 | Package: percona-server-tokudb-5.6 | ||
124 | 34 | Section: database | ||
125 | 35 | Architecture: any | ||
126 | 36 | Depends: percona-server-server-5.6 (= ${binary:Version}), libjemalloc1 (>= 3.3.0), ${misc:Depends} | ||
127 | 37 | Description: TokuDB engine plugin for Percona Server | ||
128 | 38 | . | ||
129 | 39 | TokuDB is a storage engine for MySQL and MariaDB that is specifically | ||
130 | 40 | designed for high performance on write-intensive workloads. It achieves | ||
131 | 41 | this via Fractal Tree indexing. TokuDB is a scalable, ACID and MVCC compliant | ||
132 | 42 | storage engine that provides indexing-based query improvements, offers online | ||
133 | 43 | schema modifications, and reduces slave lag for both hard disk drives and flash memory. | ||
134 | 44 | . | ||
135 | 45 | This package includes the TokuDB plugin library. | ||
136 | 46 | |||
137 | 47 | Package: libperconaserverclient18.1 | ||
138 | 48 | Section: libs | ||
139 | 49 | Architecture: any | ||
140 | 50 | Depends: percona-server-common-5.6, ${misc:Depends}, ${shlibs:Depends} | ||
141 | 51 | Replaces: libpercona-server-client16, libperconaserverclient18 | ||
142 | 52 | Description: Percona Server database client library | ||
143 | 53 | Percona Server is a fast, stable and true multi-user, | ||
144 | 54 | multi-threaded SQL database server. SQL (Structured Query Language) | ||
145 | 55 | is the most popular database query language in the world. The main | ||
146 | 56 | goals of Percona Server are speed, robustness and ease of use. | ||
147 | 57 | . | ||
148 | 58 | This package includes the client library. | ||
149 | 59 | |||
150 | 60 | Package: libperconaserverclient18.1-dev | ||
151 | 61 | Architecture: any | ||
152 | 62 | Section: libdevel | ||
153 | 63 | Depends: libperconaserverclient18.1 (= ${binary:Version}), | ||
154 | 64 | zlib1g-dev, ${misc:Depends} | ||
155 | 65 | Breaks: libperconaserverclient18-dev, | ||
156 | 66 | libperconaserverclient16-dev, | ||
157 | 67 | libperconaserverclient15-dev, | ||
158 | 68 | libperconaserverclient14-dev, | ||
159 | 69 | libperconaserverclient12-dev, | ||
160 | 70 | libperconaserverclient10-dev, | ||
161 | 71 | libmysqlclient-dev, | ||
162 | 72 | libmysqlclient18-dev, | ||
163 | 73 | libmariadbclient-dev | ||
164 | 74 | Replaces: libperconaserverclient18-dev, | ||
165 | 75 | libperconaserverclient16-dev, | ||
166 | 76 | libperconaserverclient15-dev, | ||
167 | 77 | libperconaserverclient14-dev, | ||
168 | 78 | libperconaserverclient12-dev, | ||
169 | 79 | libperconaserverclient10-dev, | ||
170 | 80 | libpercona-xtradb-client-dev, | ||
171 | 81 | libmariadbclient-dev | ||
172 | 82 | Provides: libmysqlclient-dev | ||
173 | 83 | Description: Percona Server database development files | ||
174 | 84 | Percona Server is a fast, stable and true multi-user, multi-threaded SQL | ||
175 | 85 | database server. SQL (Structured Query Language) is the most popular | ||
176 | 86 | database query language in the world. The main goals of Percona Server are | ||
177 | 87 | speed, robustness and ease of use. | ||
178 | 88 | . | ||
179 | 89 | This package includes development libraries and header files. | ||
180 | 90 | |||
181 | 91 | Package: percona-server-common-5.6 | ||
182 | 92 | Section: database | ||
183 | 93 | Architecture: any | ||
184 | 94 | Depends: ${misc:Depends} | ||
185 | 95 | Description: Percona Server database common files (e.g. /etc/mysql/my.cnf) | ||
186 | 96 | Percona Server is a fast, stable and true multi-user, multi-threaded SQL | ||
187 | 97 | database server. SQL (Structured Query Language) is the most popular database | ||
188 | 98 | query language in the world. The main goals of Percona Server are speed, | ||
189 | 99 | robustness and ease of use. | ||
190 | 100 | . | ||
191 | 101 | This package includes files needed by all versions of the client library | ||
192 | 102 | (e.g. /etc/mysql/my.cnf). | ||
193 | 103 | |||
194 | 104 | Package: percona-server-client-5.6 | ||
195 | 105 | Architecture: any | ||
196 | 106 | Depends: debianutils (>=1.6), | ||
197 | 107 | libdbi-perl, | ||
198 | 108 | percona-server-common-5.6 (>= ${source:Version}), | ||
199 | 109 | libperconaserverclient18.1 (>= ${source:Version}), | ||
200 | 110 | ${shlibs:Depends}, | ||
201 | 111 | ${misc:Depends} | ||
202 | 112 | Provides: mysql-client, | ||
203 | 113 | virtual-mysql-client, | ||
204 | 114 | virtual-mysql-client-core | ||
205 | 115 | Breaks: mysql-client-5.0, | ||
206 | 116 | mysql-client-core-5.1, | ||
207 | 117 | mysql-client-core-5.5, | ||
208 | 118 | mysql-client-5.1, | ||
209 | 119 | mysql-client-5.5, | ||
210 | 120 | mysql-client-5.6, | ||
211 | 121 | percona-xtradb-client-5.0, | ||
212 | 122 | percona-server-client-5.1, | ||
213 | 123 | percona-server-client-5.5, | ||
214 | 124 | mariadb-client, | ||
215 | 125 | mariadb-client-core-5.5, | ||
216 | 126 | mariadb-client-5.5, | ||
217 | 127 | virtual-mysql-client, | ||
218 | 128 | virtual-mysql-client-core | ||
219 | 129 | Replaces: mysql-client-5.0, | ||
220 | 130 | mysql-client-core-5.1, | ||
221 | 131 | mysql-client-core-5.5, | ||
222 | 132 | mysql-client-5.1, | ||
223 | 133 | mysql-client-5.5, | ||
224 | 134 | mysql-client-5.6, | ||
225 | 135 | percona-xtradb-client-5.0, | ||
226 | 136 | percona-server-client-5.1, | ||
227 | 137 | percona-server-client-5.5, | ||
228 | 138 | mariadb-client, | ||
229 | 139 | mariadb-client-core-5.5, | ||
230 | 140 | mariadb-client-5.5, | ||
231 | 141 | virtual-mysql-client, | ||
232 | 142 | virtual-mysql-client-core | ||
233 | 143 | Description: Percona Server database client binaries | ||
234 | 144 | Percona Server is a fast, stable and true multi-user, multi-threaded SQL | ||
235 | 145 | database server. SQL (Structured Query Language) is the most popular database | ||
236 | 146 | query language in the world. The main goals of Percona Server are speed, | ||
237 | 147 | robustness and ease of use. | ||
238 | 148 | . | ||
239 | 149 | This package includes the client binaries and the additional tools | ||
240 | 150 | innotop and mysqlreport. | ||
241 | 151 | |||
242 | 152 | Package: percona-server-server-5.6 | ||
243 | 153 | Architecture: any | ||
244 | 154 | Suggests: tinyca | ||
245 | 155 | Pre-Depends: percona-server-common-5.6 (>= ${source:Version}), | ||
246 | 156 | adduser (>= 3.4.0), | ||
247 | 157 | debconf | ||
248 | 158 | Depends: percona-server-client-5.6 (>= ${source:Version}), | ||
249 | 159 | libdbi-perl, | ||
250 | 160 | libdbd-mysql-perl, | ||
251 | 161 | perl (>= 5.6), | ||
252 | 162 | ${shlibs:Depends}, | ||
253 | 163 | ${misc:Depends}, | ||
254 | 164 | psmisc, | ||
255 | 165 | passwd, | ||
256 | 166 | lsb-base (>= 3.0-10) | ||
257 | 167 | Provides: mysql-server, | ||
258 | 168 | virtual-mysql-server, | ||
259 | 169 | virtual-mysql-server-core | ||
260 | 170 | Breaks: mysql-server-5.0, | ||
261 | 171 | mysql-server-5.1, | ||
262 | 172 | mysql-server-5.5, | ||
263 | 173 | mysql-server-5.6, | ||
264 | 174 | mysql-server-core-5.1, | ||
265 | 175 | percona-xtradb-server-5.0, | ||
266 | 176 | percona-server-server-5.1, | ||
267 | 177 | percona-server-server-5.5, | ||
268 | 178 | mariadb-server, | ||
269 | 179 | mariadb-server-core-5.5, | ||
270 | 180 | mariadb-server-5.5, | ||
271 | 181 | virtual-mysql-server, | ||
272 | 182 | virtual-mysql-server-core | ||
273 | 183 | Replaces: mysql-server-5.0, | ||
274 | 184 | mysql-server-5.1, | ||
275 | 185 | mysql-server-5.5, | ||
276 | 186 | mysql-server-5.6, | ||
277 | 187 | mysql-server-core-5.1, | ||
278 | 188 | percona-xtradb-server-5.0, | ||
279 | 189 | percona-server-server-5.1, | ||
280 | 190 | percona-server-server-5.5, | ||
281 | 191 | mariadb-server, | ||
282 | 192 | mariadb-server-core-5.5, | ||
283 | 193 | mariadb-server-5.5, | ||
284 | 194 | virtual-mysql-server, | ||
285 | 195 | virtual-mysql-server-core | ||
286 | 196 | Description: Percona Server database server binaries | ||
287 | 197 | Percona Server is a fast, stable and true multi-user, multi-threaded SQL | ||
288 | 198 | database server. SQL (Structured Query Language) is the most popular database | ||
289 | 199 | query language in the world. The main goals of Percona Server are speed, | ||
290 | 200 | robustness and ease of use. | ||
291 | 201 | . | ||
292 | 202 | This package includes the server binaries. | ||
293 | 203 | |||
294 | 204 | Package: percona-server-server | ||
295 | 205 | Section: database | ||
296 | 206 | Architecture: any | ||
297 | 207 | Depends: percona-server-server-5.6, ${misc:Depends} | ||
298 | 208 | Description: Percona Server database server | ||
299 | 209 | (metapackage depending on the latest version) | ||
300 | 210 | This is an empty package that depends on the current "best" version of | ||
301 | 211 | percona-server-server (currently percona-server-server-5.6), as determined | ||
302 | 212 | by the Percona Server maintainers. Install this package if in doubt | ||
303 | 213 | about which Percona Server version you need. That will install the version | ||
304 | 214 | recommended by the package maintainers. | ||
305 | 215 | . | ||
306 | 216 | Percona Server is a fast, stable and true multi-user, multi-threaded SQL | ||
307 | 217 | database server. SQL (Structured Query Language) is the most popular database | ||
308 | 218 | query language in the world. The main goals of Percona Server are speed, | ||
309 | 219 | robustness and ease of use. | ||
310 | 220 | |||
311 | 221 | Package: percona-server-client | ||
312 | 222 | Section: database | ||
313 | 223 | Architecture: any | ||
314 | 224 | Depends: percona-server-client-5.6, ${misc:Depends} | ||
315 | 225 | Description: Percona Server database client | ||
316 | 226 | (metapackage depending on the latest version) | ||
317 | 227 | This is an empty package that depends on the current "best" version of | ||
318 | 228 | percona-server-client (currently percona-server-client-5.6), as determined | ||
319 | 229 | by the Percona Server maintainers. Install this package if in doubt | ||
320 | 230 | about which Percona Server version you want, as this is the one we consider | ||
321 | 231 | to be in the best shape. | ||
322 | 232 | |||
323 | 233 | Package: percona-server-test-5.6 | ||
324 | 234 | Architecture: any | ||
325 | 235 | Depends: percona-server-client-5.6 (>= ${source:Version}), | ||
326 | 236 | percona-server-server-5.6 (>= ${source:Version}), | ||
327 | 237 | ${misc:Depends}, | ||
328 | 238 | ${shlibs:Depends} | ||
329 | 239 | Description: Percona Server database test suite | ||
330 | 240 | Percona Server is a fast, stable and true multi-user, multi-threaded SQL | ||
331 | 241 | database server. SQL (Structured Query Language) is the most popular database | ||
332 | 242 | query language in the world. The main goals of Percona Server are speed, | ||
333 | 243 | robustness and ease of use. | ||
334 | 244 | . | ||
335 | 245 | This package includes the Percona Server test framework that provides | ||
336 | 246 | a means for verifying that Percona Server and its client programs | ||
337 | 247 | operate according to expectations | ||
338 | 248 | |||
339 | 249 | Package: percona-server-source-5.6 | ||
340 | 250 | Architecture: any | ||
341 | 251 | Depends: ${misc:Depends}, ${shlibs:Depends} | ||
342 | 252 | Description: Percona Server 5.6 source | ||
343 | 253 | This package includes the source code to Percona Server as configured before | ||
344 | 254 | building. | ||
345 | 255 | |||
346 | 256 | Package: percona-server-5.6-dbg | ||
347 | 257 | Architecture: any | ||
348 | 258 | Section: debug | ||
349 | 259 | Depends: percona-server-server-5.6 (= ${binary:Version}), ${misc:Depends} | ||
350 | 260 | Description: Debugging package for Percona Server | ||
351 | 261 | Percona Server is a fast, stable and true multi-user, multi-threaded SQL | ||
352 | 262 | database server. SQL (Structured Query Language) is the most popular database | ||
353 | 263 | query language in the world. The main goals of Percona Server are speed, | ||
354 | 264 | robustness and ease of use. | ||
355 | 265 | . | ||
356 | 266 | This package contains the debugging symbols for the Percona Server binaries. | ||
357 | 0 | 267 | ||
358 | === added file 'build-ps/debian/percona-server-tokudb-5.6.files' | |||
359 | --- build-ps/debian/percona-server-tokudb-5.6.files 1970-01-01 00:00:00 +0000 | |||
360 | +++ build-ps/debian/percona-server-tokudb-5.6.files 2014-06-16 07:08:31 +0000 | |||
361 | @@ -0,0 +1,3 @@ | |||
362 | 1 | usr/lib/mysql/plugin/ha_tokudb.so | ||
363 | 2 | usr/bin/tokuftdump | ||
364 | 3 | usr/include/tdb-internal.h | ||
365 | 0 | 4 | ||
366 | === added file 'build-ps/debian/percona-server-tokudb-5.6.postinst' | |||
367 | --- build-ps/debian/percona-server-tokudb-5.6.postinst 1970-01-01 00:00:00 +0000 | |||
368 | +++ build-ps/debian/percona-server-tokudb-5.6.postinst 2014-06-16 07:08:31 +0000 | |||
369 | @@ -0,0 +1,18 @@ | |||
370 | 1 | #!/bin/bash -e | ||
371 | 2 | |||
372 | 3 | # Some postinstall info about TokuDB | ||
373 | 4 | if [ -z "$2" ]; then | ||
374 | 5 | echo -e "\n\n * This release of Percona Server is distributed with TokuDB storage engine." | ||
375 | 6 | echo -e " * Run the following commands to enable the TokuDB storage engine in Percona Server:\n" | ||
376 | 7 | echo -e "\tmysql -e \"INSTALL PLUGIN tokudb SONAME 'ha_tokudb.so';\"" | ||
377 | 8 | echo -e "\tmysql -e \"INSTALL PLUGIN tokudb_file_map SONAME 'ha_tokudb.so';\"" | ||
378 | 9 | echo -e "\tmysql -e \"INSTALL PLUGIN tokudb_fractal_tree_info SONAME 'ha_tokudb.so';\"" | ||
379 | 10 | echo -e "\tmysql -e \"INSTALL PLUGIN tokudb_fractal_tree_block_map SONAME 'ha_tokudb.so';\"" | ||
380 | 11 | echo -e "\tmysql -e \"INSTALL PLUGIN tokudb_trx SONAME 'ha_tokudb.so';\"" | ||
381 | 12 | echo -e "\tmysql -e \"INSTALL PLUGIN tokudb_locks SONAME 'ha_tokudb.so';\"" | ||
382 | 13 | echo -e "\tmysql -e \"INSTALL PLUGIN tokudb_lock_waits SONAME 'ha_tokudb.so';\"" | ||
383 | 14 | echo -e "\n * See http://www.percona.com/doc/percona-server/5.6/tokudb/tokudb_intro.html for more details\n\n" | ||
384 | 15 | fi | ||
385 | 16 | |||
386 | 17 | #DEBHELPER# | ||
387 | 18 | exit 0 | ||
388 | 0 | 19 | ||
389 | === modified file 'build-ps/debian/rules' | |||
390 | --- build-ps/debian/rules 2014-06-11 13:45:54 +0000 | |||
391 | +++ build-ps/debian/rules 2014-06-16 07:08:31 +0000 | |||
392 | @@ -137,7 +137,7 @@ | |||
393 | 137 | rm -rf $(builddir) | 137 | rm -rf $(builddir) |
394 | 138 | 138 | ||
395 | 139 | debconf-updatepo | 139 | debconf-updatepo |
397 | 140 | rm -f $(EXPORTED_SOURCE_TARBALL) | 140 | # rm -f $(EXPORTED_SOURCE_TARBALL) |
398 | 141 | dh_clean -v | 141 | dh_clean -v |
399 | 142 | 142 | ||
400 | 143 | 143 | ||
401 | 144 | 144 | ||
402 | === added file 'build-ps/debian/rules.tokudb' | |||
403 | --- build-ps/debian/rules.tokudb 1970-01-01 00:00:00 +0000 | |||
404 | +++ build-ps/debian/rules.tokudb 2014-06-16 07:08:31 +0000 | |||
405 | @@ -0,0 +1,279 @@ | |||
406 | 1 | #!/usr/bin/make -f | ||
407 | 2 | |||
408 | 3 | export DH_VERBOSE=1 | ||
409 | 4 | export DEB_BUILD_HARDENING=1 | ||
410 | 5 | |||
411 | 6 | PACKAGE=percona-server-5.6 | ||
412 | 7 | PS_VERSION_EXTRA = '@@PERCONA_VERSION_EXTRA@@' | ||
413 | 8 | REVISION = '@@REVISION@@' | ||
414 | 9 | COMPILATION_COMMENT_RELEASE = "Percona Server (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)" | ||
415 | 10 | |||
416 | 11 | TMP=$(CURDIR)/debian/tmp/ | ||
417 | 12 | prefix=/usr | ||
418 | 13 | |||
419 | 14 | ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH) | ||
420 | 15 | ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) | ||
421 | 16 | NCPU = $(shell grep -c processor /proc/cpuinfo) | ||
422 | 17 | DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) | ||
423 | 18 | DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) | ||
424 | 19 | |||
425 | 20 | export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc$(USE_THIS_GCC_VERSION) | ||
426 | 21 | export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++$(USE_THIS_GCC_VERSION) | ||
427 | 22 | |||
428 | 23 | DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) | ||
429 | 24 | DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') | ||
430 | 25 | DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-) | ||
431 | 26 | DEB_UPSTREAM_VERSION ?= $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') | ||
432 | 27 | DEB_UPSTREAM_VERSION_MAJOR_MINOR := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r -n 's/^([0-9]+\.[0-9]+).*/\1/p') | ||
433 | 28 | DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) | ||
434 | 29 | |||
435 | 30 | EXPORTED_SOURCE_TARBALL = debian/percona-server-source-5.6.tar.gz | ||
436 | 31 | |||
437 | 32 | DISTRIBUTION = $(shell lsb_release -i -s) | ||
438 | 33 | |||
439 | 34 | MYSQL_SRC = $(shell pwd) | ||
440 | 35 | |||
441 | 36 | #MAKE_TEST_TARGET=test-mtr | ||
442 | 37 | ifneq ($(findstring fulltest,$(DEB_BUILD_OPTIONS)),) | ||
443 | 38 | # make test-bt is the testsuite run by the MySQL build team | ||
444 | 39 | # before a release, but it is long | ||
445 | 40 | MAKE_TEST_TARGET=test-bt | ||
446 | 41 | endif | ||
447 | 42 | |||
448 | 43 | USE_ASSEMBLER=--enable-assembler | ||
449 | 44 | |||
450 | 45 | ifneq (,$(filter $(ARCH), amd64 i386)) | ||
451 | 46 | TESTSUITE_FAIL_CMD=exit 1 | ||
452 | 47 | else | ||
453 | 48 | TESTSUITE_FAIL_CMD=true | ||
454 | 49 | endif | ||
455 | 50 | |||
456 | 51 | builddir = builddir | ||
457 | 52 | |||
458 | 53 | configure: patch configure-stamp | ||
459 | 54 | |||
460 | 55 | configure-stamp: | ||
461 | 56 | @echo "RULES.$@" | ||
462 | 57 | dh_testdir | ||
463 | 58 | |||
464 | 59 | ifneq ($(ARCH_OS),hurd) | ||
465 | 60 | if [ ! -d /proc/self ]; then echo "/proc IS NEEDED" 1>&2; exit 1; fi | ||
466 | 61 | endif | ||
467 | 62 | |||
468 | 63 | [ ! -d python-for-subunit2junitxml ] || rm -rf python-for-subunit2junitxml | ||
469 | 64 | |||
470 | 65 | ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \ | ||
471 | 66 | sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \ | ||
472 | 67 | CC=$${MYSQL_BUILD_CC:-gcc} \ | ||
473 | 68 | CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -g -fno-strict-aliasing"} \ | ||
474 | 69 | CXX=$${MYSQL_BUILD_CXX:-g++} \ | ||
475 | 70 | CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -g -felide-constructors -fno-exceptions -fno-rtti -fno-strict-aliasing"} \ | ||
476 | 71 | cmake -DCMAKE_INSTALL_PREFIX=/usr \ | ||
477 | 72 | \ | ||
478 | 73 | -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ | ||
479 | 74 | -DCMAKE_BUILD_TYPE=RelWithDebInfo \ | ||
480 | 75 | -DWITH_LIBWRAP=ON \ | ||
481 | 76 | -DWITH_ZLIB=system \ | ||
482 | 77 | -DWITH_SSL=system \ | ||
483 | 78 | -DCOMPILATION_COMMENT=$(COMPILATION_COMMENT_RELEASE) \ | ||
484 | 79 | -DSYSTEM_TYPE="debian-linux-gnu" \ | ||
485 | 80 | -DINSTALL_LAYOUT=RPM \ | ||
486 | 81 | -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \ | ||
487 | 82 | -DINSTALL_PLUGINDIR=lib/mysql/plugin \ | ||
488 | 83 | -DWITH_EMBEDDED_SERVER=OFF \ | ||
489 | 84 | -DWITH_INNODB_MEMCACHED=ON \ | ||
490 | 85 | -DWITH_ARCHIVE_STORAGE_ENGINE=ON \ | ||
491 | 86 | -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \ | ||
492 | 87 | -DWITH_FEDERATED_STORAGE_ENGINE=ON \ | ||
493 | 88 | -DWITH_PAM=ON -DWITH_EXTRA_CHARSETS=all \ | ||
494 | 89 | -DWITH_VALGRIND=OFF -DUSE_VALGRIND=OFF -DDEBUG_EXTNAME=OFF -DBUILD_TESTING=OFF -DUSE_GTAGS=OFF \ | ||
495 | 90 | -DUSE_CTAGS=OFF -DUSE_ETAGS=OFF -DUSE_CSCOPE=OFF -DTOKU_DEBUG_PARANOID=OFF ..' | ||
496 | 91 | |||
497 | 92 | touch $@ | ||
498 | 93 | |||
499 | 94 | build: build-arch build-indep | ||
500 | 95 | build-arch: build-stamp | ||
501 | 96 | build-indep: build-stamp | ||
502 | 97 | |||
503 | 98 | build-stamp: configure | ||
504 | 99 | @echo "RULES.$@" | ||
505 | 100 | dh_testdir | ||
506 | 101 | |||
507 | 102 | [ -f $(EXPORTED_SOURCE_TARBALL) ] || tar -zcf $(EXPORTED_SOURCE_TARBALL) \ | ||
508 | 103 | --exclude=debian . \ | ||
509 | 104 | --transform="s,^\./,percona-server-5.6/," | ||
510 | 105 | |||
511 | 106 | cd $(builddir) && $(MAKE) -j$(NCPU) VERBOSE=1 | ||
512 | 107 | |||
513 | 108 | ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),) | ||
514 | 109 | # Don't know why the following is necessary... | ||
515 | 110 | cp unittest/unit.pl $(builddir)/unittest/ | ||
516 | 111 | cp -r mysql-test/* $(builddir)/mysql-test/ | ||
517 | 112 | cp -r sql/share/* $(builddir)/sql/share/ | ||
518 | 113 | cp -r scripts/*sql $(builddir)/scripts/ | ||
519 | 114 | if [ ! -f testsuite-stamp ] ; then \ | ||
520 | 115 | (cd $(builddir) && $(MAKE) test-unit) || $(TESTSUITE_FAIL_CMD) ; \ | ||
521 | 116 | cd $(builddir) && $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \ | ||
522 | 117 | fi | ||
523 | 118 | endif | ||
524 | 119 | |||
525 | 120 | touch testsuite-stamp | ||
526 | 121 | |||
527 | 122 | touch build-stamp | ||
528 | 123 | |||
529 | 124 | clean: clean-patched | ||
530 | 125 | rm -rf debian/patched | ||
531 | 126 | |||
532 | 127 | clean-patched: | ||
533 | 128 | @echo "RULES.clean-patched" | ||
534 | 129 | dh_testdir | ||
535 | 130 | dh_testroot | ||
536 | 131 | rm -f configure-stamp* | ||
537 | 132 | rm -f build-stamp* | ||
538 | 133 | rm -f testsuite-stamp | ||
539 | 134 | |||
540 | 135 | [ ! -f Makefile ] || $(MAKE) clean | ||
541 | 136 | [ ! -d mysql-test/var ] || rm -rf mysql-test/var | ||
542 | 137 | [ ! -d python-for-subunit2junitxml ] || rm -rf python-for-subunit2junitxml | ||
543 | 138 | |||
544 | 139 | rm -rf $(builddir) | ||
545 | 140 | |||
546 | 141 | debconf-updatepo | ||
547 | 142 | # rm -f $(EXPORTED_SOURCE_TARBALL) | ||
548 | 143 | dh_clean -v | ||
549 | 144 | |||
550 | 145 | |||
551 | 146 | install: build | ||
552 | 147 | @echo "RULES.$@" | ||
553 | 148 | dh_testdir | ||
554 | 149 | dh_testroot | ||
555 | 150 | dh_prep | ||
556 | 151 | dh_installdirs | ||
557 | 152 | |||
558 | 153 | # make install (trailing slash needed for innobase) | ||
559 | 154 | (cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/) | ||
560 | 155 | |||
561 | 156 | # After installing, remove rpath to make lintian happy. | ||
562 | 157 | set +e; \ | ||
563 | 158 | find ./debian/tmp/ -type f -print0 \ | ||
564 | 159 | | xargs -0 --no-run-if-empty chrpath -k 2>/dev/null \ | ||
565 | 160 | | fgrep RPATH= \ | ||
566 | 161 | | cut -d: -f 1 \ | ||
567 | 162 | | xargs --no-run-if-empty chrpath -d; \ | ||
568 | 163 | set -e | ||
569 | 164 | |||
570 | 165 | # libperconaserverclient: move shared libraries (but not the rest like libheap.a & co) | ||
571 | 166 | # libmysqlclient_r is now a symlink to libmysqlclient. But it is | ||
572 | 167 | # created wrong by the cmake build system and points at | ||
573 | 168 | # libmysqlclient.so instead of the corresponding versioned lib. | ||
574 | 169 | for i in `ls $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libperconaserverclient.so*` ; do \ | ||
575 | 170 | rlib=`basename $$i | sed -e 's/libperconaserverclient\./libperconaserverclient_r./'` ;\ | ||
576 | 171 | ln -sf `basename $$i` $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/$$rlib ;\ | ||
577 | 172 | done | ||
578 | 173 | |||
579 | 174 | # libmysqlclient-dev: forgotten header file since 3.23.25? | ||
580 | 175 | #cp $(BUILDDIR)/include/my_config.h $(TMP)/usr/include/mysql/ | ||
581 | 176 | #cp include/my_dir.h $(TMP)/usr/include/mysql/ | ||
582 | 177 | # install libmysqld built with -FPIC | ||
583 | 178 | install -d -m 0755 -o root -g root $(TMP)/usr/lib/percona-server | ||
584 | 179 | #install -m 0644 -o root -g root $(BUILDDIR_PIC)/libmysqld/libmysqld.a $(TMP)/usr/lib/mysql/libmysqld_pic.a | ||
585 | 180 | # mysql_config won't report the -fPIC, so give libmysqld-pic users a way to get their flags | ||
586 | 181 | #install -m 0755 -o root -g root $(BUILDDIR_PIC)/scripts/mysql_config $(TMP)/usr/bin/mysql_config_pic | ||
587 | 182 | |||
588 | 183 | # mysql-common: We now provide our own config file. | ||
589 | 184 | install -d $(TMP)/etc/mysql | ||
590 | 185 | #install -m 0644 debian/additions/my.cnf $(TMP)/etc/mysql/my.cnf | ||
591 | 186 | |||
592 | 187 | # mysql-client | ||
593 | 188 | #FIXME install -m 0755 debian/additions/mysqlreport $(TMP)/usr/bin/ | ||
594 | 189 | #FIXME install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/ | ||
595 | 190 | #FIXME install -m 0644 debian/additions/innotop/innotop.1 $(TMP)/usr/share/man/man1/ | ||
596 | 191 | |||
597 | 192 | # mysql-server | ||
598 | 193 | mkdir -p $(TMP)/usr/share/doc/percona-server-5.6/examples | ||
599 | 194 | mv $(TMP)/usr/share/mysql/*cnf $(TMP)/usr/share/doc/percona-server-5.6/examples/ | ||
600 | 195 | rm -vf $(TMP)/usr/share/mysql/mi_test_all* \ | ||
601 | 196 | $(TMP)/usr/share/mysql/mysql-log-rotate \ | ||
602 | 197 | $(TMP)/usr/share/mysql/mysql.server \ | ||
603 | 198 | $(TMP)/usr/share/mysql/binary-configure | ||
604 | 199 | nm -n $(builddir)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/percona-server-5.6/mysqld.sym.gz | ||
605 | 200 | # FIXME install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/ | ||
606 | 201 | install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/ | ||
607 | 202 | install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/ | ||
608 | 203 | |||
609 | 204 | # install AppArmor profile | ||
610 | 205 | # FIXME install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mysqld | ||
611 | 206 | # install Apport hook | ||
612 | 207 | # FIXME install -D -m 644 debian/mysql-server-5.6.py $(TMP)/usr/share/apport/package-hooks/source_mysql-5.6.py | ||
613 | 208 | |||
614 | 209 | install -D -m 0644 $(EXPORTED_SOURCE_TARBALL) $(TMP)/usr/src/percona-server/`basename $(EXPORTED_SOURCE_TARBALL)` | ||
615 | 210 | |||
616 | 211 | dh_movefiles | ||
617 | 212 | |||
618 | 213 | # Build architecture-independent files here. | ||
619 | 214 | binary-indep: build install | ||
620 | 215 | @echo "RULES.binary-indep" | ||
621 | 216 | dh_testdir -i | ||
622 | 217 | dh_testroot -i | ||
623 | 218 | dh_installdebconf -i | ||
624 | 219 | dh_installdocs -i | ||
625 | 220 | dh_installexamples -i | ||
626 | 221 | dh_installmenu -i | ||
627 | 222 | dh_installlogrotate -i | ||
628 | 223 | dh_installinit -i | ||
629 | 224 | dh_installcron -i | ||
630 | 225 | dh_installman -i | ||
631 | 226 | dh_installinfo -i | ||
632 | 227 | dh_installlogcheck -i | ||
633 | 228 | dh_installchangelogs -i | ||
634 | 229 | dh_link -i | ||
635 | 230 | dh_compress -i | ||
636 | 231 | dh_fixperms -i | ||
637 | 232 | dh_installdeb -i | ||
638 | 233 | dh_perl -i | ||
639 | 234 | dh_gencontrol -i | ||
640 | 235 | dh_md5sums -i | ||
641 | 236 | dh_builddeb -i | ||
642 | 237 | |||
643 | 238 | binary-arch: build install | ||
644 | 239 | @echo "RULES.binary-arch" | ||
645 | 240 | dh_testdir | ||
646 | 241 | dh_testroot | ||
647 | 242 | |||
648 | 243 | dh_installdebconf -a | ||
649 | 244 | dh_installdocs -a | ||
650 | 245 | dh_installexamples -a | ||
651 | 246 | dh_installmenu -a | ||
652 | 247 | dh_installlogrotate -a --name mysql-server | ||
653 | 248 | if [ "$(DISTRIBUTION)" = "Ubuntu" ]; then if [ "$(DISTRELEASE)" != "lucid"]; then dh_apparmor -pmysql-server-5.5 --profile-name=usr.sbin.mysqld; fi; fi | ||
654 | 249 | # Start mysql in runlevel 19 before 20 where apache, proftpd etc gets | ||
655 | 250 | # started which might depend on a running database server. | ||
656 | 251 | dh_installinit -a --name=mysql -- defaults 19 21 | ||
657 | 252 | dh_installcron -a --name mysql-server | ||
658 | 253 | dh_installman -a | ||
659 | 254 | dh_installinfo -a | ||
660 | 255 | dh_installlogcheck -a | ||
661 | 256 | dh_installchangelogs -a | ||
662 | 257 | dh_strip -a --dbg-package=percona-server-5.6-dbg | ||
663 | 258 | dh_lintian | ||
664 | 259 | dh_link -a # .so muss nach .so.1.2.3 installier werden! | ||
665 | 260 | dh_compress -a | ||
666 | 261 | dh_fixperms -a | ||
667 | 262 | dh_makeshlibs -a | ||
668 | 263 | dh_installdeb -a | ||
669 | 264 | dh_perl -a | ||
670 | 265 | #dh_shlibdeps -a -l debian/libmysqlclient16/usr/lib -L libmysqlclient16 | ||
671 | 266 | dh_shlibdeps -a | ||
672 | 267 | dh_gencontrol -a | ||
673 | 268 | dh_md5sums -a | ||
674 | 269 | dh_builddeb -a | ||
675 | 270 | |||
676 | 271 | binary: binary-indep binary-arch | ||
677 | 272 | |||
678 | 273 | override_dh_auto_install: | ||
679 | 274 | dh_auto_install | ||
680 | 275 | |||
681 | 276 | .PHONY: clean clean-patched configure build binary binary-indep binary-arch install patch | ||
682 | 277 | |||
683 | 278 | override_dh_installinit: | ||
684 | 279 | dh_installinit --name=mysql --error-handler=: | ||
685 | 0 | 280 | ||
686 | === modified file 'build-ps/percona-server.spec' | |||
687 | --- build-ps/percona-server.spec 2014-06-11 13:45:54 +0000 | |||
688 | +++ build-ps/percona-server.spec 2014-06-16 07:08:31 +0000 | |||
689 | @@ -30,6 +30,19 @@ | |||
690 | 30 | %define percona_server_version @@PERCONA_VERSION@@ | 30 | %define percona_server_version @@PERCONA_VERSION@@ |
691 | 31 | %define revision @@REVISION@@ | 31 | %define revision @@REVISION@@ |
692 | 32 | 32 | ||
693 | 33 | # | ||
694 | 34 | %bcond_with tokudb | ||
695 | 35 | # | ||
696 | 36 | %if %{with tokudb} | ||
697 | 37 | %define TOKUDB_FLAGS -DWITH_VALGRIND=OFF -DUSE_VALGRIND=OFF -DDEBUG_EXTNAME=OFF -DBUILD_TESTING=OFF -DUSE_GTAGS=OFF -DUSE_CTAGS=OFF -DUSE_ETAGS=OFF -DUSE_CSCOPE=OFF | ||
698 | 38 | %define TOKUDB_DEBUG_ON -DTOKU_DEBUG_PARANOID=ON | ||
699 | 39 | %define TOKUDB_DEBUG_OFF -DTOKU_DEBUG_PARANOID=OFF | ||
700 | 40 | %else | ||
701 | 41 | %define TOKUDB_FLAGS %{nil} | ||
702 | 42 | %define TOKUDB_DEBUG_ON %{nil} | ||
703 | 43 | %define TOKUDB_DEBUG_OFF %{nil} | ||
704 | 44 | %endif | ||
705 | 45 | # | ||
706 | 33 | %define mysqld_user mysql | 46 | %define mysqld_user mysql |
707 | 34 | %define mysqld_group mysql | 47 | %define mysqld_group mysql |
708 | 35 | %define mysqldatadir /var/lib/mysql | 48 | %define mysqldatadir /var/lib/mysql |
709 | @@ -227,6 +240,9 @@ | |||
710 | 227 | Distribution: %{distro_description} | 240 | Distribution: %{distro_description} |
711 | 228 | License: Copyright (c) 2000, 2010, %{mysql_vendor}. All rights reserved. Use is subject to license terms. Under %{license_type} license as shown in the Description field. | 241 | License: Copyright (c) 2000, 2010, %{mysql_vendor}. All rights reserved. Use is subject to license terms. Under %{license_type} license as shown in the Description field. |
712 | 229 | Source: http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-%{mysql_version}-%{percona_server_version}/source/%{src_dir}.tar.gz | 242 | Source: http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-%{mysql_version}-%{percona_server_version}/source/%{src_dir}.tar.gz |
713 | 243 | %if %{with tokudb} | ||
714 | 244 | Source1: http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-%{mysql_version}-%{percona_server_version}/source/%{src_dir}.tokudb.tar.gz | ||
715 | 245 | %endif | ||
716 | 230 | URL: http://www.percona.com/ | 246 | URL: http://www.percona.com/ |
717 | 231 | Packager: Percona MySQL Development Team <mysqldev@percona.com> | 247 | Packager: Percona MySQL Development Team <mysqldev@percona.com> |
718 | 232 | Vendor: %{percona_server_vendor} | 248 | Vendor: %{percona_server_vendor} |
719 | @@ -273,11 +289,26 @@ | |||
720 | 273 | If you want to access and work with the database, you have to install | 289 | If you want to access and work with the database, you have to install |
721 | 274 | package "Percona-Server-client%{product_suffix}" as well! | 290 | package "Percona-Server-client%{product_suffix}" as well! |
722 | 275 | 291 | ||
723 | 292 | %if %{with tokudb} | ||
724 | 293 | # ---------------------------------------------------------------------------- | ||
725 | 294 | %package -n Percona-Server-tokudb%{product_suffix} | ||
726 | 295 | Summary: Percona Server - TokuDB | ||
727 | 296 | Group: Applications/Databases | ||
728 | 297 | Requires: Percona-Server-server%{product_suffix} = %{version}-%{release} | ||
729 | 298 | Requires: Percona-Server-shared%{product_suffix} = %{version}-%{release} | ||
730 | 299 | Requires: Percona-Server-client%{product_suffix} = %{version}-%{release} | ||
731 | 300 | Requires: jemalloc >= 3.3.0 | ||
732 | 301 | Provides: tokudb-plugin = %{version}-%{release} | ||
733 | 302 | |||
734 | 303 | %description -n Percona-Server-tokudb%{product_suffix} | ||
735 | 304 | This package contains the TokuDB plugin for Percona Server %{version}-%{release} | ||
736 | 305 | %endif | ||
737 | 306 | |||
738 | 276 | # ---------------------------------------------------------------------------- | 307 | # ---------------------------------------------------------------------------- |
739 | 277 | %package -n Percona-Server-client%{product_suffix} | 308 | %package -n Percona-Server-client%{product_suffix} |
740 | 278 | Summary: Percona Server - Client | 309 | Summary: Percona Server - Client |
741 | 279 | Group: Applications/Databases | 310 | Group: Applications/Databases |
743 | 280 | Requires: Percona-Server-shared%{product_suffix} | 311 | Requires: Percona-Server-shared%{product_suffix} |
744 | 281 | Provides: mysql-client MySQL-client mysql MySQL | 312 | Provides: mysql-client MySQL-client mysql MySQL |
745 | 282 | Conflicts: Percona-SQL-client-50 Percona-Server-client-51 Percona-Server-client-55 | 313 | Conflicts: Percona-SQL-client-50 Percona-Server-client-51 Percona-Server-client-55 |
746 | 283 | 314 | ||
747 | @@ -331,6 +362,9 @@ | |||
748 | 331 | ############################################################################## | 362 | ############################################################################## |
749 | 332 | %prep | 363 | %prep |
750 | 333 | %setup -n %{src_dir} | 364 | %setup -n %{src_dir} |
751 | 365 | %if %{with tokudb} | ||
752 | 366 | %setup -n %{src_dir} -T -D -b 1 | ||
753 | 367 | %endif | ||
754 | 334 | ############################################################################## | 368 | ############################################################################## |
755 | 335 | %build | 369 | %build |
756 | 336 | 370 | ||
757 | @@ -350,7 +384,11 @@ | |||
758 | 350 | RPM_OPT_FLAGS= | 384 | RPM_OPT_FLAGS= |
759 | 351 | %endif | 385 | %endif |
760 | 352 | # | 386 | # |
761 | 387 | %if %{with tokudb} | ||
762 | 388 | RPM_OPT_FLAGS= | ||
763 | 389 | %else | ||
764 | 353 | RPM_OPT_FLAGS=$(echo ${RPM_OPT_FLAGS} | sed -e 's|-march=i386|-march=i686|g') | 390 | RPM_OPT_FLAGS=$(echo ${RPM_OPT_FLAGS} | sed -e 's|-march=i386|-march=i686|g') |
765 | 391 | %endif | ||
766 | 354 | # | 392 | # |
767 | 355 | export PATH=${MYSQL_BUILD_PATH:-$PATH} | 393 | export PATH=${MYSQL_BUILD_PATH:-$PATH} |
768 | 356 | export CC=${MYSQL_BUILD_CC:-${CC:-gcc}} | 394 | export CC=${MYSQL_BUILD_CC:-${CC:-gcc}} |
769 | @@ -399,7 +437,8 @@ | |||
770 | 399 | -DINSTALL_SUPPORTFILESDIR=share/percona-server \ | 437 | -DINSTALL_SUPPORTFILESDIR=share/percona-server \ |
771 | 400 | -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \ | 438 | -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \ |
772 | 401 | -DFEATURE_SET="%{feature_set}" \ | 439 | -DFEATURE_SET="%{feature_set}" \ |
774 | 402 | -DCOMPILATION_COMMENT="%{compilation_comment_debug}" | 440 | -DCOMPILATION_COMMENT="%{compilation_comment_debug}" %{TOKUDB_FLAGS} %{TOKUDB_DEBUG_ON} |
775 | 441 | |||
776 | 403 | echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG | 442 | echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG |
777 | 404 | make %{?_smp_mflags} | 443 | make %{?_smp_mflags} |
778 | 405 | ) | 444 | ) |
779 | @@ -419,7 +458,8 @@ | |||
780 | 419 | -DINSTALL_SUPPORTFILESDIR=share/percona-server \ | 458 | -DINSTALL_SUPPORTFILESDIR=share/percona-server \ |
781 | 420 | -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \ | 459 | -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \ |
782 | 421 | -DFEATURE_SET="%{feature_set}" \ | 460 | -DFEATURE_SET="%{feature_set}" \ |
784 | 422 | -DCOMPILATION_COMMENT="%{compilation_comment_release}" | 461 | -DCOMPILATION_COMMENT="%{compilation_comment_release}" %{TOKUDB_FLAGS} %{TOKUDB_DEBUG_OFF} |
785 | 462 | |||
786 | 423 | echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG | 463 | echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG |
787 | 424 | make %{?_smp_mflags} | 464 | make %{?_smp_mflags} |
788 | 425 | ) | 465 | ) |
789 | @@ -452,7 +492,7 @@ | |||
790 | 452 | %install | 492 | %install |
791 | 453 | 493 | ||
792 | 454 | RBR=$RPM_BUILD_ROOT | 494 | RBR=$RPM_BUILD_ROOT |
794 | 455 | MBD=$RPM_BUILD_DIR/percona-server-%{mysql_version}-%{percona_server_version} | 495 | MBD=$RPM_BUILD_DIR/%{src_dir} |
795 | 456 | 496 | ||
796 | 457 | # Ensure that needed directories exists | 497 | # Ensure that needed directories exists |
797 | 458 | install -d $RBR%{_sysconfdir}/{logrotate.d,init.d} | 498 | install -d $RBR%{_sysconfdir}/{logrotate.d,init.d} |
798 | @@ -484,7 +524,9 @@ | |||
799 | 484 | # Install logrotate and autostart | 524 | # Install logrotate and autostart |
800 | 485 | install -m 644 $MBD/release/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql | 525 | install -m 644 $MBD/release/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql |
801 | 486 | install -m 755 $MBD/release/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql | 526 | install -m 755 $MBD/release/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql |
803 | 487 | 527 | # | |
804 | 528 | %{__rm} -f $RBR/%{_prefix}/README* | ||
805 | 529 | # | ||
806 | 488 | # Delete the symlinks to the libraries from the libdir. These are created by | 530 | # Delete the symlinks to the libraries from the libdir. These are created by |
807 | 489 | # ldconfig(8) afterwards. | 531 | # ldconfig(8) afterwards. |
808 | 490 | rm -f $RBR%{_libdir}/libmysqlclient*.so.18 | 532 | rm -f $RBR%{_libdir}/libmysqlclient*.so.18 |
809 | @@ -898,6 +940,30 @@ | |||
810 | 898 | echo "=====" >> $STATUS_HISTORY | 940 | echo "=====" >> $STATUS_HISTORY |
811 | 899 | 941 | ||
812 | 900 | 942 | ||
813 | 943 | %if %{with tokudb} | ||
814 | 944 | # ---------------------------------------------------------------------------- | ||
815 | 945 | %post -n Percona-Server-tokudb%{product_suffix} | ||
816 | 946 | |||
817 | 947 | if [ $1 -eq 1 ] ; then | ||
818 | 948 | echo "" | ||
819 | 949 | echo "* This release of Percona Server is distributed with TokuDB storage engine." | ||
820 | 950 | echo "* Run the following commands to enable the TokuDB storage engine in Percona Server:" | ||
821 | 951 | echo "" | ||
822 | 952 | echo "mysql -e \"INSTALL PLUGIN tokudb SONAME 'ha_tokudb.so';\"" | ||
823 | 953 | echo "mysql -e \"INSTALL PLUGIN tokudb_file_map SONAME 'ha_tokudb.so';\"" | ||
824 | 954 | echo "mysql -e \"INSTALL PLUGIN tokudb_fractal_tree_info SONAME 'ha_tokudb.so';\"" | ||
825 | 955 | echo "mysql -e \"INSTALL PLUGIN tokudb_fractal_tree_block_map SONAME 'ha_tokudb.so';\"" | ||
826 | 956 | echo "mysql -e \"INSTALL PLUGIN tokudb_trx SONAME 'ha_tokudb.so';\"" | ||
827 | 957 | echo "mysql -e \"INSTALL PLUGIN tokudb_locks SONAME 'ha_tokudb.so';\"" | ||
828 | 958 | echo "mysql -e \"INSTALL PLUGIN tokudb_lock_waits SONAME 'ha_tokudb.so';\"" | ||
829 | 959 | echo "" | ||
830 | 960 | echo "* See http://www.percona.com/doc/percona-server/5.6/tokudb/tokudb_intro.html for more details" | ||
831 | 961 | echo "" | ||
832 | 962 | fi | ||
833 | 963 | %endif | ||
834 | 964 | # ---------------------------------------------------------------------------- | ||
835 | 965 | |||
836 | 966 | |||
837 | 901 | # ---------------------------------------------------------------------- | 967 | # ---------------------------------------------------------------------- |
838 | 902 | # Clean up the BuildRoot after build is done | 968 | # Clean up the BuildRoot after build is done |
839 | 903 | # ---------------------------------------------------------------------- | 969 | # ---------------------------------------------------------------------- |
840 | @@ -982,8 +1048,57 @@ | |||
841 | 982 | %attr(755, root, root) %{_sbindir}/mysqld-debug | 1048 | %attr(755, root, root) %{_sbindir}/mysqld-debug |
842 | 983 | %attr(755, root, root) %{_sbindir}/rcmysql | 1049 | %attr(755, root, root) %{_sbindir}/rcmysql |
843 | 984 | %attr(644, root, root) %{_libdir}/mysql/plugin/daemon_example.ini | 1050 | %attr(644, root, root) %{_libdir}/mysql/plugin/daemon_example.ini |
846 | 985 | %attr(755, root, root) %{_libdir}/mysql/plugin/*.so* | 1051 | |
847 | 986 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/*.so* | 1052 | #plugins |
848 | 1053 | %attr(755, root, root) %{_libdir}/mysql/plugin/adt_null.so | ||
849 | 1054 | %attr(755, root, root) %{_libdir}/mysql/plugin/auth.so | ||
850 | 1055 | %attr(755, root, root) %{_libdir}/mysql/plugin/auth_socket.so | ||
851 | 1056 | %attr(755, root, root) %{_libdir}/mysql/plugin/auth_test_plugin.so | ||
852 | 1057 | %attr(755, root, root) %{_libdir}/mysql/plugin/innodb_engine.so | ||
853 | 1058 | %attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so | ||
854 | 1059 | %attr(755, root, root) %{_libdir}/mysql/plugin/libfnv1a_udf.* | ||
855 | 1060 | %attr(755, root, root) %{_libdir}/mysql/plugin/libfnv_udf.* | ||
856 | 1061 | %attr(755, root, root) %{_libdir}/mysql/plugin/libmemcached.so | ||
857 | 1062 | %attr(755, root, root) %{_libdir}/mysql/plugin/libmurmur_udf.* | ||
858 | 1063 | %attr(755, root, root) %{_libdir}/mysql/plugin/mypluglib.so | ||
859 | 1064 | %attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_client.so | ||
860 | 1065 | %attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_interface.so | ||
861 | 1066 | %attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_server.so | ||
862 | 1067 | %attr(755, root, root) %{_libdir}/mysql/plugin/semisync_master.so | ||
863 | 1068 | %attr(755, root, root) %{_libdir}/mysql/plugin/semisync_slave.so | ||
864 | 1069 | %attr(755, root, root) %{_libdir}/mysql/plugin/validate_password.so | ||
865 | 1070 | %attr(755, root, root) %{_libdir}/mysql/plugin/auth_pam.so | ||
866 | 1071 | %attr(755, root, root) %{_libdir}/mysql/plugin/auth_pam_compat.so | ||
867 | 1072 | %attr(755, root, root) %{_libdir}/mysql/plugin/dialog.so | ||
868 | 1073 | %attr(755, root, root) %{_libdir}/mysql/plugin/handlersocket.so | ||
869 | 1074 | |||
870 | 1075 | # %attr(755, root, root) %{_libdir}/mysql/plugin/debug/*.so* | ||
871 | 1076 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/adt_null.so | ||
872 | 1077 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth.so | ||
873 | 1078 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_pam.so | ||
874 | 1079 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_pam_compat.so | ||
875 | 1080 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_socket.so | ||
876 | 1081 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_test_plugin.so | ||
877 | 1082 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/dialog.so | ||
878 | 1083 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/innodb_engine.so | ||
879 | 1084 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/libdaemon_example.so | ||
880 | 1085 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/libfnv1a_udf.* | ||
881 | 1086 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/libfnv_udf.* | ||
882 | 1087 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/libmemcached.so | ||
883 | 1088 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/libmurmur_udf.* | ||
884 | 1089 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/mypluglib.so | ||
885 | 1090 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_client.so | ||
886 | 1091 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_interface.so | ||
887 | 1092 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so | ||
888 | 1093 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_master.so | ||
889 | 1094 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_slave.so | ||
890 | 1095 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/validate_password.so | ||
891 | 1096 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/handlersocket.so | ||
892 | 1097 | # Audit Log and Scalability Metrics files | ||
893 | 1098 | %attr(755, root, root) %{_libdir}/mysql/plugin/audit_log.so | ||
894 | 1099 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/audit_log.so | ||
895 | 1100 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/scalability_metrics.so | ||
896 | 1101 | %attr(755, root, root) %{_libdir}/mysql/plugin/scalability_metrics.so | ||
897 | 987 | 1102 | ||
898 | 988 | %if %{WITH_TCMALLOC} | 1103 | %if %{WITH_TCMALLOC} |
899 | 989 | %attr(755, root, root) %{_libdir}/mysql/%{malloc_lib_target} | 1104 | %attr(755, root, root) %{_libdir}/mysql/%{malloc_lib_target} |
900 | @@ -992,7 +1107,48 @@ | |||
901 | 992 | %attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql | 1107 | %attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql |
902 | 993 | %attr(755, root, root) %{_sysconfdir}/init.d/mysql | 1108 | %attr(755, root, root) %{_sysconfdir}/init.d/mysql |
903 | 994 | 1109 | ||
905 | 995 | %attr(755, root, root) %{_datadir}/percona-server/ | 1110 | # %attr(755, root, root) %{_datadir}/percona-server/ |
906 | 1111 | %attr(755, root, root) %{_datadir}/percona-server/binary-configure | ||
907 | 1112 | %attr(755, root, root) %{_datadir}/percona-server/bulgarian | ||
908 | 1113 | %attr(755, root, root) %{_datadir}/percona-server/charsets | ||
909 | 1114 | %attr(755, root, root) %{_datadir}/percona-server/czech | ||
910 | 1115 | %attr(755, root, root) %{_datadir}/percona-server/danish | ||
911 | 1116 | %attr(755, root, root) %{_datadir}/percona-server/dictionary.txt | ||
912 | 1117 | %attr(755, root, root) %{_datadir}/percona-server/dutch | ||
913 | 1118 | %attr(755, root, root) %{_datadir}/percona-server/english | ||
914 | 1119 | %attr(755, root, root) %{_datadir}/percona-server/errmsg-utf8.txt | ||
915 | 1120 | %attr(755, root, root) %{_datadir}/percona-server/estonian | ||
916 | 1121 | %attr(755, root, root) %{_datadir}/percona-server/fill_help_tables.sql | ||
917 | 1122 | %attr(755, root, root) %{_datadir}/percona-server/french | ||
918 | 1123 | %attr(755, root, root) %{_datadir}/percona-server/german | ||
919 | 1124 | %attr(755, root, root) %{_datadir}/percona-server/greek | ||
920 | 1125 | %attr(755, root, root) %{_datadir}/percona-server/hungarian | ||
921 | 1126 | %attr(755, root, root) %{_datadir}/percona-server/innodb_memcached_config.sql | ||
922 | 1127 | %attr(755, root, root) %{_datadir}/percona-server/italian | ||
923 | 1128 | %attr(755, root, root) %{_datadir}/percona-server/japanese | ||
924 | 1129 | %attr(755, root, root) %{_datadir}/percona-server/korean | ||
925 | 1130 | %attr(755, root, root) %{_datadir}/percona-server/magic | ||
926 | 1131 | %attr(755, root, root) %{_datadir}/percona-server/my-default.cnf | ||
927 | 1132 | %attr(755, root, root) %{_datadir}/percona-server/mysqld_multi.server | ||
928 | 1133 | %attr(755, root, root) %{_datadir}/percona-server/mysql-log-rotate | ||
929 | 1134 | %attr(755, root, root) %{_datadir}/percona-server/mysql_security_commands.sql | ||
930 | 1135 | %attr(755, root, root) %{_datadir}/percona-server/mysql.server | ||
931 | 1136 | %attr(755, root, root) %{_datadir}/percona-server/mysql_system_tables_data.sql | ||
932 | 1137 | %attr(755, root, root) %{_datadir}/percona-server/mysql_system_tables.sql | ||
933 | 1138 | %attr(755, root, root) %{_datadir}/percona-server/mysql_test_data_timezone.sql | ||
934 | 1139 | %attr(755, root, root) %{_datadir}/percona-server/norwegian | ||
935 | 1140 | %attr(755, root, root) %{_datadir}/percona-server/norwegian-ny | ||
936 | 1141 | %attr(755, root, root) %{_datadir}/percona-server/polish | ||
937 | 1142 | %attr(755, root, root) %{_datadir}/percona-server/portuguese | ||
938 | 1143 | %attr(755, root, root) %{_datadir}/percona-server/romanian | ||
939 | 1144 | %attr(755, root, root) %{_datadir}/percona-server/russian | ||
940 | 1145 | %attr(755, root, root) %{_datadir}/percona-server/SELinux | ||
941 | 1146 | %attr(755, root, root) %{_datadir}/percona-server/serbian | ||
942 | 1147 | %attr(755, root, root) %{_datadir}/percona-server/slovak | ||
943 | 1148 | %attr(755, root, root) %{_datadir}/percona-server/solaris | ||
944 | 1149 | %attr(755, root, root) %{_datadir}/percona-server/spanish | ||
945 | 1150 | %attr(755, root, root) %{_datadir}/percona-server/swedish | ||
946 | 1151 | %attr(755, root, root) %{_datadir}/percona-server/ukrainian | ||
947 | 996 | 1152 | ||
948 | 997 | # ---------------------------------------------------------------------------- | 1153 | # ---------------------------------------------------------------------------- |
949 | 998 | %files -n Percona-Server-client%{product_suffix} | 1154 | %files -n Percona-Server-client%{product_suffix} |
950 | @@ -1044,6 +1200,16 @@ | |||
951 | 1044 | %{_libdir}/*.so | 1200 | %{_libdir}/*.so |
952 | 1045 | 1201 | ||
953 | 1046 | # ---------------------------------------------------------------------------- | 1202 | # ---------------------------------------------------------------------------- |
954 | 1203 | %if %{with tokudb} | ||
955 | 1204 | %files -n Percona-Server-tokudb%{product_suffix} | ||
956 | 1205 | %attr(-, root, root) | ||
957 | 1206 | %{_bindir}/tokuftdump | ||
958 | 1207 | %{_includedir}/tdb-internal.h | ||
959 | 1208 | %{_libdir}/mysql/plugin/ha_tokudb.so | ||
960 | 1209 | %attr(755, root, root) %{_libdir}/mysql/plugin/debug/ha_tokudb.so | ||
961 | 1210 | %endif | ||
962 | 1211 | |||
963 | 1212 | # ---------------------------------------------------------------------------- | ||
964 | 1047 | %files -n Percona-Server-shared%{product_suffix} | 1213 | %files -n Percona-Server-shared%{product_suffix} |
965 | 1048 | %defattr(-, root, root, 0755) | 1214 | %defattr(-, root, root, 0755) |
966 | 1049 | # Shared libraries (omit for architectures that don't support them) | 1215 | # Shared libraries (omit for architectures that don't support them) |
967 | @@ -1076,6 +1242,10 @@ | |||
968 | 1076 | %doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1* | 1242 | %doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1* |
969 | 1077 | 1243 | ||
970 | 1078 | %changelog | 1244 | %changelog |
971 | 1245 | * Mon May 26 2014 Tomislav Plavcic <tomislav.plavcic@percona.com> | ||
972 | 1246 | |||
973 | 1247 | - Added packaging changes regarding TokuDB | ||
974 | 1248 | |||
975 | 1079 | * Thu Feb 10 2011 Ignacio Nin <ignacio.nin@percona.com> | 1249 | * Thu Feb 10 2011 Ignacio Nin <ignacio.nin@percona.com> |
976 | 1080 | 1250 | ||
977 | 1081 | - Removed lines which prevented -debuginfo packages from being built. | 1251 | - Removed lines which prevented -debuginfo packages from being built. |
978 | 1082 | 1252 | ||
979 | === modified file 'scripts/mysqld_safe.sh' | |||
980 | --- scripts/mysqld_safe.sh 2014-03-16 08:15:10 +0000 | |||
981 | +++ scripts/mysqld_safe.sh 2014-06-16 07:08:31 +0000 | |||
982 | @@ -375,6 +375,19 @@ | |||
983 | 375 | 375 | ||
984 | 376 | 376 | ||
985 | 377 | # | 377 | # |
986 | 378 | # Add jemalloc to ld_preload - needed for TokuDB | ||
987 | 379 | # | ||
988 | 380 | for libjemall in "/usr/lib64" "/usr/lib/x86_64-linux-gnu" "/usr/lib" | ||
989 | 381 | do | ||
990 | 382 | if test -f "$libjemall/libjemalloc.so.1" | ||
991 | 383 | then | ||
992 | 384 | add_mysqld_ld_preload "$libjemall/libjemalloc.so.1" | ||
993 | 385 | break | ||
994 | 386 | fi | ||
995 | 387 | done | ||
996 | 388 | |||
997 | 389 | |||
998 | 390 | # | ||
999 | 378 | # First, try to find BASEDIR and ledir (where mysqld is) | 391 | # First, try to find BASEDIR and ledir (where mysqld is) |
1000 | 379 | # | 392 | # |
1001 | 380 | 393 | ||
1002 | 381 | 394 | ||
1003 | === modified file 'sql/handler.h' | |||
1004 | --- sql/handler.h 2014-06-04 14:48:06 +0000 | |||
1005 | +++ sql/handler.h 2014-06-16 07:08:31 +0000 | |||
1006 | @@ -395,6 +395,7 @@ | |||
1007 | 395 | DB_TYPE_MEMCACHE, | 395 | DB_TYPE_MEMCACHE, |
1008 | 396 | DB_TYPE_FALCON, | 396 | DB_TYPE_FALCON, |
1009 | 397 | DB_TYPE_MARIA, | 397 | DB_TYPE_MARIA, |
1010 | 398 | DB_TYPE_TOKUDB=41, | ||
1011 | 398 | /** Performance schema engine. */ | 399 | /** Performance schema engine. */ |
1012 | 399 | DB_TYPE_PERFORMANCE_SCHEMA, | 400 | DB_TYPE_PERFORMANCE_SCHEMA, |
1013 | 400 | DB_TYPE_FIRST_DYNAMIC=42, | 401 | DB_TYPE_FIRST_DYNAMIC=42, |
1014 | 401 | 402 | ||
1015 | === modified file 'storage/innobase/include/univ.i' | |||
1016 | --- storage/innobase/include/univ.i 2014-06-11 13:45:54 +0000 | |||
1017 | +++ storage/innobase/include/univ.i 2014-06-16 07:08:31 +0000 | |||
1018 | @@ -47,7 +47,7 @@ | |||
1019 | 47 | #define INNODB_VERSION_BUGFIX MYSQL_VERSION_PATCH | 47 | #define INNODB_VERSION_BUGFIX MYSQL_VERSION_PATCH |
1020 | 48 | 48 | ||
1021 | 49 | #ifndef PERCONA_INNODB_VERSION | 49 | #ifndef PERCONA_INNODB_VERSION |
1023 | 50 | #define PERCONA_INNODB_VERSION 65.0 | 50 | #define PERCONA_INNODB_VERSION 66.0 |
1024 | 51 | #endif | 51 | #endif |
1025 | 52 | 52 | ||
1026 | 53 | /* Enable UNIV_LOG_ARCHIVE in XtraDB */ | 53 | /* Enable UNIV_LOG_ARCHIVE in XtraDB */ |
sql/handler.h change is spurious and will be reverted in trunk after this is merged.
mysqld_safe.sh patch means that jemalloc will always be loaded if found in the checked paths, regardless of TokuDB presence, with no option to avoid it. Was this agreed on somewhere?