Commit graph

296 commits

Author SHA1 Message Date
lenz@mysql.com
1e399654b4 Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0-build
2005-07-04 22:14:14 +02:00
lenz@mysql.com
a300489d0c - 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
lenz@mysql.com
e218dffe1b Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-5.0-build
2005-06-15 00:57:23 +02:00
lenz@mysql.com
90479d9ece - 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.
2005-06-14 21:39:08 +02:00
lenz@mysql.com
d30f69ab0a - added the libndbclient static and shared libraries to the RPM (BUG 10676) 2005-06-07 14:39:00 +02:00
lenz@mysql.com
6e5818e977 - manual merge of mysql.spec.sh 2005-06-07 11:40:56 +02:00
lenz@mysql.com
1c21f84afb - BUG#10676: don't install "make_win_src_distribution" and "make_win_binary_distribution"
when doing "make install" (they are not needed/useful) outside the build tree. Added
  "mysql_client_test" to the "MySQL-bench" RPM.
- some small RPM spec file improvements (more variables than hard-coded values, cleanups)
2005-06-07 10:25:51 +02:00
lenz@mysql.com
9afd2563e9 Merge of 4.1 -> 5.0 2005-06-01 15:11:14 +02:00
lenz@mysql.com
e877e71b17 Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-06-01 13:06:15 +02:00
lenz@mysql.com
7bd3dd7cb3 - removed references to some obsolete files (BUG#10824)
- removed obsolete mysql-max.spec.sc RPM spec file (Max is built out of the standard
  spec file)
2005-06-01 12:59:10 +02:00
joerg@mysql.com
9504bd0ddd Manual merge. 2005-05-26 12:51:44 +02:00
joerg@mysql.com
830d25d985 Manual merge. 2005-05-25 18:11:03 +02:00
joerg@mysql.com
0d121fe01a Added a missing "make clean" to the RPM "spec" file which had caused the original 4.1.12 RPMs to be broken.
(bug#10674, bug#10681)
2005-05-25 16:24:07 +02:00
konstantin@mysql.com
753959cd88 Manual merge 2005-05-05 13:47:09 +04:00
kent@mysql.com
038ef8f865 mwcc-wrapper, compile-darwin-mwcc, mwar-wrapper:
Initial Metrowerks CodeWarrior compiler support
  new file
2005-05-05 09:34:15 +02:00
lenz@mysql.com
e4907dcdb7 Merge mysql.com:/space/my/mysql-4.1-bug9444
into mysql.com:/space/my/mysql-5.0
2005-05-04 15:00:18 +02:00
lenz@mysql.com
59930b6e84 - adjusted the start and stop priority level in the mysql.server init script for chkconfig on
Red Hat Linux (BUG#9444) - we now match the levels used by the MySQL as shipped with Red Hat Linux
  (e.g. RHEL3/RHEL4)
2005-05-04 14:58:43 +02:00
joerg@mysql.com
af59b7502b Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-04-26 19:26:51 +02:00
joerg@mysql.com
49ac2dac3e Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497).
Post-merge fix will follow.
2005-04-26 12:03:37 +02:00
lenz@mysql.com
918ce29557 - manual merge 2005-04-21 08:30:59 +02:00
joerg@mysql.com
48ba5e4956 Step 1 of the switch to support configuration with NPTL:
Rename 'IS_LINUX' configuration variable to 'TARGET_LINUX'.
2005-04-20 20:10:28 +02:00
lenz@mysql.com
cf152b156d - Enabled the "blackhole" storage engine for the Max RPM subpackage 2005-04-20 08:39:08 +02:00
lenz@mysql.com
113c883f1d Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0-build
2005-04-17 13:04:29 +02:00
lenz@mysql.com
5126016d3c Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build
2005-04-17 12:48:33 +02:00
lenz@mysql.com
4bc0a01d33 - removed ReadMe.txt from CLEANFILES, as it's cleaned by Docs/Makefile.am
already (and that's the Makefile that acutally creates it)
2005-04-17 12:44:59 +02:00
monty@mishka.local
0c03aea1aa Set bindir, datadir & others if --basedir is given. This ensures that one only has to set basedir in [mysqld] group when moving a binary installation to a not default polace
Use for now safe_mysqld by default. (unless use-manager is set in the [mysql.server] option in my.cnf)
Search first for defaults files in basedir and then in datadir (like mysqld_safe)
2005-04-16 11:40:41 +03:00
monty@mishka.local
de1b1fe54d Added more rows to test to get predictable results 2005-04-16 10:53:30 +03:00
monty@mishka.local
c8170b349f Merge with 4.1 2005-04-16 04:35:54 +03:00
jimw@mysql.com
77f6f5b178 Merge mysql.com:/home/jimw/my/mysql-4.1-9852
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-15 11:51:41 -07:00
jimw@mysql.com
5e581186a4 Fix mysql.server.sh to use shell functions as replacement
for LSB init functions when they aren't available. (Bug #9852)
2005-04-14 17:22:18 -07:00
lenz@mysql.com
c4fb796e9e Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build
2005-04-13 19:51:55 +02:00
lenz@mysql.com
c8225b62fd - fixed a date for a changelog entry in the RPM spec file (s/Mar/Apr/) - RPM complains about wrongly
ordered entries.
2005-04-13 19:50:54 +02:00
lenz@mysql.com
1bd8c68f7f - After merge fixes 2005-04-13 19:46:26 +02:00
lenz@mysql.com
077368fc28 More changes to reflect the removal of manual.texi from the sources:
- Added a stub scripts/fill_help_tables.sql file to satisfy the build dependencies
- Removed scripts/fill_help_tables.sh and updated scripts/Makefile.am accordingly

The fill_help_tables.sql stub will be replaced with the approriate content when building the
official source distribution via Bootstrap - it's now autogenerated on the documentation server
and will be copied into place before packing up the source distribution.
2005-04-13 18:29:23 +02:00
lenz@mysql.com
ad75afe308 Manual merge of the ChangeSet to remove the dependency on manual.texi from the source tree (from 4.0) 2005-04-13 13:27:06 +02:00
lenz@mysql.com
11df4eec85 - manual.texi will be replaced with a manual written in DocBook/XML. This ChangeSet removes all
references to the .texi file and the build targets that depend on manual.texi as the input file.
- added COPYING as a regular file instead of creating it during the build. This ensures that it's part
  of the sources when pulling from BK (it used to be extracted from the manual)
- Removed a lot of cruft and unused/obsolete stuff from the Docs directory (e.g. Flags, Images)
- added a dummy mysql.info placeholder file (the info file is still used as the source to extract
  various text files during the build). It will be replaced with a "real" file during the Bootstrap
  process to create the official source distribution - the placeholder just satisfies build dependencies.
2005-04-13 11:51:38 +02:00
petr@mysql.com
7730319738 Enable IM in the binary distribution and fix Bug #9513 (mysql.server script from the binary distibution
doesn't work out of the box)
2005-04-04 03:49:10 +04:00
pekka@mysql.com
5b9bd8c0c8 Merge 2005-04-01 10:13:37 +02:00
petr@mysql.com
8f5029b42c Bug #9507 /etc/init.d/mysql script does not stop mysqld correctly
wait_for_pid function is fixed to wait for pid removal in "stop".
recomitted with post-review fix
2005-03-31 14:25:03 +04:00
bell@sanja.is.com.ua
05d4ed14e4 merge 4.1->5.0 2005-03-31 10:39:48 +03:00
joerg@mysql.com
1314c4aaee Portability fix (avoid bash-ism). 2005-03-30 18:38:54 +02:00
jimw@mysql.com
954ef465bc Removed MyISAM RAID from the Linux "Max" RPMs
(patch from lenz, reapplied by jimw)
2005-03-18 16:14:49 -08:00
petr@mysql.com
28bf536411 IM setup patch. Enable IM instead of mysqld_safe in start/stop script.
Alter RPM to include mysqlmanger binary and config files.
2005-03-15 22:51:13 +03:00
lenz@mysql.com
945aad6b49 Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0
2005-03-15 12:28:43 +01:00
lenz@mysql.com
2714f176fb Applied some changes to the mysql.server init script that are already shipped as an additional patch
in the 4.1.10a RPMs for SLES9/RHEL3:

- small improvement: use LSB functions to display startup success and failure, if available.
  Fall back to more primitive builtin functions otherwise.
- joined two pieces of code performing the same functionality into one "wait_for_pid" function
- added a "reload" function (LSB requirement)
2005-03-15 12:23:14 +01:00
jani@ua141d10.elisa.omakaista.fi
d378dbe83d Fixed Bug#7873. 2005-02-17 20:20:48 +02:00
lenz@mysql.com
ab2a4c4d54 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-02-17 11:09:35 +01:00
lenz@mysql.com
01180054fa - fixed a changelog entry in the RPM spec file (wrong author) 2005-02-17 11:07:33 +01:00
lenz@mysql.com
65e804612f Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-02-17 10:56:20 +01:00
lenz@mysql.com
083003f1c1 - fixed the compilation comments
- fixed a broken changelog entry
2005-02-14 11:12:39 +01:00