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
1=== modified file 'build-ps/percona-server.spec'
2--- build-ps/percona-server.spec 2014-10-06 15:58:54 +0000
3+++ build-ps/percona-server.spec 2015-01-02 09:28:44 +0000
4@@ -601,7 +601,7 @@
5
6 # Touch the place where the my.cnf config file might be located
7 # Just to make sure it's in the file list and marked as a config file
8-# touch $RBR%{_sysconfdir}/my.cnf
9+touch $RBR%{_sysconfdir}/my.cnf
10
11 # Install SELinux files in datadir
12 install -m 600 $MBD/support-files/RHEL4-SElinux/mysql.{fc,te} \
13@@ -1118,6 +1118,10 @@
14 %doc %attr(644, root, man) %{_mandir}/man1/resolveip.1*
15 %doc %attr(644, root, man) %{_mandir}/man1/mysql_plugin.1*
16
17+%if "%rhel" < "7"
18+%ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
19+%endif
20+
21 %attr(755, root, root) %{_bindir}/innochecksum
22 %attr(755, root, root) %{_bindir}/myisam_ftdump
23 %attr(755, root, root) %{_bindir}/myisamchk
24
25=== modified file 'build-ps/rpm/mysql-5.5-sharedlib-rename.patch'
26--- build-ps/rpm/mysql-5.5-sharedlib-rename.patch 2014-09-30 09:01:49 +0000
27+++ build-ps/rpm/mysql-5.5-sharedlib-rename.patch 2015-01-02 09:28:44 +0000
28@@ -1,7 +1,7 @@
29 diff -rup old/client/CMakeLists.txt new/client/CMakeLists.txt
30---- old/client/CMakeLists.txt 2014-09-02 10:31:44.520385517 +0200
31-+++ new/client/CMakeLists.txt 2014-09-18 10:53:56.746861840 +0200
32-@@ -28,45 +28,45 @@ INCLUDE_DIRECTORIES(
33+--- old/client/CMakeLists.txt 2014-12-18 12:01:43.000000000 +0100
34++++ new/client/CMakeLists.txt 2014-12-29 15:27:07.670433150 +0100
35+@@ -28,7 +28,7 @@ INCLUDE_DIRECTORIES(
36 ADD_DEFINITIONS(${READLINE_DEFINES})
37 ADD_DEFINITIONS(${SSL_DEFINES})
38 MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
39@@ -10,9 +10,10 @@
40 IF(UNIX)
41 TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
42 ENDIF(UNIX)
43-
44- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
45- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
46+@@ -41,38 +41,38 @@ IF(HAVE_WERROR_FLAG)
47+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
48+ ADD_COMPILE_FLAGS(mysqltest.cc COMPILE_FLAGS "-Wno-error")
49+ ENDIF()
50 -TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)
51 +TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
52
53@@ -59,8 +60,8 @@
54 # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
55 IF(WIN32)
56 diff -rup old/libmysql/CMakeLists.txt new/libmysql/CMakeLists.txt
57---- old/libmysql/CMakeLists.txt 2014-09-02 10:31:46.484385549 +0200
58-+++ new/libmysql/CMakeLists.txt 2014-09-18 10:47:31.254855590 +0200
59+--- old/libmysql/CMakeLists.txt 2014-08-26 15:55:45.000000000 +0200
60++++ new/libmysql/CMakeLists.txt 2014-12-29 15:27:07.670433150 +0100
61 @@ -163,13 +163,13 @@ IF(WIN32)
62 LIST(APPEND LIBS auth_win_client)
63 ENDIF()
64@@ -131,8 +132,8 @@
65 "${ver}"
66 linkname)
67 diff -rup old/libmysql/libmysql.map new/libmysql/libmysql.map
68---- old/libmysql/libmysql.map 2014-09-02 10:31:46.484385549 +0200
69-+++ new/libmysql/libmysql.map 2014-09-18 10:49:01.386857051 +0200
70+--- old/libmysql/libmysql.map 2014-04-19 02:18:26.000000000 +0200
71++++ new/libmysql/libmysql.map 2014-12-29 15:27:07.670433150 +0100
72 @@ -1,5 +1,5 @@
73 # symbols exported from mysql 5.1
74 -libperconaserverclient_16 {
75@@ -159,14 +160,14 @@
76 # mysql-connector-odbc requires these
77 mysql_default_charset_info;
78 diff -rup old/libmysql/libmysql.ver.in new/libmysql/libmysql.ver.in
79---- old/libmysql/libmysql.ver.in 2014-09-02 10:31:46.488385549 +0200
80-+++ new/libmysql/libmysql.ver.in 2014-09-18 10:49:37.018857629 +0200
81+--- old/libmysql/libmysql.ver.in 2014-04-19 02:18:26.000000000 +0200
82++++ new/libmysql/libmysql.ver.in 2014-12-29 15:27:07.674433150 +0100
83 @@ -1 +1 @@
84 -libperconaserverclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; };
85 +libmysqlclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; };
86 diff -rup old/plugin/percona-pam-for-mysql/CMakeLists.txt new/plugin/percona-pam-for-mysql/CMakeLists.txt
87---- old/plugin/percona-pam-for-mysql/CMakeLists.txt 2014-09-02 10:31:46.548385550 +0200
88-+++ new/plugin/percona-pam-for-mysql/CMakeLists.txt 2014-09-18 11:12:44.546880123 +0200
89+--- old/plugin/percona-pam-for-mysql/CMakeLists.txt 2014-04-19 02:18:25.000000000 +0200
90++++ new/plugin/percona-pam-for-mysql/CMakeLists.txt 2014-12-29 15:27:07.674433150 +0100
91 @@ -31,6 +31,6 @@ IF(HAVE_PAM AND HAVE_GETPWNAM_R AND HAVE
92 SET(AUTH_PAM_COMPAT_SOURCES ${AUTH_PAM_COMMON_SOURCES} src/auth_pam_compat.c)
93 MYSQL_ADD_PLUGIN(auth_pam ${AUTH_PAM_SOURCES} LINK_LIBRARIES pam MODULE_ONLY)
94@@ -176,9 +177,9 @@
95 ENDIF(HAVE_PAM AND HAVE_GETPWNAM_R AND HAVE_GETGRGID_R)
96 ENDIF(WITH_PAM)
97 diff -rup old/scripts/CMakeLists.txt new/scripts/CMakeLists.txt
98---- old/scripts/CMakeLists.txt 2014-09-02 10:31:45.744385537 +0200
99-+++ new/scripts/CMakeLists.txt 2014-09-18 10:57:36.062865395 +0200
100-@@ -242,7 +242,7 @@ ELSE()
101+--- old/scripts/CMakeLists.txt 2014-12-18 12:01:43.000000000 +0100
102++++ new/scripts/CMakeLists.txt 2014-12-29 15:27:07.674433150 +0100
103+@@ -246,7 +246,7 @@ ELSE()
104 ENDIF()
105
106 # Use cmake variables to inspect dependencies for
107@@ -187,7 +188,7 @@
108 SET(CLIENT_LIBS "")
109 SET(LIBS "")
110
111-@@ -282,7 +282,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
112+@@ -286,7 +286,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
113 ENDIF()
114 ENDMACRO()
115
116@@ -197,8 +198,8 @@
117
118 # mysql_config evaluates ${LIBDL}, we want to avoid it
119 diff -rup old/scripts/mysql_config.pl.in new/scripts/mysql_config.pl.in
120---- old/scripts/mysql_config.pl.in 2014-09-02 10:31:45.744385537 +0200
121-+++ new/scripts/mysql_config.pl.in 2014-09-18 10:56:49.110864634 +0200
122+--- old/scripts/mysql_config.pl.in 2014-04-19 02:18:33.000000000 +0200
123++++ new/scripts/mysql_config.pl.in 2014-12-29 15:27:07.674433150 +0100
124 @@ -183,15 +183,15 @@ if ( $^O eq "MSWin32" )
125 my $linkpath = "$pkglibdir";
126 # user32 is only needed for debug or embedded
127@@ -219,8 +220,8 @@
128 }
129
130 diff -rup old/scripts/mysql_config.sh new/scripts/mysql_config.sh
131---- old/scripts/mysql_config.sh 2014-09-02 10:31:45.748385537 +0200
132-+++ new/scripts/mysql_config.sh 2014-09-18 10:58:25.702866200 +0200
133+--- old/scripts/mysql_config.sh 2014-08-26 15:55:45.000000000 +0200
134++++ new/scripts/mysql_config.sh 2014-12-29 15:27:07.674433150 +0100
135 @@ -111,9 +111,9 @@ fi
136
137 # Create options
138@@ -234,8 +235,8 @@
139
140 if [ -r "$pkglibdir/libmygcc.a" ]; then
141 diff -rup old/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile new/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile
142---- old/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile 2014-09-02 10:31:46.428385548 +0200
143-+++ new/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile 2014-09-18 11:01:36.374869291 +0200
144+--- old/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile 2014-04-19 02:18:26.000000000 +0200
145++++ new/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile 2014-12-29 15:27:07.674433150 +0100
146 @@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
147 SYS_LIB =
148
149@@ -246,8 +247,8 @@
150 $(OBJS): $(SRCS)
151 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi -I$(INCLUDE_DIR)/ndbapi $(SRCS)
152 diff -rup old/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile new/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile
153---- old/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile 2014-09-02 10:31:46.428385548 +0200
154-+++ new/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile 2014-09-18 11:02:59.302870635 +0200
155+--- old/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile 2014-04-19 02:18:26.000000000 +0200
156++++ new/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile 2014-12-29 15:27:07.674433150 +0100
157 @@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
158 SYS_LIB =
159
160@@ -258,8 +259,8 @@
161 $(OBJS): $(SRCS)
162 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/mgmapi -I$(INCLUDE_DIR)/ndbapi $(SRCS)
163 diff -rup old/storage/ndb/ndbapi-examples/ndbapi_async/Makefile new/storage/ndb/ndbapi-examples/ndbapi_async/Makefile
164---- old/storage/ndb/ndbapi-examples/ndbapi_async/Makefile 2014-09-02 10:31:46.428385548 +0200
165-+++ new/storage/ndb/ndbapi-examples/ndbapi_async/Makefile 2014-09-18 11:04:24.226872012 +0200
166+--- old/storage/ndb/ndbapi-examples/ndbapi_async/Makefile 2014-04-19 02:18:26.000000000 +0200
167++++ new/storage/ndb/ndbapi-examples/ndbapi_async/Makefile 2014-12-29 15:27:07.674433150 +0100
168 @@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
169 SYS_LIB =
170
171@@ -270,8 +271,8 @@
172 $(TARGET).o: $(SRCS)
173 $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/extra -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
174 diff -rup old/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile new/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile
175---- old/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile 2014-09-02 10:31:46.428385548 +0200
176-+++ new/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile 2014-09-18 11:04:42.406872307 +0200
177+--- old/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile 2014-04-19 02:18:26.000000000 +0200
178++++ new/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile 2014-12-29 15:27:07.674433150 +0100
179 @@ -14,7 +14,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
180 SYS_LIB =
181
182@@ -282,8 +283,8 @@
183 $(TARGET).o: $(SRCS)
184 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)
185 diff -rup old/storage/ndb/ndbapi-examples/ndbapi_event/Makefile new/storage/ndb/ndbapi-examples/ndbapi_event/Makefile
186---- old/storage/ndb/ndbapi-examples/ndbapi_event/Makefile 2014-09-02 10:31:46.428385548 +0200
187-+++ new/storage/ndb/ndbapi-examples/ndbapi_event/Makefile 2014-09-18 11:03:23.782871032 +0200
188+--- old/storage/ndb/ndbapi-examples/ndbapi_event/Makefile 2014-04-19 02:18:26.000000000 +0200
189++++ new/storage/ndb/ndbapi-examples/ndbapi_event/Makefile 2014-12-29 15:27:07.674433150 +0100
190 @@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
191 SYS_LIB =
192
193@@ -294,8 +295,8 @@
194 $(TARGET).o: $(SRCS) Makefile
195 $(CXX) $(CFLAGS) $(DEBUG) -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi -I$(TOP_SRCDIR)/include $(SRCS)
196 diff -rup old/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile new/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile
197---- old/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile 2014-09-02 10:31:46.428385548 +0200
198-+++ new/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile 2014-09-18 11:02:29.830870158 +0200
199+--- old/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile 2014-04-19 02:18:26.000000000 +0200
200++++ new/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile 2014-12-29 15:27:07.674433150 +0100
201 @@ -14,7 +14,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
202 SYS_LIB =
203
204@@ -306,8 +307,8 @@
205 $(TARGET).o: $(SRCS)
206 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)
207 diff -rup old/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile new/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile
208---- old/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile 2014-09-02 10:31:46.424385548 +0200
209-+++ new/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile 2014-09-18 11:00:36.934868327 +0200
210+--- old/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile 2014-04-19 02:18:26.000000000 +0200
211++++ new/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile 2014-12-29 15:27:07.674433150 +0100
212 @@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
213 SYS_LIB =
214
215@@ -318,8 +319,8 @@
216 $(TARGET).o: $(SRCS)
217 $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/extra -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
218 diff -rup old/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile new/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile
219---- old/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile 2014-09-02 10:31:46.428385548 +0200
220-+++ new/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile 2014-09-18 11:01:09.606868857 +0200
221+--- old/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile 2014-04-19 02:18:26.000000000 +0200
222++++ new/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile 2014-12-29 15:27:07.674433150 +0100
223 @@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
224 SYS_LIB =
225
226@@ -330,8 +331,8 @@
227 $(TARGET).o: $(SRCS)
228 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)
229 diff -rup old/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile new/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile
230---- old/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile 2014-09-02 10:31:46.428385548 +0200
231-+++ new/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile 2014-09-18 11:02:01.074869691 +0200
232+--- old/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile 2014-04-19 02:18:26.000000000 +0200
233++++ new/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile 2014-12-29 15:27:07.674433150 +0100
234 @@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
235 SYS_LIB =
236
237@@ -342,8 +343,8 @@
238 $(OBJS): $(SRCS)
239 $(CXX) $(CFLAGS) -I$(TOP_SRCDIR)/include -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)
240 diff -rup old/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile new/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile
241---- old/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile 2014-09-02 10:31:46.428385548 +0200
242-+++ new/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile 2014-09-18 11:04:00.262871624 +0200
243+--- old/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile 2014-04-19 02:18:26.000000000 +0200
244++++ new/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile 2014-12-29 15:27:07.674433150 +0100
245 @@ -15,7 +15,7 @@ LIB_DIR = -L$(TOP_SRCDIR)/storage/ndb/sr
246 SYS_LIB =
247
248@@ -354,8 +355,8 @@
249 $(OBJS): $(SRCS)
250 $(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/storage/ndb/include -I$(INCLUDE_DIR)/storage/ndb/include/ndbapi $(SRCS)
251 diff -rup old/storage/ndb/test/ndbapi/Makefile.am new/storage/ndb/test/ndbapi/Makefile.am
252---- old/storage/ndb/test/ndbapi/Makefile.am 2014-09-02 10:31:46.272385546 +0200
253-+++ new/storage/ndb/test/ndbapi/Makefile.am 2014-09-18 10:59:49.286867555 +0200
254+--- old/storage/ndb/test/ndbapi/Makefile.am 2014-04-19 02:18:26.000000000 +0200
255++++ new/storage/ndb/test/ndbapi/Makefile.am 2014-12-29 15:27:07.674433150 +0100
256 @@ -102,7 +102,7 @@ testReadPerf_SOURCES = testReadPerf.cpp
257 testLcp_SOURCES = testLcp.cpp
258 testPartitioning_SOURCES = testPartitioning.cpp
259@@ -375,8 +376,8 @@
260 windoze-dsp: flexBench.dsp testBasic.dsp testBlobs.dsp \
261 testScan.dsp
262 diff -rup old/support-files/MySQL-shared-compat.spec.sh new/support-files/MySQL-shared-compat.spec.sh
263---- old/support-files/MySQL-shared-compat.spec.sh 2014-09-02 10:31:46.520385550 +0200
264-+++ new/support-files/MySQL-shared-compat.spec.sh 2014-09-18 11:11:58.210879372 +0200
265+--- old/support-files/MySQL-shared-compat.spec.sh 2014-04-19 02:18:33.000000000 +0200
266++++ new/support-files/MySQL-shared-compat.spec.sh 2014-12-29 15:27:07.678433150 +0100
267 @@ -82,7 +82,7 @@ rpm2cpio %{SOURCE3} | cpio -iv --make-di
268
269 %files
270@@ -387,9 +388,9 @@
271 # The spec file changelog only includes changes made to the spec file
272 # itself - note that they must be ordered by date (important when
273 diff -rup old/support-files/mysql.spec.sh new/support-files/mysql.spec.sh
274---- old/support-files/mysql.spec.sh 2014-09-02 10:31:46.520385550 +0200
275-+++ new/support-files/mysql.spec.sh 2014-09-18 11:11:29.494878906 +0200
276-@@ -704,7 +704,7 @@ A manual upgrade is required.
277+--- old/support-files/mysql.spec.sh 2014-12-18 12:01:43.000000000 +0100
278++++ new/support-files/mysql.spec.sh 2014-12-29 15:27:07.678433150 +0100
279+@@ -710,7 +710,7 @@ A manual upgrade is required.
280 rpm -qa | grep -i '^mysql-'
281
282 You may choose to use 'rpm --nodeps -ev <package-name>' to remove
283@@ -398,7 +399,7 @@
284 library will be reinstalled by the MySQL-shared-compat package.
285 - Install the new MySQL packages supplied by $myvendor
286 - Ensure that the MySQL server is started
287-@@ -1177,8 +1177,8 @@ echo "====="
288+@@ -1184,8 +1184,8 @@ echo "====="
289 %dir %attr(755, root, root) %{_libdir}/mysql
290 %{_includedir}/mysql/*
291 %{_datadir}/aclocal/mysql.m4
292@@ -410,8 +411,8 @@
293
294 # ----------------------------------------------------------------------------
295 diff -rup old/tests/CMakeLists.txt new/tests/CMakeLists.txt
296---- old/tests/CMakeLists.txt 2014-09-02 10:31:46.512385550 +0200
297-+++ new/tests/CMakeLists.txt 2014-09-18 11:06:20.830873902 +0200
298+--- old/tests/CMakeLists.txt 2014-04-19 02:18:25.000000000 +0200
299++++ new/tests/CMakeLists.txt 2014-12-29 15:27:07.678433150 +0100
300 @@ -18,12 +18,12 @@ ADD_DEFINITIONS("-DMYSQL_CLIENT")
301 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
302

Subscribers

People subscribed via source and target branches