1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Commit Graph

585 Commits

Author SHA1 Message Date
f8e1d43159 Merge 5.5.27 into the tree for ULN RPMs. 2012-07-25 22:22:34 +02:00
e28785eb2f 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
350eef0e1d Protect traditional RPMs that "SPECIFIC-ULN/" will not break their packaging. 2012-06-11 22:07:24 +02:00
4f106324c1 Backport SuSE 11 fix to RPM spec file 2012-06-08 16:31:03 +02:00
1e93ac62bf Merge the changes of 5.5.17 back into main 5.5 2011-10-19 13:39:43 +02:00
eb488a7aeb Merge to main. 2011-10-04 17:17:17 +02:00
332fa530e3 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
961f0fd0fc 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
e9ebced50a Fix the spec file: Files must not be mentioned twice in a "%files" list. 2011-09-28 11:43:16 +02:00
fe1b205d02 merge from 5.5.16 2011-09-21 12:40:41 +02:00
2e7098561b Update email address for Release Engineering. 2011-09-20 17:47:53 +02:00
0595b00aa9 Don't use macro names in changelog comments. 2011-09-19 21:16:01 +02:00
3d09f32381 Complete support for OL/RH6. 2011-09-13 16:18:57 +02:00
07d898ab61 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.
2011-09-13 12:32:53 +02:00
d9d8074000 Fix typos in last. 2011-09-12 20:43:36 +02:00
7e6cc0cd17 Add support for RHEL6 and OL6. 2011-09-12 14:16:38 +02:00
1830d76adf add mysql_plugin man page to spec file 2011-09-08 09:36:06 +02:00
fc1ff23c6e Add the manual page for "mysql_plugin" to the server RPM. 2011-08-30 12:54:00 +02:00
88609db5d8 Null-upmerge the bug#37165 fix: No functional change,
but some notation improvement is applicable.
2011-08-19 19:26:27 +02:00
b2648c9036 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
11c20be47e 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
c8c3e9bd9b Source plugin library files list from cmake-generated file in RPM builds 2011-08-15 12:10:08 +02:00
4869635b88 WL#5710 : enable and disable plugins
Merge with main prior to pushing to mysql-5.5.
2011-08-10 14:39:49 -04:00
6c821acddd fixing BUG 11759958 - 52319: MYSQL RHEL5 RPMS DO NOT REQUIRE NET-TOOLS 2011-08-06 01:51:25 +02:00
127d4f2e13 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
c8519150b4 Bug #12561297: Added the MySQL embedded binary 2011-07-22 10:34:45 +02:00
61eb98d5bf Upmerge the 45415 fix from 5.1 to 5.5 2011-07-07 17:27:44 +02:00
535855eb75 Fix bug#45415: "rpm upgrade recreates test database"
Let the creation of the "test" database happen only during a new
installation, not in an RPM upgrade.
2011-07-07 17:22:24 +02:00
1400d7a2cc Updated/added copyright headers 2011-06-30 17:37:13 +02:00
9da00ebec9 Updated/added copyright headers 2011-06-30 17:46:53 +02:00
0dab33608f Merge bug fix 42969 into main 5.5 branch. 2011-02-14 15:53:51 +01:00
fd21e07d6b Fix bug#42969 Please add a MANIFEST to each build
With this change, there will be new files "INFO_SRC"
and "INFO_BIN", which describe the source and the
binaries.
They will be contained in all packages:
- in "tar.gz" and derived packages, in "docs/",
- in RPMs, in "/usr/share/doc/packages/MySQL-server".

"INFO_SRC" is also part of a source tarball.
It gives the version as exact as possible, preferably
by calling "bzr version-info" on the source tree.
If that is not possible, it just contains the three
level version number.

"INFO_BIN" contains some info when and where the
binaries were built, the options given to the compiler,
and the flags controlling the included features.

The tests (test "mysql" in the main suite) are extended
to verify the existence of both "INFO_SRC" and "INFO_BIN",
as well as some of the expected contents.
2011-02-11 15:55:25 +01:00
796672c44b Fix Bug #56581 RPM scripts use hardcoded datadir location
When fixing the 27072 bug, the shell snippets running before/after
a RPM upgrade got expanded to look at files in the data directory
and at the PID file.
In this expansion, the standard locations were used.

There are users who configure their installations to use non-standard
locations for the data directory, the PID file, and other objects.
For these users, the fix of 27072 did not work.
As a result, the fact that a server was running at upgrade start was
not noticed, and the new server was not started after the upgrade.

