Commit graph

195 commits

Author SHA1 Message Date
kent@mysql.com
2205d1b8d5 mysql.spec.sh, make_binary_distribution.sh, Makefile.am, mysql.sln:
Added "client/mysqlslap"
mysqlslap.vcproj, mysqlslap.def:
  new file
2005-12-19 01:12:11 +01:00
rparranovo@mysql.com
acc6609bfd * made the following changes for the generic 5.1 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:45:54 -03:00
joerg@mysql.com
2eb0e9a43c Merge mysql.com:/M50/merge-5.0 into mysql.com:/M51/merge-5.1 2005-12-05 19:00:00 +01:00
joerg@mysql.com
b9451ee51f Merge from 4.1, partly manual. 2005-12-05 18:33:48 +01:00
joerg@mysql.com
7ce92291f0 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)
2005-12-05 17:53:42 +01:00
joerg@mysql.com
9b0bfb8858 Manual merge from 4.1 (bug#15145). 2005-11-22 20:30:45 +01:00
joerg@mysql.com
511fbac4df Manual merge from 4.1, bug#15145. 2005-11-22 20:15:54 +01:00
joerg@mysql.com
c735d07dec support-files/mysql.spec.sh
Fix a possible problem on RPM un-install. bug#15145
2005-11-22 19:58:58 +01:00
guilhem@mysql.com
2f95fc2701 Merge mysql.com:/home/mysql_src/mysql-5.0
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
2005-11-18 16:38:01 +01:00
joerg@mysql.com
9f065041fc Not all RPM builds can use the bundled zlib, due to dependency and link conflicts. Solve this. 2005-11-11 22:18:41 +01:00
petr@mysql.com
0f373f9501 Merge mysql.com:/home/cps/mysql/trees/mysql-4.1
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-11-08 01:27:15 +03:00
kent@mysql.com
79aaf0754d mysql.spec.sh:
Always use bundled zlib
2005-11-05 01:44:35 +01:00
monty@mysql.com
a6f5375cb0 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2005-11-05 01:32:55 +02:00
lenz@mysql.com
7decf21c02 - after merge fix: removed pack_isam from the RPM spec file list again 2005-10-28 16:50:52 +02:00
lenz@mysql.com
303ba37044 - added man page for the mysqlmanager in the RPM spec file list 2005-10-28 13:31:19 +02:00
lenz@mysql.com
8303ca007a - after merge fixes 2005-10-28 11:10:29 +02:00
lenz@mysql.com
0f3192323c - fixed RPM spec file list after merge, removed dupes 2005-10-28 10:46:07 +02:00
lenz@mysql.com
6b123044d0 - after merge fixes 2005-10-27 16:53:14 +02:00
lenz@mysql.com
f793d7b5bf - 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)
2005-10-27 14:51:58 +02:00
kent@mysql.com
e3c4993bf3 mysql.spec.sh:
Made yaSSL support an option (off by default)
2005-10-19 22:00:12 +02:00
kent@mysql.com
8bccfab21f mysql.spec.sh:
Enabled yaSSL
mysql-test-run.pl:
  Increased test case timeout from 15 min
2005-10-19 02:53:03 +02:00
kent@mysql.com
dcd4b9923a 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
kent@mysql.com
4ea2aacb2a 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
kent@mysql.com
5035abf052 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
lenz@mysql.com
89e10f34c3 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-10-13 22:16:24 +02:00
lenz@mysql.com
c93927eef0 - 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)
2005-10-13 22:10:54 +02:00
lenz@mysql.com
a315d1be76 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.
2005-10-13 22:01:02 +02:00
ndbdev@dl145b.mysql.com
147e22650e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-10-10 17:15:25 +02:00
lenz@mysql.com
0b80982497 - typo fix: rott->root in the file attributes for mysql_client_test of the RPM spec file 2005-10-10 13:00:41 +02:00
tomas@poseidon.ndb.mysql.com
620b7bafb0 Merge 2005-10-06 10:54:07 +02:00
lenz@mysql.com
54d60d7fa7 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-09-29 14:35:07 +02:00
lenz@mysql.com
68e6b0e21d Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-09-29 13:57:41 +02:00
lenz@mysql.com
443048f61c - 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)
2005-09-29 13:55:54 +02:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
02056f8e3a Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-25 13:11:38 -04:00
monty@mishka.local
f384e08277 Merge mishka.local:/home/my/mysql-4.1
into  mishka.local:/home/my/mysql-5.0
2005-08-25 06:55:48 +03:00
joerg@mysql.com
ddcbf609c4 Ensure that a failing test does not stop testing or the whole RPM build process. 2005-08-22 12:48:01 +02:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
69acde961f Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-05 18:01:34 -04:00
lenz@mysql.com
aff1328ada Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0-build
2005-08-04 12:48:28 +02:00
lenz@mysql.com
eb19f12fbf - manual merge from 4.0 into 4.1: used the local version of ha_innodb.cc, merged
the rpm spec file changelog
2005-08-04 12:35:13 +02:00
lenz@mysql.com
307c920354 - Fixed the creation of the mysql user group account in the postinstall section of
the MySQL-server RPM spec file (BUG#12348)
2005-08-04 12:22:51 +02:00
lenz@mysql.com
08694dc2ac - fixed enabling the Archive storage engine for the mysqld-max RPM binary 2005-08-04 11:57:30 +02:00
lenz@mysql.com
2889025acc Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0-build
2005-08-02 14:04:21 +02:00
lenz@mysql.com
9217c90a77 - 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
monty@mysql.com
15d48525af Merge mysql.com:/home/my/mysql-4.1
into  mysql.com:/home/my/mysql-5.0
2005-07-28 17:09:54 +03:00
lenz@mysql.com
a5b6057db5 - build the RPM binaries against the bundled zlib, when static linking is requested 2005-07-27 16:42:13 +02:00
tomas@poseidon.ndb.mysql.com
911d878ca9 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-07-15 15:08:38 +02:00
tomas@poseidon.ndb.mysql.com
f54afc792f Merge 2005-07-15 14:13:23 +02:00
lenz@mysql.com
d9de51cf23 Merge mysql.com:/space/my/mysql-4.1.13-clone
into mysql.com:/space/my/mysql-5.0-build
2005-07-15 09:23:36 +02:00
lenz@mysql.com
0487cb938e - 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
2005-07-15 09:07:33 +02:00
lenz@mysql.com
0d7a2641b5 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)
2005-07-15 08:54:11 +02:00