Merge lp:~tplavcic/percona-server/bug1405667-5.5 into lp:percona-server/5.5

Proposed by Tomislav Plavcic on 2015-01-02
Status: Merged
Approved by: Laurynas Biveinis on 2015-01-05
Approved revision: 723
Merged at revision: 725
Proposed branch: lp:~tplavcic/percona-server/bug1405667-5.5
Merge into: lp:percona-server/5.5
Diff against target: 301 lines (+58/-53)
2 files modified
build-ps/percona-server.spec (+5/-1)
build-ps/rpm/mysql-5.5-sharedlib-rename.patch (+53/-52)
To merge this branch: bzr merge lp:~tplavcic/percona-server/bug1405667-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2015-01-02 Approve on 2015-01-05
Review via email: mp+245484@code.launchpad.net

Description of the change

my.cnf was left out from file list (regression - bug1405667) and the patch on centos7 for renaming the shared library to libmysqlclient has been misaligned so it was failing to patch.

PS 5.6 patch fail:
http://jenkins.percona.com/view/TEST/job/percona-server-5.6-redhat-binary-test/68/label_exp=centos7-64/consoleFull
PS 5.5 patch fail:
http://jenkins.percona.com/view/Percona-RELEASES/job/percona-server-5.5-redhat-binary/label_exp=centos7-64/130/consoleFull

SOME TESTING:
PS 5.5 test:
------------
build: http://jenkins.percona.com/view/Percona-RELEASES/job/percona-server-5.5-redhat-binary/134/

TEST: centos6 - that my.cnf is present in the file list
[vagrant@b-centos7-64 test]$ rpm -qlp Percona-Server-server-55-5.5.41-rel37.0.el6.x86_64.rpm |more
/etc/init.d/mysql
/etc/logrotate.d/mysql
/etc/my.cnf
...

TEST: centos7 - that patch is working
http://jenkins.percona.com/view/Percona-RELEASES/job/percona-server-5.5-redhat-binary/label_exp=centos7-64/134/consoleFull
- the build is failing for other bug, but patch works
- tried to build without patches to check that it doesn't make the problem with debug plugins and the problem is still there even without rename patch - so that is the issue to be resolved - ticket already open and linked in jira for the 5.5 release

PS 5.6 test:
------------
build: http://jenkins.percona.com/view/Percona-RELEASES/job/percona-server-5.6-redhat-binary/96/

centos6: that my.cnf is on the filelist
[vagrant@b-centos7-64 test]$ rpm -qlp Percona-Server-server-56-5.6.22-rel71.0.el6.x86_64.rpm
/etc/init.d/mysql
/etc/logrotate.d/mysql
/etc/my.cnf
...

