Merge lp:~percona-core/percona-server/release-5.5.40-36.1 into lp:percona-server/5.5

Proposed by Tomislav Plavcic on 2014-10-07
Status: Merged
Approved by: Laurynas Biveinis on 2014-10-08
Approved revision: 707
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
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-10-07 Approve on 2014-10-08
Review via email: mp+237451@code.launchpad.net

Description of the change

Release branch for PS version 5.5.40-36.1

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

Subscribers

People subscribed via source and target branches