mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
171738 commits 2781 branches 343 tags 1.6 GiB
Commit graph

585 commits

Author SHA1 Message Date
Jonathan Perkin
bdcac62110 Remove _unpackaged_files_terminate_build=0, we should not ignore errors. 2010-04-08 15:32:15 +02:00
Jonathan Perkin
fe1030303a Fix gcc check, SuSE doesn't print (GCC) anywhere. Get rid of 
WITH_LIBGCC %define, it isn't subject to shell rules and is
parsed anyway.  Instead create a file with optional files to
include.
 2010-04-08 15:21:31 +02:00
Jonathan Perkin
478c27599a Revert library changes, let's just stick with keeping to existing 
setup for now, leave large changes to later.
 2010-04-08 12:30:04 +02:00
Jonathan Perkin
8148145929 RPM doesn't like %install in comments, doh 2010-04-01 15:10:05 +02:00
Jonathan Perkin
5f1e75d584 Put libmygcc back in %build, needs $CC etc of course... 2010-04-01 13:48:44 +02:00
Jonathan Perkin
2785be2d70 Actually, move the libgcc stuff to %install where it belongs. 2010-04-01 12:24:00 +02:00
Jonathan Perkin
346c2b7afa We do need the mkdir. 2010-04-01 12:18:51 +02:00
Jonathan Perkin
8c750455fc Just put libs in %{_libdir}. 
Can't see how mysqld_safe can work with current setup, so make it look
in $pkglibdir/mysql too.

Other cleanups.
 2010-04-01 10:32:29 +02:00
Jonathan Perkin
515de61347 Try some more fixes. 2010-04-01 02:20:41 +02:00
Jonathan Perkin
f0856cc114 Try a bunch of fixes. 2010-03-31 23:52:49 +02:00
Jonathan Perkin
2f71bf43ef Put back libmysqlclient_r.a, not sure it was supposed to be removed. 
Remove libmysqld-debug.a, it doesn't exist in current packages?
 2010-03-31 19:04:22 +02:00
