Skip to content

Commit fc77c11

Browse files
committed
Added mecab plugin
1 parent 1945710 commit fc77c11

File tree

4 files changed

+44
-2
lines changed

4 files changed

+44
-2
lines changed

packaging/rpm-docker/mysql.spec.in

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
%global mysql_vendor Oracle and/or its affiliates
2020
%global mysqldatadir /var/lib/mysql
2121

22+
# Pass path to mecab lib
23+
%{?with_mecab: %global mecab_option -DWITH_MECAB=%{with_mecab}}
24+
%{?with_mecab: %global mecab 1}
25+
2226
# Regression tests may take a long time, override the default to skip them
2327
%{!?runselftest:%global runselftest 0}
2428

@@ -145,6 +149,7 @@ mkdir release
145149
-DFEATURE_SET="%{feature_set}" \
146150
-DWITH_EMBEDDED_SERVER=0 \
147151
-DWITH_EMBEDDED_SHARED_LIBRARY=0 \
152+
%{?mecab_option} \
148153
-DWITH_SSL=system \
149154
-DCOMPILATION_COMMENT="%{compilation_comment_release}" \
150155
-DMYSQL_SERVER_SUFFIX="%{?server_suffix}"
@@ -185,7 +190,8 @@ done
185190

186191
# Remove test plugins
187192
for p in auth.so auth_test_plugin.so daemon_example.ini libdaemon_example.so qa_auth_client.so \
188-
qa_auth_interface.so qa_auth_server.so replication_observers_example_plugin.so ha_example.so ; do
193+
qa_auth_interface.so qa_auth_server.so replication_observers_example_plugin.so ha_example.so \
194+
libtest_framework.so libtest_services.so libtest_services_threaded.so ; do
189195
rm -f %{buildroot}%{_libdir}/mysql/plugin/$p
190196
done
191197

@@ -238,13 +244,19 @@ rm -r $(readlink var) var
238244
%attr(755, root, root) %{_libdir}/mysql/plugin/auth_socket.so
239245
%attr(755, root, root) %{_libdir}/mysql/plugin/innodb_engine.so
240246
%attr(755, root, root) %{_libdir}/mysql/plugin/libmemcached.so
247+
%if 0%{?mecab}
248+
%{_libdir}/mysql/mecab
249+
%attr(755, root, root) %{_libdir}/mysql/plugin/libpluginmecab.so
250+
%endif
251+
%attr(755, root, root) %{_libdir}/mysql/plugin/locking_service.so
241252
%attr(755, root, root) %{_libdir}/mysql/plugin/mypluglib.so
242253
%attr(755, root, root) %{_libdir}/mysql/plugin/mysql_no_login.so
243254
%attr(755, root, root) %{_libdir}/mysql/plugin/rewrite_example.so
244255
%attr(755, root, root) %{_libdir}/mysql/plugin/rewriter.so
245256
%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_master.so
246257
%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_slave.so
247258
%attr(755, root, root) %{_libdir}/mysql/plugin/validate_password.so
259+
%attr(755, root, root) %{_libdir}/mysql/plugin/version_token.so
248260
%dir %{_datadir}/mysql/
249261
%{_datadir}/mysql/charsets/
250262
%{_datadir}/mysql/bulgarian/
@@ -282,7 +294,6 @@ rm -r $(readlink var) var
282294
%attr(644, root, root) %{_datadir}/mysql/dictionary.txt
283295
%attr(644, root, root) %{_datadir}/mysql/innodb_memcached_config.sql
284296
%attr(644, root, root) %{_datadir}/mysql/install_rewriter.sql
285-
%attr(644, root, root) %{_datadir}/mysql/install_rewriter_with_optional_columns.sql
286297
%attr(644, root, root) %{_datadir}/mysql/uninstall_rewriter.sql
287298
%attr(644, root, root) %{_datadir}/mysql/magic
288299
%dir %attr(750, mysql, mysql) /var/lib/mysql
@@ -292,6 +303,7 @@ rm -r $(readlink var) var
292303
%changelog
293304
* Wed Jul 1 2015 Balasubramanian Kandasamy <[email protected]> - 5.7.8-0.3.rc
294305
- Update package names
306+
- Handle plugin changes
295307

