Commit graph

303 commits

Author SHA1 Message Date
unknown
92ad3d5bd7 mysql.spec.sh:
Disable the simplistic auto dependency scan for test/bench (bug#20078)


support-files/mysql.spec.sh:
  Disable the simplistic auto dependency scan for test/bench (bug#20078)
2006-06-23 00:37:31 +02:00
unknown
41d2bb9eab Merge mysql.com:/M41/bug18810-4.1 into mysql.com:/M41/mysql-4.1 2006-06-14 18:28:49 +02:00
unknown
f10fa9711b support-files/mysql.server.sh : Fix the startup sequence. bug#18810 + bug#20118
support-files/mysql.server.sh:
  Ensure that some necessary / useful system services have been started already,
  when the MySQL server is started. 
  This fixes bug#18810 and bug#20118
2006-06-14 16:54:54 +02:00
unknown
ddd9fbacc6 Merge
support-files/mysql.spec.sh:
  SCCS merged
2006-05-20 23:36:17 +02:00
unknown
65fcdee56e mysql.spec.sh:
Always compile position independent


support-files/mysql.spec.sh:
  Always compile position independent
2006-05-20 22:47:20 +02:00
unknown
9f46b3b53e Merge jonas@perch:src/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


support-files/mysql.spec.sh:
  Auto merged
2006-05-16 11:31:10 +02:00
unknown
bc1815aa3d mysql.spec.sh:
Compile in all character sets in Max (bug#14918)


support-files/mysql.spec.sh:
  Compile in all character sets in Max (bug#14918)
2006-05-10 21:53:01 +02:00
unknown
2dce78e8f6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1


support-files/mysql.spec.sh:
  Auto merged
2006-05-08 07:48:08 +02:00
unknown
38b1f7c7c3 mysql.spec.sh:
Use "./libtool --mode=execute" to find real path to executables


support-files/mysql.spec.sh:
  Use "./libtool --mode=execute" to find real path to executables
2006-05-01 19:48:31 +02:00
unknown
9cffcab4e6 mysql.spec.sh:
Backport of changes in 5.0 (bug#18294)


support-files/mysql.spec.sh:
  Backport of changes in 5.0 (bug#18294)
2006-04-29 01:28:04 +02:00
unknown
4191b8a39f Add ndb_config to rpm spec 2006-04-26 14:54:20 +02:00
unknown
2a4e2e8da2 Makefile.am:
Let "make install" install mysql-test-run.pl
mysql.spec.sh:
  Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)


support-files/mysql.spec.sh:
  Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)
mysql-test/Makefile.am:
  Let "make install" install mysql-test-run.pl
2006-04-01 05:44:10 +02:00
unknown
b4d38aa0c6 support-files/mysql.spec.sh : Use "-i" on "make test-force", essential for log file evaluation.
support-files/mysql.spec.sh:
  Use "-i" on "make test-force";
  this will prevent "make" from writing "***" which in turn was treated as a _build_ error
  by the log evaluation tool, causing it not to list the failing tests.
2006-02-10 17:40:04 +01:00
unknown
966ab524a3 Not all RPM builds can use the bundled zlib, due to dependency and link conflicts. Solve this.
(Backport of an identical change from 5.0)


support-files/mysql.spec.sh:
  We cannot always use the bundled zlib, as this conflicts with the "shared" build of the "max" binary.
  The fully static RPM build on "build" also does not work with the bundled zlib.
  With this change, we use the bundled zlib for "standard" RPMs (unless fully static, "build")
  and the one already installed on the system for the "max" build which is also labeled "experimental".
  (Backport of an identical change from 5.0)
2005-12-05 17:53:42 +01:00
unknown
ddf89750ea Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-11-23 09:38:12 +01:00
unknown
6a6caf565d support-files/mysql.spec.sh
Fix a possible problem on RPM un-install. bug#15145


support-files/mysql.spec.sh:
  Extend the file existence check for "init.d/mysql" on un-install
  to also guard the call to "insserv"/"chkconfig".
  bug#15145, br#5369 / 5586, csc#7129
2005-11-22 19:58:58 +01:00
unknown
2e7c367519 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-11-07 13:39:03 +01:00
unknown
0e878d7e54 mysql.spec.sh:
Always use bundled zlib


support-files/mysql.spec.sh:
  Always use bundled zlib
2005-11-05 01:44:35 +01:00
unknown
b0701a5c3b Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck


Makefile.am:
  Auto merged
configure.in:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
2005-11-04 01:15:35 +01:00
unknown
fc0769619f Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/data0/mysqldev/lenz/mysql-4.1
2005-11-01 17:46:00 +01:00
unknown
a6aff9ecf9 Merge mysql.com:/home/jimw/my/mysql-4.1-13811
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-28 18:43:52 -07:00
unknown
76714fe6de - fixed RPM spec file list after merge, removed dupes
support-files/mysql.spec.sh:
   - fixed file list after merge, removed dupes
2005-10-28 10:46:07 +02:00
unknown
62359c2dd0 Merge mysql.com:/data0/mysqldev/lenz/mysql-4.0
into mysql.com:/data0/mysqldev/lenz/mysql-4.1


netware/BUILD/compile-linux-tools:
  Auto merged
2005-10-27 18:34:20 +02:00
unknown
ac22cdc577 - cleanup: removed the empty NEW-RPMS directory and all references
- cleanup: removed obsolete support-files/MacOSX/make_mysql_pkg.pl
   script (we now use Do-pkg for building OS X packages)


BitKeeper/deleted/.del-.cvsignore~4c7a1f88a5a62a24:
  Delete: NEW-RPMS/.cvsignore
BitKeeper/deleted/.del-make_mysql_pkg.pl~caac82eb901cc206:
  Delete: support-files/MacOSX/make_mysql_pkg.pl
netware/BUILD/compile-linux-tools:
   - removed reference to the NEW-RPMS directory
netware/BUILD/compile-netware-END:
   - removed reference to the NEW-RPMS directory
netware/BUILD/compile-netware-src:
   - removed reference to the NEW-RPMS directory
2005-10-27 18:32:14 +02:00
unknown
ae60d9dd7d - after merge fixes
configure.in:
  Auto merged
support-files/mysql.spec.sh:
   - after-merge fix
2005-10-27 16:53:14 +02:00
unknown
0ffe070cee - Removed obsolete and outdated man page files from the man
directory - these files are now maintained in the mysqldoc
   repository and included in the source distribution during the
   release build. Updated the configure.in script and Makefiles to
   create the man page file list at build time
 - Updated the file list in the RPM spec file to include all currently
   available man pages (this can not be done with wildcards, as
   the man pages are spread across several subpackages. However, RPM
   warns about unpackaged files, so newly added man pages can be 
   spotted)


BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962:
  Delete: man/isamchk.1.in
BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19:
  Delete: man/isamlog.1.in
BitKeeper/deleted/.del-mysql.1.in~3f4dbf65d31fea3a:
  Delete: man/mysql.1.in
BitKeeper/deleted/.del-mysqlaccess.1.in~2adf98feb44a0dbf:
  Delete: man/mysqlaccess.1.in
BitKeeper/deleted/.del-mysqladmin.1.in~81703c6092a1f769:
  Delete: man/mysqladmin.1.in
BitKeeper/deleted/.del-mysqld.1.in~42371a82eb27d87c:
  Delete: man/mysqld.1.in
BitKeeper/deleted/.del-mysqld_multi.1.in~b3f1c5343b8481e6:
  Delete: man/mysqld_multi.1.in
BitKeeper/deleted/.del-mysqld_safe.1.in~6f34e14acc0c5e0b:
  Delete: man/mysqld_safe.1.in
BitKeeper/deleted/.del-mysqldump.1.in~9520980bfec710d5:
  Delete: man/mysqldump.1.in
BitKeeper/deleted/.del-mysql_fix_privilege_tables.1.in~7422405bb0e64325:
  Delete: man/mysql_fix_privilege_tables.1.in
BitKeeper/deleted/.del-mysql_zap.1.in~df5cf8089b50c624:
  Delete: man/mysql_zap.1.in
BitKeeper/deleted/.del-mysqlshow.1.in~81ce953dcc1a282f:
  Delete: man/mysqlshow.1.in
BitKeeper/deleted/.del-perror.1.in~60d1efcbe71bdd9c:
  Delete: man/perror.1.in
BitKeeper/deleted/.del-replace.1.in~e92dc1aea682608c:
  Delete: man/replace.1.in
configure.in:
   - dynamically add man pages included in the man directory
     (the BK tree only contains one dummy file, the directory is
     populated by the Bootstrap script by copying current man pages
     from the documentation server)
man/Makefile.am:
   - removed hard-coded list of man pages, the list is populated
     during the configure stage. When building from BK, only one
     placeholder file exists. For the release builds, this directory
     is populated by the Bootstrap script, which takes man page files
     from the documentation server.
man/mysqlman.1:
   - removed version number
support-files/mysql.spec.sh:
   - adjusted file list: added man pages that are now part of the
     official source distribution (taken from the documentation
     server)
2005-10-27 14:51:58 +02:00
unknown
124b0a594c - added a usermod call in the postinstall section of the RPM spec file
to assign a potential existing mysql user to the correct user group (BUG#12823) 


support-files/mysql.spec.sh:
   - added a usermod call to assign a potential existing mysql user to the
     correct user group (BUG#12823)
2005-10-13 22:10:54 +02:00
unknown
4b51051d99 RPM spec file fixes:
- added a usermod call to assign a potential existing mysql user to the
   correct user group (BUG#12823)
 - Save the perror binary built during Max build so it supports the NDB
   error codes (BUG#13740)
 - added a separate macro "mysqld_group" to be able to define the
   user group of the mysql user seperately, if desired.


support-files/mysql.spec.sh:
   - added a usermod call to assign a potential existing mysql user to the
     correct user group (BUG#12823)
   - Save the perror binary built during Max build so it supports the NDB
     error codes (BUG#13740)
   - added a separate macro "mysqld_group" to be able to define the
     user group of the mysql user seperately, if desired.
2005-10-13 22:01:02 +02:00
unknown
ab90b23a87 Fix typo (thread_cache should be thread_cache_size) in example
configuration files. (Bug #13811)


support-files/my-huge.cnf.sh:
  Fix name of thread_cache_size setting.
support-files/my-innodb-heavy-4G.cnf.sh:
  Fix name of thread_cache_size setting.
support-files/my-large.cnf.sh:
  Fix name of thread_cache_size setting.
2005-10-13 11:05:59 -07:00
unknown
7af7e61604 Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1
support-files/mysql.spec.sh:
  Auto merged
2005-09-29 13:57:41 +02:00
unknown
a44907e7a6 - fixed the removing of the RPM_BUILD_ROOT in the %clean section of the RPM
spec file (the $RBR variable did not get expanded, thus leaving old build
   roots behind)


support-files/mysql.spec.sh:
   - fixed the removing of the RPM_BUILD_ROOT in the %clean section (the
     $RBR variable did not get expanded, thus leaving old build roots behind)
2005-09-29 13:55:54 +02:00
unknown
5409f2554f Makefile.am, configure.in:
Enable "make distcheck" to work


configure.in:
  Enable "make distcheck" to work
Docs/Makefile.am:
  Enable "make distcheck" to work
Makefile.am:
  Enable "make distcheck" to work
client/Makefile.am:
  Enable "make distcheck" to work
cmd-line-utils/libedit/Makefile.am:
  Enable "make distcheck" to work
include/Makefile.am:
  Enable "make distcheck" to work
libmysql/Makefile.am:
  Enable "make distcheck" to work
libmysql_r/Makefile.am:
  Enable "make distcheck" to work
libmysqld/Makefile.am:
  Enable "make distcheck" to work
libmysqld/examples/Makefile.am:
  Enable "make distcheck" to work
mysql-test/Makefile.am:
  Enable "make distcheck" to work
ndb/docs/Makefile.am:
  Enable "make distcheck" to work
netware/Makefile.am:
  Enable "make distcheck" to work
pstack/Makefile.am:
  Enable "make distcheck" to work
scripts/Makefile.am:
  Enable "make distcheck" to work
sql-bench/Makefile.am:
  Enable "make distcheck" to work
sql/Makefile.am:
  Enable "make distcheck" to work
sql/share/Makefile.am:
  Enable "make distcheck" to work
support-files/Makefile.am:
  Enable "make distcheck" to work
2005-09-24 15:51:45 +02:00
unknown
8fc308b873 Ensure that a failing test does not stop testing or the whole RPM build process. 2005-08-22 12:48:01 +02:00
unknown
7df203c8d1 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-merge
2005-08-12 14:44:16 +02:00
unknown
d5ee74c92d Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-merge
2005-08-12 14:44:03 +02:00
unknown
32e29cd7e2 Merge mysql.com:/space/my/mysql-4.0-merge
into mysql.com:/space/my/mysql-4.1-merge


support-files/MacOSX/Makefile.am:
  Auto merged
support-files/Makefile.am:
  Auto merged
support-files/MacOSX/postflight.sh:
  Auto merged
2005-08-12 08:13:02 +02:00
unknown
e11a23a8aa - another comment typo fixed 2005-08-11 21:18:45 +02:00
unknown
ed0d295e3a - Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts to
preflight/postflight instead, so they are run every time a PKG is installed, not only for
  a fresh installation


support-files/MacOSX/Makefile.am:
  - Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts to
    preflight/postflight instead, so they are run every time, not only for a fresh installation
support-files/MacOSX/postflight.sh:
  - Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts to
    preflight/postflight instead, so they are run every time, not only for a fresh installation
support-files/MacOSX/preflight.sh:
  - Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts to
    preflight/postflight instead, so they are run every time, not only for a fresh installation
  - fixed comment typo
2005-08-11 20:23:12 +02:00
unknown
8c5e6af57d - Make sure the Mac OS X support files are built, but not installed by "make install" (the previous
change was too drastic) (BUG#12506)


support-files/Makefile.am:
  - make sure that the RPM spec files are built, but not installed by "make install"
2005-08-11 20:13:12 +02:00
unknown
3986a1f86a - manual merge from 4.0 into 4.1: used the local version of ha_innodb.cc, merged
the rpm spec file changelog


sql/ha_innodb.cc:
  - Merge: used local version (as the fix in 4.0 was a backport)
support-files/mysql.spec.sh:
  - manual merge from 4.0
2005-08-04 12:35:13 +02:00
unknown
21fefc68cb - Fixed the creation of the mysql user group account in the postinstall section of
the MySQL-server RPM spec file (BUG#12348)


support-files/mysql.spec.sh:
  - Fixed the creation of the mysql user group account in the postinstall section
   (BUG#12348)
2005-08-04 12:22:51 +02:00
unknown
5107f1ab50 - fixed enabling the Archive storage engine for the mysqld-max RPM binary
support-files/mysql.spec.sh:
  - fixed enabling the Archive storage engine for the mysqld-max binary
2005-08-04 11:57:30 +02:00
unknown
acfc848e01 - Fixed the Requires: tag for the server RPM (BUG#12233), make sure to list all
required commands/packages so the installation succeeds. Removed the superflouus
  Requires field from the source RPM.
2005-08-02 13:59:02 +02:00
unknown
7b88672dce - build the RPM binaries against the bundled zlib, when static linking is requested
support-files/mysql.spec.sh:
  - build against the bundled zlib, when linking statically
2005-07-27 16:42:13 +02:00
unknown
40a779e9e6 - Manually merged fixes for BUG#12057 (*.plist (Mac OS X) files are installed on Linux)
support-files/MacOSX/Makefile.am:
  Auto merged
scripts/Makefile.am:
  - manual merge
support-files/Makefile.am:
  - manual merge
2005-07-20 21:47:10 +02:00
unknown
d207bd81f8 - don't install the Mac OS X support files when running "make install" -
they're not needed outside of the source tree (BUG#12057)
- Removed some more unneeded files from "make install" along the way


scripts/Makefile.am:
  - don't install the following files with "make install", as they are
    not needed to be installed: 
    make_win_src_distribution, make_win_binary_distribution,
    make_binary_distribution, make_sharedlib_distribution
support-files/MacOSX/Makefile.am:
  - don't install the Mac OS X support files when running "make install" -
    they're not needed outside of the source tree (BUG#12057)
support-files/Makefile.am:
  - don't install the RPM spec files with "make install" - they are not
    needed outside of the source tree
2005-07-20 19:15:48 +02:00
unknown
7dbae42b84 - manual merge of the fix for BUG#10984: create a "mysql" user group and assign the
mysql user account to that group in the server postinstall section of the RPM spec
  file


support-files/mysql.spec.sh:
  - manual merge of the fix for BUG#10984: create a "mysql" user group and assign the 
    mysql user account to that group in the server postinstall section.
2005-07-15 09:07:33 +02:00
unknown
5c27ff06c7 RPM spec file improvements:
- create a "mysql" user group and assign the mysql user account to that group
  in the server postinstall section. (BUG 10984)
- backported some changes from the 4.1 RPM spec file (cleanups: removed the incomplete
  Brazilian translations, more consequent use of macros)


support-files/mysql.spec.sh:
  - create a "mysql" user group and assign the mysql user account to that group
    in the server postinstall section. (BUG 10984)
  - backported some changes from the 4.1 RPM spec file (cleanups: removed the incomplete
    Brazilian translations, more consequent use of macros)
2005-07-15 08:54:11 +02:00
unknown
175f12fdc0 - The Max package should Require a matching MySQL-server package. Automatically replace
the version string with the base version of the current build
2005-07-04 22:11:38 +02:00
unknown
d92877629c - Do not build the RPMs statically on i386 by default, only when adding either
"--with static" or "--define '_with_static 1'" to the RPM build options. 
   Static linking really only makes sense when linking against the specially patched
   glibc 2.2.5.


support-files/mysql.spec.sh:
   - Do not build statically on i386 by default, only when adding either "--with
     static" or "--define '_with_static 1'" to the RPM build options. Static
     linking really only makes sense when linking against the specially patched
     glibc 2.2.5.
2005-06-14 21:39:08 +02:00