Merge lp:~percona-core/percona-server/release-5.6.21-69.0 into lp:percona-server/5.6
- release-5.6.21-69.0
- Merge into 5.6
Proposed by
Tomislav Plavcic
Status: | Merged |
---|---|
Approved by: | Laurynas Biveinis |
Approved revision: | no longer in the source branch. |
Merged at revision: | 676 |
Proposed branch: | lp:~percona-core/percona-server/release-5.6.21-69.0 |
Merge into: | lp:percona-server/5.6 |
Diff against target: |
881 lines (+596/-48) 7 files modified
build-ps/debian/control (+2/-0) build-ps/debian/control.tokudb (+2/-0) build-ps/percona-server.spec (+74/-47) build-ps/rpm/my.cnf (+30/-0) build-ps/rpm/mysql-5.6-sharedlib-rename.patch (+486/-0) build-ps/rpm/mysql.conf (+1/-0) storage/innobase/include/univ.i (+1/-1) |
To merge this branch: | bzr merge lp:~percona-core/percona-server/release-5.6.21-69.0 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Laurynas Biveinis (community) | Approve | ||
Review via email: mp+237452@code.launchpad.net |
Commit message
Description of the change
Release branch for PS version 5.6.21-69.0
To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'build-ps/debian/control' | |||
2 | --- build-ps/debian/control 2014-09-26 04:43:24 +0000 | |||
3 | +++ build-ps/debian/control 2014-10-07 16:28:28 +0000 | |||
4 | @@ -158,6 +158,7 @@ | |||
5 | 158 | mysql-server-5.5, | 158 | mysql-server-5.5, |
6 | 159 | mysql-server-5.6, | 159 | mysql-server-5.6, |
7 | 160 | mysql-server-core-5.1, | 160 | mysql-server-core-5.1, |
8 | 161 | mysql-server-core-5.5, | ||
9 | 161 | percona-xtradb-server-5.0, | 162 | percona-xtradb-server-5.0, |
10 | 162 | percona-server-server-5.1, | 163 | percona-server-server-5.1, |
11 | 163 | percona-server-server-5.5, | 164 | percona-server-server-5.5, |
12 | @@ -171,6 +172,7 @@ | |||
13 | 171 | mysql-server-5.5, | 172 | mysql-server-5.5, |
14 | 172 | mysql-server-5.6, | 173 | mysql-server-5.6, |
15 | 173 | mysql-server-core-5.1, | 174 | mysql-server-core-5.1, |
16 | 175 | mysql-server-core-5.5, | ||
17 | 174 | percona-xtradb-server-5.0, | 176 | percona-xtradb-server-5.0, |
18 | 175 | percona-server-server-5.1, | 177 | percona-server-server-5.1, |
19 | 176 | percona-server-server-5.5, | 178 | percona-server-server-5.5, |
20 | 177 | 179 | ||
21 | === modified file 'build-ps/debian/control.tokudb' | |||
22 | --- build-ps/debian/control.tokudb 2014-05-23 00:24:00 +0000 | |||
23 | +++ build-ps/debian/control.tokudb 2014-10-07 16:28:28 +0000 | |||
24 | @@ -172,6 +172,7 @@ | |||
25 | 172 | mysql-server-5.5, | 172 | mysql-server-5.5, |
26 | 173 | mysql-server-5.6, | 173 | mysql-server-5.6, |
27 | 174 | mysql-server-core-5.1, | 174 | mysql-server-core-5.1, |
28 | 175 | mysql-server-core-5.5, | ||
29 | 175 | percona-xtradb-server-5.0, | 176 | percona-xtradb-server-5.0, |
30 | 176 | percona-server-server-5.1, | 177 | percona-server-server-5.1, |
31 | 177 | percona-server-server-5.5, | 178 | percona-server-server-5.5, |
32 | @@ -185,6 +186,7 @@ | |||
33 | 185 | mysql-server-5.5, | 186 | mysql-server-5.5, |
34 | 186 | mysql-server-5.6, | 187 | mysql-server-5.6, |
35 | 187 | mysql-server-core-5.1, | 188 | mysql-server-core-5.1, |
36 | 189 | mysql-server-core-5.5, | ||
37 | 188 | percona-xtradb-server-5.0, | 190 | percona-xtradb-server-5.0, |
38 | 189 | percona-server-server-5.1, | 191 | percona-server-server-5.1, |
39 | 190 | percona-server-server-5.5, | 192 | percona-server-server-5.5, |
40 | 191 | 193 | ||
41 | === modified file 'build-ps/percona-server.spec' | |||
42 | --- build-ps/percona-server.spec 2014-09-26 13:47:55 +0000 | |||
43 | +++ build-ps/percona-server.spec 2014-10-07 16:28:28 +0000 | |||
44 | @@ -61,6 +61,14 @@ | |||
45 | 61 | 61 | ||
46 | 62 | %define release rel%{percona_server_version}%{?dist} | 62 | %define release rel%{percona_server_version}%{?dist} |
47 | 63 | 63 | ||
48 | 64 | %if "%rhel" > "6" | ||
49 | 65 | %define shared_lib_pri_name libmysqlclient | ||
50 | 66 | %define shared_lib_sec_name libperconaserverclient | ||
51 | 67 | %else | ||
52 | 68 | %define shared_lib_pri_name libperconaserverclient | ||
53 | 69 | %define shared_lib_sec_name libmysqlclient | ||
54 | 70 | %endif | ||
55 | 71 | |||
56 | 64 | # | 72 | # |
57 | 65 | # Macros we use which are not available in all supported versions of RPM | 73 | # Macros we use which are not available in all supported versions of RPM |
58 | 66 | # | 74 | # |
59 | @@ -263,6 +271,7 @@ | |||
60 | 263 | %if 0%{?systemd} | 271 | %if 0%{?systemd} |
61 | 264 | BuildRequires: systemd | 272 | BuildRequires: systemd |
62 | 265 | %endif | 273 | %endif |
63 | 274 | Patch0: mysql-5.6-sharedlib-rename.patch | ||
64 | 266 | 275 | ||
65 | 267 | # Think about what you use here since the first step is to | 276 | # Think about what you use here since the first step is to |
66 | 268 | # run a rm -rf | 277 | # run a rm -rf |
67 | @@ -396,11 +405,19 @@ | |||
68 | 396 | %package -n Percona-Server-shared%{product_suffix} | 405 | %package -n Percona-Server-shared%{product_suffix} |
69 | 397 | Summary: Percona Server - Shared libraries | 406 | Summary: Percona Server - Shared libraries |
70 | 398 | Group: Applications/Databases | 407 | Group: Applications/Databases |
71 | 408 | %if "%rhel" > "6" | ||
72 | 409 | Provides: mysql-shared mysql-libs | ||
73 | 410 | Obsoletes: mariadb-libs | ||
74 | 411 | Conflicts: Percona-Server-shared-55 | ||
75 | 412 | %else | ||
76 | 399 | %ifarch x86_64 | 413 | %ifarch x86_64 |
77 | 400 | Provides: libmysqlclient.so.18()(64bit) | 414 | Provides: libmysqlclient.so.18()(64bit) |
78 | 415 | Provides: libmysqlclient.so.18(libmysqlclient_18)(64bit) | ||
79 | 401 | %endif | 416 | %endif |
80 | 402 | %ifarch i386 i686 | 417 | %ifarch i386 i686 |
81 | 403 | Provides: libmysqlclient.so.18()(32bit) | 418 | Provides: libmysqlclient.so.18()(32bit) |
82 | 419 | Provides: libmysqlclient.so.18(libmysqlclient_18)(32bit) | ||
83 | 420 | %endif | ||
84 | 404 | %endif | 421 | %endif |
85 | 405 | 422 | ||
86 | 406 | %description -n Percona-Server-shared%{product_suffix} | 423 | %description -n Percona-Server-shared%{product_suffix} |
87 | @@ -413,6 +430,11 @@ | |||
88 | 413 | %if %{with tokudb} | 430 | %if %{with tokudb} |
89 | 414 | %setup -n %{src_dir} -T -D -b 1 | 431 | %setup -n %{src_dir} -T -D -b 1 |
90 | 415 | %endif | 432 | %endif |
91 | 433 | |||
92 | 434 | %if "%rhel" > "6" | ||
93 | 435 | %patch0 -p1 | ||
94 | 436 | %endif | ||
95 | 437 | |||
96 | 416 | ############################################################################## | 438 | ############################################################################## |
97 | 417 | %build | 439 | %build |
98 | 418 | 440 | ||
99 | @@ -580,11 +602,16 @@ | |||
100 | 580 | install -m 644 $MBD/release/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql | 602 | install -m 644 $MBD/release/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql |
101 | 581 | %if 0%{?systemd} | 603 | %if 0%{?systemd} |
102 | 582 | install -D -m 0755 $MBD/build-ps/rpm/mysql-systemd $RBR%{_bindir}/mysql-systemd | 604 | install -D -m 0755 $MBD/build-ps/rpm/mysql-systemd $RBR%{_bindir}/mysql-systemd |
104 | 583 | install -D -m 0644 $MBD/build-ps/rpm/mysql.service $RBR%{_unitdir}/mysql.service | 605 | install -D -m 0644 $MBD/build-ps/rpm/mysqld.service $RBR%{_unitdir}/mysqld.service |
105 | 606 | install -D -m 0644 $MBD/build-ps/rpm/mysql.conf $RBR%{_tmpfilesdir}/mysql.conf | ||
106 | 584 | %else | 607 | %else |
107 | 585 | install -m 755 $MBD/release/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql | 608 | install -m 755 $MBD/release/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql |
108 | 586 | %endif | 609 | %endif |
109 | 587 | 610 | ||
110 | 611 | %if "%rhel" > "6" | ||
111 | 612 | install -D -m 0644 $MBD/build-ps/rpm/my.cnf $RBR%{_sysconfdir}/my.cnf | ||
112 | 613 | %endif | ||
113 | 614 | |||
114 | 588 | # | 615 | # |
115 | 589 | %{__rm} -f $RBR/%{_prefix}/README* | 616 | %{__rm} -f $RBR/%{_prefix}/README* |
116 | 590 | # | 617 | # |
117 | @@ -598,7 +625,7 @@ | |||
118 | 598 | 625 | ||
119 | 599 | # Touch the place where the my.cnf config file might be located | 626 | # Touch the place where the my.cnf config file might be located |
120 | 600 | # Just to make sure it's in the file list and marked as a config file | 627 | # Just to make sure it's in the file list and marked as a config file |
122 | 601 | touch $RBR%{_sysconfdir}/my.cnf | 628 | # touch $RBR%{_sysconfdir}/my.cnf |
123 | 602 | 629 | ||
124 | 603 | # Install SELinux files in datadir | 630 | # Install SELinux files in datadir |
125 | 604 | install -m 600 $MBD/support-files/RHEL4-SElinux/mysql.{fc,te} \ | 631 | install -m 600 $MBD/support-files/RHEL4-SElinux/mysql.{fc,te} \ |
126 | @@ -625,15 +652,6 @@ | |||
127 | 625 | 652 | ||
128 | 626 | %pre -n Percona-Server-server%{product_suffix} | 653 | %pre -n Percona-Server-server%{product_suffix} |
129 | 627 | 654 | ||
130 | 628 | # On rhel7 change default MariaDB options if they exists (only on initial installation) | ||
131 | 629 | %if "%rhel" > "6" | ||
132 | 630 | if [ $1 -eq 1 -a -f /etc/my.cnf ]; then | ||
133 | 631 | sed -i 's/log-error=\/var\/log\/mariadb\/mariadb.log/log-error=\/var\/log\/mysqld.log/g' /etc/my.cnf; | ||
134 | 632 | sed -i 's/pid-file=\/var\/run\/mariadb\/mariadb.pid/pid-file=\/var\/run\/mysqld\/mysqld.pid/g' /etc/my.cnf; | ||
135 | 633 | sed -i 's/\!includedir \/etc\/my.cnf.d/\#\!includedir \/etc\/my.cnf.d/g' /etc/my.cnf; | ||
136 | 634 | fi | ||
137 | 635 | %endif | ||
138 | 636 | |||
139 | 637 | # ATTENTION: Parts of this are duplicated in the "triggerpostun" ! | 655 | # ATTENTION: Parts of this are duplicated in the "triggerpostun" ! |
140 | 638 | 656 | ||
141 | 639 | # There are users who deviate from the default file system layout. | 657 | # There are users who deviate from the default file system layout. |
142 | @@ -789,20 +807,11 @@ | |||
143 | 789 | # Note we *could* make that depend on $SERVER_TO_START, but we rather don't, | 807 | # Note we *could* make that depend on $SERVER_TO_START, but we rather don't, |
144 | 790 | # so a "stop" is attempted even if there is no PID file. | 808 | # so a "stop" is attempted even if there is no PID file. |
145 | 791 | # (Maybe the "stop" doesn't work then, but we might fix that in itself.) | 809 | # (Maybe the "stop" doesn't work then, but we might fix that in itself.) |
146 | 792 | %if 0%{?systemd} | ||
147 | 793 | SYSD_ACTIVE=$(systemctl is-active mysql) | ||
148 | 794 | if [ $SYSD_ACTIVE == "active" ] ; then | ||
149 | 795 | %{_bindir}/systemctl stop mysql >/dev/null 2>&1 | ||
150 | 796 | echo "Giving mysqld 5 seconds to exit nicely" | ||
151 | 797 | sleep 5 | ||
152 | 798 | fi | ||
153 | 799 | %else | ||
154 | 800 | if [ -x %{_sysconfdir}/init.d/mysql ] ; then | 810 | if [ -x %{_sysconfdir}/init.d/mysql ] ; then |
155 | 801 | %{_sysconfdir}/init.d/mysql stop > /dev/null 2>&1 | 811 | %{_sysconfdir}/init.d/mysql stop > /dev/null 2>&1 |
156 | 802 | echo "Giving mysqld 5 seconds to exit nicely" | 812 | echo "Giving mysqld 5 seconds to exit nicely" |
157 | 803 | sleep 5 | 813 | sleep 5 |
158 | 804 | fi | 814 | fi |
159 | 805 | %endif | ||
160 | 806 | 815 | ||
161 | 807 | # SElinux | 816 | # SElinux |
162 | 808 | %post -n Percona-Server-selinux%{product_suffix} | 817 | %post -n Percona-Server-selinux%{product_suffix} |
163 | @@ -817,6 +826,10 @@ | |||
164 | 817 | 826 | ||
165 | 818 | %post -n Percona-Server-server%{product_suffix} | 827 | %post -n Percona-Server-server%{product_suffix} |
166 | 819 | 828 | ||
167 | 829 | %if 0%{?systemd} | ||
168 | 830 | %systemd_post mysqld | ||
169 | 831 | %endif | ||
170 | 832 | |||
171 | 820 | # ATTENTION: Parts of this are duplicated in the "triggerpostun" ! | 833 | # ATTENTION: Parts of this are duplicated in the "triggerpostun" ! |
172 | 821 | 834 | ||
173 | 822 | # There are users who deviate from the default file system layout. | 835 | # There are users who deviate from the default file system layout. |
174 | @@ -852,7 +865,7 @@ | |||
175 | 852 | # use chkconfig on Enterprise Linux and newer SuSE releases | 865 | # use chkconfig on Enterprise Linux and newer SuSE releases |
176 | 853 | %if 0%{?systemd} | 866 | %if 0%{?systemd} |
177 | 854 | if [ -x %{_bindir}/systemctl ] ; then | 867 | if [ -x %{_bindir}/systemctl ] ; then |
179 | 855 | %{_bindir}/systemctl enable mysql >/dev/null 2>&1 | 868 | %{_bindir}/systemctl enable mysqld >/dev/null 2>&1 |
180 | 856 | fi | 869 | fi |
181 | 857 | %else | 870 | %else |
182 | 858 | if [ -x /sbin/chkconfig ] ; then | 871 | if [ -x /sbin/chkconfig ] ; then |
183 | @@ -893,6 +906,10 @@ | |||
184 | 893 | --datadir=$mysql_datadir | 906 | --datadir=$mysql_datadir |
185 | 894 | fi | 907 | fi |
186 | 895 | 908 | ||
187 | 909 | %if 0%{?systemd} | ||
188 | 910 | %tmpfiles_create mysql.conf | ||
189 | 911 | %endif | ||
190 | 912 | |||
191 | 896 | # ---------------------------------------------------------------------- | 913 | # ---------------------------------------------------------------------- |
192 | 897 | # Upgrade databases if needed would go here - but it cannot be automated yet | 914 | # Upgrade databases if needed would go here - but it cannot be automated yet |
193 | 898 | # ---------------------------------------------------------------------- | 915 | # ---------------------------------------------------------------------- |
194 | @@ -919,21 +936,18 @@ | |||
195 | 919 | sbin/restorecon -R var/lib/mysql | 936 | sbin/restorecon -R var/lib/mysql |
196 | 920 | fi | 937 | fi |
197 | 921 | 938 | ||
198 | 939 | # For systemd check postun | ||
199 | 940 | %if 0%{?systemd} == 0 | ||
200 | 922 | # Was the server running before the upgrade? If so, restart the new one. | 941 | # Was the server running before the upgrade? If so, restart the new one. |
201 | 923 | if [ "$SERVER_TO_START" = "true" ] ; then | 942 | if [ "$SERVER_TO_START" = "true" ] ; then |
202 | 924 | %if 0%{?systemd} | ||
203 | 925 | if [ -x %{_bindir}/systemctl ] ; then | ||
204 | 926 | %{_bindir}/systemctl start mysql | ||
205 | 927 | fi | ||
206 | 928 | %else | ||
207 | 929 | # Restart in the same way that mysqld will be started normally. | 943 | # Restart in the same way that mysqld will be started normally. |
208 | 930 | if [ -x %{_sysconfdir}/init.d/mysql ] ; then | 944 | if [ -x %{_sysconfdir}/init.d/mysql ] ; then |
209 | 931 | %{_sysconfdir}/init.d/mysql start | 945 | %{_sysconfdir}/init.d/mysql start |
210 | 946 | echo "Giving mysqld 5 seconds to start" | ||
211 | 947 | sleep 5 | ||
212 | 932 | fi | 948 | fi |
213 | 949 | fi | ||
214 | 933 | %endif | 950 | %endif |
215 | 934 | echo "Giving mysqld 5 seconds to start" | ||
216 | 935 | sleep 5 | ||
217 | 936 | fi | ||
218 | 937 | 951 | ||
219 | 938 | echo "Percona Server is distributed with several useful UDF (User Defined Function) from Percona Toolkit." | 952 | echo "Percona Server is distributed with several useful UDF (User Defined Function) from Percona Toolkit." |
220 | 939 | echo "Run the following commands to create these functions:" | 953 | echo "Run the following commands to create these functions:" |
221 | @@ -970,12 +984,9 @@ | |||
222 | 970 | 984 | ||
223 | 971 | if [ $1 = 0 ] ; then | 985 | if [ $1 = 0 ] ; then |
224 | 972 | %if 0%{?systemd} | 986 | %if 0%{?systemd} |
229 | 973 | if [ -x %{_bindir}/systemctl ] ; then | 987 | %systemd_preun mysqld |
226 | 974 | %{_bindir}/systemctl stop mysql > /dev/null | ||
227 | 975 | %{_bindir}/systemctl disable mysql > /dev/null | ||
228 | 976 | fi | ||
230 | 977 | %else | 988 | %else |
232 | 978 | # Stop MySQL before uninstalling it | 989 | # Stop MySQL before uninstalling it |
233 | 979 | if [ -x %{_sysconfdir}/init.d/mysql ] ; then | 990 | if [ -x %{_sysconfdir}/init.d/mysql ] ; then |
234 | 980 | %{_sysconfdir}/init.d/mysql stop > /dev/null | 991 | %{_sysconfdir}/init.d/mysql stop > /dev/null |
235 | 981 | # Remove autostart of MySQL | 992 | # Remove autostart of MySQL |
236 | @@ -1032,7 +1043,7 @@ | |||
237 | 1032 | 1043 | ||
238 | 1033 | %if 0%{?systemd} | 1044 | %if 0%{?systemd} |
239 | 1034 | if [ -x %{_bindir}/systemctl ] ; then | 1045 | if [ -x %{_bindir}/systemctl ] ; then |
241 | 1035 | %{_bindir}/systemctl enable mysql >/dev/null 2>&1 | 1046 | %{_bindir}/systemctl enable mysqld >/dev/null 2>&1 |
242 | 1036 | fi | 1047 | fi |
243 | 1037 | %else | 1048 | %else |
244 | 1038 | if [ -x /sbin/chkconfig ] ; then | 1049 | if [ -x /sbin/chkconfig ] ; then |
245 | @@ -1048,7 +1059,7 @@ | |||
246 | 1048 | # Restart in the same way that mysqld will be started normally. | 1059 | # Restart in the same way that mysqld will be started normally. |
247 | 1049 | %if 0%{?systemd} | 1060 | %if 0%{?systemd} |
248 | 1050 | if [ -x %{_bindir}/systemctl ] ; then | 1061 | if [ -x %{_bindir}/systemctl ] ; then |
250 | 1051 | %{_bindir}/systemctl start mysql | 1062 | %{_bindir}/systemctl start mysqld |
251 | 1052 | echo "Giving mysqld 5 seconds to start" | 1063 | echo "Giving mysqld 5 seconds to start" |
252 | 1053 | sleep 5 | 1064 | sleep 5 |
253 | 1054 | fi | 1065 | fi |
254 | @@ -1086,9 +1097,13 @@ | |||
255 | 1086 | echo "* See http://www.percona.com/doc/percona-server/5.6/tokudb/tokudb_intro.html for more details" | 1097 | echo "* See http://www.percona.com/doc/percona-server/5.6/tokudb/tokudb_intro.html for more details" |
256 | 1087 | echo "" | 1098 | echo "" |
257 | 1088 | fi | 1099 | fi |
258 | 1089 | %endif | ||
259 | 1090 | # ---------------------------------------------------------------------------- | 1100 | # ---------------------------------------------------------------------------- |
260 | 1101 | %endif | ||
261 | 1091 | 1102 | ||
262 | 1103 | %postun -n Percona-Server-server%{product_suffix} | ||
263 | 1104 | %if 0%{?systemd} | ||
264 | 1105 | %systemd_postun_with_restart mysqld | ||
265 | 1106 | %endif | ||
266 | 1092 | 1107 | ||
267 | 1093 | # ---------------------------------------------------------------------- | 1108 | # ---------------------------------------------------------------------- |
268 | 1094 | # Clean up the BuildRoot after build is done | 1109 | # Clean up the BuildRoot after build is done |
269 | @@ -1146,8 +1161,6 @@ | |||
270 | 1146 | %doc %attr(644, root, man) %{_mandir}/man1/mysql_plugin.1* | 1161 | %doc %attr(644, root, man) %{_mandir}/man1/mysql_plugin.1* |
271 | 1147 | %doc %attr(644, root, man) %{_mandir}/man8/mysqld.8* | 1162 | %doc %attr(644, root, man) %{_mandir}/man8/mysqld.8* |
272 | 1148 | 1163 | ||
273 | 1149 | %ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf | ||
274 | 1150 | |||
275 | 1151 | %attr(755, root, root) %{_bindir}/innochecksum | 1164 | %attr(755, root, root) %{_bindir}/innochecksum |
276 | 1152 | %attr(755, root, root) %{_bindir}/my_print_defaults | 1165 | %attr(755, root, root) %{_bindir}/my_print_defaults |
277 | 1153 | %attr(755, root, root) %{_bindir}/myisam_ftdump | 1166 | %attr(755, root, root) %{_bindir}/myisam_ftdump |
278 | @@ -1241,7 +1254,9 @@ | |||
279 | 1241 | 1254 | ||
280 | 1242 | %attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql | 1255 | %attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql |
281 | 1243 | %if 0%{?systemd} | 1256 | %if 0%{?systemd} |
283 | 1244 | %attr(644, root, root) %{_unitdir}/mysql.service | 1257 | %attr(755, root, root) %{_bindir}/mysql-systemd |
284 | 1258 | %attr(644, root, root) %{_unitdir}/mysqld.service | ||
285 | 1259 | %attr(644, root, root) %{_tmpfilesdir}/mysql.conf | ||
286 | 1245 | %else | 1260 | %else |
287 | 1246 | %attr(755, root, root) %{_sysconfdir}/init.d/mysql | 1261 | %attr(755, root, root) %{_sysconfdir}/init.d/mysql |
288 | 1247 | %endif | 1262 | %endif |
289 | @@ -1332,8 +1347,8 @@ | |||
290 | 1332 | %dir %attr(755, root, root) %{_libdir}/mysql | 1347 | %dir %attr(755, root, root) %{_libdir}/mysql |
291 | 1333 | %{_includedir}/mysql/* | 1348 | %{_includedir}/mysql/* |
292 | 1334 | %{_datadir}/aclocal/mysql.m4 | 1349 | %{_datadir}/aclocal/mysql.m4 |
295 | 1335 | %{_libdir}/mysql/libperconaserverclient.a | 1350 | %{_libdir}/mysql/%{shared_lib_pri_name}.a |
296 | 1336 | %{_libdir}/mysql/libperconaserverclient_r.a | 1351 | %{_libdir}/mysql/%{shared_lib_pri_name}_r.a |
297 | 1337 | %{_libdir}/mysql/libmysqlservices.a | 1352 | %{_libdir}/mysql/libmysqlservices.a |
298 | 1338 | %{_libdir}/*.so | 1353 | %{_libdir}/*.so |
299 | 1339 | 1354 | ||
300 | @@ -1350,18 +1365,30 @@ | |||
301 | 1350 | %files -n Percona-Server-shared%{product_suffix} | 1365 | %files -n Percona-Server-shared%{product_suffix} |
302 | 1351 | %defattr(-, root, root, 0755) | 1366 | %defattr(-, root, root, 0755) |
303 | 1352 | # Shared libraries (omit for architectures that don't support them) | 1367 | # Shared libraries (omit for architectures that don't support them) |
305 | 1353 | %{_libdir}/libperconaserver*.so.* | 1368 | %{_libdir}/%{shared_lib_pri_name}*.so.* |
306 | 1369 | |||
307 | 1370 | %if "%rhel" > "6" | ||
308 | 1371 | %attr(644, root, root) %config(noreplace) %{_sysconfdir}/my.cnf | ||
309 | 1372 | %endif | ||
310 | 1354 | 1373 | ||
311 | 1355 | %post -n Percona-Server-shared%{product_suffix} | 1374 | %post -n Percona-Server-shared%{product_suffix} |
312 | 1375 | %if "%rhel" > "6" | ||
313 | 1356 | # Added for compatibility | 1376 | # Added for compatibility |
315 | 1357 | for lib in libmysqlclient{.so.18.0.0,.so.18,_r.so.18.0.0,_r.so.18}; do | 1377 | for lib in %{shared_lib_pri_name}{.so.18,_r.so.18}; do |
316 | 1378 | if [ ! -f %{_libdir}/$lib ]; then | ||
317 | 1379 | ln -s %{shared_lib_pri_name}.so.18.1.0 %{_libdir}/$lib | ||
318 | 1380 | fi | ||
319 | 1381 | done | ||
320 | 1382 | %endif | ||
321 | 1383 | # For compatibility between different names of library | ||
322 | 1384 | for lib in %{shared_lib_sec_name}{.so.18.0.0,.so.18,_r.so.18.0.0,_r.so.18}; do | ||
323 | 1358 | if [ ! -f %{_libdir}/$lib ]; then | 1385 | if [ ! -f %{_libdir}/$lib ]; then |
325 | 1359 | ln -s libperconaserverclient.so.18 %{_libdir}/$lib; | 1386 | ln -s %{shared_lib_pri_name}.so.18 %{_libdir}/$lib; |
326 | 1360 | fi | 1387 | fi |
327 | 1361 | done | 1388 | done |
329 | 1362 | for lib in libmysqlclient{.so.18.1.0,_r.so.18.1.0}; do | 1389 | for lib in %{shared_lib_sec_name}{.so.18.1.0,_r.so.18.1.0}; do |
330 | 1363 | if [ ! -f %{_libdir}/$lib ]; then | 1390 | if [ ! -f %{_libdir}/$lib ]; then |
332 | 1364 | ln -s libperconaserverclient.so.18.1.0 %{_libdir}/$lib; | 1391 | ln -s %{shared_lib_pri_name}.so.18.1.0 %{_libdir}/$lib; |
333 | 1365 | fi | 1392 | fi |
334 | 1366 | done | 1393 | done |
335 | 1367 | 1394 | ||
336 | 1368 | 1395 | ||
337 | === added file 'build-ps/rpm/my.cnf' | |||
338 | --- build-ps/rpm/my.cnf 1970-01-01 00:00:00 +0000 | |||
339 | +++ build-ps/rpm/my.cnf 2014-10-07 16:28:28 +0000 | |||
340 | @@ -0,0 +1,30 @@ | |||
341 | 1 | # Percona Server template configuration | ||
342 | 2 | |||
343 | 3 | [mysqld] | ||
344 | 4 | # | ||
345 | 5 | # Remove leading # and set to the amount of RAM for the most important data | ||
346 | 6 | # cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. | ||
347 | 7 | # innodb_buffer_pool_size = 128M | ||
348 | 8 | # | ||
349 | 9 | # Remove leading # to turn on a very important data integrity option: logging | ||
350 | 10 | # changes to the binary log between backups. | ||
351 | 11 | # log_bin | ||
352 | 12 | # | ||
353 | 13 | # Remove leading # to set options mainly useful for reporting servers. | ||
354 | 14 | # The server defaults are faster for transactions and fast SELECTs. | ||
355 | 15 | # Adjust sizes as needed, experiment to find the optimal values. | ||
356 | 16 | # join_buffer_size = 128M | ||
357 | 17 | # sort_buffer_size = 2M | ||
358 | 18 | # read_rnd_buffer_size = 2M | ||
359 | 19 | datadir=/var/lib/mysql | ||
360 | 20 | socket=/var/lib/mysql/mysql.sock | ||
361 | 21 | |||
362 | 22 | # Disabling symbolic-links is recommended to prevent assorted security risks | ||
363 | 23 | symbolic-links=0 | ||
364 | 24 | |||
365 | 25 | # Recommended in standard MySQL setup | ||
366 | 26 | sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES | ||
367 | 27 | |||
368 | 28 | [mysqld_safe] | ||
369 | 29 | log-error=/var/log/mysqld.log | ||
370 | 30 | pid-file=/var/run/mysqld/mysqld.pid | ||
371 | 0 | 31 | ||
372 | === added file 'build-ps/rpm/mysql-5.6-sharedlib-rename.patch' | |||
373 | --- build-ps/rpm/mysql-5.6-sharedlib-rename.patch 1970-01-01 00:00:00 +0000 | |||
374 | +++ build-ps/rpm/mysql-5.6-sharedlib-rename.patch 2014-10-07 16:28:28 +0000 | |||
375 | @@ -0,0 +1,486 @@ | |||
376 | 1 | diff -rup old/client/CMakeLists.txt new/client/CMakeLists.txt | ||
377 | 2 | --- old/client/CMakeLists.txt 2014-09-11 15:57:31.002299863 +0200 | ||
378 | 3 | +++ new/client/CMakeLists.txt 2014-09-17 00:46:43.968870528 +0200 | ||
379 | 4 | @@ -32,48 +32,48 @@ COPY_OPENSSL_DLLS(copy_openssl_client) | ||
380 | 5 | |||
381 | 6 | ADD_DEFINITIONS(${SSL_DEFINES}) | ||
382 | 7 | MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) | ||
383 | 8 | -TARGET_LINK_LIBRARIES(mysql perconaserverclient) | ||
384 | 9 | +TARGET_LINK_LIBRARIES(mysql mysqlclient) | ||
385 | 10 | IF(UNIX) | ||
386 | 11 | TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) | ||
387 | 12 | ENDIF(UNIX) | ||
388 | 13 | |||
389 | 14 | MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) | ||
390 | 15 | SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") | ||
391 | 16 | -TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex) | ||
392 | 17 | +TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) | ||
393 | 18 | |||
394 | 19 | |||
395 | 20 | MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) | ||
396 | 21 | -TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient) | ||
397 | 22 | +TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) | ||
398 | 23 | |||
399 | 24 | MYSQL_ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c) | ||
400 | 25 | -TARGET_LINK_LIBRARIES(mysqldump perconaserverclient) | ||
401 | 26 | +TARGET_LINK_LIBRARIES(mysqldump mysqlclient) | ||
402 | 27 | |||
403 | 28 | MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) | ||
404 | 29 | -TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient) | ||
405 | 30 | +TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) | ||
406 | 31 | |||
407 | 32 | MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) | ||
408 | 33 | -TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient) | ||
409 | 34 | +TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) | ||
410 | 35 | ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) | ||
411 | 36 | |||
412 | 37 | MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) | ||
413 | 38 | -TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient) | ||
414 | 39 | +TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) | ||
415 | 40 | |||
416 | 41 | MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) | ||
417 | 42 | -TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient) | ||
418 | 43 | +TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) | ||
419 | 44 | |||
420 | 45 | MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc | ||
421 | 46 | ../sql/rpl_filter.cc ../sql/sql_list.cc) | ||
422 | 47 | -TARGET_LINK_LIBRARIES(mysqlbinlog perconaserverclient) | ||
423 | 48 | +TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) | ||
424 | 49 | |||
425 | 50 | MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc) | ||
426 | 51 | -TARGET_LINK_LIBRARIES(mysqladmin perconaserverclient) | ||
427 | 52 | +TARGET_LINK_LIBRARIES(mysqladmin mysqlclient) | ||
428 | 53 | |||
429 | 54 | MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) | ||
430 | 55 | SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") | ||
431 | 56 | -TARGET_LINK_LIBRARIES(mysqlslap perconaserverclient) | ||
432 | 57 | +TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) | ||
433 | 58 | |||
434 | 59 | MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) | ||
435 | 60 | -TARGET_LINK_LIBRARIES(mysql_config_editor perconaserverclient) | ||
436 | 61 | +TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) | ||
437 | 62 | |||
438 | 63 | # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". | ||
439 | 64 | IF(WIN32) | ||
440 | 65 | diff -rup old/libmysql/CMakeLists.txt new/libmysql/CMakeLists.txt | ||
441 | 66 | --- old/libmysql/CMakeLists.txt 2014-09-11 15:57:34.030299912 +0200 | ||
442 | 67 | +++ new/libmysql/CMakeLists.txt 2014-09-16 23:57:09.240822303 +0200 | ||
443 | 68 | @@ -179,12 +179,12 @@ IF(WIN32) | ||
444 | 69 | LIST(APPEND LIBS auth_win_client) | ||
445 | 70 | ENDIF() | ||
446 | 71 | |||
447 | 72 | -# Merge several convenience libraries into one big perconaserverclient | ||
448 | 73 | -MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development) | ||
449 | 74 | +# Merge several convenience libraries into one big mysqlclient | ||
450 | 75 | +MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) | ||
451 | 76 | |||
452 | 77 | # Visual Studio users need debug static library for debug projects | ||
453 | 78 | IF(MSVC) | ||
454 | 79 | - INSTALL_DEBUG_TARGET(perconaserverclient DESTINATION ${INSTALL_LIBDIR}/debug) | ||
455 | 80 | + INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug) | ||
456 | 81 | INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug) | ||
457 | 82 | ENDIF() | ||
458 | 83 | |||
459 | 84 | @@ -209,14 +209,14 @@ IF(UNIX) | ||
460 | 85 | ENDIF() | ||
461 | 86 | |||
462 | 87 | IF(UNIX) | ||
463 | 88 | - GET_TARGET_NAME(perconaserverclient lib_name) | ||
464 | 89 | - INSTALL_SYMLINK(perconaserverclient | ||
465 | 90 | - ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a | ||
466 | 91 | + GET_TARGET_NAME(mysqlclient lib_name) | ||
467 | 92 | + INSTALL_SYMLINK(mysqlclient | ||
468 | 93 | + ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a | ||
469 | 94 | ${INSTALL_LIBDIR} Development) | ||
470 | 95 | ENDIF() | ||
471 | 96 | |||
472 | 97 | IF(NOT DISABLE_SHARED) | ||
473 | 98 | - # Merge several convenience libraries into one big perconaserverclient | ||
474 | 99 | + # Merge several convenience libraries into one big mysqlclient | ||
475 | 100 | # and link them together into shared library. | ||
476 | 101 | MERGE_LIBRARIES(libmysql SHARED ${LIBS} | ||
477 | 102 | EXPORTS ${CLIENT_API_FUNCTIONS} | ||
478 | 103 | @@ -229,9 +229,9 @@ IF(NOT DISABLE_SHARED) | ||
479 | 104 | SET(OS_SHARED_LIB_VERSION | ||
480 | 105 | "${SHARED_LIB_MAJOR_VERSION}.${SHARED_LIB_MINOR_VERSION}.0") | ||
481 | 106 | ENDIF() | ||
482 | 107 | - # Name of shared library is perconaserverclient on Unix | ||
483 | 108 | + # Name of shared library is mysqlclient on Unix | ||
484 | 109 | SET_TARGET_PROPERTIES(libmysql PROPERTIES | ||
485 | 110 | - OUTPUT_NAME perconaserverclient | ||
486 | 111 | + OUTPUT_NAME mysqlclient | ||
487 | 112 | VERSION "${OS_SHARED_LIB_VERSION}" | ||
488 | 113 | SOVERSION "${SHARED_LIB_MAJOR_VERSION}") | ||
489 | 114 | CONFIGURE_FILE(libmysql.ver.in ${CMAKE_CURRENT_BINARY_DIR}/libmysql.ver) | ||
490 | 115 | @@ -248,13 +248,13 @@ IF(NOT DISABLE_SHARED) | ||
491 | 116 | PROPERTIES LINK_FLAGS "${libmysql_link_flags}") | ||
492 | 117 | ENDIF() | ||
493 | 118 | # clean direct output needs to be set several targets have the same name | ||
494 | 119 | - #(perconaserverclient in this case) | ||
495 | 120 | - SET_TARGET_PROPERTIES(perconaserverclient PROPERTIES CLEAN_DIRECT_OUTPUT 1) | ||
496 | 121 | + #(mysqlclient in this case) | ||
497 | 122 | + SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1) | ||
498 | 123 | SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1) | ||
499 | 124 | |||
500 | 125 | - # Install links to libperconaserverclient.so (client_r) | ||
501 | 126 | + # Install links to libmysqlclient.so (client_r) | ||
502 | 127 | GET_VERSIONED_LIBNAME( | ||
503 | 128 | - "${CMAKE_SHARED_LIBRARY_PREFIX}perconaserverclient_r" | ||
504 | 129 | + "${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r" | ||
505 | 130 | "${CMAKE_SHARED_LIBRARY_SUFFIX}" | ||
506 | 131 | "" | ||
507 | 132 | linkname) | ||
508 | 133 | @@ -268,7 +268,7 @@ IF(NOT DISABLE_SHARED) | ||
509 | 134 | LIST(REMOVE_DUPLICATES OS_SHARED_LIB_SYMLINKS) | ||
510 | 135 | FOREACH(ver ${OS_SHARED_LIB_SYMLINKS}) | ||
511 | 136 | GET_VERSIONED_LIBNAME( | ||
512 | 137 | - "${CMAKE_SHARED_LIBRARY_PREFIX}perconaserverclient_r" | ||
513 | 138 | + "${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r" | ||
514 | 139 | "${CMAKE_SHARED_LIBRARY_SUFFIX}" | ||
515 | 140 | "${ver}" | ||
516 | 141 | linkname) | ||
517 | 142 | diff -rup old/libmysql/libmysql.map new/libmysql/libmysql.map | ||
518 | 143 | --- old/libmysql/libmysql.map 2014-09-11 15:57:34.030299912 +0200 | ||
519 | 144 | +++ new/libmysql/libmysql.map 2014-09-11 16:04:17.866306459 +0200 | ||
520 | 145 | @@ -1,5 +1,5 @@ | ||
521 | 146 | # symbols exported from mysql 5.1 | ||
522 | 147 | -libperconaserverclient_16 { | ||
523 | 148 | +libmysqlclient_16 { | ||
524 | 149 | global: | ||
525 | 150 | _fini; | ||
526 | 151 | _init; | ||
527 | 152 | @@ -124,7 +124,7 @@ libperconaserverclient_16 { | ||
528 | 153 | *; | ||
529 | 154 | }; | ||
530 | 155 | # symbols added in mysql 5.5 | ||
531 | 156 | -libperconaserverclient_18 { | ||
532 | 157 | +libmysqlclient_18 { | ||
533 | 158 | global: | ||
534 | 159 | mysql_client_find_plugin; | ||
535 | 160 | mysql_client_register_plugin; | ||
536 | 161 | @@ -136,7 +136,7 @@ libperconaserverclient_18 { | ||
537 | 162 | # Ideally the following symbols wouldn't be exported, but various applications | ||
538 | 163 | # require them. We limit the namespace damage by prefixing mysql_ | ||
539 | 164 | # (see mysql-dubious-exports.patch), which means the symbols are not present | ||
540 | 165 | -# in libperconaserverclient_16. | ||
541 | 166 | +# in libmysqlclient_16. | ||
542 | 167 | # | ||
543 | 168 | # mysql-connector-odbc requires these | ||
544 | 169 | mysql_default_charset_info; | ||
545 | 170 | @@ -149,7 +149,7 @@ libperconaserverclient_18 { | ||
546 | 171 | my_net_read; | ||
547 | 172 | }; | ||
548 | 173 | # symbols added in mysql 5.6 | ||
549 | 174 | -libperconaserverclient_18_1 { | ||
550 | 175 | +libmysqlclient_18_1 { | ||
551 | 176 | global: | ||
552 | 177 | get_tty_password; | ||
553 | 178 | }; | ||
554 | 179 | diff -rup old/libmysql/libmysql.ver.in new/libmysql/libmysql.ver.in | ||
555 | 180 | --- old/libmysql/libmysql.ver.in 2014-09-11 15:57:34.030299912 +0200 | ||
556 | 181 | +++ new/libmysql/libmysql.ver.in 2014-09-11 16:02:40.254304877 +0200 | ||
557 | 182 | @@ -1 +1 @@ | ||
558 | 183 | -libperconaserverclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; }; | ||
559 | 184 | +libmysqlclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; }; | ||
560 | 185 | diff -rup old/plugin/percona-pam-for-mysql/CMakeLists.txt new/plugin/percona-pam-for-mysql/CMakeLists.txt | ||
561 | 186 | --- old/plugin/percona-pam-for-mysql/CMakeLists.txt 2014-09-11 15:57:34.094299913 +0200 | ||
562 | 187 | +++ new/plugin/percona-pam-for-mysql/CMakeLists.txt 2014-09-17 01:06:48.308890052 +0200 | ||
563 | 188 | @@ -31,6 +31,6 @@ IF(HAVE_PAM AND HAVE_GETPWNAM_R AND HAVE | ||
564 | 189 | SET(AUTH_PAM_COMPAT_SOURCES ${AUTH_PAM_COMMON_SOURCES} src/auth_pam_compat.c) | ||
565 | 190 | MYSQL_ADD_PLUGIN(auth_pam ${AUTH_PAM_SOURCES} LINK_LIBRARIES pam MODULE_ONLY) | ||
566 | 191 | MYSQL_ADD_PLUGIN(auth_pam_compat ${AUTH_PAM_COMPAT_SOURCES} LINK_LIBRARIES pam MODULE_ONLY) | ||
567 | 192 | - MYSQL_ADD_PLUGIN(dialog src/dialog.c LINK_LIBRARIES perconaserverclient MODULE_ONLY) | ||
568 | 193 | + MYSQL_ADD_PLUGIN(dialog src/dialog.c LINK_LIBRARIES mysqlclient MODULE_ONLY) | ||
569 | 194 | ENDIF(HAVE_PAM AND HAVE_GETPWNAM_R AND HAVE_GETGRGID_R) | ||
570 | 195 | ENDIF(WITH_PAM) | ||
571 | 196 | diff -rup old/scripts/CMakeLists.txt new/scripts/CMakeLists.txt | ||
572 | 197 | --- old/scripts/CMakeLists.txt 2014-09-11 15:57:33.210299899 +0200 | ||
573 | 198 | +++ new/scripts/CMakeLists.txt 2014-09-17 00:48:25.428872172 +0200 | ||
574 | 199 | @@ -253,7 +253,7 @@ ELSE() | ||
575 | 200 | ENDIF() | ||
576 | 201 | |||
577 | 202 | # Use cmake variables to inspect dependencies for | ||
578 | 203 | -# perconaserverclient library (add -l stuff) | ||
579 | 204 | +# mysqlclient library (add -l stuff) | ||
580 | 205 | SET(CLIENT_LIBS "") | ||
581 | 206 | SET(LIBS "") | ||
582 | 207 | |||
583 | 208 | @@ -293,7 +293,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) | ||
584 | 209 | ENDIF() | ||
585 | 210 | ENDMACRO() | ||
586 | 211 | |||
587 | 212 | -EXTRACT_LINK_LIBRARIES(perconaserverclient CLIENT_LIBS) | ||
588 | 213 | +EXTRACT_LINK_LIBRARIES(mysqlclient CLIENT_LIBS) | ||
589 | 214 | EXTRACT_LINK_LIBRARIES(mysqlserver LIBS) | ||
590 | 215 | |||
591 | 216 | # mysql_config evaluates ${LIBDL}, we want to avoid it | ||
592 | 217 | diff -rup old/scripts/mysql_config.pl.in new/scripts/mysql_config.pl.in | ||
593 | 218 | --- old/scripts/mysql_config.pl.in 2014-09-11 15:57:33.210299899 +0200 | ||
594 | 219 | +++ new/scripts/mysql_config.pl.in 2014-09-17 00:50:09.804873864 +0200 | ||
595 | 220 | @@ -182,15 +182,15 @@ if ( $^O eq "MSWin32" ) | ||
596 | 221 | my $linkpath = "$pkglibdir"; | ||
597 | 222 | # user32 is only needed for debug or embedded | ||
598 | 223 | my @winlibs = ("wsock32.lib","advapi32.lib","user32.lib"); | ||
599 | 224 | - @lib_opts = ("$linkpath/perconaserverclient.lib",@winlibs); | ||
600 | 225 | + @lib_opts = ("$linkpath/mysqlclient.lib",@winlibs); | ||
601 | 226 | @lib_r_opts = @lib_opts; | ||
602 | 227 | @lib_e_opts = ("$linkpath/mysqlserver.lib",@winlibs); | ||
603 | 228 | } | ||
604 | 229 | else | ||
605 | 230 | { | ||
606 | 231 | my $linkpath = "-L$pkglibdir @RPATH_OPTION@"; | ||
607 | 232 | - @lib_opts = ($linkpath,"-lperconaserverclient"); | ||
608 | 233 | - @lib_r_opts = ($linkpath,"-lperconaserverclient_r"); | ||
609 | 234 | + @lib_opts = ($linkpath,"-lmysqlclient"); | ||
610 | 235 | + @lib_r_opts = ($linkpath,"-lmysqlclient_r"); | ||
611 | 236 | @lib_e_opts = ($linkpath,"-lmysqld"); | ||
612 | 237 | } | ||
613 | 238 | |||
614 | 239 | diff -rup old/scripts/mysql_config.sh new/scripts/mysql_config.sh | ||
615 | 240 | --- old/scripts/mysql_config.sh 2014-09-11 15:57:33.218299899 +0200 | ||
616 | 241 | +++ new/scripts/mysql_config.sh 2014-09-17 00:51:04.160874746 +0200 | ||
617 | 242 | @@ -111,9 +111,9 @@ fi | ||
618 | 243 | |||
619 | 244 | # Create options | ||
620 | 245 | # We intentionally add a space to the beginning and end of lib strings, simplifies replace later | ||
621 | 246 | -libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lperconaserverclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" | ||
622 | 247 | +libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" | ||
623 | 248 | libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " | ||
624 | 249 | -libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lperconaserverclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " | ||
625 | 250 | +libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " | ||
626 | 251 | embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " | ||
627 | 252 | embedded_libs="$embedded_libs @QUOTED_CMAKE_CXX_LINK_FLAGS@" | ||
628 | 253 | |||
629 | 254 | diff -rup old/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile new/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile | ||
630 | 255 | --- old/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile 2014-09-11 15:57:33.850299909 +0200 | ||
631 | 256 | +++ new/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile 2014-09-17 00:56:44.060880256 +0200 | ||
632 | 257 | @@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
633 | 258 | SYS_LIB = | ||
634 | 259 | |||
635 | 260 | $(TARGET): $(OBJS) | ||
636 | 261 | - $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) | ||
637 | 262 | + $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) | ||
638 | 263 | |||
639 | 264 | $(OBJS): $(SRCS) | ||
640 | 265 | $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi -I$(INCLUDE_DIR)/ndbapi $(SRCS) | ||
641 | 266 | diff -rup old/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile new/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile | ||
642 | 267 | --- old/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile 2014-09-11 15:57:33.854299909 +0200 | ||
643 | 268 | +++ new/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile 2014-09-17 00:58:30.524881982 +0200 | ||
644 | 269 | @@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
645 | 270 | SYS_LIB = | ||
646 | 271 | |||
647 | 272 | $(TARGET): $(OBJS) | ||
648 | 273 | - $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) | ||
649 | 274 | + $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) | ||
650 | 275 | |||
651 | 276 | $(OBJS): $(SRCS) | ||
652 | 277 | $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi -I$(INCLUDE_DIR)/ndbapi $(SRCS) | ||
653 | 278 | diff -rup old/storage/ndb/ndbapi-examples/ndbapi_async/Makefile new/storage/ndb/ndbapi-examples/ndbapi_async/Makefile | ||
654 | 279 | --- old/storage/ndb/ndbapi-examples/ndbapi_async/Makefile 2014-09-11 15:57:33.854299909 +0200 | ||
655 | 280 | +++ new/storage/ndb/ndbapi-examples/ndbapi_async/Makefile 2014-09-17 01:00:02.560883474 +0200 | ||
656 | 281 | @@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
657 | 282 | SYS_LIB = | ||
658 | 283 | |||
659 | 284 | $(TARGET): $(OBJS) | ||
660 | 285 | - $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) | ||
661 | 286 | + $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) | ||
662 | 287 | |||
663 | 288 | $(TARGET).o: $(SRCS) | ||
664 | 289 | $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) | ||
665 | 290 | diff -rup old/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile new/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile | ||
666 | 291 | --- old/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile 2014-09-11 15:57:33.854299909 +0200 | ||
667 | 292 | +++ new/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile 2014-09-17 01:00:57.516884365 +0200 | ||
668 | 293 | @@ -28,7 +28,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
669 | 294 | SYS_LIB = | ||
670 | 295 | |||
671 | 296 | $(TARGET): $(OBJS) | ||
672 | 297 | - $(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) | ||
673 | 298 | + $(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) | ||
674 | 299 | |||
675 | 300 | $(TARGET).o: $(SRCS) | ||
676 | 301 | $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS) | ||
677 | 302 | diff -rup old/storage/ndb/ndbapi-examples/ndbapi_blob/Makefile new/storage/ndb/ndbapi-examples/ndbapi_blob/Makefile | ||
678 | 303 | --- old/storage/ndb/ndbapi-examples/ndbapi_blob/Makefile 2014-09-11 15:57:33.854299909 +0200 | ||
679 | 304 | +++ new/storage/ndb/ndbapi-examples/ndbapi_blob/Makefile 2014-09-17 01:01:33.404884947 +0200 | ||
680 | 305 | @@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
681 | 306 | SYS_LIB = | ||
682 | 307 | |||
683 | 308 | $(TARGET): $(OBJS) | ||
684 | 309 | - $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) | ||
685 | 310 | + $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) | ||
686 | 311 | |||
687 | 312 | $(TARGET).o: $(SRCS) | ||
688 | 313 | $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) | ||
689 | 314 | diff -rup old/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile new/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile | ||
690 | 315 | --- old/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile 2014-09-11 15:57:33.854299909 +0200 | ||
691 | 316 | +++ new/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile 2014-09-17 01:01:50.888885230 +0200 | ||
692 | 317 | @@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
693 | 318 | SYS_LIB = | ||
694 | 319 | |||
695 | 320 | $(TARGET): $(OBJS) | ||
696 | 321 | - $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) | ||
697 | 322 | + $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) | ||
698 | 323 | |||
699 | 324 | $(OBJS): $(SRCS) | ||
700 | 325 | $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) | ||
701 | 326 | diff -rup old/storage/ndb/ndbapi-examples/ndbapi_event/Makefile new/storage/ndb/ndbapi-examples/ndbapi_event/Makefile | ||
702 | 327 | --- old/storage/ndb/ndbapi-examples/ndbapi_event/Makefile 2014-09-11 15:57:33.854299909 +0200 | ||
703 | 328 | +++ new/storage/ndb/ndbapi-examples/ndbapi_event/Makefile 2014-09-17 00:58:49.500882290 +0200 | ||
704 | 329 | @@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
705 | 330 | SYS_LIB = | ||
706 | 331 | |||
707 | 332 | $(TARGET): $(OBJS) | ||
708 | 333 | - $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) | ||
709 | 334 | + $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) | ||
710 | 335 | |||
711 | 336 | $(TARGET).o: $(SRCS) Makefile | ||
712 | 337 | $(CXX) $(CFLAGS) $(DEBUG) -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi -I$(TOP_SRCDIR)/include $(SRCS) | ||
713 | 338 | diff -rup old/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile new/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile | ||
714 | 339 | --- old/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile 2014-09-11 15:57:33.850299909 +0200 | ||
715 | 340 | +++ new/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile 2014-09-17 00:57:27.564880961 +0200 | ||
716 | 341 | @@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
717 | 342 | SYS_LIB = | ||
718 | 343 | |||
719 | 344 | $(TARGET): $(OBJS) | ||
720 | 345 | - $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) | ||
721 | 346 | + $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) | ||
722 | 347 | |||
723 | 348 | $(OBJS): $(SRCS) | ||
724 | 349 | $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) | ||
725 | 350 | diff -rup old/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile new/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile | ||
726 | 351 | --- old/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile 2014-09-11 15:57:33.850299909 +0200 | ||
727 | 352 | +++ new/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile 2014-09-17 00:57:55.916881421 +0200 | ||
728 | 353 | @@ -28,7 +28,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
729 | 354 | SYS_LIB = | ||
730 | 355 | |||
731 | 356 | $(TARGET): $(OBJS) | ||
732 | 357 | - $(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) | ||
733 | 358 | + $(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) | ||
734 | 359 | |||
735 | 360 | $(TARGET).o: $(SRCS) | ||
736 | 361 | $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS) | ||
737 | 362 | diff -rup old/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile new/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile | ||
738 | 363 | --- old/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile 2014-09-11 15:57:33.850299909 +0200 | ||
739 | 364 | +++ new/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile 2014-09-17 00:56:07.200879658 +0200 | ||
740 | 365 | @@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
741 | 366 | SYS_LIB = | ||
742 | 367 | |||
743 | 368 | $(TARGET): $(OBJS) | ||
744 | 369 | - $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) | ||
745 | 370 | + $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) | ||
746 | 371 | |||
747 | 372 | $(TARGET).o: $(SRCS) | ||
748 | 373 | $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) | ||
749 | 374 | diff -rup old/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile new/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile | ||
750 | 375 | --- old/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile 2014-09-11 15:57:33.850299909 +0200 | ||
751 | 376 | +++ new/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile 2014-09-17 00:56:24.332879936 +0200 | ||
752 | 377 | @@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
753 | 378 | SYS_LIB = | ||
754 | 379 | |||
755 | 380 | $(TARGET): $(OBJS) | ||
756 | 381 | - $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) | ||
757 | 382 | + $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) | ||
758 | 383 | |||
759 | 384 | $(TARGET).o: $(SRCS) | ||
760 | 385 | $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS) | ||
761 | 386 | diff -rup old/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile new/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile | ||
762 | 387 | --- old/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile 2014-09-11 15:57:33.850299909 +0200 | ||
763 | 388 | +++ new/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile 2014-09-17 00:57:08.236880648 +0200 | ||
764 | 389 | @@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
765 | 390 | SYS_LIB = | ||
766 | 391 | |||
767 | 392 | $(TARGET): $(OBJS) | ||
768 | 393 | - $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) | ||
769 | 394 | + $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) | ||
770 | 395 | |||
771 | 396 | $(OBJS): $(SRCS) | ||
772 | 397 | $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS) | ||
773 | 398 | diff -rup old/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile new/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile | ||
774 | 399 | --- old/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile 2014-09-11 15:57:33.854299909 +0200 | ||
775 | 400 | +++ new/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile 2014-09-17 00:59:43.080883158 +0200 | ||
776 | 401 | @@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
777 | 402 | SYS_LIB = | ||
778 | 403 | |||
779 | 404 | $(TARGET): $(OBJS) | ||
780 | 405 | - $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) | ||
781 | 406 | + $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) | ||
782 | 407 | |||
783 | 408 | $(OBJS): $(SRCS) | ||
784 | 409 | $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) | ||
785 | 410 | diff -rup old/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile new/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile | ||
786 | 411 | --- old/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile 2014-09-11 15:57:33.854299909 +0200 | ||
787 | 412 | +++ new/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile 2014-09-17 01:01:15.132884650 +0200 | ||
788 | 413 | @@ -29,7 +29,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
789 | 414 | SYS_LIB = | ||
790 | 415 | |||
791 | 416 | $(TARGET): $(OBJS) | ||
792 | 417 | - $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r $(SYS_LIB) -o $(TARGET) | ||
793 | 418 | + $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r $(SYS_LIB) -o $(TARGET) | ||
794 | 419 | |||
795 | 420 | $(OBJS): $(SRCS) | ||
796 | 421 | $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) | ||
797 | 422 | diff -rup old/storage/ndb/test/run-test/CMakeLists.txt new/storage/ndb/test/run-test/CMakeLists.txt | ||
798 | 423 | --- old/storage/ndb/test/run-test/CMakeLists.txt 2014-09-11 15:57:33.390299902 +0200 | ||
799 | 424 | +++ new/storage/ndb/test/run-test/CMakeLists.txt 2014-09-17 00:53:34.700877186 +0200 | ||
800 | 425 | @@ -32,7 +32,7 @@ IF(NOT WIN32) | ||
801 | 426 | ADD_DEFINITIONS(-DDEFAULT_PREFIX=\"${CMAKE_INSTALL_PREFIX}\") | ||
802 | 427 | ENDIF() | ||
803 | 428 | ADD_EXECUTABLE(atrt main.cpp setup.cpp files.cpp db.cpp command.cpp) | ||
804 | 429 | -TARGET_LINK_LIBRARIES(atrt ndbNDBT ndbclient dbug mysys strings perconaserverclient) | ||
805 | 430 | +TARGET_LINK_LIBRARIES(atrt ndbNDBT ndbclient dbug mysys strings mysqlclient) | ||
806 | 431 | |||
807 | 432 | INSTALL(TARGETS atrt DESTINATION mysql-test/ndb) | ||
808 | 433 | INSTALL(FILES atrt-testBackup atrt-mysql-test-run DESTINATION bin) | ||
809 | 434 | diff -rup old/support-files/MySQL-shared-compat.spec.sh new/support-files/MySQL-shared-compat.spec.sh | ||
810 | 435 | --- old/support-files/MySQL-shared-compat.spec.sh 2014-09-11 15:57:34.062299913 +0200 | ||
811 | 436 | +++ new/support-files/MySQL-shared-compat.spec.sh 2014-09-17 01:05:59.832889266 +0200 | ||
812 | 437 | @@ -82,7 +82,7 @@ rpm2cpio %{SOURCE3} | cpio -iv --make-di | ||
813 | 438 | |||
814 | 439 | %files | ||
815 | 440 | %defattr(-, root, root) | ||
816 | 441 | -%{_libdir}/libperconaserverclient* | ||
817 | 442 | +%{_libdir}/libmysqlclient* | ||
818 | 443 | |||
819 | 444 | # The spec file changelog only includes changes made to the spec file | ||
820 | 445 | # itself - note that they must be ordered by date (important when | ||
821 | 446 | diff -rup old/support-files/mysql.spec.sh new/support-files/mysql.spec.sh | ||
822 | 447 | --- old/support-files/mysql.spec.sh 2014-09-11 15:57:34.062299913 +0200 | ||
823 | 448 | +++ new/support-files/mysql.spec.sh 2014-09-17 01:04:32.416887849 +0200 | ||
824 | 449 | @@ -690,7 +690,7 @@ A manual upgrade is required. | ||
825 | 450 | rpm -qa | grep -i '^mysql-' | ||
826 | 451 | |||
827 | 452 | You may choose to use 'rpm --nodeps -ev <package-name>' to remove | ||
828 | 453 | - the package which contains the perconaserverclient shared library. The | ||
829 | 454 | + the package which contains the mysqlclient shared library. The | ||
830 | 455 | library will be reinstalled by the MySQL-shared-compat package. | ||
831 | 456 | - Install the new MySQL packages supplied by $myvendor | ||
832 | 457 | - Ensure that the MySQL server is started | ||
833 | 458 | @@ -1173,8 +1173,8 @@ echo "=====" | ||
834 | 459 | %dir %attr(755, root, root) %{_libdir}/mysql | ||
835 | 460 | %{_includedir}/mysql/* | ||
836 | 461 | %{_datadir}/aclocal/mysql.m4 | ||
837 | 462 | -%{_libdir}/mysql/libperconaserverclient.a | ||
838 | 463 | -%{_libdir}/mysql/libperconaserverclient_r.a | ||
839 | 464 | +%{_libdir}/mysql/libmysqlclient.a | ||
840 | 465 | +%{_libdir}/mysql/libmysqlclient_r.a | ||
841 | 466 | %{_libdir}/mysql/libmysqlservices.a | ||
842 | 467 | |||
843 | 468 | # ---------------------------------------------------------------------------- | ||
844 | 469 | diff -rup old/tests/CMakeLists.txt new/tests/CMakeLists.txt | ||
845 | 470 | --- old/tests/CMakeLists.txt 2014-09-11 15:57:34.050299913 +0200 | ||
846 | 471 | +++ new/tests/CMakeLists.txt 2014-09-17 01:02:46.088886125 +0200 | ||
847 | 472 | @@ -18,12 +18,12 @@ ADD_DEFINITIONS("-DMYSQL_CLIENT") | ||
848 | 473 | INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) | ||
849 | 474 | |||
850 | 475 | ADD_EXECUTABLE(mysql_client_test mysql_client_test.c) | ||
851 | 476 | -TARGET_LINK_LIBRARIES(mysql_client_test perconaserverclient) | ||
852 | 477 | +TARGET_LINK_LIBRARIES(mysql_client_test mysqlclient) | ||
853 | 478 | SET_TARGET_PROPERTIES(mysql_client_test PROPERTIES LINKER_LANGUAGE CXX) | ||
854 | 479 | |||
855 | 480 | IF(WITH_UNIT_TESTS) | ||
856 | 481 | ADD_EXECUTABLE(bug25714 bug25714.c) | ||
857 | 482 | - TARGET_LINK_LIBRARIES(bug25714 perconaserverclient) | ||
858 | 483 | + TARGET_LINK_LIBRARIES(bug25714 mysqlclient) | ||
859 | 484 | SET_TARGET_PROPERTIES(bug25714 PROPERTIES LINKER_LANGUAGE CXX) | ||
860 | 485 | ENDIF() | ||
861 | 486 | |||
862 | 0 | 487 | ||
863 | === added file 'build-ps/rpm/mysql.conf' | |||
864 | --- build-ps/rpm/mysql.conf 1970-01-01 00:00:00 +0000 | |||
865 | +++ build-ps/rpm/mysql.conf 2014-10-07 16:28:28 +0000 | |||
866 | @@ -0,0 +1,1 @@ | |||
867 | 1 | d /var/run/mysqld 0755 mysql mysql - | ||
868 | 0 | 2 | ||
869 | === renamed file 'build-ps/rpm/mysql.service' => 'build-ps/rpm/mysqld.service' | |||
870 | === modified file 'storage/innobase/include/univ.i' | |||
871 | --- storage/innobase/include/univ.i 2014-09-26 04:43:24 +0000 | |||
872 | +++ storage/innobase/include/univ.i 2014-10-07 16:28:28 +0000 | |||
873 | @@ -47,7 +47,7 @@ | |||
874 | 47 | #define INNODB_VERSION_BUGFIX MYSQL_VERSION_PATCH | 47 | #define INNODB_VERSION_BUGFIX MYSQL_VERSION_PATCH |
875 | 48 | 48 | ||
876 | 49 | #ifndef PERCONA_INNODB_VERSION | 49 | #ifndef PERCONA_INNODB_VERSION |
878 | 50 | #define PERCONA_INNODB_VERSION 68.0 | 50 | #define PERCONA_INNODB_VERSION 69.0 |
879 | 51 | #endif | 51 | #endif |
880 | 52 | 52 | ||
881 | 53 | /* Enable UNIV_LOG_ARCHIVE in XtraDB */ | 53 | /* Enable UNIV_LOG_ARCHIVE in XtraDB */ |