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

69 commits

Author SHA1 Message Date
Otto Kekäläinen
82e64fde07 Remove debian/dist/* and have just one version 
Use the slightly better Ubuntu version in both Ubuntu and
Debian and latest versions of Debian don't have problems
with AppArmor files included in packaging.
 2015-07-21 23:21:50 +03:00
Sergei Golubchik
658992699b Merge tag 'mariadb-10.0.20' into 10.1 2015-06-27 20:35:26 +02:00
Sergei Golubchik
5a4c5fa211 MDEV-5977 MariaDB 10.0 is not installable on Trusty when "trusty-updates universe" is in sources.list 
fix upgrade[2] tests on trusty and utopic: add missing
conflicts/replaces, client-10.0 should conflict/replace client-5.5.

reformat other conflicts/replaces lines to make them easier
to read and merge
 2015-06-17 14:18:16 +02:00
Sergei Golubchik
810cf362ea Merge branch '5.5' into 10.0 2015-06-11 20:20:35 +02:00
Sergei Golubchik
33d480f8b7 MDEV-4608 deb packages for jessie 
jessie has newer automake so build-depends could not be satisfied.

refresh build-depends, remove automake, libtool,
doxygen, texlive-latex-base, ghostscript.
 2015-06-03 16:33:10 +02:00
Nirbhay Choubey
a1f3356bf3 Update galera package name/version for debian 2015-04-15 10:21:46 -04:00
Sergei Golubchik
11536f99f1 MDEV-7305 Difficulties building cracklib_password_check 
put cracklib_password_check into a separate package.
build it conditionally on Debian/Ubuntu
 2015-02-17 23:49:56 +01:00
Sergei Golubchik
87eb82d4d5 cleanup: remove old debian/ubuntu names from debian/* files 
namely, remove the code to support:
etch, lenny, hardy, intrepid, jaunty, karmic, maverick, natty
 2015-02-17 23:49:55 +01:00
Sergei Golubchik
8e7649867f Merge 10.0-galera into 10.1 2015-02-06 16:14:23 +01:00
Nirbhay Choubey
f6e1906ced MDEV-7470: MariaDB-Galera-server uses 'tar', but 'tar' is 
not in the dependency list

Added tar to the dependency list.
 2015-01-18 18:16:36 -05:00
Nirbhay Choubey
41367e4023 MDEV-7204: mariadb-galera-server el7 rpms packaging 
issue, no mariadb-server in provides
MDEV-7233: Fix issue with missing dependency socat
           when installing MariaDB-galera-server on
           RedhatEL/OracleEL/(Others?) RPM based 

* Added mariadb-server to "provides" for MariaDB Galera
  server package. (rpm)
* Removed "socat" from MariaDB Galera server's mandatory
  dependency list. (rpm)
* Moved "socat" from mandatory to optional dependency. (deb)
 2014-12-09 10:35:16 -05:00
Nirbhay Choubey
3bb02f3e6d bzr merge -rtag:mariadb-10.0.15 maria/10.0 2014-12-05 12:33:02 -05:00
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
Sergei Golubchik
f62c12b405 Merge 10.0.14 into 10.1 2014-10-15 12:59:13 +02:00
Sergei Golubchik
1b75bed00f 5.5.40+ merge 2014-10-09 10:30:11 +02:00
Sergei Golubchik
9d4b365d5d MDEV-6550 Missing dependency on Debian 7 (Wheezy) installation package 
add bsdutils dependency, because mariadb-server-5.5 deb package uses logger
 2014-10-02 13:47:52 +02:00
Sergei Golubchik
3620910eea cleanup: galera merge, simple changes 2014-10-01 23:38:27 +02:00
Nirbhay Choubey
c916085e27 bzr merge -rtag:mariadb-10.0.14 maria/10.0/ 2014-09-28 20:43:56 -04:00
Nirbhay Choubey
d6a67ce080 Fix for syntax error in debian control file. 2014-09-25 13:32:55 -04:00
Sergei Golubchik
989dd4d9ec 5.5 merge 2014-09-18 21:54:45 +02:00
Sergei Golubchik
e41bca0066 support statically linked jemalloc. use that for release builds 2014-09-18 17:00:44 +02:00
Sergei Golubchik
7e29c1b539 5.5 merge 2014-09-16 14:03:17 +02:00
Sergei Golubchik
f18b1400d1 debian: require jemalloc >= 3.0.0, because 2.2.5 (on precise) crashes 2014-09-15 18:55:17 +02:00
Sergei Golubchik
3d94523638 MDEV-6613 build system endianness test fails for ppc64le (i.e. Ubuntu) 
* remove bundled jemalloc, use the system one
* force jemalloc in release builds on linux
 2014-09-12 08:41:16 +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
abbdc7ae86 MDEV-6118: Unable to install "MariaDB-connect-engine" when 
using "MariaDB-Galera-server"

rpm: Updated components' requires-list to include "MariaDB"
     instead of "MariaDB-server".

deb: Added (ORed) 'mariadb-galera-server-10.0' to the 'Depends'
     list of connect and oqgraph engine packages.
 2014-08-06 19:31:13 -04:00
Nirbhay Choubey
707f378a13 Added rsync to galera server's debian dependency list. 2014-05-29 15:39:29 -04:00
Nirbhay Choubey
ef7e173404 Removing rsync from the debian build dependency list. 2014-05-27 09:06:04 -04:00
Sergei Golubchik
eef1201bcc set version to 10.1.0 2014-05-25 17:17:50 +02: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
Sergei Golubchik
d3e2e1243b 5.5 merge 2014-05-09 12:35:11 +02:00
Sergei Golubchik
a5beb350ae MDEV-5454 Dependencies for mariadb-connect-engine-10.0.deb don't look correct 2014-05-04 17:37:54 +02:00
Nirbhay Choubey
90e4f7f9d3 * bzr merge -rtag:mariadb-10.0.9 maria/10.0 
* Fix for post-merge build failures.
 2014-03-26 14:27:24 -04:00
Nirbhay Choubey
586fab72f0 Merging deb/rpm script changes from maria-5.5-galera. 2014-03-24 16:40:24 -04:00
Nirbhay Choubey
8a99be643c Modified debian scripts to make galera packages 
self-contained.
 2014-03-14 17:52:55 -04:00
Nirbhay Choubey
ff0f41974c Debian script fixes. 2014-03-13 11:56:37 -04:00
Sergei Golubchik
2eaaeaeaa2 MDEV-5625 Debian package mariadb-client-5.5 lacks dependency on libterm-readkey-perl 2014-04-10 13:10:33 +02:00
Nirbhay Choubey
9564537cb1 Fixes in debian distribution files. 2014-02-13 09:33:04 -05:00
Sergei Golubchik
a0de0fd50e revert bugfix for MDEV-5295 deb upgrade 5.5 to 10.0.6 does not work 
it didn't help, instead it only broke upgrades even more
 2014-02-05 18:18:51 +01:00
Sergei Golubchik
72c20282db 10.0-base merge 2014-02-03 15:22:39 +01:00
Nirbhay Choubey
4a6be51f78 * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera. 
* Fixed Debian/Ubuntu dist files.
* Fixed some compiler warnings.
 2014-01-30 12:45:38 -05:00
Sergei Golubchik
a9c22c1888 MDEV-5295 deb upgrade 5.5 to 10.0.6 does not work 
Use Breaks: not Conflicts:
 2014-01-29 16:10:53 +01:00
Sergei Golubchik
4a3ea30221 MDEV-4787 Missing dependency to "patch" for the Debian/Ubuntu "mariadb-test" package 
add patch as a "suggested" dependency to mariadb-test-5.5
 2014-01-27 16:58:26 +01:00
Sergey Vojtovich
4cee899fb7 MDEV-5319 - Request for merge of Oqgraph v3 functionality 
storage/oqgraph into 10.0

- since oqgraph depends on Judy, move it to a separate package (DEB)
 2013-12-16 16:03:34 +04:00
Sergei Golubchik
b2c56742b5 restore debian/dist/Ubuntu/control that was changed by mistake 2013-12-12 17:02:13 +01:00
Sergei Golubchik
cec76b3861 correct old assert in add_role_user_mapping_action to match changed function prototypes. 
fix the element deleting logic for roles_mappings_hash
 2013-12-09 12:39:31 +01:00
Sergei Golubchik
ed910b62e9 remove unused libevent (that was merged from 5.6 by mistake) 2013-11-21 15:05:25 +01:00
Sergei Golubchik
4157185f24 10.0-base merge 2013-11-13 23:03:48 +01:00
Sergei Golubchik
3d57c343e5 MDEV-5038 put tokudb into the server package 2013-11-11 09:30:35 +01:00