Commit graph

862 commits

Author SHA1 Message Date
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
Daniel Fischer
458d0e7ae0 merge 2010-05-27 16:11:13 +02:00
Jonathan Perkin
3c5aef7dc7 Split OEL/RHEL 2010-05-27 12:51:26 +02:00
Alexander Nozdrin
759d5bc535 Another incarnation of the patch for Bug#30708
(make relies GNU extentions). The patch was partially
backport from 6.0.

Original comment:
bug#30708: make relies GNU extensions.  Now that we no longer use
BitKeeper we can safely remove the SCCS handling with no loss of
functionality.
2010-05-19 17:00:23 +04: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
31f5867fc3 Remove comments. 2010-05-12 16:25:53 +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
ce2aabb712 Changes to build using CMake according to existing release packages:
- Update/fix file layouts for each package type, add new types for
   native package formats including deb, rpm and svr4.

 - Build all plugins, including debug versions

 - Update compiler flags to match current release

 - Add missing @VAR@ expansions

 - Install correct mysqclient library symlinks

 - Fix icc/ia64 builds

 - Fix install of libmysqld-debug

 - Don't include mysql_embedded

 - Remove unpackaged manual pages to avoid missing files warnings

 - Don't install mtr's test suite
2010-05-12 12:51:23 +01: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
Daniel Fischer
463a60ece6 merge 2010-04-30 13:36:57 +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
Daniel Fischer
b83e1c8686 Merge 2010-04-21 14:58:09 +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
Jonathan Perkin
4127d1a536 fixup product suffix 2010-04-13 15:31:40 +02:00
Jonathan Perkin
499411e192 fix 2010-04-13 15:03:54 +02:00
Jonathan Perkin
aa992903b9 fixes 2010-04-13 14:13:02 +02:00
Jonathan Perkin
f94c34ce3d fixes 2010-04-13 08:27:15 +02:00
Jonathan Perkin
b5444898e8 Try something different 2010-04-12 23:23:46 +02:00
Jonathan Perkin
2386422383 Dynamic distribution support. 2010-04-12 22:23:25 +02:00
Jonathan Perkin
05ab4c77e2 trigger rebuild 2010-04-12 18:41:18 +02:00
Jonathan Perkin
cce0bd8854 product tags 2010-04-12 18:13:10 +02:00
Jonathan Perkin
7901b9e9e5 More fixes/cleanups. 2010-04-12 16:20:10 +02:00