Commit graph

952 commits

Author SHA1 Message Date
unknown
bb70b07d98 Merge from mysql-5.5.31-release 2013-04-18 12:52:59 +02:00
Murthy Narkedimilli
abd76285da Merging the changes for Bug 16633169 - MYSQL.INFO CONTAINS OUTDATED INFORMATION. 2013-04-16 12:17:18 +02:00
Murthy Narkedimilli
7c384a9333 Bug 16633169 - MYSQL.INFO CONTAINS OUTDATED INFORMATION. 2013-04-16 12:12:18 +02:00
Nirbhay Choubey
b350990a11 local merge. 2013-04-09 14:03:35 +05:30
Nirbhay Choubey
4ad004c2b4 Backporting patch for bug#15852074. 2013-04-09 14:00:05 +05:30
Balasubramanian Kandasamy
5a781ff2ad Reverted MySQL Release Engineering mail address 2013-03-25 13:50:21 +01:00
Balasubramanian Kandasamy
061f3d1b53 Added SuSE RPM Build fix 2013-03-21 14:59:57 +01:00
Murthy Narkedimilli
e55c30f943 Correcting the permissions of the executable files. 2013-03-20 17:50:15 +01:00
Murthy Narkedimilli
7c28426b8b Correcting the permissions of executable files. 2013-03-20 17:49:30 +01:00
Murthy Narkedimilli
8afe262ae5 Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 15:53:48 +01:00
Murthy Narkedimilli
fe85f54640 Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
Balasubramanian Kandasamy
0fd024f6ee Added fix for Bug#16445097 2013-03-06 17:05:32 +01:00
Balasubramanian Kandasamy
f3abc36db6 Added fix for Bug#16445097 2013-03-06 16:33:26 +01:00
Balasubramanian Kandasamy
673c68a925 Updated Code for Bug#16235828 and Bug#16298542 2013-03-05 16:34:14 +01:00
Balasubramanian Kandasamy
8ac9ee0801 Updated Code for Bug#16235828 2013-03-05 16:16:34 +01:00
unknown
429e589256 Updated mysql.spec.sh file for br16298542 2013-03-01 14:11:24 +01:00
unknown
759519034e Updated release number in mysql.spec.sh file for br16298542 2013-02-28 14:49:54 +01:00
unknown
5c22652bab Updated mysql.spec.sh file for br16298542 2013-02-28 14:36:00 +01:00
Murthy Narkedimilli
053d7e775c Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
Balasubramanian Kandasamy
31c06437c9 Removed Conflicts: mysql-libs mysql-libs-advanced from spec file 2013-01-16 08:09:26 +01:00
Joerg Bruehe
813b661d00 Spec file change to work around cast ulonglong -> int. 2012-09-11 12:47:32 +02:00
Joerg Bruehe
11fc7b64d3 Spec file: Declare conflicts with the ULN RPMs. 2012-07-26 21:20:15 +02:00
Joerg Bruehe
aa36e25cb2 Spec file: transfer the 'runselftest' macro to a work tree. 2012-07-26 20:41:45 +02:00
Joerg Bruehe
d06273ef43 Spec file polishing: Handle 'MySQL-*' and 'mysql-*', part 1 2012-07-26 20:24:51 +02:00
Joerg Bruehe
dbfe6a6d42 Merge 5.5.27 into the tree for ULN RPMs. 2012-07-25 22:22:34 +02:00
Joerg Bruehe
9ea789e434 Still work on getting the "SPECIFIC-ULN/" files into the build.
"INSTALL" was wrong, happens too late,
but "CONFIGURE_FILES(... COPYONLY)" should hopefully do it.