296308
* Mon Feb 16 2015 Terje Rosten <[email protected]> - 5.7.6-0.3.m16
297309
- Introduce minimal server for docker

packaging/rpm-fedora/mysql.spec.in

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ BuildRequires: cmake
7979
BuildRequires: perl
8080
BuildRequires: time
8181
BuildRequires: libaio-devel
82+
BuildRequires: mecab-devel
8283
BuildRequires: ncurses-devel
8384
BuildRequires: openssl-devel
8485
BuildRequires: zlib-devel
@@ -404,6 +405,7 @@ mkdir debug
404405
-DINSTALL_LAYOUT=RPM \
405406
-DCMAKE_BUILD_TYPE=Debug \
406407
-DWITH_BOOST=.. \
408+
-DWITH_MECAB=system \
407409
-DCMAKE_C_FLAGS="$optflags" \
408410
-DCMAKE_CXX_FLAGS="$optflags" \
409411
-DWITH_SYSTEMD=1 \
@@ -431,6 +433,7 @@ mkdir release
431433
-DINSTALL_LAYOUT=RPM \
432434
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
433435
-DWITH_BOOST=.. \
436+
-DWITH_MECAB=system \
434437
-DCMAKE_C_FLAGS="%{optflags}" \
435438
-DCMAKE_CXX_FLAGS="%{optflags}" \
436439
-DWITH_SYSTEMD=1 \
@@ -596,6 +599,7 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n
596599
%attr(755, root, root) %{_libdir}/mysql/plugin/innodb_engine.so
597600
%attr(755, root, root) %{_libdir}/mysql/plugin/libmemcached.so
598601
%attr(755, root, root) %{_libdir}/mysql/plugin/locking_service.so
602+
%attr(755, root, root) %{_libdir}/mysql/plugin/libpluginmecab.so
599603
%attr(755, root, root) %{_libdir}/mysql/plugin/mypluglib.so
600604
%attr(755, root, root) %{_libdir}/mysql/plugin/mysql_no_login.so
601605
%attr(755, root, root) %{_libdir}/mysql/plugin/rewrite_example.so
@@ -611,6 +615,7 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n
611615
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/innodb_engine.so
612616
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libmemcached.so
613617
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/locking_service.so
618+
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libpluginmecab.so
614619
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/mypluglib.so
615620
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/mysql_no_login.so
616621
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/rewrite_example.so
@@ -796,6 +801,7 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n
796801
%changelog
797802
* Wed May 20 2015 Balasubramanian Kandasamy <[email protected]> - 5.7.8-0.2.rc
798803
- Added libtest_framework.so, libtest_services.so, libtest_services_threaded.so plugins
804+
- Build and ship mecab plugin
799805

800806
* Tue Feb 3 2015 Balasubramanian Kandasamy <[email protected]> - 5.7.6-0.2.m16
801807
- Include boost sources

packaging/rpm-oel/mysql.spec.in

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
# By default, a build will include the bundeled "yaSSL" library for SSL.
3131
%{?with_ssl: %global ssl_option -DWITH_SSL=%{with_ssl}}
3232

33+
# Pass path to mecab lib
34+
%{?with_mecab: %global mecab_option -DWITH_MECAB=%{with_mecab}}
35+
%{?with_mecab: %global mecab 1}
36+
3337
# Regression tests may take a long time, override the default to skip them
3438
%{!?runselftest:%global runselftest 0}
3539

