1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-04 01:23:45 +03:00
Commit Graph

571 Commits

Author SHA1 Message Date
fc98c60f51 Merge 5.1 => 5.5 2013-10-30 04:12:24 +01:00
d73f2a8224 Removed non gpl file docs/mysql.info from community packages 2013-10-30 04:07:07 +01:00
07ffbdc2c9 Reverted the changes to spec file to ignore mysqld_safe.pid file, updated the logic to get the correct count of PID files 2013-09-09 20:07:12 +02:00
543b6e0224 Reverted the changes to spec file, updated the logic to get the correct count of PID files 2013-09-09 19:49:44 +02:00
199a98ee28 Committing patch from venkata.sidagam@oracle.com for Bug#16776528 2013-09-09 18:58:08 +02:00
0daae54fb5 Fixing sles11 build that /usr/lib/mysql/plugin is not owned by a package 2013-09-03 18:37:46 +02:00
9e49de009c Fix to ignore mysqld_safe.pid 2013-08-30 17:14:46 +02:00
bb82aecef9 Fix to ignore mysqld_safe.pid 2013-08-30 15:02:16 +02:00
1f6434ba3d Corrected the PID_FILE_PATT manipulation 2013-08-30 06:33:02 +02:00
095b6645b0 Fix for Bug#17377159, ignore mysqld_safe.pid file created by mysqld_safe script 2013-08-29 14:42:55 +02:00
e2c77ad949 Fix for Bug#17377159, ignore mysqld_safe.pid file created by mysqld_safe script 2013-08-29 14:33:28 +02:00
6613734b1a Corrected Date in the changelog 2013-08-22 16:51:30 +02:00
9d9e54d380 Removed bugnumber from the changelog and updated description 2013-08-22 14:58:13 +02:00
fcc0011438 Reverted Release version 2013-08-20 12:21:35 +02:00
1e904e36e5 dummy commit 2013-08-16 17:48:54 +02:00
f1e23d73d5 Added fix Provides for Bug#17211588 2013-08-16 16:41:20 +02:00
66aad1a94d Updated spec file for Bug#17080138 2013-07-10 19:14:41 +02:00
1cfa4eb045 Updated copyright year in the spec file 2013-06-27 10:08:30 +02:00
ddeab5e495 - Spec file cleanup for 5.5.33 release to resolve rpm dependencies bugs
Bug16785036 - RPM REQUIRES: MISSING PACKAGES ON RHEL 6 (AND PROBABLY 5)
Bug 16878042 - CANNOT KEEP SEVERAL MAJOR VERSIONS OF MYSQL IN THE SAME YUM REPOSITORY
2013-06-27 09:18:48 +02:00
1e949a53bb Cleaned up spec file for 5.5.33 release 2013-06-26 11:43:44 +02:00
ded5a79dab Updated spec file to ignore upgrade error message 2013-05-07 09:14:51 +02:00
5a781ff2ad Reverted MySQL Release Engineering mail address 2013-03-25 13:50:21 +01:00
061f3d1b53 Added SuSE RPM Build fix 2013-03-21 14:59:57 +01:00
0fd024f6ee Added fix for Bug#16445097 2013-03-06 17:05:32 +01:00
f3abc36db6 Added fix for Bug#16445097 2013-03-06 16:33:26 +01:00
673c68a925 Updated Code for Bug#16235828 and Bug#16298542 2013-03-05 16:34:14 +01:00
8ac9ee0801 Updated Code for Bug#16235828 2013-03-05 16:16:34 +01:00
429e589256 Updated mysql.spec.sh file for br16298542 2013-03-01 14:11:24 +01:00
759519034e Updated release number in mysql.spec.sh file for br16298542 2013-02-28 14:49:54 +01:00
5c22652bab Updated mysql.spec.sh file for br16298542 2013-02-28 14:36:00 +01:00
053d7e775c Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
31c06437c9 Removed Conflicts: mysql-libs mysql-libs-advanced from spec file 2013-01-16 08:09:26 +01:00
813b661d00 Spec file change to work around cast ulonglong -> int. 2012-09-11 12:47:32 +02:00
11fc7b64d3 Spec file: Declare conflicts with the ULN RPMs. 2012-07-26 21:20:15 +02:00
aa36e25cb2 Spec file: transfer the 'runselftest' macro to a work tree. 2012-07-26 20:41:45 +02:00
d06273ef43 Spec file polishing: Handle 'MySQL-*' and 'mysql-*', part 1 2012-07-26 20:24:51 +02:00
dbfe6a6d42 Merge 5.5.27 into the tree for ULN RPMs. 2012-07-25 22:22:34 +02:00
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
2c64e17361 Protect traditional RPMs that "SPECIFIC-ULN/" will not break their packaging. 2012-06-11 22:07:24 +02:00
d74c3df6ce Backport SuSE 11 fix to RPM spec file 2012-06-08 16:31:03 +02:00
8082c70b10 Merge the changes of 5.5.17 back into main 5.5 2011-10-19 13:39:43 +02:00
ab8326f546 Merge to main. 2011-10-04 17:17:17 +02:00
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
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
deba087af0 Fix the spec file: Files must not be mentioned twice in a "%files" list. 2011-09-28 11:43:16 +02:00
7450044eb7 merge from 5.5.16 2011-09-21 12:40:41 +02:00
1f9fe1b4d5 Update email address for Release Engineering. 2011-09-20 17:47:53 +02:00
3ad46f8111 Don't use macro names in changelog comments. 2011-09-19 21:16:01 +02:00
e715b761ad Complete support for OL/RH6. 2011-09-13 16:18:57 +02:00
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