Commit graph

699 commits

Author SHA1 Message Date
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
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
297593c5d3 Better fix of build-tags, merged from local 5.0-bugteam . 2008-08-06 16:45:15 -04:00
Chad MILLER
b94519a154 Bug#37201: make tags doesn't work in bazaar server trees
Fall back to "find" if bzr is unavailable.

Don't fail for paths that have spaces in them.
2008-08-06 16:25:25 -04:00
Chad MILLER
17badbd9a5 Merge from local 5.0-bugteam. 2008-08-06 15:29:41 -04:00
Chad MILLER
15beb38f9f Bug#37201: make tags doesn't work in bazaar server trees
bk sfiles -> bzr ls
2008-08-06 15:27:28 -04:00
Timothy Smith
6e8eaa8e21 Up-merge of merges, some criss-cross resolved with --weave. 2008-07-19 02:31:33 -06:00
Chad MILLER
dae4c823e9 Merge from 5.0 trunk. 2008-07-14 16:16:37 -04: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
Jonathan Perkin
2244456ddf Use skip-federated by default in all example configs. 2008-06-10 21:10:56 +02: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
cmiller@zippy.cornsilk.net
75da480f85 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
2008-03-26 14:30:26 -04:00
cmiller@zippy.cornsilk.net
3af3e6963b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
2008-03-26 14:24:10 -04:00
cmiller@zippy.cornsilk.net
cfb9c8458e Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
2008-03-26 12:39:22 -04:00
cmiller@zippy.cornsilk.net
897f772c14 Suggestion of Tim. Avoid unnecessary sleep. 2008-03-19 18:36:41 -04:00
cmiller@zippy.cornsilk.net
955983a154 Bug#30378: mysql.server needs to skip wait_for_pid() when mysqld \
isn't running

Pass the process id of the manager as a parameter to "wait_for_pid"
and if the manager isn't running, then do not continue to wait.

Also, capture the error message of our process-existence test, 
"kill -0", as we expect errors and shouldn't pass them to the user.  
Additionally, be a bit more descriptive of what the problem is.
2008-03-19 18:13:56 -04:00
tsmith@ramayana.hindu.god
79365b94c8 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-03-19 14:59:48 -06:00
tsmith@ramayana.hindu.god
c4ee11bac6 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-03-19 14:57:35 -06:00
tsmith@ramayana.hindu.god
1f06d215e7 Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-03-19 14:49:28 -06:00