mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 09:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
202447 commits 2780 branches 343 tags 1.6 GiB
Commit graph

236 commits

Author SHA1 Message Date
Sergei Golubchik
853077ad7e Merge branch '10.0' into bb-10.1-merge 
Conflicts:
	.bzrignore
	VERSION
	cmake/plugin.cmake
	debian/dist/Debian/control
	debian/dist/Ubuntu/control
	mysql-test/r/join_outer.result
	mysql-test/r/join_outer_jcl6.result
	mysql-test/r/null.result
	mysql-test/r/old-mode.result
	mysql-test/r/union.result
	mysql-test/t/join_outer.test
	mysql-test/t/null.test
	mysql-test/t/old-mode.test
	mysql-test/t/union.test
	packaging/rpm-oel/mysql.spec.in
	scripts/mysql_config.sh
	sql/ha_ndbcluster.cc
	sql/ha_ndbcluster_binlog.cc
	sql/ha_ndbcluster_cond.cc
	sql/item_cmpfunc.h
	sql/lock.cc
	sql/sql_select.cc
	sql/sql_show.cc
	sql/sql_update.cc
	sql/sql_yacc.yy
	storage/innobase/buf/buf0flu.cc
	storage/innobase/fil/fil0fil.cc
	storage/innobase/include/srv0srv.h
	storage/innobase/lock/lock0lock.cc
	storage/tokudb/CMakeLists.txt
	storage/xtradb/buf/buf0flu.cc
	storage/xtradb/fil/fil0fil.cc
	storage/xtradb/include/srv0srv.h
	storage/xtradb/lock/lock0lock.cc
	support-files/mysql.spec.sh
 2014-12-02 22:25:16 +01:00
Sergey Vojtovich
52fb08ac31 MDEV-6886 - Add RHEL7 RPM layout 
Set proper alternative names on RHEL7: they should match Fedora names.
 2014-10-17 15:08:50 +04:00
Sergei Golubchik
5ca5f92a1d MDEV-5749 Please add a .pc file to MariaDB for easy use via pkg-config 2014-10-11 18:53:06 +02:00
Sergei Golubchik
dbda20caff remove mariadb.pc file again, it cannot be added in a GA version 2014-10-08 09:35:00 +02:00
Sergei Golubchik
604b653394 MDEV-5749 Please add a .pc file to MariaDB for easy use via pkg-config 
1. move cflags/libs cleanup from mysql_config.sh (runtime)
   to for_client.cmake (build time). Include/library paths are
   still calculated at runtime (they depend on the location of mysql_config)

2. Use cleaned-up cflags/libs to generate mariadb.pc

3. remove obsolete @expansions@ from mysql_config (for variables that are
   never set in cmake files)
 2014-10-02 16:58:26 +02:00
Sergei Golubchik
3620910eea cleanup: galera merge, simple changes 2014-10-01 23:38:27 +02:00
Jan Lindström
df4dd593f2 MDEV-6247: Merge 10.0-galera to 10.1. 
Merged lp:maria/maria-10.0-galera up to revision 3879.

Added a new functions to handler API to forcefully abort_transaction,
producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These
were added for future possiblity to add more storage engines that
could use galera replication.
 2014-08-26 15:43:46 +03:00
Nirbhay Choubey
d939fad231 Added rsync to galera server's rpm dependency list. 2014-05-29 21:02:17 -04:00
Nirbhay Choubey
bd5ca5e609 MDEV#6211: MariaDB-Galera-server uses 'socat', but 'socat' is 
not in the dependency list

Added socat, grep, gawk, iproute, coreutils, findutils to the
dependency list.
 2014-05-25 00:18:26 -04:00
Nirbhay Choubey
ab4947463e Merging changes from maria-5.5-galera and 
some test fixes.

bzr merge -r3479..3493 maria-5.5-galera
 2014-05-22 18:31:04 -04:00
Nirbhay Choubey
086af8367e bzr merge -r4209 maria/10.0. 2014-05-21 11:09:55 -04:00
Nirbhay Choubey
586fab72f0 Merging deb/rpm script changes from maria-5.5-galera. 2014-03-24 16:40:24 -04:00
Sergei Golubchik
f5823b793d MDEV-6004 MariaDB init script fails to start (missing dependency on MariaDB-client in server RPM) 2014-04-08 09:58:33 +02:00
Sergei Golubchik
d81d13f177 MDEV-5390 doesn't install on fedora if mysql is installed, part 2 
On fedora:
1. provide/obsoleve mariadb-* packages
2. MariaDB-common conflicts with mariadb-libs (on filesystem level),
   but does not provide or obsolete it.
 2014-02-19 21:40:25 +01:00
Sergei Golubchik
de8f29bd3a RPM: 
* readability fixes
* CPackRPM wrapper to fix property leakage between components (cmake bug 13248)
 2014-02-19 21:40:20 +01:00
