mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
61470 commits 2791 branches 343 tags 1.7 GiB
Commit graph

425 commits

Author SHA1 Message Date
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
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
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