Commit graph

734 commits

Author SHA1 Message Date
Joerg Bruehe
6ddab77da2 Automerge the build fixes of 5.5.0-m2 back into the tree. 2009-12-16 14:11:20 +01:00
Alexander Nozdrin
78c61d6b83 Remove .cvsignore files (attempt #2). 2009-12-16 11:24:30 +03:00
MySQL Build Team
4746239b37 Handle the "semisync" plugin in
- binary distributions for Windows,
- "generic" RPM packages.
2009-11-26 19:55:33 +01:00
MySQL Build Team
63a044f31f 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
1da38990cb 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
2c3d501189 Automerge from mysql-trunk-merge. 2009-10-19 22:41:18 +04:00
Alexander Nozdrin
a1ac1b7d48 Automerge from mysql-trunk. 2009-10-19 22:40:08 +04:00
Timothy Smith
df129b749d Merge from mysql-5.4.3-beta-release 2009-10-16 20:19:36 +02:00
Timothy Smith
d87592ec52 Update _libdir/plugin to _libdir/mysql/plugin in a few places 2009-10-16 19:59:23 +02:00
Alexander Nozdrin
c30d924dd5 Manual merge from mysql-trunk-merge. 2009-10-14 12:25:39 +04:00
Alexander Nozdrin
c69629d269 Merge from mysql-5.1. 2009-10-13 13:42:38 +04:00
Alexander Nozdrin
21916790a1 Backport WL#4085: Merge revno:2617.56.29 from 6.0. 2009-10-06 14:57:07 +04:00
Alexander Nozdrin
0191eb8d3e Backport WL#4085: Merge revno:2476.1338.9 from 6.0. 2009-10-06 14:53:47 +04:00
unknown
4188fcbd55 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
Jonathan Perkin
54631d6168 Merge up to mysql-5.1-bugteam 2009-09-28 17:32:14 +01:00
Jonathan Perkin
ea295c233b bug#30954: "configure" script in binary distributions considered harmfull
Add --help option.
2009-09-28 15:14:33 +01:00
Alexander Nozdrin
ede2edd19b Merge from mysql-5.1. 2009-09-19 13:07:51 +04:00
Joerg Bruehe
55eb4962c2 Merge the changes done for 5.4.2-beta into "trunk". 2009-09-09 15:21:27 +02:00
Joerg Bruehe
eb26de2356 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
0644b0acfa Merge from mysql-5.1.38-release 2009-09-03 01:48:06 +02:00
Joerg Bruehe
905d715f10 Merge 5.1 up into 5.4-build ("trunk"). 2009-08-29 21:26:00 +02:00
Jonathan Perkin
74092a8e5b Disable ftexample to match other packages, ride previous changelog entry. 2009-08-25 13:00:23 +02:00
Jonathan Perkin
c2bd07ca9c Tidy previous, put example storage engine back as it's used by tests. 2009-08-24 14:06:01 +02:00
Jonathan Perkin
8a2454f8e9 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
df91ff571b Add conditionals for bundled zlib and innodb plugin 2009-08-24 10:50:04 +02:00
Jonathan Perkin
769d9f3803 Apply patch from bug#46834 to install the test suite in RPMs. 2009-08-21 13:58:33 +02:00
Jonathan Perkin
58903aecd3 Add plugins to RPMs. Disable example plugins. 2009-08-21 13:52:30 +02:00
Guilhem Bichot
eceba8912c merge of 5.1-main into mysql-trunk.
Changes to ha_innodb.cc are not propagated to plugin, they will come back
via Oracle/Innobase if needed.
2009-08-12 15:44:34 +02:00
Guilhem Bichot
b57e4dbd88 Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:
bzr branch mysql-5.1-performance-version mysql-trunk # Summit
cd mysql-trunk
bzr merge mysql-5.1-innodb_plugin # which is 5.1 + Innodb plugin 
bzr rm innobase # remove the builtin
Next step: build, test fixes.
2009-08-04 13:25:19 +02:00
Daniel Fischer
69945c6169 merge patch for bug#31785 2009-07-02 15:18:12 +02:00
Mikael Ronstrom
c75a265381 Merged in 5.1.35 2009-07-01 14:36:40 +02:00
Georgi Kodinov
c4930f3505 automerge 2009-06-12 17:07:47 +03:00
Georgi Kodinov
dfb06c38c9 fixed the build-tags command 2009-06-12 17:06:59 +03:00
Mikael Ronstrom
a22c8c5be5 Merge MySQL 5.1.35 into MySQL 5.4 2009-06-11 12:07:59 +02:00
Alexey Botchkov
67117576d0 Bug#44470 innodb_file_io_threads precludes mysql from starting
the innodb_file_io_threads option isn't present here.
    Changed with the innodb_read/write_io_threads

per-file comments:
  support-files/my-innodb-heavy-4G.cnf.sh
2009-06-04 19:37:20 +05:00
MySQL Build Team
b243283e69 Updates to build with community features enabled for community builds. 2009-05-20 23:04:34 +02:00
Chad MILLER
767501a9b1 Merge community up to enterprise, thus ending the community-server
adventure.
2009-05-06 09:06:32 -04:00
MC Brown
31983456ea Adding DTrace test scripts to distribution targets 2009-04-16 18:06:32 +01:00
Daniel Fischer
af8393a6a6 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
c07354b5dc 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
a293acdacf Merge a polishing of an old bug fix,
more for completeness than for relevance.

Also, update copyright notices.

support-files/mysql.spec.sh:
  Using the occasion of the (late) merge,
  correct the copyright notices.
  
  Note the merge is in 2009, but the code changes were all done in 2008.
2009-03-30 16:09:37 +02:00
Georgi Kodinov
fac9dee474 merged 5.1-main -> 5.1-pe-stage 2009-03-09 12:52:08 +02:00
Mikael Ronstrom
c494cbe420 Added DTrace example scripts 2009-03-06 13:31:03 +01:00
unknown
ff645025e1 Only specify the current year for the Sun product copyright 2009-02-24 19:09:22 +01:00
unknown
4da0c708b5 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
8865766a4e 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
d3629d7489 Merge from Tim's 5.0.76-release tree to make 5.0.77 . 2009-01-21 13:45:23 -05:00
Kent Boortz
0c416849bb Merge 2008-12-28 08:03:44 +01:00
Kent Boortz
17a797528d Make sure cluster builds include all charsets 2008-12-28 08:00:23 +01:00
Kent Boortz
8be4724cd9 Increased thread stack size to 128K, as this is the minimum (Bug#41577) 2008-12-28 07:57:09 +01:00