centos7: the patch seems working and packages are created
http://jenkins.percona.com/view/Percona-RELEASES/job/percona-server-5.6-redhat-binary/96/label_exp=centos7-64/

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
=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec 2014-10-06 15:58:54 +0000
+++ build-ps/percona-server.spec 2015-01-02 09:28:44 +0000
@@ -601,7 +601,7 @@
601601
602# Touch the place where the my.cnf config file might be located602# Touch the place where the my.cnf config file might be located
603# Just to make sure it's in the file list and marked as a config file603# Just to make sure it's in the file list and marked as a config file
604# touch $RBR%{_sysconfdir}/my.cnf604touch $RBR%{_sysconfdir}/my.cnf
605605
606# Install SELinux files in datadir606# Install SELinux files in datadir
607install -m 600 $MBD/support-files/RHEL4-SElinux/mysql.{fc,te} \607install -m 600 $MBD/support-files/RHEL4-SElinux/mysql.{fc,te} \
@@ -1118,6 +1118,10 @@
1118%doc %attr(644, root, man) %{_mandir}/man1/resolveip.1*1118%doc %attr(644, root, man) %{_mandir}/man1/resolveip.1*
1119%doc %attr(644, root, man) %{_mandir}/man1/mysql_plugin.1*1119%doc %attr(644, root, man) %{_mandir}/man1/mysql_plugin.1*
11201120
1121%if "%rhel" < "7"
1122%ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
1123%endif
1124
1121%attr(755, root, root) %{_bindir}/innochecksum1125%attr(755, root, root) %{_bindir}/innochecksum
1122%attr(755, root, root) %{_bindir}/myisam_ftdump1126%attr(755, root, root) %{_bindir}/myisam_ftdump
1123%attr(755, root, root) %{_bindir}/myisamchk1127%attr(755, root, root) %{_bindir}/myisamchk
11241128
=== modified file 'build-ps/rpm/mysql-5.5-sharedlib-rename.patch'
--- build-ps/rpm/mysql-5.5-sharedlib-rename.patch 2014-09-30 09:01:49 +0000
+++ build-ps/rpm/mysql-5.5-sharedlib-rename.patch 2015-01-02 09:28:44 +0000
@@ -1,7 +1,7 @@
1diff -rup old/client/CMakeLists.txt new/client/CMakeLists.txt1diff -rup old/client/CMakeLists.txt new/client/CMakeLists.txt
2--- old/client/CMakeLists.txt 2014-09-02 10:31:44.520385517 +02002--- old/client/CMakeLists.txt 2014-12-18 12:01:43.000000000 +0100
3+++ new/client/CMakeLists.txt 2014-09-18 10:53:56.746861840 +02003+++ new/client/CMakeLists.txt 2014-12-29 15:27:07.670433150 +0100
4@@ -28,45 +28,45 @@ INCLUDE_DIRECTORIES(4@@ -28,7 +28,7 @@ INCLUDE_DIRECTORIES(
5 ADD_DEFINITIONS(${READLINE_DEFINES})5 ADD_DEFINITIONS(${READLINE_DEFINES})
6 ADD_DEFINITIONS(${SSL_DEFINES})6 ADD_DEFINITIONS(${SSL_DEFINES})
7 MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)7 MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
@@ -10,9 +10,10 @@
10 IF(UNIX)10 IF(UNIX)
11 TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})11 TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
12 ENDIF(UNIX)12 ENDIF(UNIX)
13 13@@ -41,38 +41,38 @@ IF(HAVE_WERROR_FLAG)
14 MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)14 INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
15 SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")15 ADD_COMPILE_FLAGS(mysqltest.cc COMPILE_FLAGS "-Wno-error")
16 ENDIF()
16-TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)17-TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)
17+TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)18+TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
18 19
@@ -59,8 +60,8 @@
59 # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".60 # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
60 IF(WIN32)61 IF(WIN32)
61diff -rup old/libmysql/CMakeLists.txt new/libmysql/CMakeLists.txt62diff -rup old/libmysql/CMakeLists.txt new/libmysql/CMakeLists.txt
62--- old/libmysql/CMakeLists.txt 2014-09-02 10:31:46.484385549 +020063--- old/libmysql/CMakeLists.txt 2014-08-26 15:55:45.000000000 +0200
63+++ new/libmysql/CMakeLists.txt 2014-09-18 10:47:31.254855590 +020064+++ new/libmysql/CMakeLists.txt 2014-12-29 15:27:07.670433150 +0100
64@@ -163,13 +163,13 @@ IF(WIN32)65@@ -163,13 +163,13 @@ IF(WIN32)
65 LIST(APPEND LIBS auth_win_client)66 LIST(APPEND LIBS auth_win_client)
66 ENDIF()67 ENDIF()
@@ -131,8 +132,8 @@
131 "${ver}"132 "${ver}"
132 linkname)133 linkname)
133diff -rup old/libmysql/libmysql.map new/libmysql/libmysql.map134diff -rup old/libmysql/libmysql.map new/libmysql/libmysql.map
134--- old/libmysql/libmysql.map 2014-09-02 10:31:46.484385549 +0200135--- old/libmysql/libmysql.map 2014-04-19 02:18:26.000000000 +0200
135+++ new/libmysql/libmysql.map 2014-09-18 10:49:01.386857051 +0200136+++ new/libmysql/libmysql.map 2014-12-29 15:27:07.670433150 +0100
136@@ -1,5 +1,5 @@137@@ -1,5 +1,5 @@
137 # symbols exported from mysql 5.1138 # symbols exported from mysql 5.1
138-libperconaserverclient_16 {139-libperconaserverclient_16 {
@@ -159,14 +160,14 @@
159 # mysql-connector-odbc requires these160 # mysql-connector-odbc requires these
160 mysql_default_charset_info;161 mysql_default_charset_info;
161diff -rup old/libmysql/libmysql.ver.in new/libmysql/libmysql.ver.in162diff -rup old/libmysql/libmysql.ver.in new/libmysql/libmysql.ver.in
162--- old/libmysql/libmysql.ver.in 2014-09-02 10:31:46.488385549 +0200163--- old/libmysql/libmysql.ver.in 2014-04-19 02:18:26.000000000 +0200
163+++ new/libmysql/libmysql.ver.in 2014-09-18 10:49:37.018857629 +0200164+++ new/libmysql/libmysql.ver.in 2014-12-29 15:27:07.674433150 +0100
164@@ -1 +1 @@165@@ -1 +1 @@
165-libperconaserverclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; };166-libperconaserverclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; };
166+libmysqlclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; };167+libmysqlclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; };
167diff -rup old/plugin/percona-pam-for-mysql/CMakeLists.txt new/plugin/percona-pam-for-mysql/CMakeLists.txt168diff -rup old/plugin/percona-pam-for-mysql/CMakeLists.txt new/plugin/percona-pam-for-mysql/CMakeLists.txt
168--- old/plugin/percona-pam-for-mysql/CMakeLists.txt 2014-09-02 10:31:46.548385550 +0200169--- old/plugin/percona-pam-for-mysql/CMakeLists.txt 2014-04-19 02:18:25.000000000 +0200
169+++ new/plugin/percona-pam-for-mysql/CMakeLists.txt 2014-09-18 11:12:44.546880123 +0200170+++ new/plugin/percona-pam-for-mysql/CMakeLists.txt 2014-12-29 15:27:07.674433150 +0100
170@@ -31,6 +31,6 @@ IF(HAVE_PAM AND HAVE_GETPWNAM_R AND HAVE171@@ -31,6 +31,6 @@ IF(HAVE_PAM AND HAVE_GETPWNAM_R AND HAVE
171 SET(AUTH_PAM_COMPAT_SOURCES ${AUTH_PAM_COMMON_SOURCES} src/auth_pam_compat.c)172 SET(AUTH_PAM_COMPAT_SOURCES ${AUTH_PAM_COMMON_SOURCES} src/auth_pam_compat.c)
172 MYSQL_ADD_PLUGIN(auth_pam ${AUTH_PAM_SOURCES} LINK_LIBRARIES pam MODULE_ONLY)173 MYSQL_ADD_PLUGIN(auth_pam ${AUTH_PAM_SOURCES} LINK_LIBRARIES pam MODULE_ONLY)
@@ -176,9 +177,9 @@
176 ENDIF(HAVE_PAM AND HAVE_GETPWNAM_R AND HAVE_GETGRGID_R)177 ENDIF(HAVE_PAM AND HAVE_GETPWNAM_R AND HAVE_GETGRGID_R)
177 ENDIF(WITH_PAM)178 ENDIF(WITH_PAM)
178diff -rup old/scripts/CMakeLists.txt new/scripts/CMakeLists.txt179diff -rup old/scripts/CMakeLists.txt new/scripts/CMakeLists.txt
179--- old/scripts/CMakeLists.txt 2014-09-02 10:31:45.744385537 +0200180--- old/scripts/CMakeLists.txt 2014-12-18 12:01:43.000000000 +0100
180+++ new/scripts/CMakeLists.txt 2014-09-18 10:57:36.062865395 +0200181+++ new/scripts/CMakeLists.txt 2014-12-29 15:27:07.674433150 +0100
181@@ -242,7 +242,7 @@ ELSE()182@@ -246,7 +246,7 @@ ELSE()
182 ENDIF()183 ENDIF()
183 184
184 # Use cmake variables to inspect dependencies for 185 # Use cmake variables to inspect dependencies for
@@ -187,7 +188,7 @@
187 SET(CLIENT_LIBS "")188 SET(CLIENT_LIBS "")
188 SET(LIBS "")189 SET(LIBS "")
189 190
190@@ -282,7 +282,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)191@@ -286,7 +286,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
191 ENDIF()192 ENDIF()
192 ENDMACRO()193 ENDMACRO()
193 194
@@ -197,8 +198,8 @@
197 198
198 # mysql_config evaluates ${LIBDL}, we want to avoid it199 # mysql_config evaluates ${LIBDL}, we want to avoid it
199diff -rup old/scripts/mysql_config.pl.in new/scripts/mysql_config.pl.in200diff -rup old/scripts/mysql_config.pl.in new/scripts/mysql_config.pl.in
200--- old/scripts/mysql_config.pl.in 2014-09-02 10:31:45.744385537 +0200201--- old/scripts/mysql_config.pl.in 2014-04-19 02:18:33.000000000 +0200
201+++ new/scripts/mysql_config.pl.in 2014-09-18 10:56:49.110864634 +0200202+++ new/scripts/mysql_config.pl.in 2014-12-29 15:27:07.674433150 +0100
202@@ -183,15 +183,15 @@ if ( $^O eq "MSWin32" )203@@ -183,15 +183,15 @@ if ( $^O eq "MSWin32" )
203 my $linkpath = "$pkglibdir";204 my $linkpath = "$pkglibdir";
204 # user32 is only needed for debug or embedded205 # user32 is only needed for debug or embedded
@@ -219,8 +220,8 @@
219 }220 }
220 221
221diff -rup old/scripts/mysql_config.sh new/scripts/mysql_config.sh222diff -rup old/scripts/mysql_config.sh new/scripts/mysql_config.sh
222--- old/scripts/mysql_config.sh 2014-09-02 10:31:45.748385537 +0200223--- old/scripts/mysql_config.sh 2014-08-26 15:55:45.000000000 +0200
223+++ new/scripts/mysql_config.sh 2014-09-18 10:58:25.702866200 +0200224+++ new/scripts/mysql_config.sh 2014-12-29 15:27:07.674433150 +0100
224@@ -111,9 +111,9 @@ fi225@@ -111,9 +111,9 @@ fi
225 226
226 # Create options 227 # Create options
@@ -234,8 +235,8 @@
234 235
235 if [ -r "$pkglibdir/libmygcc.a" ]; then236 if [ -r "$pkglibdir/libmygcc.a" ]; then
236diff -rup old/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile new/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile237diff -rup old/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile new/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile
237--- old/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile 2014-09-02 10:31:46.428385548 +0200238--- old/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile 2014-04-19 02:18:26.000000000 +0200
238+++ new/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile 2014-09-18 11:01:36.374869291 +0200239+++ new/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile 2014-12-29 15:27:07.674433150 +0100
239@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr240@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
240 SYS_LIB = 241 SYS_LIB =
241 242
@@ -246,8 +247,8 @@
246 $(OBJS): $(SRCS)247 $(OBJS): $(SRCS)
247 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi -I$(INCLUDE_DIR)/ndbapi $(SRCS)248 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi -I$(INCLUDE_DIR)/ndbapi $(SRCS)
248diff -rup old/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile new/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile249diff -rup old/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile new/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile
249--- old/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile 2014-09-02 10:31:46.428385548 +0200250--- old/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile 2014-04-19 02:18:26.000000000 +0200
250+++ new/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile 2014-09-18 11:02:59.302870635 +0200251+++ new/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile 2014-12-29 15:27:07.674433150 +0100
251@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr252@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
252 SYS_LIB = 253 SYS_LIB =
253 254
@@ -258,8 +259,8 @@
258 $(OBJS): $(SRCS)259 $(OBJS): $(SRCS)
259 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi -I$(INCLUDE_DIR)/ndbapi $(SRCS)260 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi -I$(INCLUDE_DIR)/ndbapi $(SRCS)
260diff -rup old/storage/ndb/ndbapi-examples/ndbapi_async/Makefile new/storage/ndb/ndbapi-examples/ndbapi_async/Makefile261diff -rup old/storage/ndb/ndbapi-examples/ndbapi_async/Makefile new/storage/ndb/ndbapi-examples/ndbapi_async/Makefile
261--- old/storage/ndb/ndbapi-examples/ndbapi_async/Makefile 2014-09-02 10:31:46.428385548 +0200262--- old/storage/ndb/ndbapi-examples/ndbapi_async/Makefile 2014-04-19 02:18:26.000000000 +0200
262+++ new/storage/ndb/ndbapi-examples/ndbapi_async/Makefile 2014-09-18 11:04:24.226872012 +0200263+++ new/storage/ndb/ndbapi-examples/ndbapi_async/Makefile 2014-12-29 15:27:07.674433150 +0100
263@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr264@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
264 SYS_LIB = 265 SYS_LIB =
265 266
@@ -270,8 +271,8 @@
270 $(TARGET).o: $(SRCS)271 $(TARGET).o: $(SRCS)
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)272 $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/extra -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
272diff -rup old/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile new/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile273diff -rup old/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile new/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile
273--- old/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile 2014-09-02 10:31:46.428385548 +0200274--- old/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile 2014-04-19 02:18:26.000000000 +0200
274+++ new/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile 2014-09-18 11:04:42.406872307 +0200275+++ new/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile 2014-12-29 15:27:07.674433150 +0100
275@@ -14,7 +14,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr276@@ -14,7 +14,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
276 SYS_LIB = 277 SYS_LIB =
277 278
@@ -282,8 +283,8 @@
282 $(TARGET).o: $(SRCS)283 $(TARGET).o: $(SRCS)
283 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)284 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)
284diff -rup old/storage/ndb/ndbapi-examples/ndbapi_event/Makefile new/storage/ndb/ndbapi-examples/ndbapi_event/Makefile285diff -rup old/storage/ndb/ndbapi-examples/ndbapi_event/Makefile new/storage/ndb/ndbapi-examples/ndbapi_event/Makefile
285--- old/storage/ndb/ndbapi-examples/ndbapi_event/Makefile 2014-09-02 10:31:46.428385548 +0200286--- old/storage/ndb/ndbapi-examples/ndbapi_event/Makefile 2014-04-19 02:18:26.000000000 +0200
286+++ new/storage/ndb/ndbapi-examples/ndbapi_event/Makefile 2014-09-18 11:03:23.782871032 +0200287+++ new/storage/ndb/ndbapi-examples/ndbapi_event/Makefile 2014-12-29 15:27:07.674433150 +0100
287@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr288@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
288 SYS_LIB = 289 SYS_LIB =
289 290
@@ -294,8 +295,8 @@
294 $(TARGET).o: $(SRCS) Makefile295 $(TARGET).o: $(SRCS) Makefile
295 $(CXX) $(CFLAGS) $(DEBUG) -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi -I$(TOP_SRCDIR)/include $(SRCS)296 $(CXX) $(CFLAGS) $(DEBUG) -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi -I$(TOP_SRCDIR)/include $(SRCS)
296diff -rup old/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile new/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile297diff -rup old/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile new/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile
297--- old/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile 2014-09-02 10:31:46.428385548 +0200298--- old/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile 2014-04-19 02:18:26.000000000 +0200
298+++ new/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile 2014-09-18 11:02:29.830870158 +0200299+++ new/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile 2014-12-29 15:27:07.674433150 +0100
299@@ -14,7 +14,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr300@@ -14,7 +14,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
300 SYS_LIB = 301 SYS_LIB =
301 302
@@ -306,8 +307,8 @@
306 $(TARGET).o: $(SRCS)307 $(TARGET).o: $(SRCS)
307 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)308 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)
308diff -rup old/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile new/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile309diff -rup old/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile new/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile
309--- old/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile 2014-09-02 10:31:46.424385548 +0200310--- old/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile 2014-04-19 02:18:26.000000000 +0200
310+++ new/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile 2014-09-18 11:00:36.934868327 +0200311+++ new/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile 2014-12-29 15:27:07.674433150 +0100
311@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr312@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
312 SYS_LIB = 313 SYS_LIB =
313 314
@@ -318,8 +319,8 @@
318 $(TARGET).o: $(SRCS)319 $(TARGET).o: $(SRCS)
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)320 $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/extra -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
320diff -rup old/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile new/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile321diff -rup old/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile new/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile
321--- old/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile 2014-09-02 10:31:46.428385548 +0200322--- old/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile 2014-04-19 02:18:26.000000000 +0200
322+++ new/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile 2014-09-18 11:01:09.606868857 +0200323+++ new/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile 2014-12-29 15:27:07.674433150 +0100
323@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr324@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
324 SYS_LIB = 325 SYS_LIB =
325 326
@@ -330,8 +331,8 @@
330 $(TARGET).o: $(SRCS)331 $(TARGET).o: $(SRCS)
331 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)332 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)
332diff -rup old/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile new/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile333diff -rup old/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile new/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile
333--- old/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile 2014-09-02 10:31:46.428385548 +0200334--- old/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile 2014-04-19 02:18:26.000000000 +0200
334+++ new/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile 2014-09-18 11:02:01.074869691 +0200335+++ new/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile 2014-12-29 15:27:07.674433150 +0100
335@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr336@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
336 SYS_LIB = 337 SYS_LIB =
337 338
@@ -342,8 +343,8 @@
342 $(OBJS): $(SRCS)343 $(OBJS): $(SRCS)
343 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)344 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)
344diff -rup old/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile new/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile345diff -rup old/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile new/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile
345--- old/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile 2014-09-02 10:31:46.428385548 +0200346--- old/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile 2014-04-19 02:18:26.000000000 +0200
346+++ new/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile 2014-09-18 11:04:00.262871624 +0200347+++ new/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile 2014-12-29 15:27:07.674433150 +0100
347@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr348@@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
348 SYS_LIB = 349 SYS_LIB =
349 350
@@ -354,8 +355,8 @@
354 $(OBJS): $(SRCS)355 $(OBJS): $(SRCS)
355 $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)356 $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
356diff -rup old/storage/ndb/test/ndbapi/Makefile.am new/storage/ndb/test/ndbapi/Makefile.am357diff -rup old/storage/ndb/test/ndbapi/Makefile.am new/storage/ndb/test/ndbapi/Makefile.am
357--- old/storage/ndb/test/ndbapi/Makefile.am 2014-09-02 10:31:46.272385546 +0200358--- old/storage/ndb/test/ndbapi/Makefile.am 2014-04-19 02:18:26.000000000 +0200
358+++ new/storage/ndb/test/ndbapi/Makefile.am 2014-09-18 10:59:49.286867555 +0200359+++ new/storage/ndb/test/ndbapi/Makefile.am 2014-12-29 15:27:07.674433150 +0100
359@@ -102,7 +102,7 @@ testReadPerf_SOURCES = testReadPerf.cpp360@@ -102,7 +102,7 @@ testReadPerf_SOURCES = testReadPerf.cpp
360 testLcp_SOURCES = testLcp.cpp361 testLcp_SOURCES = testLcp.cpp
361 testPartitioning_SOURCES = testPartitioning.cpp362 testPartitioning_SOURCES = testPartitioning.cpp
@@ -375,8 +376,8 @@
375 windoze-dsp: flexBench.dsp testBasic.dsp testBlobs.dsp \376 windoze-dsp: flexBench.dsp testBasic.dsp testBlobs.dsp \
376 testScan.dsp377 testScan.dsp
377diff -rup old/support-files/MySQL-shared-compat.spec.sh new/support-files/MySQL-shared-compat.spec.sh378diff -rup old/support-files/MySQL-shared-compat.spec.sh new/support-files/MySQL-shared-compat.spec.sh
378--- old/support-files/MySQL-shared-compat.spec.sh 2014-09-02 10:31:46.520385550 +0200379--- old/support-files/MySQL-shared-compat.spec.sh 2014-04-19 02:18:33.000000000 +0200
379+++ new/support-files/MySQL-shared-compat.spec.sh 2014-09-18 11:11:58.210879372 +0200380+++ new/support-files/MySQL-shared-compat.spec.sh 2014-12-29 15:27:07.678433150 +0100
380@@ -82,7 +82,7 @@ rpm2cpio %{SOURCE3} | cpio -iv --make-di381@@ -82,7 +82,7 @@ rpm2cpio %{SOURCE3} | cpio -iv --make-di
381 382
382 %files383 %files
@@ -387,9 +388,9 @@
387 # The spec file changelog only includes changes made to the spec file388 # The spec file changelog only includes changes made to the spec file
388 # itself - note that they must be ordered by date (important when389 # itself - note that they must be ordered by date (important when
389diff -rup old/support-files/mysql.spec.sh new/support-files/mysql.spec.sh390diff -rup old/support-files/mysql.spec.sh new/support-files/mysql.spec.sh
390--- old/support-files/mysql.spec.sh 2014-09-02 10:31:46.520385550 +0200391--- old/support-files/mysql.spec.sh 2014-12-18 12:01:43.000000000 +0100
391+++ new/support-files/mysql.spec.sh 2014-09-18 11:11:29.494878906 +0200392+++ new/support-files/mysql.spec.sh 2014-12-29 15:27:07.678433150 +0100
392@@ -704,7 +704,7 @@ A manual upgrade is required.393@@ -710,7 +710,7 @@ A manual upgrade is required.
393 rpm -qa | grep -i '^mysql-'394 rpm -qa | grep -i '^mysql-'
394 395
395 You may choose to use 'rpm --nodeps -ev <package-name>' to remove396 You may choose to use 'rpm --nodeps -ev <package-name>' to remove
@@ -398,7 +399,7 @@
398 library will be reinstalled by the MySQL-shared-compat package.399 library will be reinstalled by the MySQL-shared-compat package.
399 - Install the new MySQL packages supplied by $myvendor400 - Install the new MySQL packages supplied by $myvendor
400 - Ensure that the MySQL server is started401 - Ensure that the MySQL server is started
401@@ -1177,8 +1177,8 @@ echo "====="402@@ -1184,8 +1184,8 @@ echo "====="
402 %dir %attr(755, root, root) %{_libdir}/mysql403 %dir %attr(755, root, root) %{_libdir}/mysql
403 %{_includedir}/mysql/*404 %{_includedir}/mysql/*
404 %{_datadir}/aclocal/mysql.m4405 %{_datadir}/aclocal/mysql.m4
@@ -410,8 +411,8 @@
410 411
411 # ----------------------------------------------------------------------------412 # ----------------------------------------------------------------------------
412diff -rup old/tests/CMakeLists.txt new/tests/CMakeLists.txt413diff -rup old/tests/CMakeLists.txt new/tests/CMakeLists.txt
413--- old/tests/CMakeLists.txt 2014-09-02 10:31:46.512385550 +0200414--- old/tests/CMakeLists.txt 2014-04-19 02:18:25.000000000 +0200
414+++ new/tests/CMakeLists.txt 2014-09-18 11:06:20.830873902 +0200415+++ new/tests/CMakeLists.txt 2014-12-29 15:27:07.678433150 +0100
415@@ -18,12 +18,12 @@ ADD_DEFINITIONS("-DMYSQL_CLIENT")416@@ -18,12 +18,12 @@ ADD_DEFINITIONS("-DMYSQL_CLIENT")
416 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)417 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
417 418

Subscribers

People subscribed via source and target branches