Sergei Golubchik
ce4d5fe53c RPM: fix alternative provides/obsoletes - put the correct architecture and version 2014-02-17 11:09:50 +01:00
Seppo Jaakola
496e22cf3b merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 
and a number of fixes to make this buildable. 
Run also few short multi-master high conflict rate tests, with no issues
 2013-12-04 10:32:43 +02:00
Sergei Golubchik
d1f2ba3985 MDEV-5250 doesn't install on fedora if mysql is installed 
when our package is to replace "mysql", it has both provide and obsolete it
 2013-11-07 13:22:27 +01:00
Sergei Golubchik
265bbf5fe1 introduce sysconf2dir, install tokudb.conf there, both in rpm and deb 2013-09-10 22:59:18 +02:00
Seppo Jaakola
db0cfba638 Merged with lp:maria revision #3766 2013-07-13 13:30:03 +03:00
Seppo Jaakola
0a9216835f Initial merge result with mariaDB 10: lp:maria 2013-07-13 13:01:13 +03:00
Sergei Golubchik
7642154725 MDEV-4199 Installing postfix on CentOS 5.9 requires MariaDB-server 
to match distribution packages better:
  remove "mysql" from server.rpm Provides, add it to the shared.rpm Provides.
  fake provides that "mysql" and "mysql-libs" packages would've had.

cleanup:
  remove auto-generated provides from the manual provides list.
 2013-05-13 15:49:27 +02:00
Sergei Golubchik
e4e5c9fd14 hack in dependencies to imitate mysql-*.rpm even better 2013-03-06 09:38:08 +01:00
Sergei Golubchik
3bfd88d1d6 MDEV-4068 rpm scriptlet chown command dangerous 
add --mysqld option to my_print_defaults
change server-postin script to use that
 2013-03-06 09:32:13 +01:00
Sergei Golubchik
f93b5a6027 make rpm packages to respect CMAKE_INSTALL_PREFIX 2013-02-08 12:59:54 +01:00
Sergei Golubchik
52fbe44fbb more changes for fedora18 2013-01-29 12:27:31 +01:00
Sergei Golubchik
78e47eb004 fix 'compat' rpm for fedora18 2013-01-29 10:46:05 +01:00
Vladislav Vaintroub
8864940583 MDEV-3971 : problems installing MariaDB packages (conflicts with mysql-libs-5.5) 
FIx  : make "shared" RPM obsolete/provide mysql-libs
 2013-01-25 16:50:14 +01:00
Sergei Golubchik
48bf57b02e MDEV-3832 MariaDB conflicts with packages filesystem-3.1-2.fc18.i686 and jre-1.7.0_09-fcs.i586 on Fedora 18 
fix the rpm packaging to work on Fedora18. Two problems:
* conflicts on common directories with other packages.
* more auto-generated requirements for mariadb-test.rpm
 2013-01-19 14:03:33 +01:00
Sergei Golubchik
bf106948e0 RPM fixes: 
shared should provide libmysqlclient.so.18(libmysqlclient_16) too
  don't "use DBD::mysql" explicitly in mytop
 2012-10-17 19:04:08 +02:00
Sergei Golubchik
3012a5d5ce MDEV-3796 various RPM problems 
cmake/cpack_rpm.cmake:
  * mark all cnf files with %config(noreplace)
  * add the forgotten postun script
sql/sys_vars.cc:
  0 for a string variable means "no default. But datadir has the default value.
support-files/rpm/server-postin.sh:
  * use mysqld --help to determine the correct datadir in the presence of my.cnf files
    (better than my_print_defaults, because it considers the correct group set).
  * Only create users, and chown/chmod if it's a fresh install, not an upgrade.
  * only run mysql_install_db if datadir does not exist
 2012-10-05 14:24:38 +02:00
Vladislav Vaintroub
13f6783f75 MDEV-409 : /etc/my.cnf config file overwritten during RPM installation 
Fix : use attribute %config(noreplace)  for /etc/my.cnf , instead of (automatically generated) %config
 2012-07-23 23:54:57 +02:00
Sergei Golubchik
32addeaf45 RPM packages should not obsolete themselves. 
Otherwise yum on fedora will not install them
(rpm will, yum on centos and rhel will).
 2012-05-29 21:38:51 +02:00
Sergei Golubchik
6cfb62b733 MDEV-293 5.5 RPMs for RHEL6/CentOS6 
Build MariaDB-compat rpm by repackaging files from MariaDB-shared-5.3.*.rpm
Or RHEL6/CentOS6 make all other MariaDB rpms depend on MariaDB-compat.
 2012-05-29 21:38:35 +02:00
Sergei Golubchik
be0d1179a8 create a new MariaDB-common.rpm that contains files needed both by the client and the server. 
use my.cnf includes to split one big my.cnf file in server and client parts.

remove "Provides: mysql-libs" (doesn't help on CentOS 6)
 2012-05-25 19:18:29 +02:00
Sergei Golubchik
ec586f529c Building RPMs with CPack 
configure with cmake -DRPM=distro
 2012-05-22 11:04:32 +02:00