Merge lp:~percona-core/percona-server/release-5.5.40-36.1 into lp:percona-server/5.5
- release-5.5.40-36.1
- Merge into 5.5
Proposed by
Tomislav Plavcic
Status: | Merged |
---|---|
Approved by: | Laurynas Biveinis |
Approved revision: | no longer in the source branch. |
Merged at revision: | 705 |
Proposed branch: | lp:~percona-core/percona-server/release-5.5.40-36.1 |
Merge into: | lp:percona-server/5.5 |
Diff against target: |
1862 lines (+1520/-52) 10 files modified
VERSION (+1/-1) build-ps/build-binary.sh (+1/-0) build-ps/debian/control (+4/-0) build-ps/debian/rules (+2/-0) build-ps/percona-server.spec (+73/-50) build-ps/rpm/my.cnf (+27/-0) build-ps/rpm/mysql-5.5-libmysqlclient-symbols.patch (+981/-0) build-ps/rpm/mysql-5.5-sharedlib-rename.patch (+429/-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.5.40-36.1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Laurynas Biveinis (community) | Approve | ||
Review via email: mp+237451@code.launchpad.net |
Commit message
Description of the change
Release branch for PS version 5.5.40-36.1
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 'VERSION' | |||
2 | --- VERSION 2014-09-24 09:00:06 +0000 | |||
3 | +++ VERSION 2014-10-07 16:27:15 +0000 | |||
4 | @@ -1,4 +1,4 @@ | |||
5 | 1 | MYSQL_VERSION_MAJOR=5 | 1 | MYSQL_VERSION_MAJOR=5 |
6 | 2 | MYSQL_VERSION_MINOR=5 | 2 | MYSQL_VERSION_MINOR=5 |
7 | 3 | MYSQL_VERSION_PATCH=40 | 3 | MYSQL_VERSION_PATCH=40 |
9 | 4 | MYSQL_VERSION_EXTRA=-36.0 | 4 | MYSQL_VERSION_EXTRA=-36.1 |
10 | 5 | 5 | ||
11 | === modified file 'build-ps/build-binary.sh' | |||
12 | --- build-ps/build-binary.sh 2014-08-22 10:09:55 +0000 | |||
13 | +++ build-ps/build-binary.sh 2014-10-07 16:27:15 +0000 | |||
14 | @@ -203,6 +203,7 @@ | |||
15 | 203 | cmake . ${CMAKE_OPTS:-} -DBUILD_CONFIG=mysql_release \ | 203 | cmake . ${CMAKE_OPTS:-} -DBUILD_CONFIG=mysql_release \ |
16 | 204 | -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \ | 204 | -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \ |
17 | 205 | -DWITH_EMBEDDED_SERVER=OFF \ | 205 | -DWITH_EMBEDDED_SERVER=OFF \ |
18 | 206 | -DENABLE_DTRACE=OFF \ | ||
19 | 206 | -DFEATURE_SET=community \ | 207 | -DFEATURE_SET=community \ |
20 | 207 | -DWITH_SSL="$WITH_SSL_TYPE" \ | 208 | -DWITH_SSL="$WITH_SSL_TYPE" \ |
21 | 208 | -DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \ | 209 | -DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \ |
22 | 209 | 210 | ||
23 | === modified file 'build-ps/debian/control' | |||
24 | --- build-ps/debian/control 2014-08-22 10:09:55 +0000 | |||
25 | +++ build-ps/debian/control 2014-10-07 16:27:15 +0000 | |||
26 | @@ -101,6 +101,7 @@ | |||
27 | 101 | virtual-mysql-client-core | 101 | virtual-mysql-client-core |
28 | 102 | Breaks: mysql-client-5.0, | 102 | Breaks: mysql-client-5.0, |
29 | 103 | mysql-client-core-5.1, | 103 | mysql-client-core-5.1, |
30 | 104 | mysql-client-core-5.5, | ||
31 | 104 | mysql-client-5.1, | 105 | mysql-client-5.1, |
32 | 105 | mysql-client-5.5, | 106 | mysql-client-5.5, |
33 | 106 | percona-xtradb-client-5.0, | 107 | percona-xtradb-client-5.0, |
34 | @@ -112,6 +113,7 @@ | |||
35 | 112 | virtual-mysql-client-core | 113 | virtual-mysql-client-core |
36 | 113 | Replaces: mysql-client-5.0, | 114 | Replaces: mysql-client-5.0, |
37 | 114 | mysql-client-core-5.1, | 115 | mysql-client-core-5.1, |
38 | 116 | mysql-client-core-5.5, | ||
39 | 115 | mysql-client-5.1, | 117 | mysql-client-5.1, |
40 | 116 | mysql-client-5.5, | 118 | mysql-client-5.5, |
41 | 117 | percona-xtradb-client-5.0, | 119 | percona-xtradb-client-5.0, |
42 | @@ -152,6 +154,7 @@ | |||
43 | 152 | mysql-server-5.1, | 154 | mysql-server-5.1, |
44 | 153 | mysql-server-5.5, | 155 | mysql-server-5.5, |
45 | 154 | mysql-server-core-5.1, | 156 | mysql-server-core-5.1, |
46 | 157 | mysql-server-core-5.5, | ||
47 | 155 | percona-xtradb-server-5.0, | 158 | percona-xtradb-server-5.0, |
48 | 156 | percona-server-server-5.1, | 159 | percona-server-server-5.1, |
49 | 157 | mariadb-server, | 160 | mariadb-server, |
50 | @@ -163,6 +166,7 @@ | |||
51 | 163 | mysql-server-5.1, | 166 | mysql-server-5.1, |
52 | 164 | mysql-server-5.5, | 167 | mysql-server-5.5, |
53 | 165 | mysql-server-core-5.1, | 168 | mysql-server-core-5.1, |
54 | 169 | mysql-server-core-5.5, | ||
55 | 166 | percona-xtradb-server-5.0, | 170 | percona-xtradb-server-5.0, |
56 | 167 | percona-server-server-5.1, | 171 | percona-server-server-5.1, |
57 | 168 | mariadb-server, | 172 | mariadb-server, |
58 | 169 | 173 | ||
59 | === modified file 'build-ps/debian/rules' | |||
60 | --- build-ps/debian/rules 2014-08-26 14:03:49 +0000 | |||
61 | +++ build-ps/debian/rules 2014-10-07 16:27:15 +0000 | |||
62 | @@ -74,6 +74,7 @@ | |||
63 | 74 | \ | 74 | \ |
64 | 75 | -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ | 75 | -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ |
65 | 76 | -DCMAKE_BUILD_TYPE=Debug \ | 76 | -DCMAKE_BUILD_TYPE=Debug \ |
66 | 77 | -DENABLE_DTRACE=OFF \ | ||
67 | 77 | -DWITH_LIBWRAP=ON \ | 78 | -DWITH_LIBWRAP=ON \ |
68 | 78 | -DWITH_SSL=system \ | 79 | -DWITH_SSL=system \ |
69 | 79 | -DCOMPILATION_COMMENT=$(COMPILATION_COMMENT_DEBUG) \ | 80 | -DCOMPILATION_COMMENT=$(COMPILATION_COMMENT_DEBUG) \ |
70 | @@ -99,6 +100,7 @@ | |||
71 | 99 | \ | 100 | \ |
72 | 100 | -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ | 101 | -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ |
73 | 101 | -DCMAKE_BUILD_TYPE=RelWithDebInfo \ | 102 | -DCMAKE_BUILD_TYPE=RelWithDebInfo \ |
74 | 103 | -DENABLE_DTRACE=OFF \ | ||
75 | 102 | -DWITH_LIBWRAP=ON \ | 104 | -DWITH_LIBWRAP=ON \ |
76 | 103 | -DWITH_SSL=system \ | 105 | -DWITH_SSL=system \ |
77 | 104 | -DCOMPILATION_COMMENT=$(COMPILATION_COMMENT_RELEASE) \ | 106 | -DCOMPILATION_COMMENT=$(COMPILATION_COMMENT_RELEASE) \ |
78 | 105 | 107 | ||
79 | === modified file 'build-ps/percona-server.spec' | |||
80 | --- build-ps/percona-server.spec 2014-08-29 07:43:51 +0000 | |||
81 | +++ build-ps/percona-server.spec 2014-10-07 16:27:15 +0000 | |||
82 | @@ -50,6 +50,14 @@ | |||
83 | 50 | %endif | 50 | %endif |
84 | 51 | %endif | 51 | %endif |
85 | 52 | 52 | ||
86 | 53 | %if "%rhel" > "6" | ||
87 | 54 | %define shared_lib_pri_name libmysqlclient | ||
88 | 55 | %define shared_lib_sec_name libperconaserverclient | ||
89 | 56 | %else | ||
90 | 57 | %define shared_lib_pri_name libperconaserverclient | ||
91 | 58 | %define shared_lib_sec_name libmysqlclient | ||
92 | 59 | %endif | ||
93 | 60 | |||
94 | 53 | # | 61 | # |
95 | 54 | # Macros we use which are not available in all supported versions of RPM | 62 | # Macros we use which are not available in all supported versions of RPM |
96 | 55 | # | 63 | # |
97 | @@ -242,6 +250,8 @@ | |||
98 | 242 | %if 0%{?systemd} | 250 | %if 0%{?systemd} |
99 | 243 | BuildRequires: systemd | 251 | BuildRequires: systemd |
100 | 244 | %endif | 252 | %endif |
101 | 253 | Patch0: mysql-5.5-sharedlib-rename.patch | ||
102 | 254 | Patch1: mysql-5.5-libmysqlclient-symbols.patch | ||
103 | 245 | 255 | ||
104 | 246 | # Think about what you use here since the first step is to | 256 | # Think about what you use here since the first step is to |
105 | 247 | # run a rm -rf | 257 | # run a rm -rf |
106 | @@ -319,7 +329,7 @@ | |||
107 | 319 | %package -n Percona-Server-client%{product_suffix} | 329 | %package -n Percona-Server-client%{product_suffix} |
108 | 320 | Summary: Percona Server - Client | 330 | Summary: Percona Server - Client |
109 | 321 | Group: Applications/Databases | 331 | Group: Applications/Databases |
111 | 322 | Requires: Percona-Server-shared%{product_suffix} | 332 | Requires: Percona-Server-shared%{product_suffix} |
112 | 323 | Provides: mysql-client MySQL-client mysql MySQL | 333 | Provides: mysql-client MySQL-client mysql MySQL |
113 | 324 | Conflicts: Percona-SQL-client-50 Percona-Server-client-51 | 334 | Conflicts: Percona-SQL-client-50 Percona-Server-client-51 |
114 | 325 | 335 | ||
115 | @@ -360,12 +370,21 @@ | |||
116 | 360 | %package -n Percona-Server-shared%{product_suffix} | 370 | %package -n Percona-Server-shared%{product_suffix} |
117 | 361 | Summary: Percona Server - Shared libraries | 371 | Summary: Percona Server - Shared libraries |
118 | 362 | Group: Applications/Databases | 372 | Group: Applications/Databases |
119 | 373 | %if "%rhel" > "6" | ||
120 | 374 | Provides: mysql-shared mysql-libs | ||
121 | 375 | Obsoletes: mariadb-libs | ||
122 | 376 | Conflicts: Percona-Server-shared-56 | ||
123 | 377 | %else | ||
124 | 363 | %ifarch x86_64 | 378 | %ifarch x86_64 |
125 | 364 | Provides: libmysqlclient.so.18()(64bit) | 379 | Provides: libmysqlclient.so.18()(64bit) |
126 | 380 | Provides: libmysqlclient.so.18(libmysqlclient_18)(64bit) | ||
127 | 365 | %endif | 381 | %endif |
128 | 366 | %ifarch i386 i686 | 382 | %ifarch i386 i686 |
129 | 367 | Provides: libmysqlclient.so.18()(32bit) | 383 | Provides: libmysqlclient.so.18()(32bit) |
131 | 368 | %endif | 384 | Provides: libmysqlclient.so.18(libmysqlclient_18)(32bit) |
132 | 385 | %endif | ||
133 | 386 | %endif | ||
134 | 387 | |||
135 | 369 | 388 | ||
136 | 370 | %description -n Percona-Server-shared%{product_suffix} | 389 | %description -n Percona-Server-shared%{product_suffix} |
137 | 371 | This package contains the shared libraries (*.so*) which certain languages | 390 | This package contains the shared libraries (*.so*) which certain languages |
138 | @@ -376,6 +395,12 @@ | |||
139 | 376 | %prep | 395 | %prep |
140 | 377 | # | 396 | # |
141 | 378 | %setup -n %{src_dir} | 397 | %setup -n %{src_dir} |
142 | 398 | |||
143 | 399 | %if "%rhel" > "6" | ||
144 | 400 | %patch0 -p1 | ||
145 | 401 | %patch1 -p1 | ||
146 | 402 | %endif | ||
147 | 403 | |||
148 | 379 | # | 404 | # |
149 | 380 | ############################################################################## | 405 | ############################################################################## |
150 | 381 | %build | 406 | %build |
151 | @@ -454,6 +479,7 @@ | |||
152 | 454 | # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM | 479 | # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM |
153 | 455 | ${CMAKE} ../ -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \ | 480 | ${CMAKE} ../ -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \ |
154 | 456 | -DCMAKE_BUILD_TYPE=Debug \ | 481 | -DCMAKE_BUILD_TYPE=Debug \ |
155 | 482 | -DENABLE_DTRACE=OFF \ | ||
156 | 457 | -DWITH_EMBEDDED_SERVER=OFF \ | 483 | -DWITH_EMBEDDED_SERVER=OFF \ |
157 | 458 | -DWITH_SSL=system \ | 484 | -DWITH_SSL=system \ |
158 | 459 | -DINSTALL_MYSQLSHAREDIR=share/percona-server \ | 485 | -DINSTALL_MYSQLSHAREDIR=share/percona-server \ |
159 | @@ -473,6 +499,7 @@ | |||
160 | 473 | # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM | 499 | # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM |
161 | 474 | ${CMAKE} ../ -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \ | 500 | ${CMAKE} ../ -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \ |
162 | 475 | -DCMAKE_BUILD_TYPE=RelWithDebInfo \ | 501 | -DCMAKE_BUILD_TYPE=RelWithDebInfo \ |
163 | 502 | -DENABLE_DTRACE=OFF \ | ||
164 | 476 | -DWITH_EMBEDDED_SERVER=OFF \ | 503 | -DWITH_EMBEDDED_SERVER=OFF \ |
165 | 477 | -DWITH_SSL=system \ | 504 | -DWITH_SSL=system \ |
166 | 478 | -DINSTALL_MYSQLSHAREDIR=share/percona-server \ | 505 | -DINSTALL_MYSQLSHAREDIR=share/percona-server \ |
167 | @@ -554,11 +581,16 @@ | |||
168 | 554 | install -m 644 $MBD/release/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql | 581 | install -m 644 $MBD/release/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql |
169 | 555 | %if 0%{?systemd} | 582 | %if 0%{?systemd} |
170 | 556 | install -D -m 0755 $MBD/build-ps/rpm/mysql-systemd $RBR%{_bindir}/mysql-systemd | 583 | install -D -m 0755 $MBD/build-ps/rpm/mysql-systemd $RBR%{_bindir}/mysql-systemd |
172 | 557 | install -D -m 0644 $MBD/build-ps/rpm/mysql.service $RBR%{_unitdir}/mysql.service | 584 | install -D -m 0644 $MBD/build-ps/rpm/mysqld.service $RBR%{_unitdir}/mysqld.service |
173 | 585 | install -D -m 0644 $MBD/build-ps/rpm/mysql.conf $RBR%{_tmpfilesdir}/mysql.conf | ||
174 | 558 | %else | 586 | %else |
175 | 559 | install -m 755 $MBD/release/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql | 587 | install -m 755 $MBD/release/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql |
176 | 560 | %endif | 588 | %endif |
177 | 561 | 589 | ||
178 | 590 | %if "%rhel" > "6" | ||
179 | 591 | install -D -m 0644 $MBD/build-ps/rpm/my.cnf $RBR%{_sysconfdir}/my.cnf | ||
180 | 592 | %endif | ||
181 | 593 | |||
182 | 562 | # Delete the symlinks to the libraries from the libdir. These are created by | 594 | # Delete the symlinks to the libraries from the libdir. These are created by |
183 | 563 | # ldconfig(8) afterwards. | 595 | # ldconfig(8) afterwards. |
184 | 564 | rm -f $RBR%{_libdir}/libmysqlclient*.so.18 | 596 | rm -f $RBR%{_libdir}/libmysqlclient*.so.18 |
185 | @@ -569,7 +601,7 @@ | |||
186 | 569 | 601 | ||
187 | 570 | # Touch the place where the my.cnf config file might be located | 602 | # Touch the place where the my.cnf config file might be located |
188 | 571 | # Just to make sure it's in the file list and marked as a config file | 603 | # Just to make sure it's in the file list and marked as a config file |
190 | 572 | touch $RBR%{_sysconfdir}/my.cnf | 604 | # touch $RBR%{_sysconfdir}/my.cnf |
191 | 573 | 605 | ||
192 | 574 | # Install SELinux files in datadir | 606 | # Install SELinux files in datadir |
193 | 575 | install -m 600 $MBD/support-files/RHEL4-SElinux/mysql.{fc,te} \ | 607 | install -m 600 $MBD/support-files/RHEL4-SElinux/mysql.{fc,te} \ |
194 | @@ -596,15 +628,6 @@ | |||
195 | 596 | 628 | ||
196 | 597 | %pre -n Percona-Server-server%{product_suffix} | 629 | %pre -n Percona-Server-server%{product_suffix} |
197 | 598 | 630 | ||
198 | 599 | # On rhel7 change default MariaDB options if they exists (only on initial installation) | ||
199 | 600 | %if "%rhel" > "6" | ||
200 | 601 | if [ $1 -eq 1 -a -f /etc/my.cnf ]; then | ||
201 | 602 | sed -i 's/log-error=\/var\/log\/mariadb\/mariadb.log/log-error=\/var\/log\/mysqld.log/g' /etc/my.cnf; | ||
202 | 603 | sed -i 's/pid-file=\/var\/run\/mariadb\/mariadb.pid/pid-file=\/var\/run\/mysqld\/mysqld.pid/g' /etc/my.cnf; | ||
203 | 604 | sed -i 's/\!includedir \/etc\/my.cnf.d/\#\!includedir \/etc\/my.cnf.d/g' /etc/my.cnf; | ||
204 | 605 | fi | ||
205 | 606 | %endif | ||
206 | 607 | |||
207 | 608 | # ATTENTION: Parts of this are duplicated in the "triggerpostun" ! | 631 | # ATTENTION: Parts of this are duplicated in the "triggerpostun" ! |
208 | 609 | 632 | ||
209 | 610 | # There are users who deviate from the default file system layout. | 633 | # There are users who deviate from the default file system layout. |
210 | @@ -760,20 +783,11 @@ | |||
211 | 760 | # Note we *could* make that depend on $SERVER_TO_START, but we rather don't, | 783 | # Note we *could* make that depend on $SERVER_TO_START, but we rather don't, |
212 | 761 | # so a "stop" is attempted even if there is no PID file. | 784 | # so a "stop" is attempted even if there is no PID file. |
213 | 762 | # (Maybe the "stop" doesn't work then, but we might fix that in itself.) | 785 | # (Maybe the "stop" doesn't work then, but we might fix that in itself.) |
214 | 763 | %if 0%{?systemd} | ||
215 | 764 | SYSD_ACTIVE=$(systemctl is-active mysql) | ||
216 | 765 | if [ $SYSD_ACTIVE == "active" ] ; then | ||
217 | 766 | %{_bindir}/systemctl stop mysql >/dev/null 2>&1 | ||
218 | 767 | echo "Giving mysqld 5 seconds to exit nicely" | ||
219 | 768 | sleep 5 | ||
220 | 769 | fi | ||
221 | 770 | %else | ||
222 | 771 | if [ -x %{_sysconfdir}/init.d/mysql ] ; then | 786 | if [ -x %{_sysconfdir}/init.d/mysql ] ; then |
223 | 772 | %{_sysconfdir}/init.d/mysql stop > /dev/null 2>&1 | 787 | %{_sysconfdir}/init.d/mysql stop > /dev/null 2>&1 |
224 | 773 | echo "Giving mysqld 5 seconds to exit nicely" | 788 | echo "Giving mysqld 5 seconds to exit nicely" |
225 | 774 | sleep 5 | 789 | sleep 5 |
226 | 775 | fi | 790 | fi |
227 | 776 | %endif | ||
228 | 777 | 791 | ||
229 | 778 | # SElinux | 792 | # SElinux |
230 | 779 | %post -n Percona-Server-selinux%{product_suffix} | 793 | %post -n Percona-Server-selinux%{product_suffix} |
231 | @@ -790,6 +804,11 @@ | |||
232 | 790 | if [ X${PERCONA_DEBUG} == X1 ]; then | 804 | if [ X${PERCONA_DEBUG} == X1 ]; then |
233 | 791 | set -x | 805 | set -x |
234 | 792 | fi | 806 | fi |
235 | 807 | |||
236 | 808 | %if 0%{?systemd} | ||
237 | 809 | %systemd_post mysqld | ||
238 | 810 | %endif | ||
239 | 811 | |||
240 | 793 | # ATTENTION: Parts of this are duplicated in the "triggerpostun" ! | 812 | # ATTENTION: Parts of this are duplicated in the "triggerpostun" ! |
241 | 794 | 813 | ||
242 | 795 | # There are users who deviate from the default file system layout. | 814 | # There are users who deviate from the default file system layout. |
243 | @@ -848,6 +867,10 @@ | |||
244 | 848 | fi | 867 | fi |
245 | 849 | fi | 868 | fi |
246 | 850 | 869 | ||
247 | 870 | %if 0%{?systemd} | ||
248 | 871 | %tmpfiles_create mysql.conf | ||
249 | 872 | %endif | ||
250 | 873 | |||
251 | 851 | # ---------------------------------------------------------------------- | 874 | # ---------------------------------------------------------------------- |
252 | 852 | # Make MySQL start/shutdown automatically when the machine does it. | 875 | # Make MySQL start/shutdown automatically when the machine does it. |
253 | 853 | # ---------------------------------------------------------------------- | 876 | # ---------------------------------------------------------------------- |
254 | @@ -856,7 +879,7 @@ | |||
255 | 856 | # use chkconfig on Enterprise Linux and newer SuSE releases | 879 | # use chkconfig on Enterprise Linux and newer SuSE releases |
256 | 857 | %if 0%{?systemd} | 880 | %if 0%{?systemd} |
257 | 858 | if [ -x %{_bindir}/systemctl ] ; then | 881 | if [ -x %{_bindir}/systemctl ] ; then |
259 | 859 | %{_bindir}/systemctl enable mysql >/dev/null 2>&1 | 882 | %{_bindir}/systemctl enable mysqld >/dev/null 2>&1 |
260 | 860 | fi | 883 | fi |
261 | 861 | %else | 884 | %else |
262 | 862 | if [ -x /sbin/chkconfig ] ; then | 885 | if [ -x /sbin/chkconfig ] ; then |
263 | @@ -894,21 +917,18 @@ | |||
264 | 894 | sbin/restorecon -R var/lib/mysql | 917 | sbin/restorecon -R var/lib/mysql |
265 | 895 | fi | 918 | fi |
266 | 896 | 919 | ||
267 | 920 | # For systemd check postun | ||
268 | 921 | %if 0%{?systemd} == 0 | ||
269 | 897 | # Was the server running before the upgrade? If so, restart the new one. | 922 | # Was the server running before the upgrade? If so, restart the new one. |
270 | 898 | if [ "$SERVER_TO_START" = "true" ] ; then | 923 | if [ "$SERVER_TO_START" = "true" ] ; then |
271 | 899 | %if 0%{?systemd} | ||
272 | 900 | if [ -x %{_bindir}/systemctl ] ; then | ||
273 | 901 | %{_bindir}/systemctl start mysql | ||
274 | 902 | fi | ||
275 | 903 | %else | ||
276 | 904 | # Restart in the same way that mysqld will be started normally. | 924 | # Restart in the same way that mysqld will be started normally. |
277 | 905 | if [ -x %{_sysconfdir}/init.d/mysql ] ; then | 925 | if [ -x %{_sysconfdir}/init.d/mysql ] ; then |
278 | 906 | %{_sysconfdir}/init.d/mysql start | 926 | %{_sysconfdir}/init.d/mysql start |
279 | 927 | echo "Giving mysqld 5 seconds to start" | ||
280 | 928 | sleep 5 | ||
281 | 907 | fi | 929 | fi |
282 | 930 | fi | ||
283 | 908 | %endif | 931 | %endif |
284 | 909 | echo "Giving mysqld 5 seconds to start" | ||
285 | 910 | sleep 5 | ||
286 | 911 | fi | ||
287 | 912 | 932 | ||
288 | 913 | echo "Percona Server is distributed with several useful UDF (User Defined Function) from Percona Toolkit." | 933 | echo "Percona Server is distributed with several useful UDF (User Defined Function) from Percona Toolkit." |
289 | 914 | echo "Run the following commands to create these functions:" | 934 | echo "Run the following commands to create these functions:" |
290 | @@ -945,12 +965,9 @@ | |||
291 | 945 | 965 | ||
292 | 946 | if [ $1 = 0 ] ; then | 966 | if [ $1 = 0 ] ; then |
293 | 947 | %if 0%{?systemd} | 967 | %if 0%{?systemd} |
298 | 948 | if [ -x %{_bindir}/systemctl ] ; then | 968 | %systemd_preun mysqld |
295 | 949 | %{_bindir}/systemctl stop mysql > /dev/null | ||
296 | 950 | %{_bindir}/systemctl disable mysql > /dev/null | ||
297 | 951 | fi | ||
299 | 952 | %else | 969 | %else |
301 | 953 | # Stop MySQL before uninstalling it | 970 | # Stop MySQL before uninstalling it |
302 | 954 | if [ -x %{_sysconfdir}/init.d/mysql ] ; then | 971 | if [ -x %{_sysconfdir}/init.d/mysql ] ; then |
303 | 955 | %{_sysconfdir}/init.d/mysql stop > /dev/null | 972 | %{_sysconfdir}/init.d/mysql stop > /dev/null |
304 | 956 | # Remove autostart of MySQL | 973 | # Remove autostart of MySQL |
305 | @@ -1007,7 +1024,7 @@ | |||
306 | 1007 | 1024 | ||
307 | 1008 | %if 0%{?systemd} | 1025 | %if 0%{?systemd} |
308 | 1009 | if [ -x %{_bindir}/systemctl ] ; then | 1026 | if [ -x %{_bindir}/systemctl ] ; then |
310 | 1010 | %{_bindir}/systemctl enable mysql >/dev/null 2>&1 | 1027 | %{_bindir}/systemctl enable mysqld >/dev/null 2>&1 |
311 | 1011 | fi | 1028 | fi |
312 | 1012 | %else | 1029 | %else |
313 | 1013 | if [ -x /sbin/chkconfig ] ; then | 1030 | if [ -x /sbin/chkconfig ] ; then |
314 | @@ -1023,7 +1040,7 @@ | |||
315 | 1023 | # Restart in the same way that mysqld will be started normally. | 1040 | # Restart in the same way that mysqld will be started normally. |
316 | 1024 | %if 0%{?systemd} | 1041 | %if 0%{?systemd} |
317 | 1025 | if [ -x %{_bindir}/systemctl ] ; then | 1042 | if [ -x %{_bindir}/systemctl ] ; then |
319 | 1026 | %{_bindir}/systemctl start mysql | 1043 | %{_bindir}/systemctl start mysqld |
320 | 1027 | echo "Giving mysqld 5 seconds to start" | 1044 | echo "Giving mysqld 5 seconds to start" |
321 | 1028 | sleep 5 | 1045 | sleep 5 |
322 | 1029 | fi | 1046 | fi |
323 | @@ -1041,6 +1058,11 @@ | |||
324 | 1041 | echo "=====" >> $STATUS_HISTORY | 1058 | echo "=====" >> $STATUS_HISTORY |
325 | 1042 | 1059 | ||
326 | 1043 | 1060 | ||
327 | 1061 | %postun -n Percona-Server-server%{product_suffix} | ||
328 | 1062 | %if 0%{?systemd} | ||
329 | 1063 | %systemd_postun_with_restart mysqld | ||
330 | 1064 | %endif | ||
331 | 1065 | |||
332 | 1044 | # ---------------------------------------------------------------------- | 1066 | # ---------------------------------------------------------------------- |
333 | 1045 | # Clean up the BuildRoot after build is done | 1067 | # Clean up the BuildRoot after build is done |
334 | 1046 | # ---------------------------------------------------------------------- | 1068 | # ---------------------------------------------------------------------- |
335 | @@ -1095,11 +1117,6 @@ | |||
336 | 1095 | %doc %attr(644, root, man) %{_mandir}/man1/resolve_stack_dump.1* | 1117 | %doc %attr(644, root, man) %{_mandir}/man1/resolve_stack_dump.1* |
337 | 1096 | %doc %attr(644, root, man) %{_mandir}/man1/resolveip.1* | 1118 | %doc %attr(644, root, man) %{_mandir}/man1/resolveip.1* |
338 | 1097 | %doc %attr(644, root, man) %{_mandir}/man1/mysql_plugin.1* | 1119 | %doc %attr(644, root, man) %{_mandir}/man1/mysql_plugin.1* |
339 | 1098 | %if 0%{?systemd} | ||
340 | 1099 | %attr(755, root, root) %{_bindir}/mysql-systemd | ||
341 | 1100 | %endif | ||
342 | 1101 | |||
343 | 1102 | %ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf | ||
344 | 1103 | 1120 | ||
345 | 1104 | %attr(755, root, root) %{_bindir}/innochecksum | 1121 | %attr(755, root, root) %{_bindir}/innochecksum |
346 | 1105 | %attr(755, root, root) %{_bindir}/myisam_ftdump | 1122 | %attr(755, root, root) %{_bindir}/myisam_ftdump |
347 | @@ -1186,7 +1203,9 @@ | |||
348 | 1186 | 1203 | ||
349 | 1187 | %attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql | 1204 | %attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql |
350 | 1188 | %if 0%{?systemd} | 1205 | %if 0%{?systemd} |
352 | 1189 | %attr(644, root, root) %{_unitdir}/mysql.service | 1206 | %attr(755, root, root) %{_bindir}/mysql-systemd |
353 | 1207 | %attr(644, root, root) %{_unitdir}/mysqld.service | ||
354 | 1208 | %attr(644, root, root) %{_tmpfilesdir}/mysql.conf | ||
355 | 1190 | %else | 1209 | %else |
356 | 1191 | %attr(755, root, root) %{_sysconfdir}/init.d/mysql | 1210 | %attr(755, root, root) %{_sysconfdir}/init.d/mysql |
357 | 1192 | %endif | 1211 | %endif |
358 | @@ -1239,8 +1258,8 @@ | |||
359 | 1239 | %{_includedir}/mysql/* | 1258 | %{_includedir}/mysql/* |
360 | 1240 | %{_includedir}/handlersocket | 1259 | %{_includedir}/handlersocket |
361 | 1241 | %{_datadir}/aclocal/mysql.m4 | 1260 | %{_datadir}/aclocal/mysql.m4 |
364 | 1242 | %{_libdir}/mysql/libperconaserverclient.a | 1261 | %{_libdir}/mysql/%{shared_lib_pri_name}.a |
365 | 1243 | %{_libdir}/mysql/libperconaserverclient_r.a | 1262 | %{_libdir}/mysql/%{shared_lib_pri_name}_r.a |
366 | 1244 | %{_libdir}/mysql/libmysqlservices.a | 1263 | %{_libdir}/mysql/libmysqlservices.a |
367 | 1245 | %{_libdir}/mysql/libhsclient.a | 1264 | %{_libdir}/mysql/libhsclient.a |
368 | 1246 | %{_libdir}/libhsclient.la | 1265 | %{_libdir}/libhsclient.la |
369 | @@ -1249,13 +1268,17 @@ | |||
370 | 1249 | %files -n Percona-Server-shared%{product_suffix} | 1268 | %files -n Percona-Server-shared%{product_suffix} |
371 | 1250 | %defattr(-, root, root, 0755) | 1269 | %defattr(-, root, root, 0755) |
372 | 1251 | # Shared libraries (omit for architectures that don't support them) | 1270 | # Shared libraries (omit for architectures that don't support them) |
374 | 1252 | %{_libdir}/libperconaserver*.so* | 1271 | %{_libdir}/%{shared_lib_pri_name}*.so* |
375 | 1272 | |||
376 | 1273 | %if "%rhel" > "6" | ||
377 | 1274 | %attr(644, root, root) %config(noreplace) %{_sysconfdir}/my.cnf | ||
378 | 1275 | %endif | ||
379 | 1253 | 1276 | ||
380 | 1254 | %post -n Percona-Server-shared%{product_suffix} | 1277 | %post -n Percona-Server-shared%{product_suffix} |
383 | 1255 | # Added for compatibility | 1278 | # For compatibility after reverting name to libmysql |
384 | 1256 | for lib in libmysqlclient{.so.18.0.0,.so.18,_r.so.18.0.0,_r.so.18}; do | 1279 | for lib in %{shared_lib_sec_name}{.so.18.0.0,.so.18,_r.so.18.0.0,_r.so.18}; do |
385 | 1257 | if [ ! -f %{_libdir}/$lib ]; then | 1280 | if [ ! -f %{_libdir}/$lib ]; then |
387 | 1258 | ln -s libperconaserverclient.so.18 %{_libdir}/$lib; | 1281 | ln -s %{shared_lib_pri_name}.so.18.0.0 %{_libdir}/$lib; |
388 | 1259 | fi | 1282 | fi |
389 | 1260 | done | 1283 | done |
390 | 1261 | 1284 | ||
391 | 1262 | 1285 | ||
392 | === added file 'build-ps/rpm/my.cnf' | |||
393 | --- build-ps/rpm/my.cnf 1970-01-01 00:00:00 +0000 | |||
394 | +++ build-ps/rpm/my.cnf 2014-10-07 16:27:15 +0000 | |||
395 | @@ -0,0 +1,27 @@ | |||
396 | 1 | # Percona Server template configuration | ||
397 | 2 | |||
398 | 3 | [mysqld] | ||
399 | 4 | # | ||
400 | 5 | # Remove leading # and set to the amount of RAM for the most important data | ||
401 | 6 | # cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. | ||
402 | 7 | # innodb_buffer_pool_size = 128M | ||
403 | 8 | # | ||
404 | 9 | # Remove leading # to turn on a very important data integrity option: logging | ||
405 | 10 | # changes to the binary log between backups. | ||
406 | 11 | # log_bin | ||
407 | 12 | # | ||
408 | 13 | # Remove leading # to set options mainly useful for reporting servers. | ||
409 | 14 | # The server defaults are faster for transactions and fast SELECTs. | ||
410 | 15 | # Adjust sizes as needed, experiment to find the optimal values. | ||
411 | 16 | # join_buffer_size = 128M | ||
412 | 17 | # sort_buffer_size = 2M | ||
413 | 18 | # read_rnd_buffer_size = 2M | ||
414 | 19 | datadir=/var/lib/mysql | ||
415 | 20 | socket=/var/lib/mysql/mysql.sock | ||
416 | 21 | |||
417 | 22 | # Disabling symbolic-links is recommended to prevent assorted security risks | ||
418 | 23 | symbolic-links=0 | ||
419 | 24 | |||
420 | 25 | [mysqld_safe] | ||
421 | 26 | log-error=/var/log/mysqld.log | ||
422 | 27 | pid-file=/var/run/mysqld/mysqld.pid | ||
423 | 0 | 28 | ||
424 | === added file 'build-ps/rpm/mysql-5.5-libmysqlclient-symbols.patch' | |||
425 | --- build-ps/rpm/mysql-5.5-libmysqlclient-symbols.patch 1970-01-01 00:00:00 +0000 | |||
426 | +++ build-ps/rpm/mysql-5.5-libmysqlclient-symbols.patch 2014-10-07 16:27:15 +0000 | |||
427 | @@ -0,0 +1,981 @@ | |||
428 | 1 | diff -rup old/libmysql/CMakeLists.txt new/libmysql/CMakeLists.txt | ||
429 | 2 | --- old/libmysql/CMakeLists.txt 2014-09-18 10:47:31.000000000 +0200 | ||
430 | 3 | +++ new/libmysql/CMakeLists.txt 2014-09-22 09:45:34.769758731 +0200 | ||
431 | 4 | @@ -219,13 +219,14 @@ IF(NOT DISABLE_SHARED) | ||
432 | 5 | OUTPUT_NAME mysqlclient | ||
433 | 6 | VERSION "${OS_SHARED_LIB_VERSION}" | ||
434 | 7 | SOVERSION "${SHARED_LIB_MAJOR_VERSION}") | ||
435 | 8 | + CONFIGURE_FILE(libmysql.ver.in ${CMAKE_CURRENT_BINARY_DIR}/libmysql.ver) | ||
436 | 9 | IF(LINK_FLAG_NO_UNDEFINED) | ||
437 | 10 | GET_TARGET_PROPERTY(libmysql_link_flags libmysql LINK_FLAGS) | ||
438 | 11 | IF(NOT libmysql_link_flag) | ||
439 | 12 | SET(libmysql_link_flags) | ||
440 | 13 | ENDIF() | ||
441 | 14 | IF(INSTALL_LAYOUT STREQUAL "RPM") | ||
442 | 15 | - SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS "${libmysql_link_flags} -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libmysql.map ${LINK_FLAG_NO_UNDEFINED}") | ||
443 | 16 | + SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS "${libmysql_link_flags} -Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/libmysql.ver ${LINK_FLAG_NO_UNDEFINED}") | ||
444 | 17 | ELSE() | ||
445 | 18 | SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS "${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED}") | ||
446 | 19 | ENDIF(INSTALL_LAYOUT STREQUAL "RPM") | ||
447 | 20 | diff -rup old/libmysql/libmysql.c new/libmysql/libmysql.c | ||
448 | 21 | --- old/libmysql/libmysql.c 2014-09-02 10:31:46.000000000 +0200 | ||
449 | 22 | +++ new/libmysql/libmysql.c 2014-09-22 09:30:42.873744272 +0200 | ||
450 | 23 | @@ -4874,3 +4874,612 @@ my_bool STDCALL mysql_read_query_result( | ||
451 | 24 | return (*mysql->methods->read_query_result)(mysql); | ||
452 | 25 | } | ||
453 | 26 | |||
454 | 27 | +#ifndef EMBEDDED_LIBRARY | ||
455 | 28 | + | ||
456 | 29 | +// Hack to provide both libmysqlclient_16 and libmysqlclient_18 symbol versions | ||
457 | 30 | + | ||
458 | 31 | +#define SYM_16(_exportedsym) __asm__(".symver symver16_" #_exportedsym "," #_exportedsym "@libmysqlclient_16") | ||
459 | 32 | + | ||
460 | 33 | +void STDCALL symver16_myodbc_remove_escape(MYSQL *mysql,char *name) | ||
461 | 34 | +{ | ||
462 | 35 | + return myodbc_remove_escape(mysql, name); | ||
463 | 36 | +} | ||
464 | 37 | +SYM_16(myodbc_remove_escape); | ||
465 | 38 | + | ||
466 | 39 | + | ||
467 | 40 | +my_ulonglong STDCALL symver16_mysql_affected_rows(MYSQL *mysql) | ||
468 | 41 | +{ | ||
469 | 42 | + return mysql_affected_rows(mysql); | ||
470 | 43 | +} | ||
471 | 44 | +SYM_16(mysql_affected_rows); | ||
472 | 45 | + | ||
473 | 46 | + | ||
474 | 47 | +my_bool STDCALL symver16_mysql_autocommit(MYSQL * mysql, my_bool auto_mode) | ||
475 | 48 | +{ | ||
476 | 49 | + return mysql_autocommit(mysql, auto_mode); | ||
477 | 50 | +} | ||
478 | 51 | +SYM_16(mysql_autocommit); | ||
479 | 52 | + | ||
480 | 53 | + | ||
481 | 54 | +my_bool STDCALL symver16_mysql_change_user(MYSQL *mysql, const char *user, const char *passwd, const char *db) | ||
482 | 55 | +{ | ||
483 | 56 | + return mysql_change_user(mysql, user, passwd, db); | ||
484 | 57 | +} | ||
485 | 58 | +SYM_16(mysql_change_user); | ||
486 | 59 | + | ||
487 | 60 | + | ||
488 | 61 | +const char * STDCALL symver16_mysql_character_set_name(MYSQL *mysql) | ||
489 | 62 | +{ | ||
490 | 63 | + return mysql_character_set_name(mysql); | ||
491 | 64 | +} | ||
492 | 65 | +SYM_16(mysql_character_set_name); | ||
493 | 66 | + | ||
494 | 67 | + | ||
495 | 68 | +my_bool STDCALL symver16_mysql_commit(MYSQL * mysql) | ||
496 | 69 | +{ | ||
497 | 70 | + return mysql_commit(mysql); | ||
498 | 71 | +} | ||
499 | 72 | +SYM_16(mysql_commit); | ||
500 | 73 | + | ||
501 | 74 | + | ||
502 | 75 | +void STDCALL symver16_mysql_data_seek(MYSQL_RES *result, my_ulonglong row) | ||
503 | 76 | +{ | ||
504 | 77 | + return mysql_data_seek(result, row); | ||
505 | 78 | +} | ||
506 | 79 | +SYM_16(mysql_data_seek); | ||
507 | 80 | + | ||
508 | 81 | + | ||
509 | 82 | +void STDCALL symver16_mysql_debug(const char *debug __attribute__((unused))) | ||
510 | 83 | +{ | ||
511 | 84 | + return mysql_debug(debug); | ||
512 | 85 | +} | ||
513 | 86 | +SYM_16(mysql_debug); | ||
514 | 87 | + | ||
515 | 88 | + | ||
516 | 89 | +int STDCALL symver16_mysql_dump_debug_info(MYSQL *mysql) | ||
517 | 90 | +{ | ||
518 | 91 | + return mysql_dump_debug_info(mysql); | ||
519 | 92 | +} | ||
520 | 93 | +SYM_16(mysql_dump_debug_info); | ||
521 | 94 | + | ||
522 | 95 | + | ||
523 | 96 | +my_bool STDCALL symver16_mysql_embedded(void) | ||
524 | 97 | +{ | ||
525 | 98 | + return mysql_embedded(); | ||
526 | 99 | +} | ||
527 | 100 | +SYM_16(mysql_embedded); | ||
528 | 101 | + | ||
529 | 102 | + | ||
530 | 103 | +my_bool STDCALL symver16_mysql_eof(MYSQL_RES *res) | ||
531 | 104 | +{ | ||
532 | 105 | + return mysql_eof(res); | ||
533 | 106 | +} | ||
534 | 107 | +SYM_16(mysql_eof); | ||
535 | 108 | + | ||
536 | 109 | + | ||
537 | 110 | +ulong STDCALL symver16_mysql_escape_string(char *to,const char *from,ulong length) | ||
538 | 111 | +{ | ||
539 | 112 | + return mysql_escape_string(to, from, length); | ||
540 | 113 | +} | ||
541 | 114 | +SYM_16(mysql_escape_string); | ||
542 | 115 | + | ||
543 | 116 | + | ||
544 | 117 | +MYSQL_FIELD * STDCALL symver16_mysql_fetch_field(MYSQL_RES *result) | ||
545 | 118 | +{ | ||
546 | 119 | + return mysql_fetch_field(result); | ||
547 | 120 | +} | ||
548 | 121 | +SYM_16(mysql_fetch_field); | ||
549 | 122 | + | ||
550 | 123 | + | ||
551 | 124 | +MYSQL_FIELD * STDCALL symver16_mysql_fetch_field_direct(MYSQL_RES *res,uint fieldnr) | ||
552 | 125 | +{ | ||
553 | 126 | + return mysql_fetch_field_direct(res, fieldnr); | ||
554 | 127 | +} | ||
555 | 128 | +SYM_16(mysql_fetch_field_direct); | ||
556 | 129 | + | ||
557 | 130 | + | ||
558 | 131 | +MYSQL_FIELD * STDCALL symver16_mysql_fetch_fields(MYSQL_RES *res) | ||
559 | 132 | +{ | ||
560 | 133 | + return mysql_fetch_fields(res); | ||
561 | 134 | +} | ||
562 | 135 | +SYM_16(mysql_fetch_fields); | ||
563 | 136 | + | ||
564 | 137 | + | ||
565 | 138 | +unsigned int STDCALL symver16_mysql_field_count(MYSQL *mysql) | ||
566 | 139 | +{ | ||
567 | 140 | + return mysql_field_count(mysql); | ||
568 | 141 | +} | ||
569 | 142 | +SYM_16(mysql_field_count); | ||
570 | 143 | + | ||
571 | 144 | + | ||
572 | 145 | +MYSQL_FIELD_OFFSET STDCALL symver16_mysql_field_seek(MYSQL_RES *result, MYSQL_FIELD_OFFSET field_offset) | ||
573 | 146 | +{ | ||
574 | 147 | + return mysql_field_seek(result, field_offset); | ||
575 | 148 | +} | ||
576 | 149 | +SYM_16(mysql_field_seek); | ||
577 | 150 | + | ||
578 | 151 | + | ||
579 | 152 | +MYSQL_FIELD_OFFSET STDCALL symver16_mysql_field_tell(MYSQL_RES *res) | ||
580 | 153 | +{ | ||
581 | 154 | + return mysql_field_tell(res); | ||
582 | 155 | +} | ||
583 | 156 | +SYM_16(mysql_field_tell); | ||
584 | 157 | + | ||
585 | 158 | + | ||
586 | 159 | +void STDCALL symver16_mysql_get_character_set_info(MYSQL *mysql, MY_CHARSET_INFO *csinfo) | ||
587 | 160 | +{ | ||
588 | 161 | + return mysql_get_character_set_info(mysql, csinfo); | ||
589 | 162 | +} | ||
590 | 163 | +SYM_16(mysql_get_character_set_info); | ||
591 | 164 | + | ||
592 | 165 | + | ||
593 | 166 | +const char * STDCALL symver16_mysql_get_client_info(void) | ||
594 | 167 | +{ | ||
595 | 168 | + return mysql_get_client_info(); | ||
596 | 169 | +} | ||
597 | 170 | +SYM_16(mysql_get_client_info); | ||
598 | 171 | + | ||
599 | 172 | +ulong STDCALL symver16_mysql_get_client_version(void) | ||
600 | 173 | +{ | ||
601 | 174 | + return mysql_get_client_version(); | ||
602 | 175 | +} | ||
603 | 176 | +SYM_16(mysql_get_client_version); | ||
604 | 177 | + | ||
605 | 178 | + | ||
606 | 179 | +const char * STDCALL symver16_mysql_get_host_info(MYSQL *mysql) | ||
607 | 180 | +{ | ||
608 | 181 | + return mysql_get_host_info(mysql); | ||
609 | 182 | +} | ||
610 | 183 | +SYM_16(mysql_get_host_info); | ||
611 | 184 | + | ||
612 | 185 | + | ||
613 | 186 | +MYSQL_PARAMETERS *STDCALL symver16_mysql_get_parameters(void) | ||
614 | 187 | +{ | ||
615 | 188 | + return mysql_get_parameters(); | ||
616 | 189 | +} | ||
617 | 190 | +SYM_16(mysql_get_parameters); | ||
618 | 191 | + | ||
619 | 192 | + | ||
620 | 193 | +uint STDCALL symver16_mysql_get_proto_info(MYSQL *mysql) | ||
621 | 194 | +{ | ||
622 | 195 | + return mysql_get_proto_info(mysql); | ||
623 | 196 | +} | ||
624 | 197 | +SYM_16(mysql_get_proto_info); | ||
625 | 198 | + | ||
626 | 199 | + | ||
627 | 200 | +const char * STDCALL symver16_mysql_get_server_info(MYSQL *mysql) | ||
628 | 201 | +{ | ||
629 | 202 | + return mysql_get_server_info(mysql); | ||
630 | 203 | +} | ||
631 | 204 | +SYM_16(mysql_get_server_info); | ||
632 | 205 | + | ||
633 | 206 | + | ||
634 | 207 | +ulong STDCALL symver16_mysql_hex_string(char *to, const char *from, ulong length) | ||
635 | 208 | +{ | ||
636 | 209 | + return mysql_hex_string(to, from, length); | ||
637 | 210 | +} | ||
638 | 211 | +SYM_16(mysql_hex_string); | ||
639 | 212 | + | ||
640 | 213 | + | ||
641 | 214 | +const char *STDCALL symver16_mysql_info(MYSQL *mysql) | ||
642 | 215 | +{ | ||
643 | 216 | + return mysql_info(mysql); | ||
644 | 217 | +} | ||
645 | 218 | +SYM_16(mysql_info); | ||
646 | 219 | + | ||
647 | 220 | + | ||
648 | 221 | +my_ulonglong STDCALL symver16_mysql_insert_id(MYSQL *mysql) | ||
649 | 222 | +{ | ||
650 | 223 | + return mysql_insert_id(mysql); | ||
651 | 224 | +} | ||
652 | 225 | +SYM_16(mysql_insert_id); | ||
653 | 226 | + | ||
654 | 227 | + | ||
655 | 228 | +int STDCALL symver16_mysql_kill(MYSQL *mysql,ulong pid) | ||
656 | 229 | +{ | ||
657 | 230 | + return mysql_kill(mysql, pid); | ||
658 | 231 | +} | ||
659 | 232 | +SYM_16(mysql_kill); | ||
660 | 233 | + | ||
661 | 234 | + | ||
662 | 235 | +MYSQL_RES * STDCALL symver16_mysql_list_dbs(MYSQL *mysql, const char *wild) | ||
663 | 236 | +{ | ||
664 | 237 | + return mysql_list_dbs(mysql, wild); | ||
665 | 238 | +} | ||
666 | 239 | +SYM_16(mysql_list_dbs); | ||
667 | 240 | + | ||
668 | 241 | + | ||
669 | 242 | +MYSQL_RES * STDCALL symver16_mysql_list_fields(MYSQL *mysql, const char *table, const char *wild) | ||
670 | 243 | +{ | ||
671 | 244 | + return mysql_list_fields(mysql, table, wild); | ||
672 | 245 | +} | ||
673 | 246 | +SYM_16(mysql_list_fields); | ||
674 | 247 | + | ||
675 | 248 | + | ||
676 | 249 | +MYSQL_RES * STDCALL symver16_mysql_list_processes(MYSQL *mysql) | ||
677 | 250 | +{ | ||
678 | 251 | + return mysql_list_processes(mysql); | ||
679 | 252 | +} | ||
680 | 253 | +SYM_16(mysql_list_processes); | ||
681 | 254 | + | ||
682 | 255 | + | ||
683 | 256 | +MYSQL_RES * STDCALL symver16_mysql_list_tables(MYSQL *mysql, const char *wild) | ||
684 | 257 | +{ | ||
685 | 258 | + return mysql_list_tables(mysql, wild); | ||
686 | 259 | +} | ||
687 | 260 | +SYM_16(mysql_list_tables); | ||
688 | 261 | + | ||
689 | 262 | + | ||
690 | 263 | +my_bool STDCALL symver16_mysql_more_results(MYSQL *mysql) | ||
691 | 264 | +{ | ||
692 | 265 | + return mysql_more_results(mysql); | ||
693 | 266 | +} | ||
694 | 267 | +SYM_16(mysql_more_results); | ||
695 | 268 | + | ||
696 | 269 | + | ||
697 | 270 | +int STDCALL symver16_mysql_next_result(MYSQL *mysql) | ||
698 | 271 | +{ | ||
699 | 272 | + return mysql_next_result(mysql); | ||
700 | 273 | +} | ||
701 | 274 | +SYM_16(mysql_next_result); | ||
702 | 275 | + | ||
703 | 276 | + | ||
704 | 277 | +int STDCALL symver16_mysql_ping(MYSQL *mysql) | ||
705 | 278 | +{ | ||
706 | 279 | + return mysql_ping(mysql); | ||
707 | 280 | +} | ||
708 | 281 | +SYM_16(mysql_ping); | ||
709 | 282 | + | ||
710 | 283 | + | ||
711 | 284 | +int STDCALL symver16_mysql_query(MYSQL *mysql, const char *query) | ||
712 | 285 | +{ | ||
713 | 286 | + return mysql_query(mysql, query); | ||
714 | 287 | +} | ||
715 | 288 | +SYM_16(mysql_query); | ||
716 | 289 | + | ||
717 | 290 | + | ||
718 | 291 | +my_bool STDCALL symver16_mysql_read_query_result(MYSQL *mysql) | ||
719 | 292 | +{ | ||
720 | 293 | + return mysql_read_query_result(mysql); | ||
721 | 294 | +} | ||
722 | 295 | +SYM_16(mysql_read_query_result); | ||
723 | 296 | + | ||
724 | 297 | + | ||
725 | 298 | +ulong STDCALL symver16_mysql_real_escape_string(MYSQL *mysql, char *to,const char *from, ulong length) | ||
726 | 299 | +{ | ||
727 | 300 | + return mysql_real_escape_string(mysql, to, from, length); | ||
728 | 301 | +} | ||
729 | 302 | +SYM_16(mysql_real_escape_string); | ||
730 | 303 | + | ||
731 | 304 | + | ||
732 | 305 | +int STDCALL symver16_mysql_refresh(MYSQL *mysql,uint options) | ||
733 | 306 | +{ | ||
734 | 307 | + return mysql_refresh(mysql, options); | ||
735 | 308 | +} | ||
736 | 309 | +SYM_16(mysql_refresh); | ||
737 | 310 | + | ||
738 | 311 | + | ||
739 | 312 | +my_bool STDCALL symver16_mysql_rollback(MYSQL * mysql) | ||
740 | 313 | +{ | ||
741 | 314 | + return mysql_rollback(mysql); | ||
742 | 315 | +} | ||
743 | 316 | +SYM_16(mysql_rollback); | ||
744 | 317 | + | ||
745 | 318 | + | ||
746 | 319 | +MYSQL_ROW_OFFSET STDCALL symver16_mysql_row_seek(MYSQL_RES *result, MYSQL_ROW_OFFSET row) | ||
747 | 320 | +{ | ||
748 | 321 | + return mysql_row_seek(result, row); | ||
749 | 322 | +} | ||
750 | 323 | +SYM_16(mysql_row_seek); | ||
751 | 324 | + | ||
752 | 325 | + | ||
753 | 326 | +MYSQL_ROW_OFFSET STDCALL symver16_mysql_row_tell(MYSQL_RES *res) | ||
754 | 327 | +{ | ||
755 | 328 | + return mysql_row_tell(res); | ||
756 | 329 | +} | ||
757 | 330 | +SYM_16(mysql_row_tell); | ||
758 | 331 | + | ||
759 | 332 | + | ||
760 | 333 | +void STDCALL symver16_mysql_server_end() | ||
761 | 334 | +{ | ||
762 | 335 | + return mysql_server_end(); | ||
763 | 336 | +} | ||
764 | 337 | +SYM_16(mysql_server_end); | ||
765 | 338 | + | ||
766 | 339 | + | ||
767 | 340 | +int STDCALL symver16_mysql_server_init(int argc __attribute__((unused)), char **argv __attribute__((unused)), char **groups __attribute__((unused))) | ||
768 | 341 | +{ | ||
769 | 342 | + return mysql_server_init(argc, argv, groups); | ||
770 | 343 | +} | ||
771 | 344 | +SYM_16(mysql_server_init); | ||
772 | 345 | + | ||
773 | 346 | + | ||
774 | 347 | +void symver16_mysql_set_local_infile_default(MYSQL *mysql) | ||
775 | 348 | +{ | ||
776 | 349 | + return mysql_set_local_infile_default(mysql); | ||
777 | 350 | +} | ||
778 | 351 | +SYM_16(mysql_set_local_infile_default); | ||
779 | 352 | + | ||
780 | 353 | + | ||
781 | 354 | +void symver16_mysql_set_local_infile_handler(MYSQL *mysql, int (*local_infile_init)(void **, const char *, void *), int (*local_infile_read)(void *, char *, uint), void (*local_infile_end)(void *), int (*local_infile_error)(void *, char *, uint), void *userdata) | ||
782 | 355 | +{ | ||
783 | 356 | + return mysql_set_local_infile_handler(mysql, local_infile_init, local_infile_read, local_infile_end, local_infile_error, userdata); | ||
784 | 357 | +} | ||
785 | 358 | +SYM_16(mysql_set_local_infile_handler); | ||
786 | 359 | + | ||
787 | 360 | + | ||
788 | 361 | +int STDCALL symver16_mysql_set_server_option(MYSQL *mysql, enum enum_mysql_set_option option) | ||
789 | 362 | +{ | ||
790 | 363 | + return mysql_set_server_option(mysql, option); | ||
791 | 364 | +} | ||
792 | 365 | +SYM_16(mysql_set_server_option); | ||
793 | 366 | + | ||
794 | 367 | + | ||
795 | 368 | +int STDCALL symver16_mysql_shutdown(MYSQL *mysql, enum mysql_enum_shutdown_level shutdown_level) | ||
796 | 369 | +{ | ||
797 | 370 | + return mysql_shutdown(mysql, shutdown_level); | ||
798 | 371 | +} | ||
799 | 372 | +SYM_16(mysql_shutdown); | ||
800 | 373 | + | ||
801 | 374 | + | ||
802 | 375 | +const char *STDCALL symver16_mysql_sqlstate(MYSQL *mysql) | ||
803 | 376 | +{ | ||
804 | 377 | + return mysql_sqlstate(mysql); | ||
805 | 378 | +} | ||
806 | 379 | +SYM_16(mysql_sqlstate); | ||
807 | 380 | + | ||
808 | 381 | + | ||
809 | 382 | +const char * STDCALL symver16_mysql_stat(MYSQL *mysql) | ||
810 | 383 | +{ | ||
811 | 384 | + return mysql_stat(mysql); | ||
812 | 385 | +} | ||
813 | 386 | +SYM_16(mysql_stat); | ||
814 | 387 | + | ||
815 | 388 | + | ||
816 | 389 | +my_ulonglong STDCALL symver16_mysql_stmt_affected_rows(MYSQL_STMT *stmt) | ||
817 | 390 | +{ | ||
818 | 391 | + return mysql_stmt_affected_rows(stmt); | ||
819 | 392 | +} | ||
820 | 393 | +SYM_16(mysql_stmt_affected_rows); | ||
821 | 394 | + | ||
822 | 395 | + | ||
823 | 396 | +my_bool STDCALL symver16_mysql_stmt_attr_get(MYSQL_STMT *stmt, enum enum_stmt_attr_type attr_type, void *value) | ||
824 | 397 | +{ | ||
825 | 398 | + return mysql_stmt_attr_get(stmt, attr_type, value); | ||
826 | 399 | +} | ||
827 | 400 | +SYM_16(mysql_stmt_attr_get); | ||
828 | 401 | + | ||
829 | 402 | + | ||
830 | 403 | +my_bool STDCALL symver16_mysql_stmt_attr_set(MYSQL_STMT *stmt, enum enum_stmt_attr_type attr_type, const void *value) | ||
831 | 404 | +{ | ||
832 | 405 | + return mysql_stmt_attr_set(stmt, attr_type, value); | ||
833 | 406 | +} | ||
834 | 407 | +SYM_16(mysql_stmt_attr_set); | ||
835 | 408 | + | ||
836 | 409 | + | ||
837 | 410 | +my_bool STDCALL symver16_mysql_stmt_bind_param(MYSQL_STMT *stmt, MYSQL_BIND *my_bind) | ||
838 | 411 | +{ | ||
839 | 412 | + return mysql_stmt_bind_param(stmt, my_bind); | ||
840 | 413 | +} | ||
841 | 414 | +SYM_16(mysql_stmt_bind_param); | ||
842 | 415 | + | ||
843 | 416 | + | ||
844 | 417 | +my_bool STDCALL symver16_mysql_stmt_bind_result(MYSQL_STMT *stmt, MYSQL_BIND *my_bind) | ||
845 | 418 | +{ | ||
846 | 419 | + return mysql_stmt_bind_result(stmt, my_bind); | ||
847 | 420 | +} | ||
848 | 421 | +SYM_16(mysql_stmt_bind_result); | ||
849 | 422 | + | ||
850 | 423 | + | ||
851 | 424 | +my_bool STDCALL symver16_mysql_stmt_close(MYSQL_STMT *stmt) | ||
852 | 425 | +{ | ||
853 | 426 | + return mysql_stmt_close(stmt); | ||
854 | 427 | +} | ||
855 | 428 | +SYM_16(mysql_stmt_close); | ||
856 | 429 | + | ||
857 | 430 | + | ||
858 | 431 | +void STDCALL symver16_mysql_stmt_data_seek(MYSQL_STMT *stmt, my_ulonglong row) | ||
859 | 432 | +{ | ||
860 | 433 | + return mysql_stmt_data_seek(stmt, row); | ||
861 | 434 | +} | ||
862 | 435 | +SYM_16(mysql_stmt_data_seek); | ||
863 | 436 | + | ||
864 | 437 | + | ||
865 | 438 | +uint STDCALL symver16_mysql_stmt_errno(MYSQL_STMT * stmt) | ||
866 | 439 | +{ | ||
867 | 440 | + return mysql_stmt_errno(stmt); | ||
868 | 441 | +} | ||
869 | 442 | +SYM_16(mysql_stmt_errno); | ||
870 | 443 | + | ||
871 | 444 | + | ||
872 | 445 | +const char *STDCALL symver16_mysql_stmt_error(MYSQL_STMT * stmt) | ||
873 | 446 | +{ | ||
874 | 447 | + return mysql_stmt_error(stmt); | ||
875 | 448 | +} | ||
876 | 449 | +SYM_16(mysql_stmt_error); | ||
877 | 450 | + | ||
878 | 451 | + | ||
879 | 452 | +int STDCALL symver16_mysql_stmt_execute(MYSQL_STMT *stmt) | ||
880 | 453 | +{ | ||
881 | 454 | + return mysql_stmt_execute(stmt); | ||
882 | 455 | +} | ||
883 | 456 | +SYM_16(mysql_stmt_execute); | ||
884 | 457 | + | ||
885 | 458 | + | ||
886 | 459 | +int STDCALL symver16_mysql_stmt_fetch(MYSQL_STMT *stmt) | ||
887 | 460 | +{ | ||
888 | 461 | + return mysql_stmt_fetch(stmt); | ||
889 | 462 | +} | ||
890 | 463 | +SYM_16(mysql_stmt_fetch); | ||
891 | 464 | + | ||
892 | 465 | + | ||
893 | 466 | +int STDCALL symver16_mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *my_bind, uint column, ulong offset) | ||
894 | 467 | +{ | ||
895 | 468 | + return mysql_stmt_fetch_column(stmt, my_bind, column, offset); | ||
896 | 469 | +} | ||
897 | 470 | +SYM_16(mysql_stmt_fetch_column); | ||
898 | 471 | + | ||
899 | 472 | + | ||
900 | 473 | +unsigned int STDCALL symver16_mysql_stmt_field_count(MYSQL_STMT *stmt) | ||
901 | 474 | +{ | ||
902 | 475 | + return mysql_stmt_field_count(stmt); | ||
903 | 476 | +} | ||
904 | 477 | +SYM_16(mysql_stmt_field_count); | ||
905 | 478 | + | ||
906 | 479 | + | ||
907 | 480 | +my_bool STDCALL symver16_mysql_stmt_free_result(MYSQL_STMT *stmt) | ||
908 | 481 | +{ | ||
909 | 482 | + return mysql_stmt_free_result(stmt); | ||
910 | 483 | +} | ||
911 | 484 | +SYM_16(mysql_stmt_free_result); | ||
912 | 485 | + | ||
913 | 486 | + | ||
914 | 487 | +MYSQL_STMT * STDCALL symver16_mysql_stmt_init(MYSQL *mysql) | ||
915 | 488 | +{ | ||
916 | 489 | + return mysql_stmt_init(mysql); | ||
917 | 490 | +} | ||
918 | 491 | +SYM_16(mysql_stmt_init); | ||
919 | 492 | + | ||
920 | 493 | + | ||
921 | 494 | +my_ulonglong STDCALL symver16_mysql_stmt_insert_id(MYSQL_STMT *stmt) | ||
922 | 495 | +{ | ||
923 | 496 | + return mysql_stmt_insert_id(stmt); | ||
924 | 497 | +} | ||
925 | 498 | +SYM_16(mysql_stmt_insert_id); | ||
926 | 499 | + | ||
927 | 500 | + | ||
928 | 501 | +my_ulonglong STDCALL symver16_mysql_stmt_num_rows(MYSQL_STMT *stmt) | ||
929 | 502 | +{ | ||
930 | 503 | + return mysql_stmt_num_rows(stmt); | ||
931 | 504 | +} | ||
932 | 505 | +SYM_16(mysql_stmt_num_rows); | ||
933 | 506 | + | ||
934 | 507 | + | ||
935 | 508 | +ulong STDCALL symver16_mysql_stmt_param_count(MYSQL_STMT * stmt) | ||
936 | 509 | +{ | ||
937 | 510 | + return mysql_stmt_param_count(stmt); | ||
938 | 511 | +} | ||
939 | 512 | +SYM_16(mysql_stmt_param_count); | ||
940 | 513 | + | ||
941 | 514 | + | ||
942 | 515 | +MYSQL_RES * STDCALL symver16_mysql_stmt_param_metadata(MYSQL_STMT *stmt) | ||
943 | 516 | +{ | ||
944 | 517 | + return mysql_stmt_param_metadata(stmt); | ||
945 | 518 | +} | ||
946 | 519 | +SYM_16(mysql_stmt_param_metadata); | ||
947 | 520 | + | ||
948 | 521 | + | ||
949 | 522 | +int STDCALL symver16_mysql_stmt_prepare(MYSQL_STMT *stmt, const char *query, ulong length) | ||
950 | 523 | +{ | ||
951 | 524 | + return mysql_stmt_prepare(stmt, query, length); | ||
952 | 525 | +} | ||
953 | 526 | +SYM_16(mysql_stmt_prepare); | ||
954 | 527 | + | ||
955 | 528 | + | ||
956 | 529 | +my_bool STDCALL symver16_mysql_stmt_reset(MYSQL_STMT *stmt) | ||
957 | 530 | +{ | ||
958 | 531 | + return mysql_stmt_reset(stmt); | ||
959 | 532 | +} | ||
960 | 533 | +SYM_16(mysql_stmt_reset); | ||
961 | 534 | + | ||
962 | 535 | + | ||
963 | 536 | +MYSQL_RES * STDCALL symver16_mysql_stmt_result_metadata(MYSQL_STMT *stmt) | ||
964 | 537 | +{ | ||
965 | 538 | + return mysql_stmt_result_metadata(stmt); | ||
966 | 539 | +} | ||
967 | 540 | +SYM_16(mysql_stmt_result_metadata); | ||
968 | 541 | + | ||
969 | 542 | + | ||
970 | 543 | +MYSQL_ROW_OFFSET STDCALL symver16_mysql_stmt_row_seek(MYSQL_STMT *stmt, MYSQL_ROW_OFFSET row) | ||
971 | 544 | +{ | ||
972 | 545 | + return mysql_stmt_row_seek(stmt, row); | ||
973 | 546 | +} | ||
974 | 547 | +SYM_16(mysql_stmt_row_seek); | ||
975 | 548 | + | ||
976 | 549 | + | ||
977 | 550 | +MYSQL_ROW_OFFSET STDCALL symver16_mysql_stmt_row_tell(MYSQL_STMT *stmt) | ||
978 | 551 | +{ | ||
979 | 552 | + return mysql_stmt_row_tell(stmt); | ||
980 | 553 | +} | ||
981 | 554 | +SYM_16(mysql_stmt_row_tell); | ||
982 | 555 | + | ||
983 | 556 | + | ||
984 | 557 | +my_bool STDCALL symver16_mysql_stmt_send_long_data(MYSQL_STMT *stmt, uint param_number, const char *data, ulong length) | ||
985 | 558 | +{ | ||
986 | 559 | + return mysql_stmt_send_long_data(stmt, param_number, data, length); | ||
987 | 560 | +} | ||
988 | 561 | +SYM_16(mysql_stmt_send_long_data); | ||
989 | 562 | + | ||
990 | 563 | + | ||
991 | 564 | +const char *STDCALL symver16_mysql_stmt_sqlstate(MYSQL_STMT * stmt) | ||
992 | 565 | +{ | ||
993 | 566 | + return mysql_stmt_sqlstate(stmt); | ||
994 | 567 | +} | ||
995 | 568 | +SYM_16(mysql_stmt_sqlstate); | ||
996 | 569 | + | ||
997 | 570 | + | ||
998 | 571 | +int STDCALL symver16_mysql_stmt_store_result(MYSQL_STMT *stmt) | ||
999 | 572 | +{ | ||
1000 | 573 | + return mysql_stmt_store_result(stmt); | ||
1001 | 574 | +} | ||
1002 | 575 | +SYM_16(mysql_stmt_store_result); | ||
1003 | 576 | + | ||
1004 | 577 | + | ||
1005 | 578 | +void STDCALL symver16_mysql_thread_end() | ||
1006 | 579 | +{ | ||
1007 | 580 | + return mysql_thread_end(); | ||
1008 | 581 | +} | ||
1009 | 582 | +SYM_16(mysql_thread_end); | ||
1010 | 583 | + | ||
1011 | 584 | + | ||
1012 | 585 | +ulong STDCALL symver16_mysql_thread_id(MYSQL *mysql) | ||
1013 | 586 | +{ | ||
1014 | 587 | + return mysql_thread_id(mysql); | ||
1015 | 588 | +} | ||
1016 | 589 | +SYM_16(mysql_thread_id); | ||
1017 | 590 | + | ||
1018 | 591 | + | ||
1019 | 592 | +my_bool STDCALL symver16_mysql_thread_init() | ||
1020 | 593 | +{ | ||
1021 | 594 | + return mysql_thread_init(); | ||
1022 | 595 | +} | ||
1023 | 596 | +SYM_16(mysql_thread_init); | ||
1024 | 597 | + | ||
1025 | 598 | + | ||
1026 | 599 | +uint STDCALL symver16_mysql_thread_safe(void) | ||
1027 | 600 | +{ | ||
1028 | 601 | + return mysql_thread_safe(); | ||
1029 | 602 | +} | ||
1030 | 603 | +SYM_16(mysql_thread_safe); | ||
1031 | 604 | + | ||
1032 | 605 | + | ||
1033 | 606 | +MYSQL_RES * STDCALL symver16_mysql_use_result(MYSQL *mysql) | ||
1034 | 607 | +{ | ||
1035 | 608 | + return mysql_use_result(mysql); | ||
1036 | 609 | +} | ||
1037 | 610 | +SYM_16(mysql_use_result); | ||
1038 | 611 | + | ||
1039 | 612 | + | ||
1040 | 613 | +uint STDCALL symver16_mysql_warning_count(MYSQL *mysql) | ||
1041 | 614 | +{ | ||
1042 | 615 | + return mysql_warning_count(mysql); | ||
1043 | 616 | +} | ||
1044 | 617 | +SYM_16(mysql_warning_count); | ||
1045 | 618 | + | ||
1046 | 619 | +/*****/ | ||
1047 | 620 | + | ||
1048 | 621 | +MYSQL * STDCALL symver16_mysql_real_connect(MYSQL *mysql,const char *host, const char *user, const char *passwd, const char *db, uint port, const char *unix_socket,ulong client_flag) | ||
1049 | 622 | +{ | ||
1050 | 623 | + return mysql_real_connect(mysql, host, user, passwd, db, port, unix_socket, client_flag); | ||
1051 | 624 | +} | ||
1052 | 625 | +SYM_16(mysql_real_connect); | ||
1053 | 626 | + | ||
1054 | 627 | +/*****/ | ||
1055 | 628 | + | ||
1056 | 629 | +my_bool symver16_my_init(void) | ||
1057 | 630 | +{ | ||
1058 | 631 | + return my_init(); | ||
1059 | 632 | +} | ||
1060 | 633 | +SYM_16(my_init); | ||
1061 | 634 | + | ||
1062 | 635 | +#endif | ||
1063 | 636 | diff -rup old/libmysql/libmysql.ver.in new/libmysql/libmysql.ver.in | ||
1064 | 637 | --- old/libmysql/libmysql.ver.in 2014-09-18 10:49:37.000000000 +0200 | ||
1065 | 638 | +++ new/libmysql/libmysql.ver.in 2014-09-22 09:31:37.309745154 +0200 | ||
1066 | 639 | @@ -1 +1,136 @@ | ||
1067 | 640 | -libmysqlclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; }; | ||
1068 | 641 | +libmysqlclient_16 | ||
1069 | 642 | +{ | ||
1070 | 643 | + local: | ||
1071 | 644 | + symver16_*; | ||
1072 | 645 | +}; | ||
1073 | 646 | + | ||
1074 | 647 | +libmysqlclient_18 | ||
1075 | 648 | +{ | ||
1076 | 649 | + global: | ||
1077 | 650 | + my_init; | ||
1078 | 651 | + myodbc_remove_escape; | ||
1079 | 652 | + mysql_affected_rows; | ||
1080 | 653 | + mysql_autocommit; | ||
1081 | 654 | + mysql_change_user; | ||
1082 | 655 | + mysql_character_set_name; | ||
1083 | 656 | + mysql_close; | ||
1084 | 657 | + mysql_commit; | ||
1085 | 658 | + mysql_data_seek; | ||
1086 | 659 | + mysql_debug; | ||
1087 | 660 | + mysql_dump_debug_info; | ||
1088 | 661 | + mysql_embedded; | ||
1089 | 662 | + mysql_eof; | ||
1090 | 663 | + mysql_errno; | ||
1091 | 664 | + mysql_error; | ||
1092 | 665 | + mysql_escape_string; | ||
1093 | 666 | + mysql_fetch_field; | ||
1094 | 667 | + mysql_fetch_field_direct; | ||
1095 | 668 | + mysql_fetch_fields; | ||
1096 | 669 | + mysql_fetch_lengths; | ||
1097 | 670 | + mysql_fetch_row; | ||
1098 | 671 | + mysql_field_count; | ||
1099 | 672 | + mysql_field_seek; | ||
1100 | 673 | + mysql_field_tell; | ||
1101 | 674 | + mysql_free_result; | ||
1102 | 675 | + mysql_get_character_set_info; | ||
1103 | 676 | + mysql_get_client_info; | ||
1104 | 677 | + mysql_get_client_version; | ||
1105 | 678 | + mysql_get_host_info; | ||
1106 | 679 | + mysql_get_parameters; | ||
1107 | 680 | + mysql_get_proto_info; | ||
1108 | 681 | + mysql_get_server_info; | ||
1109 | 682 | + mysql_get_server_version; | ||
1110 | 683 | + mysql_get_ssl_cipher; | ||
1111 | 684 | + mysql_hex_string; | ||
1112 | 685 | + mysql_info; | ||
1113 | 686 | + mysql_init; | ||
1114 | 687 | + mysql_insert_id; | ||
1115 | 688 | + mysql_kill; | ||
1116 | 689 | + mysql_list_dbs; | ||
1117 | 690 | + mysql_list_fields; | ||
1118 | 691 | + mysql_list_processes; | ||
1119 | 692 | + mysql_list_tables; | ||
1120 | 693 | + mysql_more_results; | ||
1121 | 694 | + mysql_next_result; | ||
1122 | 695 | + mysql_num_fields; | ||
1123 | 696 | + mysql_num_rows; | ||
1124 | 697 | + mysql_options; | ||
1125 | 698 | + mysql_ping; | ||
1126 | 699 | + mysql_query; | ||
1127 | 700 | + mysql_read_query_result; | ||
1128 | 701 | + mysql_real_connect; | ||
1129 | 702 | + mysql_real_escape_string; | ||
1130 | 703 | + mysql_real_query; | ||
1131 | 704 | + mysql_refresh; | ||
1132 | 705 | + mysql_rollback; | ||
1133 | 706 | + mysql_row_seek; | ||
1134 | 707 | + mysql_row_tell; | ||
1135 | 708 | + mysql_select_db; | ||
1136 | 709 | + mysql_send_query; | ||
1137 | 710 | + mysql_server_end; | ||
1138 | 711 | + mysql_server_init; | ||
1139 | 712 | + mysql_set_character_set; | ||
1140 | 713 | + mysql_set_local_infile_default; | ||
1141 | 714 | + mysql_set_local_infile_handler; | ||
1142 | 715 | + mysql_set_server_option; | ||
1143 | 716 | + mysql_shutdown; | ||
1144 | 717 | + mysql_sqlstate; | ||
1145 | 718 | + mysql_ssl_set; | ||
1146 | 719 | + mysql_stat; | ||
1147 | 720 | + mysql_stmt_affected_rows; | ||
1148 | 721 | + mysql_stmt_attr_get; | ||
1149 | 722 | + mysql_stmt_attr_set; | ||
1150 | 723 | + mysql_stmt_bind_param; | ||
1151 | 724 | + mysql_stmt_bind_result; | ||
1152 | 725 | + mysql_stmt_close; | ||
1153 | 726 | + mysql_stmt_data_seek; | ||
1154 | 727 | + mysql_stmt_errno; | ||
1155 | 728 | + mysql_stmt_error; | ||
1156 | 729 | + mysql_stmt_execute; | ||
1157 | 730 | + mysql_stmt_fetch; | ||
1158 | 731 | + mysql_stmt_fetch_column; | ||
1159 | 732 | + mysql_stmt_field_count; | ||
1160 | 733 | + mysql_stmt_free_result; | ||
1161 | 734 | + mysql_stmt_init; | ||
1162 | 735 | + mysql_stmt_insert_id; | ||
1163 | 736 | + mysql_stmt_num_rows; | ||
1164 | 737 | + mysql_stmt_param_count; | ||
1165 | 738 | + mysql_stmt_param_metadata; | ||
1166 | 739 | + mysql_stmt_prepare; | ||
1167 | 740 | + mysql_stmt_reset; | ||
1168 | 741 | + mysql_stmt_result_metadata; | ||
1169 | 742 | + mysql_stmt_row_seek; | ||
1170 | 743 | + mysql_stmt_row_tell; | ||
1171 | 744 | + mysql_stmt_send_long_data; | ||
1172 | 745 | + mysql_stmt_sqlstate; | ||
1173 | 746 | + mysql_stmt_store_result; | ||
1174 | 747 | + mysql_store_result; | ||
1175 | 748 | + mysql_thread_end; | ||
1176 | 749 | + mysql_thread_id; | ||
1177 | 750 | + mysql_thread_init; | ||
1178 | 751 | + mysql_thread_safe; | ||
1179 | 752 | + mysql_use_result; | ||
1180 | 753 | + mysql_warning_count; | ||
1181 | 754 | + | ||
1182 | 755 | + free_defaults; | ||
1183 | 756 | + handle_options; | ||
1184 | 757 | + load_defaults; | ||
1185 | 758 | + my_print_help; | ||
1186 | 759 | + | ||
1187 | 760 | + #my_make_scrambled_password; | ||
1188 | 761 | + THR_KEY_mysys; | ||
1189 | 762 | + | ||
1190 | 763 | + mysql_client_find_plugin; | ||
1191 | 764 | + mysql_client_register_plugin; | ||
1192 | 765 | + mysql_load_plugin; | ||
1193 | 766 | + mysql_load_plugin_v; | ||
1194 | 767 | + mysql_plugin_options; | ||
1195 | 768 | + mysql_stmt_next_result; | ||
1196 | 769 | + | ||
1197 | 770 | + #mysql_default_charset_info; | ||
1198 | 771 | + mysql_get_charset; | ||
1199 | 772 | + mysql_get_charset_by_csname; | ||
1200 | 773 | + mysql_net_realloc; | ||
1201 | 774 | + #mysql_client_errors; | ||
1202 | 775 | + *; | ||
1203 | 776 | +} libmysqlclient_16; | ||
1204 | 777 | diff -rup old/mysys/charset.c new/mysys/charset.c | ||
1205 | 778 | --- old/mysys/charset.c 2014-09-02 10:31:46.000000000 +0200 | ||
1206 | 779 | +++ new/mysys/charset.c 2014-09-22 09:32:24.853745925 +0200 | ||
1207 | 780 | @@ -941,3 +941,20 @@ size_t escape_quotes_for_mysql(CHARSET_I | ||
1208 | 781 | *to= 0; | ||
1209 | 782 | return overflow ? (ulong)~0 : (ulong) (to - to_start); | ||
1210 | 783 | } | ||
1211 | 784 | + | ||
1212 | 785 | +#ifndef EMBEDDED_LIBRARY | ||
1213 | 786 | + | ||
1214 | 787 | +// Hack to provide Fedora symbols | ||
1215 | 788 | + | ||
1216 | 789 | +CHARSET_INFO *mysql_get_charset(uint cs_number, myf flags) | ||
1217 | 790 | +{ | ||
1218 | 791 | + return get_charset(cs_number, flags); | ||
1219 | 792 | +} | ||
1220 | 793 | + | ||
1221 | 794 | + | ||
1222 | 795 | +CHARSET_INFO * mysql_get_charset_by_csname(const char *cs_name, uint cs_flags, myf flags) | ||
1223 | 796 | +{ | ||
1224 | 797 | + return get_charset_by_csname(cs_name, cs_flags, flags); | ||
1225 | 798 | +} | ||
1226 | 799 | + | ||
1227 | 800 | +#endif | ||
1228 | 801 | diff -rup old/sql/net_serv.cc new/sql/net_serv.cc | ||
1229 | 802 | --- old/sql/net_serv.cc 2014-09-02 10:31:46.000000000 +0200 | ||
1230 | 803 | +++ new/sql/net_serv.cc 2014-09-22 09:33:14.009746722 +0200 | ||
1231 | 804 | @@ -1199,3 +1199,16 @@ void my_net_set_write_timeout(NET *net, | ||
1232 | 805 | #endif | ||
1233 | 806 | DBUG_VOID_RETURN; | ||
1234 | 807 | } | ||
1235 | 808 | + | ||
1236 | 809 | +#ifndef EMBEDDED_LIBRARY | ||
1237 | 810 | +C_MODE_START | ||
1238 | 811 | + | ||
1239 | 812 | +// Hack to provide Fedora symbols | ||
1240 | 813 | + | ||
1241 | 814 | +my_bool mysql_net_realloc(NET *net, size_t length) | ||
1242 | 815 | +{ | ||
1243 | 816 | + return net_realloc(net, length); | ||
1244 | 817 | +} | ||
1245 | 818 | + | ||
1246 | 819 | +C_MODE_END | ||
1247 | 820 | +#endif | ||
1248 | 821 | diff -rup old/sql/password.c new/sql/password.c | ||
1249 | 822 | --- old/sql/password.c 2014-09-02 10:31:46.000000000 +0200 | ||
1250 | 823 | +++ new/sql/password.c 2014-09-22 09:33:57.913747434 +0200 | ||
1251 | 824 | @@ -563,3 +563,17 @@ void make_password_from_salt(char *to, c | ||
1252 | 825 | *to++= PVERSION41_CHAR; | ||
1253 | 826 | octet2hex(to, (const char*) hash_stage2, SHA1_HASH_SIZE); | ||
1254 | 827 | } | ||
1255 | 828 | + | ||
1256 | 829 | +#ifndef EMBEDDED_LIBRARY | ||
1257 | 830 | + | ||
1258 | 831 | +// Hack to provide both libmysqlclient_16 and libmysqlclient_18 symbol versions | ||
1259 | 832 | + | ||
1260 | 833 | +#define SYM_16(_exportedsym) __asm__(".symver symver16_" #_exportedsym "," #_exportedsym "@libmysqlclient_16") | ||
1261 | 834 | + | ||
1262 | 835 | +void symver16_my_make_scrambled_password(char *to, const char *password, size_t pass_len) | ||
1263 | 836 | +{ | ||
1264 | 837 | + my_make_scrambled_password(to, password, pass_len); | ||
1265 | 838 | +} | ||
1266 | 839 | +SYM_16(my_make_scrambled_password); | ||
1267 | 840 | + | ||
1268 | 841 | +#endif | ||
1269 | 842 | diff -rup old/sql-common/client.c new/sql-common/client.c | ||
1270 | 843 | --- old/sql-common/client.c 2014-09-02 10:31:44.000000000 +0200 | ||
1271 | 844 | +++ new/sql-common/client.c 2014-09-22 09:34:52.453748318 +0200 | ||
1272 | 845 | @@ -4415,3 +4415,136 @@ static int clear_password_auth_client(MY | ||
1273 | 846 | |||
1274 | 847 | return res ? CR_ERROR : CR_OK; | ||
1275 | 848 | } | ||
1276 | 849 | + | ||
1277 | 850 | +#ifndef EMBEDDED_LIBRARY | ||
1278 | 851 | + | ||
1279 | 852 | +// Hack to provide both libmysqlclient_16 and libmysqlclient_18 symbol versions | ||
1280 | 853 | + | ||
1281 | 854 | +#define SYM_16(_exportedsym) __asm__(".symver symver16_" #_exportedsym "," #_exportedsym "@libmysqlclient_16") | ||
1282 | 855 | + | ||
1283 | 856 | +void STDCALL symver16_mysql_close(MYSQL *mysql) | ||
1284 | 857 | +{ | ||
1285 | 858 | + return mysql_close(mysql); | ||
1286 | 859 | +} | ||
1287 | 860 | +SYM_16(mysql_close); | ||
1288 | 861 | + | ||
1289 | 862 | + | ||
1290 | 863 | +uint STDCALL symver16_mysql_errno(MYSQL *mysql) | ||
1291 | 864 | +{ | ||
1292 | 865 | + return mysql_errno(mysql); | ||
1293 | 866 | +} | ||
1294 | 867 | +SYM_16(mysql_errno); | ||
1295 | 868 | + | ||
1296 | 869 | + | ||
1297 | 870 | +const char * STDCALL symver16_mysql_error(MYSQL *mysql) | ||
1298 | 871 | +{ | ||
1299 | 872 | + return mysql_error(mysql); | ||
1300 | 873 | +} | ||
1301 | 874 | +SYM_16(mysql_error); | ||
1302 | 875 | + | ||
1303 | 876 | + | ||
1304 | 877 | +ulong * STDCALL symver16_mysql_fetch_lengths(MYSQL_RES *res) | ||
1305 | 878 | +{ | ||
1306 | 879 | + return mysql_fetch_lengths(res); | ||
1307 | 880 | +} | ||
1308 | 881 | +SYM_16(mysql_fetch_lengths); | ||
1309 | 882 | + | ||
1310 | 883 | + | ||
1311 | 884 | +MYSQL_ROW STDCALL symver16_mysql_fetch_row(MYSQL_RES *res) | ||
1312 | 885 | +{ | ||
1313 | 886 | + return mysql_fetch_row(res); | ||
1314 | 887 | +} | ||
1315 | 888 | +SYM_16(mysql_fetch_row); | ||
1316 | 889 | + | ||
1317 | 890 | + | ||
1318 | 891 | +void STDCALL symver16_mysql_free_result(MYSQL_RES *result) | ||
1319 | 892 | +{ | ||
1320 | 893 | + return mysql_free_result(result); | ||
1321 | 894 | +} | ||
1322 | 895 | +SYM_16(mysql_free_result); | ||
1323 | 896 | + | ||
1324 | 897 | + | ||
1325 | 898 | +ulong STDCALL symver16_mysql_get_server_version(MYSQL *mysql) | ||
1326 | 899 | +{ | ||
1327 | 900 | + return mysql_get_server_version(mysql); | ||
1328 | 901 | +} | ||
1329 | 902 | +SYM_16(mysql_get_server_version); | ||
1330 | 903 | + | ||
1331 | 904 | + | ||
1332 | 905 | +const char * STDCALL symver16_mysql_get_ssl_cipher(MYSQL *mysql __attribute__((unused))) | ||
1333 | 906 | +{ | ||
1334 | 907 | + return mysql_get_ssl_cipher(mysql); | ||
1335 | 908 | +} | ||
1336 | 909 | +SYM_16(mysql_get_ssl_cipher); | ||
1337 | 910 | + | ||
1338 | 911 | + | ||
1339 | 912 | +MYSQL * STDCALL symver16_mysql_init(MYSQL *mysql) | ||
1340 | 913 | +{ | ||
1341 | 914 | + return mysql_init(mysql); | ||
1342 | 915 | +} | ||
1343 | 916 | +SYM_16(mysql_init); | ||
1344 | 917 | + | ||
1345 | 918 | + | ||
1346 | 919 | +unsigned int STDCALL symver16_mysql_num_fields(MYSQL_RES *res) | ||
1347 | 920 | +{ | ||
1348 | 921 | + return mysql_num_fields(res); | ||
1349 | 922 | +} | ||
1350 | 923 | +SYM_16(mysql_num_fields); | ||
1351 | 924 | + | ||
1352 | 925 | + | ||
1353 | 926 | +my_ulonglong STDCALL symver16_mysql_num_rows(MYSQL_RES *res) | ||
1354 | 927 | +{ | ||
1355 | 928 | + return mysql_num_rows(res); | ||
1356 | 929 | +} | ||
1357 | 930 | +SYM_16(mysql_num_rows); | ||
1358 | 931 | + | ||
1359 | 932 | + | ||
1360 | 933 | +int STDCALL symver16_mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg) | ||
1361 | 934 | +{ | ||
1362 | 935 | + return mysql_options(mysql, option, arg); | ||
1363 | 936 | +} | ||
1364 | 937 | +SYM_16(mysql_options); | ||
1365 | 938 | + | ||
1366 | 939 | + | ||
1367 | 940 | +int STDCALL symver16_mysql_real_query(MYSQL *mysql, const char *query, ulong length) | ||
1368 | 941 | +{ | ||
1369 | 942 | + return mysql_real_query(mysql, query, length); | ||
1370 | 943 | +} | ||
1371 | 944 | +SYM_16(mysql_real_query); | ||
1372 | 945 | + | ||
1373 | 946 | + | ||
1374 | 947 | +int STDCALL symver16_mysql_select_db(MYSQL *mysql, const char *db) | ||
1375 | 948 | +{ | ||
1376 | 949 | + return mysql_select_db(mysql, db); | ||
1377 | 950 | +} | ||
1378 | 951 | +SYM_16(mysql_select_db); | ||
1379 | 952 | + | ||
1380 | 953 | + | ||
1381 | 954 | +int STDCALL symver16_mysql_send_query(MYSQL* mysql, const char* query, ulong length) | ||
1382 | 955 | +{ | ||
1383 | 956 | + return mysql_send_query(mysql, query, length); | ||
1384 | 957 | +} | ||
1385 | 958 | +SYM_16(mysql_send_query); | ||
1386 | 959 | + | ||
1387 | 960 | + | ||
1388 | 961 | +int STDCALL symver16_mysql_set_character_set(MYSQL *mysql, const char *cs_name) | ||
1389 | 962 | +{ | ||
1390 | 963 | + return mysql_set_character_set(mysql, cs_name); | ||
1391 | 964 | +} | ||
1392 | 965 | +SYM_16(mysql_set_character_set); | ||
1393 | 966 | + | ||
1394 | 967 | + | ||
1395 | 968 | +my_bool STDCALL symver16_mysql_ssl_set(MYSQL *mysql __attribute__((unused)), const char *key __attribute__((unused)), const char *cert __attribute__((unused)), const char *ca __attribute__((unused)), const char *capath __attribute__((unused)), const char *cipher __attribute__((unused))) | ||
1396 | 969 | +{ | ||
1397 | 970 | + return mysql_ssl_set(mysql, key, cert, ca, capath, cipher); | ||
1398 | 971 | +} | ||
1399 | 972 | +SYM_16(mysql_ssl_set); | ||
1400 | 973 | + | ||
1401 | 974 | + | ||
1402 | 975 | +MYSQL_RES * STDCALL symver16_mysql_store_result(MYSQL *mysql) | ||
1403 | 976 | +{ | ||
1404 | 977 | + return mysql_store_result(mysql); | ||
1405 | 978 | +} | ||
1406 | 979 | +SYM_16(mysql_store_result); | ||
1407 | 980 | + | ||
1408 | 981 | +#endif | ||
1409 | 0 | 982 | ||
1410 | === added file 'build-ps/rpm/mysql-5.5-sharedlib-rename.patch' | |||
1411 | --- build-ps/rpm/mysql-5.5-sharedlib-rename.patch 1970-01-01 00:00:00 +0000 | |||
1412 | +++ build-ps/rpm/mysql-5.5-sharedlib-rename.patch 2014-10-07 16:27:15 +0000 | |||
1413 | @@ -0,0 +1,429 @@ | |||
1414 | 1 | diff -rup old/client/CMakeLists.txt new/client/CMakeLists.txt | ||
1415 | 2 | --- old/client/CMakeLists.txt 2014-09-02 10:31:44.520385517 +0200 | ||
1416 | 3 | +++ new/client/CMakeLists.txt 2014-09-18 10:53:56.746861840 +0200 | ||
1417 | 4 | @@ -28,45 +28,45 @@ INCLUDE_DIRECTORIES( | ||
1418 | 5 | ADD_DEFINITIONS(${READLINE_DEFINES}) | ||
1419 | 6 | ADD_DEFINITIONS(${SSL_DEFINES}) | ||
1420 | 7 | MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) | ||
1421 | 8 | -TARGET_LINK_LIBRARIES(mysql perconaserverclient) | ||
1422 | 9 | +TARGET_LINK_LIBRARIES(mysql mysqlclient) | ||
1423 | 10 | IF(UNIX) | ||
1424 | 11 | TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) | ||
1425 | 12 | ENDIF(UNIX) | ||
1426 | 13 | |||
1427 | 14 | MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) | ||
1428 | 15 | SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") | ||
1429 | 16 | -TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex) | ||
1430 | 17 | +TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) | ||
1431 | 18 | |||
1432 | 19 | |||
1433 | 20 | MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) | ||
1434 | 21 | -TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient) | ||
1435 | 22 | +TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) | ||
1436 | 23 | |||
1437 | 24 | MYSQL_ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c) | ||
1438 | 25 | -TARGET_LINK_LIBRARIES(mysqldump perconaserverclient) | ||
1439 | 26 | +TARGET_LINK_LIBRARIES(mysqldump mysqlclient) | ||
1440 | 27 | |||
1441 | 28 | MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) | ||
1442 | 29 | -TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient) | ||
1443 | 30 | +TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) | ||
1444 | 31 | |||
1445 | 32 | MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) | ||
1446 | 33 | -TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient) | ||
1447 | 34 | +TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) | ||
1448 | 35 | ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) | ||
1449 | 36 | |||
1450 | 37 | MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) | ||
1451 | 38 | -TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient) | ||
1452 | 39 | +TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) | ||
1453 | 40 | |||
1454 | 41 | MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) | ||
1455 | 42 | -TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient) | ||
1456 | 43 | +TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) | ||
1457 | 44 | |||
1458 | 45 | MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc | ||
1459 | 46 | ../sql/rpl_filter.cc ../sql/sql_list.cc) | ||
1460 | 47 | -TARGET_LINK_LIBRARIES(mysqlbinlog perconaserverclient) | ||
1461 | 48 | +TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) | ||
1462 | 49 | |||
1463 | 50 | MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc) | ||
1464 | 51 | -TARGET_LINK_LIBRARIES(mysqladmin perconaserverclient) | ||
1465 | 52 | +TARGET_LINK_LIBRARIES(mysqladmin mysqlclient) | ||
1466 | 53 | |||
1467 | 54 | MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) | ||
1468 | 55 | SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") | ||
1469 | 56 | -TARGET_LINK_LIBRARIES(mysqlslap perconaserverclient) | ||
1470 | 57 | +TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) | ||
1471 | 58 | |||
1472 | 59 | # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". | ||
1473 | 60 | IF(WIN32) | ||
1474 | 61 | diff -rup old/libmysql/CMakeLists.txt new/libmysql/CMakeLists.txt | ||
1475 | 62 | --- old/libmysql/CMakeLists.txt 2014-09-02 10:31:46.484385549 +0200 | ||
1476 | 63 | +++ new/libmysql/CMakeLists.txt 2014-09-18 10:47:31.254855590 +0200 | ||
1477 | 64 | @@ -163,13 +163,13 @@ IF(WIN32) | ||
1478 | 65 | LIST(APPEND LIBS auth_win_client) | ||
1479 | 66 | ENDIF() | ||
1480 | 67 | |||
1481 | 68 | -# Merge several convenience libraries into one big perconaserverclient | ||
1482 | 69 | +# Merge several convenience libraries into one big mysqlclient | ||
1483 | 70 | # and link them together into shared library. | ||
1484 | 71 | -MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development) | ||
1485 | 72 | +MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) | ||
1486 | 73 | |||
1487 | 74 | # Visual Studio users need debug static library for debug projects | ||
1488 | 75 | IF(MSVC) | ||
1489 | 76 | - INSTALL_DEBUG_TARGET(perconaserverclient DESTINATION ${INSTALL_LIBDIR}/debug) | ||
1490 | 77 | + INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug) | ||
1491 | 78 | INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug) | ||
1492 | 79 | ENDIF() | ||
1493 | 80 | |||
1494 | 81 | @@ -194,9 +194,9 @@ IF(UNIX) | ||
1495 | 82 | ENDIF() | ||
1496 | 83 | |||
1497 | 84 | IF(UNIX) | ||
1498 | 85 | - GET_TARGET_NAME(perconaserverclient lib_name) | ||
1499 | 86 | - INSTALL_SYMLINK(perconaserverclient | ||
1500 | 87 | - ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a | ||
1501 | 88 | + GET_TARGET_NAME(mysqlclient lib_name) | ||
1502 | 89 | + INSTALL_SYMLINK(mysqlclient | ||
1503 | 90 | + ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a | ||
1504 | 91 | ${INSTALL_LIBDIR} Development) | ||
1505 | 92 | ENDIF() | ||
1506 | 93 | |||
1507 | 94 | @@ -214,9 +214,9 @@ IF(NOT DISABLE_SHARED) | ||
1508 | 95 | SET(OS_SHARED_LIB_VERSION | ||
1509 | 96 | "${SHARED_LIB_MAJOR_VERSION}.${SHARED_LIB_MINOR_VERSION}.0") | ||
1510 | 97 | ENDIF() | ||
1511 | 98 | - # Name of shared library is perconaserverclient on Unix | ||
1512 | 99 | + # Name of shared library is mysqlclient on Unix | ||
1513 | 100 | SET_TARGET_PROPERTIES(libmysql PROPERTIES | ||
1514 | 101 | - OUTPUT_NAME perconaserverclient | ||
1515 | 102 | + OUTPUT_NAME mysqlclient | ||
1516 | 103 | VERSION "${OS_SHARED_LIB_VERSION}" | ||
1517 | 104 | SOVERSION "${SHARED_LIB_MAJOR_VERSION}") | ||
1518 | 105 | IF(LINK_FLAG_NO_UNDEFINED) | ||
1519 | 106 | @@ -231,13 +231,13 @@ IF(NOT DISABLE_SHARED) | ||
1520 | 107 | ENDIF(INSTALL_LAYOUT STREQUAL "RPM") | ||
1521 | 108 | ENDIF() | ||
1522 | 109 | # clean direct output needs to be set several targets have the same name | ||
1523 | 110 | - #(perconaserverclient in this case) | ||
1524 | 111 | - SET_TARGET_PROPERTIES(perconaserverclient PROPERTIES CLEAN_DIRECT_OUTPUT 1) | ||
1525 | 112 | + #(mysqlclient in this case) | ||
1526 | 113 | + SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1) | ||
1527 | 114 | SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1) | ||
1528 | 115 | |||
1529 | 116 | - # Install links to libperconaserverclient.so (client_r) | ||
1530 | 117 | + # Install links to libmysqlclient.so (client_r) | ||
1531 | 118 | GET_VERSIONED_LIBNAME( | ||
1532 | 119 | - "${CMAKE_SHARED_LIBRARY_PREFIX}perconaserverclient_r" | ||
1533 | 120 | + "${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r" | ||
1534 | 121 | "${CMAKE_SHARED_LIBRARY_SUFFIX}" | ||
1535 | 122 | "" | ||
1536 | 123 | linkname) | ||
1537 | 124 | @@ -251,7 +251,7 @@ IF(NOT DISABLE_SHARED) | ||
1538 | 125 | LIST(REMOVE_DUPLICATES OS_SHARED_LIB_SYMLINKS) | ||
1539 | 126 | FOREACH(ver ${OS_SHARED_LIB_SYMLINKS}) | ||
1540 | 127 | GET_VERSIONED_LIBNAME( | ||
1541 | 128 | - "${CMAKE_SHARED_LIBRARY_PREFIX}perconaserverclient_r" | ||
1542 | 129 | + "${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r" | ||
1543 | 130 | "${CMAKE_SHARED_LIBRARY_SUFFIX}" | ||
1544 | 131 | "${ver}" | ||
1545 | 132 | linkname) | ||
1546 | 133 | diff -rup old/libmysql/libmysql.map new/libmysql/libmysql.map | ||
1547 | 134 | --- old/libmysql/libmysql.map 2014-09-02 10:31:46.484385549 +0200 | ||
1548 | 135 | +++ new/libmysql/libmysql.map 2014-09-18 10:49:01.386857051 +0200 | ||
1549 | 136 | @@ -1,5 +1,5 @@ | ||
1550 | 137 | # symbols exported from mysql 5.1 | ||
1551 | 138 | -libperconaserverclient_16 { | ||
1552 | 139 | +libmysqlclient_16 { | ||
1553 | 140 | global: | ||
1554 | 141 | _fini; | ||
1555 | 142 | _init; | ||
1556 | 143 | @@ -121,7 +121,7 @@ libperconaserverclient_16 { | ||
1557 | 144 | *; | ||
1558 | 145 | }; | ||
1559 | 146 | # symbols added in mysql 5.5 | ||
1560 | 147 | -libperconaserverclient_18 { | ||
1561 | 148 | +libmysqlclient_18 { | ||
1562 | 149 | global: | ||
1563 | 150 | mysql_client_find_plugin; | ||
1564 | 151 | mysql_client_register_plugin; | ||
1565 | 152 | @@ -133,7 +133,7 @@ libperconaserverclient_18 { | ||
1566 | 153 | # Ideally the following symbols wouldn't be exported, but various applications | ||
1567 | 154 | # require them. We limit the namespace damage by prefixing mysql_ | ||
1568 | 155 | # (see mysql-dubious-exports.patch), which means the symbols are not present | ||
1569 | 156 | -# in libperconaserverclient_16. | ||
1570 | 157 | +# in libmysqlclient_16. | ||
1571 | 158 | # | ||
1572 | 159 | # mysql-connector-odbc requires these | ||
1573 | 160 | mysql_default_charset_info; | ||
1574 | 161 | diff -rup old/libmysql/libmysql.ver.in new/libmysql/libmysql.ver.in | ||
1575 | 162 | --- old/libmysql/libmysql.ver.in 2014-09-02 10:31:46.488385549 +0200 | ||
1576 | 163 | +++ new/libmysql/libmysql.ver.in 2014-09-18 10:49:37.018857629 +0200 | ||
1577 | 164 | @@ -1 +1 @@ | ||
1578 | 165 | -libperconaserverclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; }; | ||
1579 | 166 | +libmysqlclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; }; | ||
1580 | 167 | diff -rup old/plugin/percona-pam-for-mysql/CMakeLists.txt new/plugin/percona-pam-for-mysql/CMakeLists.txt | ||
1581 | 168 | --- old/plugin/percona-pam-for-mysql/CMakeLists.txt 2014-09-02 10:31:46.548385550 +0200 | ||
1582 | 169 | +++ new/plugin/percona-pam-for-mysql/CMakeLists.txt 2014-09-18 11:12:44.546880123 +0200 | ||
1583 | 170 | @@ -31,6 +31,6 @@ IF(HAVE_PAM AND HAVE_GETPWNAM_R AND HAVE | ||
1584 | 171 | SET(AUTH_PAM_COMPAT_SOURCES ${AUTH_PAM_COMMON_SOURCES} src/auth_pam_compat.c) | ||
1585 | 172 | MYSQL_ADD_PLUGIN(auth_pam ${AUTH_PAM_SOURCES} LINK_LIBRARIES pam MODULE_ONLY) | ||
1586 | 173 | MYSQL_ADD_PLUGIN(auth_pam_compat ${AUTH_PAM_COMPAT_SOURCES} LINK_LIBRARIES pam MODULE_ONLY) | ||
1587 | 174 | - MYSQL_ADD_PLUGIN(dialog src/dialog.c LINK_LIBRARIES perconaserverclient MODULE_ONLY) | ||
1588 | 175 | + MYSQL_ADD_PLUGIN(dialog src/dialog.c LINK_LIBRARIES mysqlclient MODULE_ONLY) | ||
1589 | 176 | ENDIF(HAVE_PAM AND HAVE_GETPWNAM_R AND HAVE_GETGRGID_R) | ||
1590 | 177 | ENDIF(WITH_PAM) | ||
1591 | 178 | diff -rup old/scripts/CMakeLists.txt new/scripts/CMakeLists.txt | ||
1592 | 179 | --- old/scripts/CMakeLists.txt 2014-09-02 10:31:45.744385537 +0200 | ||
1593 | 180 | +++ new/scripts/CMakeLists.txt 2014-09-18 10:57:36.062865395 +0200 | ||
1594 | 181 | @@ -242,7 +242,7 @@ ELSE() | ||
1595 | 182 | ENDIF() | ||
1596 | 183 | |||
1597 | 184 | # Use cmake variables to inspect dependencies for | ||
1598 | 185 | -# perconaserverclient library (add -l stuff) | ||
1599 | 186 | +# mysqlclient library (add -l stuff) | ||
1600 | 187 | SET(CLIENT_LIBS "") | ||
1601 | 188 | SET(LIBS "") | ||
1602 | 189 | |||
1603 | 190 | @@ -282,7 +282,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) | ||
1604 | 191 | ENDIF() | ||
1605 | 192 | ENDMACRO() | ||
1606 | 193 | |||
1607 | 194 | -EXTRACT_LINK_LIBRARIES(perconaserverclient CLIENT_LIBS) | ||
1608 | 195 | +EXTRACT_LINK_LIBRARIES(mysqlclient CLIENT_LIBS) | ||
1609 | 196 | EXTRACT_LINK_LIBRARIES(mysqlserver LIBS) | ||
1610 | 197 | |||
1611 | 198 | # mysql_config evaluates ${LIBDL}, we want to avoid it | ||
1612 | 199 | diff -rup old/scripts/mysql_config.pl.in new/scripts/mysql_config.pl.in | ||
1613 | 200 | --- old/scripts/mysql_config.pl.in 2014-09-02 10:31:45.744385537 +0200 | ||
1614 | 201 | +++ new/scripts/mysql_config.pl.in 2014-09-18 10:56:49.110864634 +0200 | ||
1615 | 202 | @@ -183,15 +183,15 @@ if ( $^O eq "MSWin32" ) | ||
1616 | 203 | my $linkpath = "$pkglibdir"; | ||
1617 | 204 | # user32 is only needed for debug or embedded | ||
1618 | 205 | my @winlibs = ("wsock32.lib","advapi32.lib","user32.lib"); | ||
1619 | 206 | - @lib_opts = ("$linkpath/perconaserverclient.lib",@winlibs); | ||
1620 | 207 | + @lib_opts = ("$linkpath/mysqlclient.lib",@winlibs); | ||
1621 | 208 | @lib_r_opts = @lib_opts; | ||
1622 | 209 | @lib_e_opts = ("$linkpath/mysqlserver.lib",@winlibs); | ||
1623 | 210 | } | ||
1624 | 211 | else | ||
1625 | 212 | { | ||
1626 | 213 | my $linkpath = "-L$pkglibdir @RPATH_OPTION@"; | ||
1627 | 214 | - @lib_opts = ($linkpath,"-lperconaserverclient"); | ||
1628 | 215 | - @lib_r_opts = ($linkpath,"-lperconaserverclient_r"); | ||
1629 | 216 | + @lib_opts = ($linkpath,"-lmysqlclient"); | ||
1630 | 217 | + @lib_r_opts = ($linkpath,"-lmysqlclient_r"); | ||
1631 | 218 | @lib_e_opts = ($linkpath,"-lmysqld"); | ||
1632 | 219 | } | ||
1633 | 220 | |||
1634 | 221 | diff -rup old/scripts/mysql_config.sh new/scripts/mysql_config.sh | ||
1635 | 222 | --- old/scripts/mysql_config.sh 2014-09-02 10:31:45.748385537 +0200 | ||
1636 | 223 | +++ new/scripts/mysql_config.sh 2014-09-18 10:58:25.702866200 +0200 | ||
1637 | 224 | @@ -111,9 +111,9 @@ fi | ||
1638 | 225 | |||
1639 | 226 | # Create options | ||
1640 | 227 | # We intentionally add a space to the beginning and end of lib strings, simplifies replace later | ||
1641 | 228 | -libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lperconaserverclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" | ||
1642 | 229 | +libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" | ||
1643 | 230 | libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " | ||
1644 | 231 | -libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lperconaserverclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " | ||
1645 | 232 | +libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " | ||
1646 | 233 | embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " | ||
1647 | 234 | |||
1648 | 235 | if [ -r "$pkglibdir/libmygcc.a" ]; then | ||
1649 | 236 | diff -rup old/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile new/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile | ||
1650 | 237 | --- old/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile 2014-09-02 10:31:46.428385548 +0200 | ||
1651 | 238 | +++ new/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile 2014-09-18 11:01:36.374869291 +0200 | ||
1652 | 239 | @@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
1653 | 240 | SYS_LIB = | ||
1654 | 241 | |||
1655 | 242 | $(TARGET): $(OBJS) | ||
1656 | 243 | - $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET) | ||
1657 | 244 | + $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET) | ||
1658 | 245 | |||
1659 | 246 | $(OBJS): $(SRCS) | ||
1660 | 247 | $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi -I$(INCLUDE_DIR)/ndbapi $(SRCS) | ||
1661 | 248 | diff -rup old/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile new/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile | ||
1662 | 249 | --- old/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile 2014-09-02 10:31:46.428385548 +0200 | ||
1663 | 250 | +++ new/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile 2014-09-18 11:02:59.302870635 +0200 | ||
1664 | 251 | @@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
1665 | 252 | SYS_LIB = | ||
1666 | 253 | |||
1667 | 254 | $(TARGET): $(OBJS) | ||
1668 | 255 | - $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET) | ||
1669 | 256 | + $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET) | ||
1670 | 257 | |||
1671 | 258 | $(OBJS): $(SRCS) | ||
1672 | 259 | $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi -I$(INCLUDE_DIR)/ndbapi $(SRCS) | ||
1673 | 260 | diff -rup old/storage/ndb/ndbapi-examples/ndbapi_async/Makefile new/storage/ndb/ndbapi-examples/ndbapi_async/Makefile | ||
1674 | 261 | --- old/storage/ndb/ndbapi-examples/ndbapi_async/Makefile 2014-09-02 10:31:46.428385548 +0200 | ||
1675 | 262 | +++ new/storage/ndb/ndbapi-examples/ndbapi_async/Makefile 2014-09-18 11:04:24.226872012 +0200 | ||
1676 | 263 | @@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
1677 | 264 | SYS_LIB = | ||
1678 | 265 | |||
1679 | 266 | $(TARGET): $(OBJS) | ||
1680 | 267 | - $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET) | ||
1681 | 268 | + $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET) | ||
1682 | 269 | |||
1683 | 270 | $(TARGET).o: $(SRCS) | ||
1684 | 271 | $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/extra -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) | ||
1685 | 272 | diff -rup old/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile new/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile | ||
1686 | 273 | --- old/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile 2014-09-02 10:31:46.428385548 +0200 | ||
1687 | 274 | +++ new/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile 2014-09-18 11:04:42.406872307 +0200 | ||
1688 | 275 | @@ -14,7 +14,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
1689 | 276 | SYS_LIB = | ||
1690 | 277 | |||
1691 | 278 | $(TARGET): $(OBJS) | ||
1692 | 279 | - $(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET) | ||
1693 | 280 | + $(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET) | ||
1694 | 281 | |||
1695 | 282 | $(TARGET).o: $(SRCS) | ||
1696 | 283 | $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS) | ||
1697 | 284 | diff -rup old/storage/ndb/ndbapi-examples/ndbapi_event/Makefile new/storage/ndb/ndbapi-examples/ndbapi_event/Makefile | ||
1698 | 285 | --- old/storage/ndb/ndbapi-examples/ndbapi_event/Makefile 2014-09-02 10:31:46.428385548 +0200 | ||
1699 | 286 | +++ new/storage/ndb/ndbapi-examples/ndbapi_event/Makefile 2014-09-18 11:03:23.782871032 +0200 | ||
1700 | 287 | @@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
1701 | 288 | SYS_LIB = | ||
1702 | 289 | |||
1703 | 290 | $(TARGET): $(OBJS) | ||
1704 | 291 | - $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET) | ||
1705 | 292 | + $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET) | ||
1706 | 293 | |||
1707 | 294 | $(TARGET).o: $(SRCS) Makefile | ||
1708 | 295 | $(CXX) $(CFLAGS) $(DEBUG) -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi -I$(TOP_SRCDIR)/include $(SRCS) | ||
1709 | 296 | diff -rup old/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile new/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile | ||
1710 | 297 | --- old/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile 2014-09-02 10:31:46.428385548 +0200 | ||
1711 | 298 | +++ new/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile 2014-09-18 11:02:29.830870158 +0200 | ||
1712 | 299 | @@ -14,7 +14,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
1713 | 300 | SYS_LIB = | ||
1714 | 301 | |||
1715 | 302 | $(TARGET): $(OBJS) | ||
1716 | 303 | - $(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET) | ||
1717 | 304 | + $(CXX) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET) | ||
1718 | 305 | |||
1719 | 306 | $(TARGET).o: $(SRCS) | ||
1720 | 307 | $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS) | ||
1721 | 308 | diff -rup old/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile new/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile | ||
1722 | 309 | --- old/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile 2014-09-02 10:31:46.424385548 +0200 | ||
1723 | 310 | +++ new/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile 2014-09-18 11:00:36.934868327 +0200 | ||
1724 | 311 | @@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
1725 | 312 | SYS_LIB = | ||
1726 | 313 | |||
1727 | 314 | $(TARGET): $(OBJS) | ||
1728 | 315 | - $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET) | ||
1729 | 316 | + $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET) | ||
1730 | 317 | |||
1731 | 318 | $(TARGET).o: $(SRCS) | ||
1732 | 319 | $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/extra -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) | ||
1733 | 320 | diff -rup old/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile new/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile | ||
1734 | 321 | --- old/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile 2014-09-02 10:31:46.428385548 +0200 | ||
1735 | 322 | +++ new/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile 2014-09-18 11:01:09.606868857 +0200 | ||
1736 | 323 | @@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
1737 | 324 | SYS_LIB = | ||
1738 | 325 | |||
1739 | 326 | $(TARGET): $(OBJS) | ||
1740 | 327 | - $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET) | ||
1741 | 328 | + $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET) | ||
1742 | 329 | |||
1743 | 330 | $(TARGET).o: $(SRCS) | ||
1744 | 331 | $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS) | ||
1745 | 332 | diff -rup old/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile new/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile | ||
1746 | 333 | --- old/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile 2014-09-02 10:31:46.428385548 +0200 | ||
1747 | 334 | +++ new/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile 2014-09-18 11:02:01.074869691 +0200 | ||
1748 | 335 | @@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
1749 | 336 | SYS_LIB = | ||
1750 | 337 | |||
1751 | 338 | $(TARGET): $(OBJS) | ||
1752 | 339 | - $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET) | ||
1753 | 340 | + $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET) | ||
1754 | 341 | |||
1755 | 342 | $(OBJS): $(SRCS) | ||
1756 | 343 | $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS) | ||
1757 | 344 | diff -rup old/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile new/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile | ||
1758 | 345 | --- old/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile 2014-09-02 10:31:46.428385548 +0200 | ||
1759 | 346 | +++ new/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile 2014-09-18 11:04:00.262871624 +0200 | ||
1760 | 347 | @@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr | ||
1761 | 348 | SYS_LIB = | ||
1762 | 349 | |||
1763 | 350 | $(TARGET): $(OBJS) | ||
1764 | 351 | - $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lperconaserverclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET) | ||
1765 | 352 | + $(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET) | ||
1766 | 353 | |||
1767 | 354 | $(OBJS): $(SRCS) | ||
1768 | 355 | $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS) | ||
1769 | 356 | diff -rup old/storage/ndb/test/ndbapi/Makefile.am new/storage/ndb/test/ndbapi/Makefile.am | ||
1770 | 357 | --- old/storage/ndb/test/ndbapi/Makefile.am 2014-09-02 10:31:46.272385546 +0200 | ||
1771 | 358 | +++ new/storage/ndb/test/ndbapi/Makefile.am 2014-09-18 10:59:49.286867555 +0200 | ||
1772 | 359 | @@ -102,7 +102,7 @@ testReadPerf_SOURCES = testReadPerf.cpp | ||
1773 | 360 | testLcp_SOURCES = testLcp.cpp | ||
1774 | 361 | testPartitioning_SOURCES = testPartitioning.cpp | ||
1775 | 362 | testNDBT_SOURCES = testNDBT.cpp | ||
1776 | 363 | -testNDBT_LDADD = $(LDADD) $(top_srcdir)/libmysql_r/libperconaserverclient_r.la | ||
1777 | 364 | +testNDBT_LDADD = $(LDADD) $(top_srcdir)/libmysql_r/libmysqlclient_r.la | ||
1778 | 365 | testBitfield_SOURCES = testBitfield.cpp | ||
1779 | 366 | NdbRepStress_SOURCES = acrt/NdbRepStress.cpp | ||
1780 | 367 | DbCreate_SOURCES = bench/mainPopulate.cpp bench/dbPopulate.cpp bench/userInterface.cpp bench/dbPopulate.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp | ||
1781 | 368 | @@ -124,7 +124,7 @@ include $(top_srcdir)/storage/ndb/config | ||
1782 | 369 | NdbRepStress_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/test/include -I$(top_srcdir)/include | ||
1783 | 370 | testBackup_LDADD = $(LDADD) bank/libbank.a | ||
1784 | 371 | testSRBank_LDADD = bank/libbank.a $(LDADD) | ||
1785 | 372 | -NdbRepStress_LDADD = $(LDADD) $(top_builddir)/libmysql_r/libperconaserverclient_r.la | ||
1786 | 373 | +NdbRepStress_LDADD = $(LDADD) $(top_builddir)/libmysql_r/libmysqlclient_r.la | ||
1787 | 374 | |||
1788 | 375 | windoze-dsp: flexBench.dsp testBasic.dsp testBlobs.dsp \ | ||
1789 | 376 | testScan.dsp | ||
1790 | 377 | diff -rup old/support-files/MySQL-shared-compat.spec.sh new/support-files/MySQL-shared-compat.spec.sh | ||
1791 | 378 | --- old/support-files/MySQL-shared-compat.spec.sh 2014-09-02 10:31:46.520385550 +0200 | ||
1792 | 379 | +++ new/support-files/MySQL-shared-compat.spec.sh 2014-09-18 11:11:58.210879372 +0200 | ||
1793 | 380 | @@ -82,7 +82,7 @@ rpm2cpio %{SOURCE3} | cpio -iv --make-di | ||
1794 | 381 | |||
1795 | 382 | %files | ||
1796 | 383 | %defattr(-, root, root) | ||
1797 | 384 | -%{_libdir}/libperconaserverclient* | ||
1798 | 385 | +%{_libdir}/libmysqlclient* | ||
1799 | 386 | |||
1800 | 387 | # The spec file changelog only includes changes made to the spec file | ||
1801 | 388 | # itself - note that they must be ordered by date (important when | ||
1802 | 389 | diff -rup old/support-files/mysql.spec.sh new/support-files/mysql.spec.sh | ||
1803 | 390 | --- old/support-files/mysql.spec.sh 2014-09-02 10:31:46.520385550 +0200 | ||
1804 | 391 | +++ new/support-files/mysql.spec.sh 2014-09-18 11:11:29.494878906 +0200 | ||
1805 | 392 | @@ -704,7 +704,7 @@ A manual upgrade is required. | ||
1806 | 393 | rpm -qa | grep -i '^mysql-' | ||
1807 | 394 | |||
1808 | 395 | You may choose to use 'rpm --nodeps -ev <package-name>' to remove | ||
1809 | 396 | - the package which contains the perconaserverclient shared library. The | ||
1810 | 397 | + the package which contains the mysqlclient shared library. The | ||
1811 | 398 | library will be reinstalled by the MySQL-shared-compat package. | ||
1812 | 399 | - Install the new MySQL packages supplied by $myvendor | ||
1813 | 400 | - Ensure that the MySQL server is started | ||
1814 | 401 | @@ -1177,8 +1177,8 @@ echo "=====" | ||
1815 | 402 | %dir %attr(755, root, root) %{_libdir}/mysql | ||
1816 | 403 | %{_includedir}/mysql/* | ||
1817 | 404 | %{_datadir}/aclocal/mysql.m4 | ||
1818 | 405 | -%{_libdir}/mysql/libperconaserverclient.a | ||
1819 | 406 | -%{_libdir}/mysql/libperconaserverclient_r.a | ||
1820 | 407 | +%{_libdir}/mysql/libmysqlclient.a | ||
1821 | 408 | +%{_libdir}/mysql/libmysqlclient_r.a | ||
1822 | 409 | %{_libdir}/mysql/libmysqlservices.a | ||
1823 | 410 | |||
1824 | 411 | # ---------------------------------------------------------------------------- | ||
1825 | 412 | diff -rup old/tests/CMakeLists.txt new/tests/CMakeLists.txt | ||
1826 | 413 | --- old/tests/CMakeLists.txt 2014-09-02 10:31:46.512385550 +0200 | ||
1827 | 414 | +++ new/tests/CMakeLists.txt 2014-09-18 11:06:20.830873902 +0200 | ||
1828 | 415 | @@ -18,12 +18,12 @@ ADD_DEFINITIONS("-DMYSQL_CLIENT") | ||
1829 | 416 | INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) | ||
1830 | 417 | |||
1831 | 418 | ADD_EXECUTABLE(mysql_client_test mysql_client_test.c) | ||
1832 | 419 | -TARGET_LINK_LIBRARIES(mysql_client_test perconaserverclient) | ||
1833 | 420 | +TARGET_LINK_LIBRARIES(mysql_client_test mysqlclient) | ||
1834 | 421 | SET_TARGET_PROPERTIES(mysql_client_test PROPERTIES LINKER_LANGUAGE CXX) | ||
1835 | 422 | |||
1836 | 423 | IF(WITH_UNIT_TESTS) | ||
1837 | 424 | ADD_EXECUTABLE(bug25714 bug25714.c) | ||
1838 | 425 | - TARGET_LINK_LIBRARIES(bug25714 perconaserverclient) | ||
1839 | 426 | + TARGET_LINK_LIBRARIES(bug25714 mysqlclient) | ||
1840 | 427 | SET_TARGET_PROPERTIES(bug25714 PROPERTIES LINKER_LANGUAGE CXX) | ||
1841 | 428 | ENDIF() | ||
1842 | 429 | |||
1843 | 0 | 430 | ||
1844 | === added file 'build-ps/rpm/mysql.conf' | |||
1845 | --- build-ps/rpm/mysql.conf 1970-01-01 00:00:00 +0000 | |||
1846 | +++ build-ps/rpm/mysql.conf 2014-10-07 16:27:15 +0000 | |||
1847 | @@ -0,0 +1,1 @@ | |||
1848 | 1 | d /var/run/mysqld 0755 mysql mysql - | ||
1849 | 0 | 2 | ||
1850 | === renamed file 'build-ps/rpm/mysql.service' => 'build-ps/rpm/mysqld.service' | |||
1851 | === modified file 'storage/innobase/include/univ.i' | |||
1852 | --- storage/innobase/include/univ.i 2014-08-29 07:43:51 +0000 | |||
1853 | +++ storage/innobase/include/univ.i 2014-10-07 16:27:15 +0000 | |||
1854 | @@ -64,7 +64,7 @@ | |||
1855 | 64 | (INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR) | 64 | (INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR) |
1856 | 65 | 65 | ||
1857 | 66 | #ifndef PERCONA_INNODB_VERSION | 66 | #ifndef PERCONA_INNODB_VERSION |
1859 | 67 | #define PERCONA_INNODB_VERSION 36.0 | 67 | #define PERCONA_INNODB_VERSION 36.1 |
1860 | 68 | #endif | 68 | #endif |
1861 | 69 | 69 | ||
1862 | 70 | #define INNODB_VERSION_STR MYSQL_SERVER_VERSION | 70 | #define INNODB_VERSION_STR MYSQL_SERVER_VERSION |