Jonathan Perkin
719d62a3dd Fix socket path in RPMs. XXX should be put into cmake/* somewhere. 2010-03-31 12:04:21 +02:00
Jonathan Perkin
d2b8d2487f Default to CXX=gcc 2010-03-30 12:01:30 +02:00
Jonathan Perkin
0145b00834 Must specify -DDCMAKE_BUILD_TYPE=RelWithDebInfo now that compiler 
flags are being used correctly.
 2010-03-30 11:54:25 +02:00
Jonathan Perkin
483a5b249a Variables need to be exported so cmake can pick them up. 2010-03-29 17:54:08 +02:00
Jonathan Perkin
af315a60fa Fix environment setup. 
Don't create empty ChangeLog.
 2010-03-29 17:01:15 +02:00
Jonathan Perkin
dec6ab7b3a Move libmysqlclient*.a out of the WITH_LIBGCC section. 2010-03-26 11:25:02 +01:00
Jonathan Perkin
cda94abe8d Put back libmysqlclient*.a 
Add ChangeLog.
 2010-03-25 19:54:47 +01:00
Jonathan Perkin
831b3e224c Merge latest mysql-5.5.3-m3-release 2010-03-25 17:23:08 +01:00
Jonathan Perkin
0612d16a56 Fix some paths. 2010-03-25 17:15:34 +01:00
Jonathan Perkin
ebaccc5fb0 Current iteration of spec file cleanup. 2010-03-25 13:29:02 +01:00
Jonathan Perkin
29fd67ff4e Fix source layout. 2010-03-24 22:30:39 +01:00
Jonathan Perkin
e7711a372a Initial attempt at CMake support. 2010-03-24 21:17:13 +01:00
Joerg Bruehe
8a5aca0dc7 Add "--with-perfschema" to the configure options for RPMs. 2010-03-24 20:30:33 +01:00
Joerg Bruehe
d3c3a14e0a Some fixes developed during the build of 5.5.3-m3 
about handling the debug plugin files,
also "ha_example.*" are dropped.
 2010-03-24 20:01:01 +01:00
Magnus Blåudd
fda5004d36 Merge in fix for bug#42589 2010-03-15 14:57:20 +01:00
Joerg Bruehe
4d75f6e251 Part of the fixes for bug#49022 
Plugins included into bin release cannot be
    installed on debug version of server

Ensure that the plugin files of the debug build
get into the optimized tree, so that they find
their way into the final RPMs.
 2010-03-10 14:36:27 +01:00
Alexander Nozdrin
fe6e3bf20a Manual merge from mysql-5.1. 
Conflicts:
  - support-files/mysql.spec.sh
  - configure.in
 2010-03-01 21:49:06 +03:00
Joerg Bruehe
158e89792a Spec file for RPMs: 
Now that Oracle has legally acquired Sun, change the copyright owner
and the vendor.
 2010-03-01 11:42:44 +01:00
Alexander Nozdrin
8c9153008a Manual merge from mysql-trunk. 2010-02-23 17:06:06 +03:00
Alexey Kopytov
8c31c4d16c Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-22 00:33:11 +03:00
Joerg Bruehe
1c2e33b1fc Fix a bug in the RPM spec file: 
A "%define" is no shell command, so it must not be the
only line in the "then" or "else" branch of an "if".

Add a ':' line to make the branch non-empty.
 2010-02-17 11:13:15 +01:00
Joerg Bruehe
4ecf25d39e Upmerge the RPM spec file correction: "release" was missing. 2010-02-12 17:26:22 +01:00
Joerg Bruehe
a02157aea2 Correction: The "release" setting had got lost in the RPM spec file. 2010-02-12 17:23:22 +01:00
Joerg Bruehe
61ae95ed6b Upmerge the spec file alignment from 5.1 to 5.5, 
no other functional changes.
 2010-02-12 13:20:42 +01:00
Joerg Bruehe
16e60ff563 Upmerge changes done to the generic spec file in 5.0 to 5.1, 
this includes a major whitespace (formatting) alignment
and sequence changes to better agree with other spec files.

Further changes:
- All features are controlled by "%define" set from call
  options or builtin.
- "bundled zlib" is on by default.
- "with libgcc" is controlled by runtime detection of gcc.
- Handling of "CFLAGS" and "CXXFLAGS" is more concentrated.
- Several missing man pages were added.
 2010-02-11 21:33:48 +01:00
Joerg Bruehe
c41646d2a5 Cleanup in the RPM spec file: 
Get rid of trailing blanks.
 2010-02-02 17:53:52 +01:00
Joerg Bruehe
26656115af Spec file for "generic" RPMs: 
Cleanup, formatting improvements,
vendor is Sun (since MySQL AB was bought).

Backport the change so that RPM doesn't magically
create a dependency on "Perl-DBI".
 2010-02-02 16:28:59 +01:00
Alexander Nozdrin
8a433bc4dc Manual merge from mysql-trunk. 
Conflicts:
  - support-files/mysql.spec.sh
 2010-01-18 23:15:17 +03:00
Alexey Kopytov
82ba3e1dbc Manual merge from mysql-5.1-bugteam into mysql-trunk-merge. 
Conflicts:

Text conflict in .bzr-mysql/default.conf
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result
Text conflict in mysql-test/t/mysqlbinlog.test
Text conflict in sql/sql_acl.cc
Text conflict in sql/sql_servers.cc
Text conflict in sql/sql_update.cc
Text conflict in support-files/mysql.spec.sh
 2010-01-15 14:26:53 +03:00
Georgi Kodinov
748ff84ef3 merge 2010-01-13 12:47:42 +02:00
Georgi Kodinov
c3ba50ade1 merge 5.1-main to 5.1-bugteam 2010-01-13 12:28:42 +02:00
Joerg Bruehe
b0dad6edf4 Upmerge the changes for RPM versioning/naming from 5.0 to 5.1. 
This includes "MYSQL_U_SCORE_VERSION" in "configure.in".
 2010-01-12 12:57:51 +01:00
Joerg Bruehe
789352e87b Implement the change of RPM versioning and file naming: 
- "release" starts from 1
- "level" ("m2", "rc", ...) is included in the RPM version.
 2010-01-12 12:41:18 +01:00
Joerg Bruehe
684405a5d3 Implement the change of RPM versioning and file naming: 
- "release" starts from 1
- "level" ("m2", "rc", ...) is included in the RPM version.
 2010-01-11 19:23:36 +01:00
Kent Boortz
d64f049351 Removed unwanted Perl DBI dependency 2009-12-30 23:06:14 +01:00
Joerg Bruehe
980b34b81c Remove the "fix_privilege_tables" manual from the RPM spec file, 
there is none in 5.5.
 2009-12-23 22:42:44 +01:00
Joerg Bruehe
b8f546fa03 The "semisync" plugin file name has lost its introductory "lib", 
adapt the file lists for the subpackages.

This is a part missing from the fix for bug#48351.
 2009-12-23 13:06:41 +01:00
Joerg Bruehe
a10699754f Change RPM file naming: 
- Suffix like "-m2", "-rc" becomes part of version as "_m2", "_rc".
- Release counts from 1, not 0.

This is done for both the "generic" RPMs and the "shared-compat" ones.
It includes introducing a new version variable "MYSQL_U_SCORE_VERSION"
in "configure.in", where the dash is replaced by an underscore:
  5.5.1-m2   ->  5.5.1_m2
 2009-12-22 23:22:42 +01:00
MySQL Build Team
be59f7ff54 Handle the "semisync" plugin in 
- binary distributions for Windows,
- "generic" RPM packages.
 2009-11-26 19:55:33 +01:00
MySQL Build Team
bd40517b03 Remove erroneous traces of the InnoDB plugin (that is 5.1 only) 
from the "spec" file for generic RPMs.
 2009-11-18 11:42:20 +01:00
MySQL Build Team
3a016794d9 Change the control structures which the RPM spec file uses to govern 
the inclusion of a separate malloc library (used for Google's "tcmalloc")
to follow the pattern used for other optional parts.

This is still experimental, there are some "rpmbuild" issues around this.
 2009-11-17 17:19:00 +01:00
Alexander Nozdrin
583d724e64 Automerge from mysql-trunk-merge. 2009-10-19 22:41:18 +04:00
Timothy Smith
813d8ff6dc Merge from mysql-5.4.3-beta-release 2009-10-16 20:19:36 +02:00
Timothy Smith
6d569306b4 Update _libdir/plugin to _libdir/mysql/plugin in a few places 2009-10-16 19:59:23 +02:00
Magnus Blåudd
04e99c1009 Bug#42589 mysql_fix_privilege_tables.sh to be deprecated 
- Remove remnants of "mysql_fix_privilege_tables.sh"(again)
 2009-10-07 15:42:16 +02:00
Alexander Nozdrin
f81b26509e Backport WL#4085: Merge revno:2476.1338.9 from 6.0. 2009-10-06 14:53:47 +04:00
timothy.smith@sun.com
d86e8b7c64 make_binary_distribution and mysql.spec: add options to copy a shared library, for use by mysqld_safe, into pkglibdir during package creation 2009-09-29 08:58:32 +02:00
Alexander Nozdrin
eeec93f305 Merge from mysql-5.1. 2009-09-19 13:07:51 +04:00
Joerg Bruehe
0e42c21e87 Merge the changes done for 5.4.2-beta into "trunk". 2009-09-09 15:21:27 +02:00
Joerg Bruehe
472d0c0dfd The former "Instance Manager" (program "mysqlmanager") 
is not being built in 5.4.2-beta,
so it cannot be included in a RPM:
Remove both the program and the man page from the spec file.

This patch was applied during the build of 5.4.2-beta.
 2009-09-08 15:48:55 +02:00
Jonathan Perkin
b74d8fa21e Merge from mysql-5.1.38-release 2009-09-03 01:48:06 +02:00
Joerg Bruehe
51c27a6942 Merge 5.1 up into 5.4-build ("trunk"). 2009-08-29 21:26:00 +02:00
Jonathan Perkin
c5c392af51 Disable ftexample to match other packages, ride previous changelog entry. 2009-08-25 13:00:23 +02:00
Jonathan Perkin
ac01a89909 Tidy previous, put example storage engine back as it's used by tests. 2009-08-24 14:06:01 +02:00
Jonathan Perkin
c4fa4f31ae Apply changes from mysql-5.1.38-release clone: 
- Add conditionals for bundled zlib and innodb plugin.
 - Apply patch from bug#46834 to install the test suite in RPMs.
 - Add plugins to RPMs.  Disable example plugins.
 2009-08-24 10:13:34 +01:00
Jonathan Perkin
2b97f19fca Add conditionals for bundled zlib and innodb plugin 2009-08-24 10:50:04 +02:00
Jonathan Perkin
4a76122f43 Apply patch from bug#46834 to install the test suite in RPMs. 2009-08-21 13:58:33 +02:00
Jonathan Perkin
a0169ebb03 Add plugins to RPMs. Disable example plugins. 2009-08-21 13:52:30 +02:00
MySQL Build Team
ea603044d8 Updates to build with community features enabled for community builds. 2009-05-20 23:04:34 +02:00
Chad MILLER
128afdc3e5 Merge community up to enterprise, thus ending the community-server 
adventure.
 2009-05-06 09:06:32 -04:00
Joerg Bruehe
a62103aa94 Merge a polishing of an old bug fix, 
more for completeness than for relevance.

Also, update copyright notices.
 2009-03-30 16:09:37 +02:00
Lars.Heill@Sun.COM
0d67e29dd2 Only specify the current year for the Sun product copyright 2009-02-24 19:09:22 +01:00
kent.boortz@sun.com
4f11a82b5c Insert current year as last copyright year for the product 
Don't use both "License" and "license" as RPM macro, they are the same
 2009-02-24 17:54:03 +01:00
Kent Boortz
54e3ab8aff Make sure cluster builds include all charsets 2008-12-28 08:00:23 +01:00
Chad MILLER
1c73da70ce Merged from 5.0 (enterprise). 2008-12-17 15:01:34 -05:00
Build Team
d2c4816716 mysql-test/r/partition.result 
mysql-test/t/partition.test
sql/ha_partition.cc
  Bug#40954: Crash in MyISAM index code with concurrency test using partitioned tables
  Problem was usage of read_range_first with an empty key.
  Solution was to not to give a key if it was empty. (real author Mattias Jonsson)

storage/archive/archive_reader.c
client/mysqlslap.c
  Aligned the copyright texts output from "--version" of tools, to
  let internal tools be able to change them if needed.

storage/ndb/test/tools/connect.cpp
storage/ndb/test/run-test/atrt.hpp
  Corrected a few GPL headers not restricted to GPL version 2

Makefile.am
  Added missing --report-features to the 'test-bt-fast' target

support-files/mysql.spec.sh
  Reversed the removal of the "%define license GPL" in as internal
  tools depended on it
 2008-11-25 03:04:58 +01:00
kent.boortz@sun.com
906e12124c Changes of copyright output from "--version" and similar. 
Changes of copyright in RPM spec file.
 2008-11-14 17:29:38 +01:00
Joerg Bruehe
31144766b4 Merge second fix for bug#40546 to the 5.1.30 tree. 2008-11-07 20:08:37 +01:00
Joerg Bruehe
2e6a0cbc03 Upmerge the second fix for bug#40546 from 5.0 to 5.1 
and fix a defect specific to 5.1 (wrong quoting).
 2008-11-07 19:01:28 +01:00
Joerg Bruehe
c81061e458 "spec" file for RPM builds: 
Fix yesterday's patch so that it also works for the last flag.
Still part of the fix for bug#40546.
 2008-11-07 18:38:40 +01:00
kent.boortz@sun.com
a21f8a0e57 Back merges from 6.0.8 
- Removed some copy/paste between debug and normal build in RPM spec
- Removed "mysql_upgrade_shell" from RPM build
- Removed use of "grep -q" in "configure.in", not portable
- Improved test to disable ABI check not to accidently run for icc

Other changes
- Added make file test targets 'test-bt-fast' and 'test-bt-debug-fast'
- Reenabled "jp" test suite run
 2008-11-06 19:38:19 +01:00
Joerg Bruehe
fb7e23eb44 Bug #40546 Debug server in RPM is built with compiler optimization 
Prevent this by modifying CFLAGS and CXXFLAGS.

Upmerge from 5.0, modified according to the different spec file structure.
 2008-11-06 17:09:14 +01:00
Joerg Bruehe
e7fe288054 Bug #40546 Debug server in RPM is built with compiler optimization 
Prevent this by modifying CFLAGS and CXXFLAGS.
 2008-11-06 16:24:58 +01:00
Kent Boortz
3653536ae8 Removed option to control if federated is enabled, and enabled it. 2008-08-29 17:31:31 +02:00
Joerg Bruehe
811337dd72 Bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM build 
Merge it up from 5.0 to 5.1,
adapt to some version differences.
 2008-08-27 16:03:39 +02:00
Joerg Bruehe
ff3d230a03 Bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM build 
Mostly, this affected files (programs, scripts, and manual pages)
which got built during a RPM build but were not listed in the
appropriate "%files" section of the "spec" file.
This is fixed now, they are added.

To make this consistent, this patch also makes the build of "innochecksum"
(and its inclusion in a tar.gz or other package) depend on whether InnoDB
is configured in the build.

Also, some tools to create Windows packages are irrelevant in any binary
Unix package (not the sources !), and so they are deleted before packaging.
 2008-08-25 21:07:41 +02:00
Chad MILLER
c94a46240a Merge chunk from trunk. 2008-07-10 14:50:07 -04:00
Chad MILLER
06756c19c5 Merge chunk from trunk. 2008-07-10 14:47:53 -04:00
kent/mysqldev@mysql.com/production.mysql.com
9b6ac078f6 Makefile.am: 
Add ChangeLog if it exists
  - Removed separate 'normal+rowrepl' test run, not needed any longer
  - Removed separate 'rpl' test run, included in main test run already
  - Renamed some test "comments", to use similar naming style
  - Limited one of the Cluster test runs to 'ndb' and 'rpl_ndb' suites
  - Reordered test runs, to be aligned with Windows test runs
mysql.spec.sh:
  - No longer including the "Example" storage engine
  - Added to configure "--without-ENGINE" if not to compile engine as plugin
 2008-04-08 11:44:18 +02:00
kent/mysqldev@mysql.com/production.mysql.com
c41a4e13f8 mysql.spec.sh: 
If excluding Federated, make sure dynamic plugin is not built
Makefile.am:
  Only run cluster test when compiled with cluster
lib_sql.cc:
  Work around for Visual Studio 2003, that lacks vsnprintf() but has _vsnprintf()
 2008-04-02 22:24:53 +02:00
kent/mysqldev@mysql.com/production.mysql.com
bf92d91e1e mysql.spec.sh: 
Made Federated and Cluster optional
 2008-03-31 19:48:54 +02:00
joerg@trift2.
25c9fd5961 Merge trift2.:/MySQL/M50/man8-5.0 
into  trift2.:/MySQL/M51/man8-5.1
 2008-03-19 19:59:08 +01:00
joerg@trift2.
9ece3ac2df Merge trift2.:/MySQL/M41/man8-4.1 
into  trift2.:/MySQL/M50/man8-5.0
 2008-03-19 19:42:59 +01:00
joerg@trift2.
d4e7bf8709 support-files/mysql.spec.sh : Add the man pages for "ndbd" and "ndb_mgmd". 2008-03-19 19:13:28 +01:00
tsmith@ramayana.hindu.god
732eb0b4ce Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-02-18 12:18:36 -07:00
tsmith@ramayana.hindu.god
69dcac5a7e Bug #28555 Upgrading MySQL Fails to shut down old server and kills socket file 
Check for an existing MySQL server package from a different vendor or
major MySQL version.  In such a case, refuse to install the server and
recommend how to safely remove the old packages before installing the
new ones.
 2008-02-18 12:03:39 -07:00
cmiller@zippy.cornsilk.net
a35a8fe550 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
 2007-12-10 15:28:17 -05:00
joerg@trift2.
9ffd927e7d In the "spec" file for RPM builds, handle the debug server tests different from the standard server. 2007-11-16 17:36:13 +01:00
cmiller@zippy.cornsilk.net
79d652408d Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-unified02 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unification
 2007-05-07 16:59:03 -04:00
df@pippilotta.erinye.com
18c733a5e2 specfile fixes 2007-05-07 08:25:47 +02:00
joerg@trift2.
11484e3319 "ndb_size.tmpl" is gone (NDB change 2007-04-24), so remove it from the spec file. 2007-05-02 17:10:41 +02:00
joerg@trift2.
8a08eec81a Merge trift2.:/MySQL/M50/spec-5.0 
into  trift2.:/MySQL/M51/spec-5.1
 2007-05-02 16:57:58 +02:00
joerg@trift2.
fc8b2783f0 Merge trift2.:/MySQL/M41/spec-4.1 
into  trift2.:/MySQL/M50/spec-5.0
 2007-05-02 16:53:54 +02:00
joerg@trift2.
f32c261973 RPM spec file error: Trailing '*' to cover '.gz' for a man page was missing. 2007-05-02 16:51:15 +02:00
cmiller@zippy.cornsilk.net
71a0ecee6e Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-formergecomm 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-unified02
 2007-04-27 16:45:01 -04:00
cmiller@zippy.cornsilk.net
c9cbc1e7f3 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
 2007-04-26 11:51:37 -04:00
cmiller@zippy.cornsilk.net
9dd7812fec Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community-formerge51 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-formergecomm
 2007-04-25 08:14:46 -04:00
kent/kboortz@production.mysql.com
9d380a2c29 Merge mysql.com:/tmp/mysql-5.0-build 
into  mysql.com:/tmp/mysql-5.1-build
 2007-04-07 04:22:19 +02:00
kent/kboortz@mysql.com/production.mysql.com
c5fb034464 mysql.spec.sh: 
Removed man page for "mysql_create_system_tables"
 2007-04-07 04:14:44 +02:00
df@pippilotta.erinye.com
8c490e2689 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-RPMs
 2007-04-03 18:16:42 +02:00
df@pippilotta.erinye.com
6ed21ea834 no Max rpms anymore, but a debug binary 2007-04-03 18:04:24 +02:00
cmiller@zippy.cornsilk.net
5f4dfdd5fe Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
 2007-04-03 09:20:22 -04:00
kent@kent-amd64.(none)
0544355385 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-28 23:08:00 +02:00
kent@mysql.com/kent-amd64.(none)
4ad479b891 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-03-27 17:51:30 +02:00
kent@mysql.com/kent-amd64.(none)
ef530348cd mysql.spec.sh, Makefile.am: 
Don't use explicit calls to mysql-test-run in spec
 2007-03-27 17:42:55 +02:00
df@pippilotta.erinye.com
921c835ff3 add ad 2007-03-05 16:10:42 +01:00
joerg@trift2.
a91f84eb09 Merge trift2.:/MySQL/M50/manpages-5.0 
into  trift2.:/MySQL/M51/manpages-5.1
 2007-03-02 17:15:13 +01:00
joerg@trift2.
9cdd21515b Merge trift2.:/MySQL/M41/manpages-4.1 
into  trift2.:/MySQL/M50/manpages-5.0
 2007-03-02 17:01:24 +01:00
joerg@trift2.
57bc6066e3 Merge trift2.:/MySQL/M40/manpages-4.0 
into  trift2.:/MySQL/M41/manpages-4.1
 2007-03-02 16:34:29 +01:00
joerg@trift2.
6158657090 More man pages for the RPMs. 2007-03-02 16:32:27 +01:00
joerg@trift2.
c1c22df202 Another man page in the RPMs. 2007-03-02 16:30:22 +01:00
joerg@trift2.
ce9452152e Add man pages for NDB to the RPMs. 2007-03-02 14:13:13 +01:00
joerg@trift2.
dfce4c8ffd Add the man pages for NDB to the RPMs. 2007-03-02 14:08:32 +01:00
joerg@trift2.
3e2e58d60e Add the man pages for NDB to the RPMs. 2007-03-02 14:05:43 +01:00
joerg@trift2.
1775f82d58 Add missing man pages to the RPMs. 2007-03-02 14:03:28 +01:00
joerg@trift2.
b2d20b04fc Merge trift2.:/MySQL/M50/merge-5.0 
into  trift2.:/MySQL/M51/merge-5.1
 2007-02-21 09:45:13 +01:00
joerg@trift2.
4cb11ae425 Merge trift2.:/MySQL/M41/merge-4.1 
into  trift2.:/MySQL/M50/merge-5.0
 2007-02-20 20:18:29 +01:00
istruewing@chilla.local
bdf18a85f9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-02-03 09:43:38 +01:00
istruewing@chilla.local
ed09987083 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-02-01 19:41:04 +01:00
df@kahlann.erinye.com
3f12c914b7 use MTR_BUILD_THREAD=auto for rpm builds 2007-01-31 19:01:46 +01:00
df@kahlann.erinye.com
9fe01abcca Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2007-01-31 18:54:15 +01:00
df@kahlann.erinye.com
beb265b2fe MTR_BUILD_THREAD=auto for test runs during RPM build 2007-01-31 18:18:44 +01:00
kent@kent-amd64.(none)
f8c66fe926 Merge mysql.com:/home/kent/bk/tmp2/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp2/mysql-5.1-build
 2007-01-31 00:30:53 +01:00
kent@mysql.com/kent-amd64.(none)
e580bd6c6f gen_lex_hash.cc: 
If inserting a GPL header, include a complete one
Makefile.am, mysql.dsw, mysql.sln:
  Removed C version of mysql-test-run
mysql.spec.sh:
  Specify GPL license only in GPL sources
.del-my_manage.h:
  Delete: mysql-test/my_manage.h
mysql.spec.sh:
  Added GPL header
.del-mysql_test_run_new.c:
  Delete: mysql-test/mysql_test_run_new.c
.del-mysql_test_run_new.dsp:
  Delete: VC++Files/mysql-test/mysql_test_run_new.dsp
.del-my_create_tables.c:
  Delete: mysql-test/my_create_tables.c
.del-mysql_test_run_new_ia64.dsp:
  Delete: VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
msql2mysql.sh:
  Use up-to-date GPL header
.del-mysql_test_run_new.vcproj:
  Delete: VC++Files/mysql-test/mysql_test_run_new.vcproj
.del-my_manage.c:
  Delete: mysql-test/my_manage.c
 2007-01-31 00:06:42 +01:00
kent@mysql.com/kent-amd64.(none)
de8654e534 mysql.spec.sh: 
Added man page mysql_install_db.1
 2007-01-30 22:40:30 +01:00
df@kahlann.erinye.com
199f7b46b6 fix order in spec file changelog 2007-01-27 12:46:20 +01:00
kent@kent-amd64.(none)
1a0e36ea6d Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-01-05 17:30:40 +01:00
kent@mysql.com/kent-amd64.(none)
fa5a359f07 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-01-05 16:57:23 +01:00
kent@mysql.com/kent-amd64.(none)
528b457644 mysql.spec.sh, make_binary_distribution.sh: 
Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
  correct "libgcc.a" path is returned for the 32/64 bit architecture
 2007-01-05 16:53:03 +01:00
joerg@trift2.
c011b2e70f Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2006-12-18 11:59:14 +01:00
joerg@trift2.
534b2ca0a8 support-files/mysql.spec.sh 
Fix the move of "mysqlmanager" to section 8: Directory name was wrong.
 2006-12-18 11:51:45 +01:00
joerg@trift2.
436aa807fb Merge trift2.:/MySQL/M50/spec-5.0 
into  trift2.:/MySQL/M51/spec-5.1
 2006-12-14 22:45:06 +01:00
joerg@trift2.
a62051b77c support-files/mysql.spec.sh 
The "mysqlmanager" man page got moved from section 1 to 8.
 2006-12-14 22:41:26 +01:00
joerg@trift2.
8bdcf736bb Merge trift2.:/MySQL/M41/spec-4.1 
into  trift2.:/MySQL/M50/spec-5.0
 2006-12-14 22:37:13 +01:00
joerg@trift2.
5582d60177 support-files/mysql.spec.sh 
The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".
 2006-12-14 22:30:32 +01:00
msvensson@neptunus.(none)
971c783f7d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-04 19:11:55 +01:00
joerg@trift2.
1801033139 support-files/mysql.spec.sh : Call "make install" using "benchdir_root=%{_datadir}" (bug#24182). 2006-11-30 11:03:49 +01:00
joerg@trift2.
43cd9427e2 Merge trift2.:/MySQL/M50/bug22081-5.0 
into  trift2.:/MySQL/M51/bug22081-5.1
 2006-11-16 15:16:51 +01:00
joerg@trift2.
818f3fa21f Merge trift2.:/MySQL/M41/bug22081-4.1 
into  trift2.:/MySQL/M50/bug22081-5.0
 2006-11-16 14:38:15 +01:00
joerg@trift2.
29dd8d2e58 support-files/mysql.spec.sh : Add an "Obsoletes" note relative to SuSE RPMs (bug#22081). 2006-11-16 14:01:31 +01:00
joerg@trift2.
844d5161fc Merge trift2.:/MySQL/M41/spec-mtr-4.1 
into  trift2.:/MySQL/M50/spec-mtr-5.0
 2006-11-15 20:34:44 +01:00
joerg@trift2.
65d6b24ed9 support-files/mysql.spec.sh : Use "report features" in the first test run. 2006-11-15 20:27:02 +01:00
joerg@trift2.
5057fa01f4 support-files/mysql.spec.sh : Make the server report its features in the first test run. 2006-11-13 12:10:12 +01:00
joerg@trift2.
ccadac3267 Build the generic RPMs including the "partition" feature. bug#23949 2006-11-13 11:10:27 +01:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
87a9d23487 mysql.spec.sh: 
Aligned test flags to TAR builds
 2006-10-18 12:35:45 +02:00
kent@mysql.com/c-584072d5.010-2112-6f72651.cust.bredbandsbolaget.se
712c4cdbe3 mysql.spec.sh: 
Corrected path to mysql-test directory
  Removed man1/mysql_explain_log.1
 2006-10-12 18:26:17 +02:00
cmiller@zippy.cornsilk.net
e72bc63906 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-28 10:15:32 -04:00
kent@mysql.com/c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
e826f7490e mysql.spec.sh: 
Added "test" RPM package
  Install all binaries "make install" would
make_binary_distribution.sh:
  Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)
 2006-09-24 00:41:20 +02:00
msvensson@shellback.(none)
91844fb81f Bug#19738 "make install" tries to build files that "make" should already have built 
- Move comp_err to EXTRA_PROGRAMS, it will not be installed from 5.1 and up.
 2006-09-20 09:28:12 +02:00
kent@c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
386743c783 Merge mysql.com:/Users/kent/mysql/bk/bug17194/my51-bug17194 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1-maint
 2006-08-24 15:12:08 +02:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
68e1e60f27 Merge mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-maint
 2006-08-24 14:51:54 +02:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
13e0fa2ccf Merge mysql.com:/Users/kent/mysql/bk/bug17194/my41-bug17194 
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1-maint
 2006-08-24 14:48:22 +02:00
kent@g4-2.local
510240fb56 Merge mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194 
into  mysql.com:/Users/kent/mysql/bk/bug17194/my51-bug17194
 2006-08-22 11:57:37 +02:00
kent@mysql.com/g4-2.local
c8b6563dfc mysql.spec.sh: 
Added ndb_error_reporter to the RPM install (bug#20426)
 2006-08-22 11:55:08 +02:00
kent@mysql.com/g4-2.local
d210c8cfc3 Merge mysql.com:/Users/kent/mysql/bk/bug17194/my41-bug17194 
into  mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194
 2006-08-22 11:52:26 +02:00
kent@mysql.com/g4-2.local
442c111b72 mysql.spec.sh: 
Added ndb_size.{pl,tmpl} to the RPM install (bug#20426)
 2006-08-22 11:48:58 +02:00
joerg@trift2.
71be39fad6 Remove building, packing, and installing the "max" server from the RPM "spec" file. 2006-08-15 20:38:51 +02:00
kroki/tomash@moonlight.intranet
5c272816ca Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
 2006-08-09 13:37:20 +04:00
patg@govinda.patg.net
8d1e5a5bb1 Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfoot 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-5.0-merge2

Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:

bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
 2006-08-08 09:01:32 -07:00
kroki/tomash@moonlight.intranet
5c90b6f810 Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge
 2006-07-29 13:43:34 +04:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
01f5bc3a83 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2006-07-28 23:40:05 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
ef0c9d7588 mysql.spec.sh: 
Man page for "mysqld" command move to section 8 (bug#21220)
 2006-07-28 22:57:57 +02:00
joerg@trift2.
37408ed0f3 Merge trift2.:/M41/tmp_merge 
into  trift2.:/M50/merge-4.1-to-5.0
 2006-07-24 15:47:57 +02:00
joerg@trift2.
5ac44f14cb Merge trift2.:/M41/tmp_merge 
into  trift2.:/M50/merge-4.1-to-5.0
 2006-07-24 14:06:17 +02:00
ingo/mydev@chilla.local
8bb8069653 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.1-amerge
 2006-07-24 10:05:17 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
2eacb14d2e mysql.spec.sh: 
Added new "mysql_explain_log" man page
  Added missing install of "myisam_ftdump" man page
  Added missing install of "mysqlman" man page
 2006-07-19 02:46:48 +02:00
kent@mysql.com/g4-2.local
0f11ea9b0b mysql.spec.sh: 
Command "ndb_mgm" is an optional tool, and should only be in "ndb-tools" package (bug#21058)
 2006-07-15 00:24:35 +02:00
kostja@bodhi.local
d7845b74db Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
 2006-07-13 22:09:36 +04:00
joerg@trift2.
6ec62524b3 support-files/mysql.spec.sh : Fix a typing error. 2006-07-10 12:03:44 +02:00
joerg@mysql.com
dbc1ca22a0 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/bug20216-4.1
 2006-07-05 10:42:49 +02:00
joerg@mysql.com
be5f48268c When building RPMs, use the Perl script to run the tests, to automatically check SSL. 2006-07-04 12:30:08 +02:00
kent@mysql.com
593b359d92 mysql.spec.sh: 
Disable old RPM strip
my_global.h:
  Fixed wrong cast, which caused problems with gcc 4.0 and
  floats in prepared statements (Bug #19694)
mysqlmanager.vcproj:
  Place output files in common release/debug directory
 2006-06-30 02:49:28 +02:00
joerg@mysql.com
dcc67c0080 Manual merge from 5.0 to 5.1 (bug#20216 + bug#18516). 2006-06-29 11:59:05 +02:00
evgen@moonbone.local
82369c4e65 Manual merge 2006-06-28 19:34:04 +04:00
joerg@mysql.com
0320bae069 Manual merge for bug#20216. 2006-06-27 20:32:08 +02:00
joerg@mysql.com
44653eed3b Revert all previous attempts to call "mysql_upgrade" during RPM upgrade. 
This finishes bug#18516, as far as "generic RPMs" are concerned.
 2006-06-27 20:18:03 +02:00
joerg@mysql.com
3300c79b07 Merge mysql.com:/M50/bug19353-5.0-2 into mysql.com:/M50/bug20216-5.0 2006-06-27 20:04:44 +02:00
joerg@mysql.com
f789b87a1b Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216), 
manual merge from 4.0.
 2006-06-27 18:36:41 +02:00
joerg@mysql.com
46ee3ac19d Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216). 2006-06-27 18:17:53 +02:00
evgen@moonbone.local
9a9224da68 Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql 
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-06-23 14:53:41 +04:00
kent@mysql.com
ef2860e8ff mysql.spec.sh: 
Disable the simplistic auto dependency scan for test/bench (bug#20078)
 2006-06-23 00:37:31 +02:00
joerg@mysql.com
7d83b7e48a Improved fix for bug#18516 (also 19353): 
1) Rename the old shell tool "mysql_upgrade", to avoid a name collision.
2) Improve the spec file, to explicitly use a temporary socket.
 2006-06-22 14:28:05 +02:00
joerg@trift2.
5eea972046 Merge mysql.com:/M50/bug19353-5.0 into mysql.com:/M51/bug19353-5.1 2006-06-22 12:22:52 +02:00
joerg@mysql.com
27df8b07b7 Fix for bug#18516 (also #19353, reported for 5.1): 
In addition to include "mysql_upgrade" in a RPM, it should also be called
when the RPM is upgraded.
 2006-06-20 22:40:46 +02:00
kent@mysql.com
34d82f0bc6 make_win_src_distribution.sh: 
Removed reference to missing "tools" directory
mysql.spec.sh:
  Changed flag --with-yassl => --with-ssl
  Reverted accidental removal of the "make" call :-)
  Configure --with-embedded-server
  Corrected path to "libtool" command
  Corrected path to "libmysqld.a"
  Removed references to "safe_mysqld"
 2006-06-20 12:24:12 +02:00
brian@zim.(none)
ca63edc88b Removing mysql_explain_log from 5.1 2006-05-23 17:26:56 -07:00
kent@mysql.com
49a8f9ee29 Merge 2006-05-21 10:38:59 +02:00
kent@mysql.com
0a778b4ce0 Merge 2006-05-21 00:47:08 +02:00
kent@mysql.com
2419732379 Merge 2006-05-20 23:36:17 +02:00