Traditional RPMs need to be checked, the above might fix their issues.
2012-06-12 11:01:41 +02:00
Joerg Bruehe
2c64e17361 Protect traditional RPMs that "SPECIFIC-ULN/" will not break their packaging. 2012-06-11 22:07:24 +02:00
Bjorn Munch
d74c3df6ce Backport SuSE 11 fix to RPM spec file 2012-06-08 16:31:03 +02:00
Bjorn Munch
26c08ffa40 Merged some fixes from 7.2 release branches 2012-03-22 16:16:11 +01:00
Joerg Bruehe
8082c70b10 Merge the changes of 5.5.17 back into main 5.5 2011-10-19 13:39:43 +02:00
Joerg Bruehe
ab8326f546 Merge to main. 2011-10-04 17:17:17 +02:00
Joerg Bruehe
5cba8c5141 Fix bug#11886309: RPM UPGRADE OF MYSQL ADVANCED GPL TO MYSQL SERVER ADVANCED DOES NOT WORK
Upmerge from 5.1 to 5.5
2011-10-04 16:21:32 +02:00
Joerg Bruehe
4836c66d3c Fix bug#11886309: RPM UPGRADE OF MYSQL ADVANCED GPL TO MYSQL SERVER ADVANCED DOES NOT WORK
Change the RPM spec file so that each RPM "obsoletes" the corresponding RPMs
of all (other) configurations, so a "server" RPM of any configuration
can replace the "server" RPM of any other configuration on a "rpm -U".
2011-10-04 15:58:19 +02:00
Joerg Bruehe
deba087af0 Fix the spec file: Files must not be mentioned twice in a "%files" list. 2011-09-28 11:43:16 +02:00
Daniel Fischer
7450044eb7 merge from 5.5.16 2011-09-21 12:40:41 +02:00
Jonathan Perkin
1f9fe1b4d5 Update email address for Release Engineering. 2011-09-20 17:47:53 +02:00
Jonathan Perkin
3ad46f8111 Don't use macro names in changelog comments. 2011-09-19 21:16:01 +02:00
Jonathan Perkin
e715b761ad Complete support for OL/RH6. 2011-09-13 16:18:57 +02:00
Joerg Bruehe
3690fa63e3 Bug #58241
Please exclude make_binary_distribution from the distribution

With cmake (5.5 and up), "make package" will do it,
or cpack.
The (generated) "scripts/make_binary_distribution" is just
a wrapper around a "cpack" call,
with path names set at build time.

Similar, "make_win_bin_dist" is not needed any more.

scripts/CMakeLists.txt:
  Cleanup:
  Append a trailing newline when generating "make_binary_distribution"
  (which is just a wrapper around a "cpack" call).
support-files/mysql.spec.sh:
  "make_win_bin_dist" is removed from the sources,
  so its man page is gone,
  and it need not be removed when creating the RPMs.
2011-09-13 12:32:53 +02:00
Jonathan Perkin
741efeedb5 Fix typos in last. 2011-09-12 20:43:36 +02:00
Jonathan Perkin
b82d6043b3 Add support for RHEL6 and OL6. 2011-09-12 14:16:38 +02:00
Daniel Fischer
a526779755 add mysql_plugin man page to spec file 2011-09-08 09:36:06 +02:00
Joerg Bruehe
38bc8cf392 Add the manual page for "mysql_plugin" to the server RPM. 2011-08-30 12:54:00 +02:00
Joerg Bruehe
73312bddb3 Null-upmerge the bug#37165 fix: No functional change,
but some notation improvement is applicable.
2011-08-19 19:26:27 +02:00
Joerg Bruehe
e8f2e3c217 Fix bug#37165 "((Generic rpm)) fail to install on Fedora 9 x86_64"
On Fedora, certain accesses to "/var/lib/mysql/HOSTNAME.err" were blocked
by SELinux policy, this made the server start fail with the message
    Manager of pid-file quit without updating file
Calling "/sbin/restorecon -R /var/lib/mysql" fixes this.
2011-08-19 18:48:14 +02:00
Alexander Nozdrin
6e5bbf5138 Cherry-picking WL#5710 from mysql-5.5 to mysql-5.5.16-release.
Original revision id:
# revno: 3489 [merge]
# revision-id: tatjana.nuernberg@oracle.com-20110811120945-c6x9a5d2du8s9oj2
# parent: tatjana.nuernberg@oracle.com-20110811112736-so8r813hs8dmf7nr
# parent: chuck.bell@oracle.com-20110810183949-2s9uxcuoux2p668e
# committer: Tatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com>
# branch nick: 55-9
# timestamp: Thu 2011-08-11 13:09:45 +0100
# message:
#   auto-merge

This merge revision also has a patch for Bug 12664445, which has been also
taken to 5.5.16.
2011-08-15 18:29:38 +04:00
Daniel Fischer
888b8793a2 Source plugin library files list from cmake-generated file in RPM builds 2011-08-15 12:10:08 +02:00
Chuck Bell
e08126089b WL#5710 : enable and disable plugins
Merge with main prior to pushing to mysql-5.5.
2011-08-10 14:39:49 -04:00
unknown
34a71efca7 fixing BUG 11759958 - 52319: MYSQL RHEL5 RPMS DO NOT REQUIRE NET-TOOLS 2011-08-06 01:51:25 +02:00
Chuck Bell
6c4da66d83 WL#5710: enable and disable plugins
This patch corrects a problem found in pushbuild with the stat()
method on some platforms. The code was changed to use my_stat()
instead.

Also adds mysql_plugin to the mysql.spec.sh file for packaging.
2011-07-25 15:30:24 -04:00