Commit graph

500 commits

Author SHA1 Message Date
Alexander Nozdrin
07a07e29bb - Fix changelog (remove duplicated entry)
- Mark main.gis experimental
2010-11-24 18:55:23 +03:00
Alexander Nozdrin
6f1c49321f Merge from mysql-5.5-bugteam. 2010-11-24 13:43:20 +03:00
Alexander Nozdrin
9c7629fda3 Merge from mysql-5.1-bugteam. 2010-11-24 13:23:44 +03:00
Alexander Nozdrin
1e43b94c70 Merge from mysql-5.0-bugteam. 2010-11-24 13:07:37 +03:00
Alexander Nozdrin
85f855e0ed 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
8cc51eb1c2 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
bd557f04f6 Manual merge from mysql-5.5-bugteam. 2010-11-22 14:47:28 +03:00
Davi Arnaut
8664de2230 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.

VERSION:
  Add top-level version file.
cmake/mysql_version.cmake:
  Get version information from the top-level VERSION file.
  Do not cache the version components (MAJOR_VERSION, etc).
  Add MYSQL_RPM_VERSION as a replacement for MYSQL_U_SCORE_VERSION.
2010-11-20 12:47:50 -02:00
Ramil Kalimullin
3bae49d64c Manual-merge from 5.5-bugfixing. 2010-11-18 15:01:50 +03:00
Joerg Bruehe
b4d5039e71 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
Joerg Bruehe
682f27266b 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
Georgi Kodinov
c3b64853e9 fixed the .spec file to package the new QA plugins. 2010-11-01 15:10:02 +02:00
Georgi Kodinov
72f61e31d7 Fixed the .spec file to include the new wl1054 shared objects 2010-10-06 16:23:46 +03:00
Joerg Bruehe
48bc7c028d Merge the fix for bug#55015. 2010-08-17 15:54:18 +02:00
Joerg Bruehe
5d458c6fdb 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
Alexander Nozdrin
07702953a2 Auto-merge from mysql-trunk-stage. 2010-06-21 17:08:16 +04:00
Daniel Fischer
073943cd7d merge 2010-06-18 17:04:15 +02:00
Joerg Bruehe
766f6a76ca Fix bug#27072: RPM autostarts the server
This is the fix for 5.5, where the behaviour on both installation
and upgrade is changed:
On installation, we do not start the server, to allow automated
installs (which happen in some indeterminate machine status).
If the server was stopped when the upgrade begins, we assume the
administrator is taking manual action, so we do not start the (new)
server at the end of the upgrade.
We still install the start/stop script, so it will be started on reboot.


support-files/mysql.spec.sh:
  In the "pre" section of the spec file, check the server status, and write
  the result to a file.
  In the "post" section, evaluate the status file, and start the server if
  it was running during status analysis.
  In 5.5, we do *not* start the server if there is no status file (which will happen on first installation, when there is no data directory yet).
2010-06-15 22:46:29 +02:00
Joerg Bruehe
b3eac87c3c Fix bug#27072: RPM autostarts the server
This is the fix for 5.1, where only the behaviour on upgrade is changed:
If the server was stopped when the upgrade begins, we assume the
administrator is taking manual action, so we do not start the (new)
server at the end of the upgrade.
We still install the start/stop script, so it will be started on reboot.


support-files/mysql.spec.sh:
  In the "pre" section of the spec file, check the server status, and write
  the result to a file.
  In the "post" section, evaluate the status file, and start the server if
  it was running during status analysis.
  In 5.1, we start the server if there is no status file (which will happen
  on first installation, when there is no data directory yet).
2010-06-15 22:27:48 +02:00
Jonathan Perkin
e01117534c Revert Oracle Enterprise Linux changes. 2010-06-02 11:38:13 +01:00
Jonathan Perkin
99b5ca1f20 Add SELinux checks from distribution-specific spec file, missed in
previous.

