Commit graph

924 commits

Author SHA1 Message Date
Bjorn Munch
b80c6a2941 Merged some fixes from 7.2 release branches 2012-03-22 16:16:11 +01:00
Joerg Bruehe
1e93ac62bf Merge the changes of 5.5.17 back into main 5.5 2011-10-19 13:39:43 +02:00
Joerg Bruehe
eb488a7aeb Merge to main. 2011-10-04 17:17:17 +02:00
Joerg Bruehe
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
Joerg Bruehe
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
Joerg Bruehe
e9ebced50a Fix the spec file: Files must not be mentioned twice in a "%files" list. 2011-09-28 11:43:16 +02:00
Daniel Fischer
fe1b205d02 merge from 5.5.16 2011-09-21 12:40:41 +02:00
Jonathan Perkin
2e7098561b Update email address for Release Engineering. 2011-09-20 17:47:53 +02:00
Jonathan Perkin
0595b00aa9 Don't use macro names in changelog comments. 2011-09-19 21:16:01 +02:00
Jonathan Perkin
3d09f32381 Complete support for OL/RH6. 2011-09-13 16:18:57 +02:00
Joerg Bruehe
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
Jonathan Perkin
d9d8074000 Fix typos in last. 2011-09-12 20:43:36 +02:00
Jonathan Perkin
7e6cc0cd17 Add support for RHEL6 and OL6. 2011-09-12 14:16:38 +02:00
Daniel Fischer
1830d76adf add mysql_plugin man page to spec file 2011-09-08 09:36:06 +02:00
Joerg Bruehe
fc1ff23c6e Add the manual page for "mysql_plugin" to the server RPM. 2011-08-30 12:54:00 +02:00
Joerg Bruehe
88609db5d8 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
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
Alexander Nozdrin
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
Daniel Fischer
c8c3e9bd9b Source plugin library files list from cmake-generated file in RPM builds 2011-08-15 12:10:08 +02:00
Chuck Bell
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
hery.ramilison@oracle.com
6c821acddd fixing BUG 11759958 - 52319: MYSQL RHEL5 RPMS DO NOT REQUIRE NET-TOOLS 2011-08-06 01:51:25 +02:00
Chuck Bell
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
Sunanda Menon
c8519150b4 Bug #12561297: Added the MySQL embedded binary 2011-07-22 10:34:45 +02:00
Joerg Bruehe
61eb98d5bf Upmerge the 45415 fix from 5.1 to 5.5 2011-07-07 17:27:44 +02:00
Joerg Bruehe
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
Kent Boortz
1400d7a2cc Updated/added copyright headers 2011-06-30 17:37:13 +02:00
Kent Boortz
e5ce023f57 Updated/added copyright headers 2011-06-30 17:31:31 +02:00
Kent Boortz
9da00ebec9 Updated/added copyright headers 2011-06-30 17:46:53 +02:00
Joerg Bruehe
0dab33608f Merge bug fix 42969 into main 5.5 branch. 2011-02-14 15:53:51 +01:00
Joerg Bruehe
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
Joerg Bruehe
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
Joerg Bruehe
653b6216b8 Upmerge the fix for bug#56581 from 5.1 to 5.5. 2011-02-09 14:31:30 +01:00
Kent Boortz
94cde4c951 Merge 2010-12-29 01:26:31 +01:00
Kent Boortz
920d185fd8 Merge 2010-12-29 00:47:05 +01:00
Kent Boortz
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
Jonathan Perkin
2b39e065d7 bug#51264: MySQL.prefPane fails to run
@prefix@ was erroneously set to '.' with the STANDALONE install
layout, when it should instead be set to CMAKE_INSTALL_PREFIX,
this was likely accidentally copied from scripts/CMakeLists.txt
which has similar handling specifically for mysql_install_db.sh

mysql.server init script can now find the install, assuming the
defaults have been chosen.
2010-12-17 23:03:23 +00:00
Alexander Nozdrin
a3d073d2cf - Fix changelog (remove duplicated entry)
- Mark main.gis experimental
2010-11-24 18:55:23 +03:00
Alexander Nozdrin
56f3f2245e Merge from mysql-5.5-bugteam. 2010-11-24 13:43:20 +03:00
Alexander Nozdrin
7a3636c1af Merge from mysql-5.1-bugteam. 2010-11-24 13:23:44 +03:00
Alexander Nozdrin
d7a4672cf7 Merge from mysql-5.0-bugteam. 2010-11-24 13:07:37 +03:00
Alexander Nozdrin
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
Jonathan Perkin
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
Ramil Kalimullin
1b897ad1d8 Auto-merge with mysql-5.5-bugteam. 2010-11-23 16:44:26 +03:00
Ramil Kalimullin
cc5263b223 Manual merge from mysql-5.5-bugteam. 2010-11-22 14:47:28 +03:00
Davi Arnaut
5324d10fe7 WL#5665: Removal of the autotools-based build system
Remove some more leftovers from the initial removal:

o Update relevant mentions of configure.in throughout
the source code.

o Remove win/configure.js, which at this point just
duplicates logic already present in CMake based build
system.

o Remove support files which relied on the autotools
build system. In any case, MySQL is no longer officially
supported on SCO.

o Remove files which are no longer part of the build.
2010-11-20 20:56:09 -02:00
Davi Arnaut
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
Georgi Kodinov
589428b625 Bug #50021: Windows standard configuration files are showing Linux
options/settings
 
 1. Changed the default value for socket on Windows to the windows
 default
 2. Removed hard-coded trailing slashes from innodb_data_home_dir
 and innodb_log_group_name_dir.
 3. Added extra backslashes to the innodb directory example
 4. Made the tempdir platform "dependent"
 5. Fixed the comments in the .ini files
 6. Removed the tmpdir from the templates and the scripts
2010-11-18 18:02:37 +02:00
Ramil Kalimullin
aab0c52976 Manual-merge from 5.5-bugfixing. 2010-11-18 15:01:50 +03:00
Georgi Kodinov
5dc48be160 merge 2010-11-19 15:56:08 +02:00
Vladislav Vaintroub
616f90b372 merge 2010-11-13 23:17:22 +01:00