@@ -571,6 +575,7 @@ mkdir debug
571575
-DWITH_EMBEDDED_SERVER=1 \
572576
-DWITH_EMBEDDED_SHARED_LIBRARY=1 \
573577
%{?ssl_option} \
578+
%{?mecab_option} \
574579
-DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
575580
-DMYSQL_SERVER_SUFFIX="%{?server_suffix}"
576581
echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG
@@ -600,6 +605,7 @@ mkdir release
600605
-DWITH_EMBEDDED_SERVER=1 \
601606
-DWITH_EMBEDDED_SHARED_LIBRARY=1 \
602607
%{?ssl_option} \
608+
%{?mecab_option} \
603609
-DCOMPILATION_COMMENT="%{compilation_comment_release}" \
604610
-DMYSQL_SERVER_SUFFIX="%{?server_suffix}"
605611
echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
@@ -814,6 +820,11 @@ fi
814820
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_slave.so
815821
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/validate_password.so
816822
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/version_token.so
823+
%if 0%{?mecab}
824+
%{_libdir}/mysql/mecab
825+
%attr(755, root, root) %{_libdir}/mysql/plugin/libpluginmecab.so
826+
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libpluginmecab.so
827+
%endif
817828
%if 0%{?commercial}
818829
%attr(755, root, root) %{_libdir}/mysql/plugin/audit_log.so
819830
%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_pam.so
@@ -1017,6 +1028,7 @@ fi
10171028
%changelog
10181029
* Wed May 20 2015 Balasubramanian Kandasamy <[email protected]> - 5.7.8-0.2.rc
10191030
- Added libtest_framework.so, libtest_services.so, libtest_services_threaded.so plugins
1031+
- Build and ship mecab plugin
10201032

10211033
* Tue Feb 3 2015 Balasubramanian Kandasamy <[email protected]> - 5.7.6-0.2.m16
10221034
- Include boost sources

packaging/rpm-sles/mysql.spec.in

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
# By default, a build will include the bundeled "yaSSL" library for SSL.
2424
%{?with_ssl: %global ssl_option -DWITH_SSL=%{with_ssl}}
2525

26+
# Pass path to mecab lib
27+
%{?with_mecab: %global mecab_option -DWITH_MECAB=%{with_mecab}}
28+
%{?with_mecab: %global mecab 1}
29+
2630
# Regression tests may take a long time, override the default to skip them
2731
%{!?runselftest:%global runselftest 0}
2832

@@ -400,6 +404,7 @@ mkdir debug
400404
-DWITH_EMBEDDED_SERVER=1 \
401405
-DWITH_EMBEDDED_SHARED_LIBRARY=1 \
402406
%{?ssl_option} \
407+
%{?mecab_option} \
403408
-DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
404409
-DMYSQL_SERVER_SUFFIX="%{?server_suffix}"
405410
echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG
@@ -431,6 +436,7 @@ mkdir release
431436
-DWITH_EMBEDDED_SERVER=1 \
432437
-DWITH_EMBEDDED_SHARED_LIBRARY=1 \
433438
%{?ssl_option} \
439+
%{?mecab_option} \
434440
-DCOMPILATION_COMMENT="%{compilation_comment_release}" \
435441
-DMYSQL_SERVER_SUFFIX="%{?server_suffix}"
436442
echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
@@ -642,6 +648,11 @@ fi
642648
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_slave.so
643649
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/validate_password.so
644650
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/version_token.so
651+
%if 0%{?mecab}
652+
%{_libdir}/mysql/mecab
653+
%attr(755, root, root) %{_libdir}/mysql/plugin/libpluginmecab.so
654+
%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libpluginmecab.so
655+
%endif
645656
%if 0%{?commercial}
646657
%attr(755, root, root) %{_libdir}/mysql/plugin/audit_log.so
647658
%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_pam.so
@@ -829,6 +840,7 @@ fi
829840
%changelog
830841
* Wed May 20 2015 Balasubramanian Kandasamy <[email protected]> - 5.7.8-0.2.rc
831842
- Added libtest_framework.so, libtest_services.so, libtest_services_threaded.so plugins
843+
- Build and ship mecab plugin
832844

833845
* Tue Feb 3 2015 Balasubramanian Kandasamy <[email protected]> - 5.7.6-0.2.m16
834846
- Include boost sources

0 commit comments

Comments
 (0)