Commit graph

374 commits

Author SHA1 Message Date
unknown
d74b3684cd Merge
include/config-win.h:
  Auto merged
2006-05-01 20:16:19 +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
5fd32db8a1 mysql.spec.sh:
Include and run mysql_upgrade if needed (bug#19353)


support-files/mysql.spec.sh:
  Include and run mysql_upgrade if needed (bug#19353)
2006-04-28 17:03:11 +02:00
unknown
caa16cbfe7 Fix for Bug #16240
support-files/mysql.server.sh:
  Fixed so that if the datadir has been set via the command line,
  it won't be reset by specifing the basedir after.
2006-04-06 10:13:46 -07:00
unknown
a6871e2713 Merge 2006-04-01 05:53:37 +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
0dcd02587d mysql.spec.sh:
Use installed libz.a to avoid hard to solve static linking problems


support-files/mysql.spec.sh:
  Use installed libz.a to avoid hard to solve static linking problems
2006-03-03 20:30:28 +01:00
unknown
a91d0afdaa mysql.spec.sh:
Don't create empty embedded RPM, bug#15769


support-files/mysql.spec.sh:
  Don't create empty embedded RPM, bug#15769
2006-03-03 03:27:27 +01:00
unknown
d263d8b0d6 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/rpmspec-5.0
2006-02-13 18:04:30 +01:00
unknown
cae77087f1 support-files/mysql.spec.sh : Manual merge: new "-i" in "make -i test-force", changelog.
support-files/mysql.spec.sh:
  Manual merge: new "-i" in "make -i test-force", changelog.
2006-02-10 18:07:14 +01: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
a6c68c25c9 Update the spec file for the shared compat RPM with version info.
support-files/MySQL-shared-compat.spec.sh:
  Prevent "libndbclient" (which is not included in the "shared compat" RPM)
  from breaking the RPM packaging.
  
  Also, adapt the specification to the newer versions of the older release families.
  This needs to be repeated periodically.
  Take care of the RPM build version: For 4.1.16, it is 4.1.16-1 !
2006-01-19 10:44:44 +01:00
unknown
910052c18f Datadir variable should not be reset, if it was
set in this script.
2005-12-14 02:01:54 +02:00
unknown
ed3b63e1bb mysql.spec.sh:
* made the following changes for the generic 5.0 RPM spec file
  - Added zlib to the list of (static) libraries installed
  - Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
  - Compile MySQL with bundled zlib
  - Fixed %packager name to "MySQL Production Engineering Team"


support-files/mysql.spec.sh:
  * made the following changes for the generic 5.0 RPM spec file
  - Added zlib to the list of (static) libraries installed
  - Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
  - Compile MySQL with bundled zlib
  - Fixed %packager name to "MySQL Production Engineering Team"
2005-12-12 17:29:02 -03:00
unknown
ae9952c4b4 Merge from 4.1, partly manual.
scripts/make_binary_distribution.sh:
  Auto merged
support-files/mysql.spec.sh:
  Manual merge.
2005-12-05 18:33:48 +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
57e1c5aa9a Manual merge from 4.1, bug#15145. 2005-11-22 20:15:54 +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
6e478b60eb Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck


configure.in:
  Auto merged
2005-11-19 11:20:52 +01:00
unknown
4e1bc5abd8 Not all RPM builds can use the bundled zlib, due to dependency and link conflicts. Solve this.
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 stytic, "build")
  and the one already installed onm the system for the "max" build which is also labeled "experimental".
2005-11-11 22:18:41 +01:00
unknown
ce648a30db Merge mysql.com:/home/cps/mysql/trees/mysql-4.1
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin


sql/examples/ha_tina.cc:
  Auto merged
support-files/mysql.spec.sh:
  SCCS merged
2005-11-08 01:27:15 +03: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
233c6b797f Merge
Makefile.am:
  Auto merged
client/Makefile.am:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
netware/Makefile.am:
  Auto merged
support-files/Makefile.am:
  Auto merged
2005-11-04 02:17:11 +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
45feb66623 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/data0/mysqldev/lenz/mysql-5.0


configure.in:
  Auto merged
2005-11-01 17:39:09 +01:00
unknown
5f6b100ed0 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp


client/mysqlimport.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/spatial.cc:
  Auto merged
sql/spatial.h:
  Auto merged
support-files/my-huge.cnf.sh:
  Auto merged
support-files/my-innodb-heavy-4G.cnf.sh:
  Auto merged
support-files/my-large.cnf.sh:
  Auto merged
mysql-test/mysql-test-run.sh:
  Merged from 4.1.
mysql-test/r/mysqldump.result:
  Merged from 4.1.
mysql-test/t/gis.test:
  Merged from 4.1.
2005-10-31 11:54:36 +02: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
3171c948bf - after merge fix: removed pack_isam from the RPM spec file list again
support-files/mysql.spec.sh:
  - after merge fix: removed pack_isam from the file list again
2005-10-28 16:50:52 +02:00
unknown
e844304aef - added man page for the mysqlmanager in the RPM spec file list
support-files/mysql.spec.sh:
   - added man page for mysqlmanager
2005-10-28 13:31:19 +02:00
unknown
3ca614aeda - after merge fixes
BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962:
  Auto merged
BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19:
  Auto merged
configure.in:
  Auto merged
netware/BUILD/compile-linux-tools:
  Auto merged
netware/BUILD/compile-netware-END:
  Auto merged
man/Makefile.am:
  - after merge fix
support-files/mysql.spec.sh:
  - after merge fix
2005-10-28 11:10:29 +02: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
e27cb111cd mysql.spec.sh:
Made yaSSL support an option (off by default)


support-files/mysql.spec.sh:
  Made yaSSL support an option (off by default)
2005-10-19 22:00:12 +02:00
unknown
a43ec392af mysql.spec.sh:
Enabled yaSSL
mysql-test-run.pl:
  Increased test case timeout from 15 min


mysql-test/mysql-test-run.pl:
  Increased test case timeout from 15 min
support-files/mysql.spec.sh:
  Enabled yaSSL
2005-10-19 02:53:03 +02:00
unknown
8b6c4068ba mysql.spec.sh:
Give mode arguments the same way in all places
  Moved copy of mysqld.a to "standard" build, but
  disabled it as we don't do embedded yet in 5.0


support-files/mysql.spec.sh:
  Give mode arguments the same way in all places
  Moved copy of mysqld.a to "standard" build, but
  disabled it as we don't do embedded yet in 5.0
2005-10-15 01:40:28 +02:00
unknown
726170e8c4 mysql.spec.sh:
For 5.x, always compile with --with-big-tables
  Copy the config.log file to location outside
  the build tree


support-files/mysql.spec.sh:
  For 5.x, always compile with --with-big-tables
  Copy the config.log file to location outside
  the build tree
2005-10-14 22:49:53 +02:00
unknown
f242afb0c7 mysql.spec.sh:
Removed unneeded/obsolte configure options
  Added archive engine to standard server
  Removed the embedded server from experimental server
  Changed suffix "-Max" => "-max"
  Changed comment string "Max" => "Experimental"


support-files/mysql.spec.sh:
  Removed unneeded/obsolte configure options
  Added archive engine to standard server
  Removed the embedded server from experimental server
  Changed suffix "-Max" => "-max"
  Changed comment string "Max" => "Experimental"
2005-10-14 22:11:52 +02:00
unknown
5eac62c7e4 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0
support-files/mysql.spec.sh:
  Auto merged
2005-10-13 22:16:24 +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
931771422f - typo fix: rott->root in the file attributes for mysql_client_test of the RPM spec file
support-files/mysql.spec.sh:
  - typo fix: rott->root in the file attributes for mysql_client_test
2005-10-10 13:00:41 +02:00
unknown
66eec84f39 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0
support-files/mysql.spec.sh:
  Auto merged
2005-09-29 14:35:07 +02:00