Commit graph

721 commits

Author SHA1 Message Date
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
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
a02157aea2 Correction: The "release" setting had got lost in the RPM spec file. 2010-02-12 17:23:22 +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
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
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
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
Jonathan Perkin
3e56bac07c Merge up to mysql-5.1-bugteam 2009-09-28 17:32:14 +01:00
Jonathan Perkin
8f640b6239 bug#30954: "configure" script in binary distributions considered harmfull
Add --help option.
2009-09-28 15:14:33 +01:00
Jonathan Perkin
b74d8fa21e Merge from mysql-5.1.38-release 2009-09-03 01:48:06 +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
Daniel Fischer
e9691bdd4f merge patch for bug#31785 2009-07-02 15:18:12 +02:00
Georgi Kodinov
73a1360341 automerge 2009-06-12 17:07:47 +03:00
Georgi Kodinov
67384e7f36 fixed the build-tags command 2009-06-12 17:06:59 +03: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
Daniel Fischer
b075f36280 Bug#34521, removed a bunch of deprecated options from template my.cnf files.
Merged from 5.0 version of this patch:
- Removed entire isamchk section. Support for ISAM tables was removed in 5.0.
- Replaced key_buffer with key_buffer_size (correct spelling).
- Removed skip-bdb, as BDB is no longer included in 5.0 and above.
- Removed commented-out bdb_cache_size and bdb_max_lock for the same reason.
- Removed commented-out innodb_log_arch_dir, deprecated in 5.0.24.
- Removed myisam_max_extra_sort_file_size, deprecated in 5.0.6. 
- Removed log_long_format, deprecated in 4.1.
- Replaced default_table_type with default-storage-engine.
New in 5.1:
- Replaced table_cache with table_open_cache.
- Removed skip-federated, should have been in 5.0 only.
- Replaced log_slow_queries with slow_query_log, deprecated in 5.1.29.
2009-03-31 16:04:01 +02:00
Daniel Fischer
94a7e115db Bug#34521, removed a bunch of deprecated options from template my.cnf files:
- Removed entire isamchk section. Support for ISAM tables was removed in 5.0.
- Replaced key_buffer with key_buffer_size (correct spelling).
- Removed skip-bdb, as BDB is no longer included in 5.0 and above.
- Removed commented-out bdb_cache_size and bdb_max_lock for the same reason.
- Removed commented-out innodb_log_arch_dir, deprecated in 5.0.24.
- Removed myisam_max_extra_sort_file_size, deprecated in 5.0.6. 
- Removed log_long_format, deprecated in 4.1.
- Replaced default_table_type with default-storage-engine.
2009-03-31 11:54:48 +02: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
Georgi Kodinov
93a58abe87 merged 5.1-main -> 5.1-pe-stage 2009-03-09 12:52:08 +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
Davi Arnaut
4d5668d93b Backport from 6.0 fix for Bug#38249
2722 Konstantin Osipov	2008-10-03
Fix Bug#38249 innodb_log_arch_dir still in support files
Remove a non-supported variable from cnf file templates.
2009-02-12 20:32:37 -02:00
Chad MILLER
f68ccd024a Merge from Tim's 5.0.76-release tree to make 5.0.77 . 2009-01-21 13:45:23 -05:00
Kent Boortz
3ceb849f8a Merge 2008-12-28 08:03:44 +01:00
Kent Boortz
54e3ab8aff Make sure cluster builds include all charsets 2008-12-28 08:00:23 +01:00
Kent Boortz
b89aaffb25 Increased thread stack size to 128K, as this is the minimum (Bug#41577) 2008-12-28 07:57:09 +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
Georgi Kodinov
7a05a4f5dc Bug #39812: Make statement replication default for 5.1 (to match 5.0)
Make STMT replication default for 5.1.
Add a default of MIXED into the config files
Fix the tests that needed MIXED replication mode.
2008-10-03 15:24:19 +03: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
4cff4db39b Merge the bug fix development (37098: "unpackaged files")
into the 5.0 team tree.
2008-08-27 16:25:24 +02:00
Joerg Bruehe
eb3681ef5b Merge bug fix development tree (37098: "unpackaged files")
into current team tree (version 5.1).
2008-08-27 16:20:29 +02:00