mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 22:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
63044 commits 2781 branches 343 tags 1.6 GiB
Commit graph

780 commits

Author SHA1 Message Date
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
tsmith@ramayana.hindu.god
203de67618 Merge ramayana.hindu.god:/home/tsmith/m/bk/b25486/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
 2008-03-19 13:44:50 -06: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
1cda9d124b Bug #25486: mysqld_multi.server.sh missing from builds 
Make mysqld_multi.server executable, and allow it to be installed
via chkconfig on LSB-compliant systems.
 2008-03-10 03:25:54 -06:00
kent@kent-amd64.(none)
f3daf8ad80 Merge mysql.com:/home/kent/bk/build/mysql-5.0-build 
into  mysql.com:/home/kent/bk/build/mysql-5.1-build
 2008-02-26 18:38:43 +01:00
kent@mysql.com/kent-amd64.(none)
ac15eee942 Makefile.am, Info.plist.sh: 
Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
misc.m4, character_sets.m4, openssl.m4:
  Removed unneded semicolon
 2008-02-26 18:36:06 +01:00
joerg@trift2.
25ab6afc03 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-02-22 16:14:27 +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
tomas@poseidon.ndb.mysql.com
832b498e72 Merge poseidon.ndb.mysql.com:/home/tomas/cge-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2008-02-11 17:38:34 +01:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
c8d4323975 Makefile.am: 
Needed to add the new sample configuration files to the CLEANFILES section
 2008-01-24 19:04:48 +01:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
9803176bd1 config.medium.ini.sh, config.small.ini.sh, config.huge.ini.sh: 
Sample cluster configuration files for 5.1
Makefile.am:
  Updated for new files
 2008-01-23 20:45:46 +01:00
serg@janus.mylan
d9ca7b670e Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-12-20 22:11:37 +01:00
cmiller@zippy.cornsilk.net
edbacd3a99 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmerge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-12-14 13:42:09 -05: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
kent@mysql.com/kent-amd64.(none)
ec2e2fc187 ReadMe.txt, INSTALL-WIN-SOURCE, INSTALL-BINARY, INSTALL-SOURCE: 
Updated links to version 5.1 of the manual
 2007-11-23 10:15:55 +01:00
df@pippilotta.erinye.com
8c88e1faa2 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-11-21 19:42:50 +01:00
df@pippilotta.erinye.com
cf7b21c005 add wrong warning to suppression file 2007-11-21 19:41:13 +01:00