Convert some shell bits to standard 2-space indent, 80 columns, etc.
2010-06-01 10:24:38 +01:00
Jonathan Perkin
ba36de4f2e Differentiate between Oracle Enterprise Linux and Red Hat Enterprise Linux. 2010-05-28 13:56:57 +01:00
Jonathan Perkin
3c5aef7dc7 Split OEL/RHEL 2010-05-27 12:51:26 +02:00
Jonathan Perkin
f9101d98b7 Revert back to new CMake names for audit_null/daemon_example plugins. 2010-05-12 16:32:31 +01:00
Jonathan Perkin
05f682f653 Pointless commit to avoid unnecessary diffs and to trigger a new build 2010-05-12 14:12:20 +02:00
Jonathan Perkin
240176bfa3 Large number of changes to support building RPMs using CMake, along
with other merges from the old distribution-specific spec file.

 - update copyright notices

 - remove __os_install_post override, it was only necessary as a
   hack to build debuginfo packages - now that we no longer make
   them we can revert to the distribution macro which likely has
   other useful bits we might want

 - remove _unpackaged_files_terminate_build override, we want to
   know of any orphaned files

 - include native distribution support

 - no longer build separate debuginfo RPMs, instead just include
   debug/symbols in all binaries, which is more useful for support

 - include support for building commercial RPMs, requires a
   commercial source tree

 - remove cluster RPM support, we don't build them from this
   source tree

 - use CMake for building, and update package lists to match the
   new install layout/files.  Remove any options which were only
   useful for automake builds (e.g. yassl/zlib).

 - other minor cleanups
2010-05-12 12:46:23 +01:00
Jonathan Perkin
27a89ae355 Update comment 2010-05-05 23:03:38 +02:00
Jonathan Perkin
a8ab64650f Try an ia64 fix 2010-05-05 19:27:21 +02:00
Kent Boortz
d4cc32c6f8 Output the config.h defines to stdout 2010-05-05 17:50:22 +02:00
Jonathan Perkin
d3915204d5 Add all plugins 2010-05-05 15:23:34 +02:00
Jonathan Perkin
44a05c19f0 Ok, let's try, one more time 2010-05-04 15:41:42 +02:00
Jonathan Perkin
3e13ce61ba fix 2010-05-04 14:03:10 +02:00
Jonathan Perkin
81fe0594fd Put back SELinux files 2010-05-04 12:34:00 +02:00
Jonathan Perkin
2087a2e8d7 Rebrand Red Hat as 'Enterprise Linux' 2010-04-29 16:37:28 +02:00
Jonathan Perkin
4e149a5982 Revert the RPM naming change, we know it works, and can apply it
to a later release.
2010-04-28 17:55:45 +02:00
Jonathan Perkin
66e6481408 Try to fix the manual again, and a kent change 2010-04-28 11:52:26 +02:00
Jonathan Perkin
3aa03e138a Try to exclude make_win_bin_dist.1
Build full debug release in RPMs so we can include bits we need.
2010-04-27 17:10:06 +02:00
Jonathan Perkin
4c478738c7 Avoid __os_install_post RHEL5 bug by redefining __strip. 2010-04-27 12:09:55 +02:00
Jonathan Perkin
1acfd787a7 Try removing debuginfo altogether. 2010-04-26 19:25:58 +02:00
Jonathan Perkin
20e7f2d434 Try new RPM layout.
Fix libmysqlclient_r symlinks.
2010-04-26 18:06:59 +02:00
Joerg Bruehe
4b68b2d289 Merge the changes of the 5.5.3-m3 release build
back into the development branches.
2010-04-18 15:32:05 +02:00
Jonathan Perkin
05f55615ff cleanup 2010-04-14 17:33:01 +02:00
Jonathan Perkin
0efd7b4810 remove bogus docs in client RPM 2010-04-14 16:00:28 +02:00
Jonathan Perkin
43e4273750 fixup license and tidy distro detection 2010-04-14 14:21:13 +02:00
Jonathan Perkin
c75e130f84 fix depends 2010-04-14 08:46:40 +02:00
Jonathan Perkin
65a826a6fc hack 2010-04-13 23:35:12 +02:00
Jonathan Perkin
ea1da65e25 Debug and fix. 2010-04-13 22:55:14 +02:00
Jonathan Perkin
45d63b65e0 redo optional files 2010-04-13 20:53:44 +02:00
Jonathan Perkin
75e8c38144 try to fix 2010-04-13 19:03:02 +02:00
Jonathan Perkin
f6a741f454 fix fileexists() 2010-04-13 17:02:29 +02:00