With this patch, the shell snippets now try to get these locations
from "my_print_defaults" before falling back to the defaults.
Now, the fact that the old server is running is again noticed (even
with non-standard locations), and the new server is started.

Also, the upgrade log is written to the correct data directory.
2011-02-03 18:16:22 +01:00
653b6216b8 Upmerge the fix for bug#56581 from 5.1 to 5.5. 2011-02-09 14:31:30 +01:00
fddb1f1b13 - Added/updated copyright headers
- Removed files specific to compiling on OS/2
- Removed files specific to SCO Unix packaging
- Removed "libmysqld/copyright", text is included in documentation
- Removed LaTeX headers for NDB Doxygen documentation
- Removed obsolete NDB files
- Removed "mkisofs" binaries
- Removed the "cvs2cl.pl" script
- Changed a few GPL texts to use "program" instead of "library"
2010-12-28 19:57:23 +01:00
a3d073d2cf - Fix changelog (remove duplicated entry)
- Mark main.gis experimental
2010-11-24 18:55:23 +03:00
56f3f2245e Merge from mysql-5.5-bugteam. 2010-11-24 13:43:20 +03:00
7a3636c1af Merge from mysql-5.1-bugteam. 2010-11-24 13:23:44 +03:00
d7a4672cf7 Merge from mysql-5.0-bugteam. 2010-11-24 13:07:37 +03:00
174a6962da A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- remove all
EXCEPTIONS-CLIENT from all the places.
2010-11-24 12:53:39 +03:00
7427df4a80 EXCEPTIONS-CLIENT was removed, update the RPM spec file.
While here, support supplying a '-j' flag to make(1) from
the environment.
2010-11-23 15:24:14 +00:00
cc5263b223 Manual merge from mysql-5.5-bugteam. 2010-11-22 14:47:28 +03:00
f6deb00a56 WL#5665: Removal of the autotools-based build system
The autotools-based build system has been superseded and
is being removed in order to ease the maintenance burden on
developers tweaking and maintaining the build system.

In order to support tools that need to extract the server
version, a new file that (only) contains the server version,
called VERSION, is introduced. The file contents are human
and machine-readable. The format is:

MYSQL_VERSION_MAJOR=5
MYSQL_VERSION_MINOR=5
MYSQL_VERSION_PATCH=8
MYSQL_VERSION_EXTRA=-rc

The CMake based version extraction in cmake/mysql_version.cmake
is changed to extract the version from this file. The configure
to CMake wrapper is retained for backwards compatibility and to
support the BUILD/ scripts. Also, a new a makefile target
show-dist-name that prints the server version is introduced.
2010-11-20 12:47:50 -02:00
aab0c52976 Manual-merge from 5.5-bugfixing. 2010-11-18 15:01:50 +03:00
6c6ad182a6 Patch for bug#57596
MySQL-shared RPM no longer provides mysql-shared

The spec file is changed to explicitly "provide" "mysql-shared"
by the "shared" sub-RPM.
2010-11-12 22:22:55 +01:00
3a7d79d5a5 Add the new "qa_auth_*" plugin files to the RPM spec file,
otherwise RPM builds will fail due to "unpackaged file".
2010-11-02 19:54:58 +01:00
a10e8359fa fixed the .spec file to package the new QA plugins. 2010-11-01 15:10:02 +02:00
7e61f64015 Fixed the .spec file to include the new wl1054 shared objects 2010-10-06 16:23:46 +03:00
49652079e0 Merge the fix for bug#55015. 2010-08-17 15:54:18 +02:00
20f9faea92 Fix Bug#55015
"MySQL server is not restarted properly after RPM upgrade"

The problem is that with the general spec file cleanup and
alignment we also did a name change, dropping the "-community"
part from the package file name.

As a result of this, RPM (some versions of it) will report
file conflicts, because it considers this name difference
to imply different packages.
To avoid this, the spec file explicitly "obsoletes" the old
packages (with "-community" in the file name).

Now, RPM will first install these packages and the remove the
old ones, and part of that removal is running the "%preun"
section which stops the server and uninstalls the service
(removes the symlinks to "/etc/init.d/mysql" from the run
level directories).
This stop/uninstall will affect the new server!

The fix is to define a "%triggerpostun" in this spec file
which will watch for removal of the "-community" server.
If this is done (as part of this install/upgrade), the
trigger code will re-install the service and restart the
server process.

In addition, the "sleep" calls after starting the server
have been cleaned up: Rather than doing 2* "sleep 2",
it is now 1 "sleep 5".
2010-08-11 22:52:23 +02:00