mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 10:31:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
198770 commits 2786 branches 343 tags 1.7 GiB
Commit graph

1203 commits

Author SHA1 Message Date
Otto Kekäläinen
61e31aa5d4 Remove files from debian/* that are unrelevant for this upstream repo 
* README and NEWS are very old and mostly plain wrong and not needed
 * Lintian-overrides are relevant only in actual Debian QA systems
 * watch file was plain wrong and anyway relevant only in downstream distros
 2015-07-22 11:29:21 +03:00
Otto Kekäläinen
6809fdb741 Update autobake.sh to match control file location. Drop lucid and squeeze support. 2015-07-22 10:28:39 +03:00
Otto Kekäläinen
af9509d0d8 debian/*: wrap and sort for cleaner diffs 2015-07-21 23:24:05 +03:00
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
Sergey Vojtovich
94bc50650e MDEV-8374 - Debian: mysqld_safe Can't log to error log and syslog at the same time 
Let mysqld_safe_syslog.cnf force disable error log so that logging to syslog is
not affected by previous log_error setting.

Added handling of --skip-log-error to mysqld_safe.
 2015-07-16 14:03:29 +04:00
Sergei Golubchik
658992699b Merge tag 'mariadb-10.0.20' into 10.1 2015-06-27 20:35:26 +02:00
Nirbhay Choubey
46024098be Merge tag 'mariadb-10.0.20' into 10.0-galera 2015-06-21 23:54:55 -04:00
Nirbhay Choubey
327409443f Merge tag 'mariadb-5.5.44' into 5.5-galera 2015-06-21 21:50:43 -04: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
Sergei Golubchik
8e7d6652ad CRLF->LF 2015-06-02 22:07:47 +02:00
Nirbhay Choubey
a1f3356bf3 Update galera package name/version for debian 2015-04-15 10:21:46 -04:00
Sergei Golubchik
24341cb6cb add encryption plugins to deb packages 2015-04-10 18:01:53 +02:00
Elena Stepanova
bf963d3b52 MDEV-7874 deb package installation fails with "dpkg: dependency problems prevent configuration of mariadb-server" 
Added usr/share/mysql/maria_add_gis_sp_bootstrap.sql to the file lists
 2015-03-30 01:09:59 +03:00
Sergei Golubchik
2db62f686e Merge branch '10.0' into 10.1 2015-03-07 13:21:02 +01:00
Nirbhay Choubey
73a143ab34 Update galera package name 2015-03-04 19:52:15 -05:00
Nirbhay Choubey
e52a58a5cc Update galera package name 2015-03-04 19:49:17 -05:00
Nirbhay Choubey
af651c80f7 Merge tag 'mariadb-10.0.17' into 10.0-galera 
Conflicts:
	storage/innobase/include/trx0trx.h
 2015-02-27 17:36:54 -05:00
Sergei Golubchik
dc94bd09b8 MDEV-7520 gtid replication broken during upgrade to debian 10.0.16 
Don't binlog mariadb setup sql statements:
* use "mysql_install_db --disable-log-bin"
* use "mysqld --bootstrap --disable-log-bin"
* use "SET sql_log_bin=0"
 2015-02-22 12:54:52 +01:00
Sergei Golubchik
6a1d44339b fix after 5.5 merge, debian packaging 
* oqgraph is in a separate package in 10.0
* sphinx udf is in the ha_sphinx.so
 2015-02-20 14:10:25 +01:00
Nirbhay Choubey
860576f416 Merge branch '10.0' into 10.0-galera 
Merge branch 10.0 till revision:
f37bdd9 - Merge remote-tracking branch 'github/10.0' into 10.0

Conflicts:
	.bzrignore
	storage/xtradb/CMakeLists.txt
 2015-02-18 18:07:45 -05:00
Nirbhay Choubey
3c9137deeb Merge branch '5.5' into 5.5-galera 
Merge banch 5.5 till revision :
fdd6c11 - MDEV-7419 Function cli_safe_read not exported

Conflicts:
	.bzrignore
	debian/dist/Debian/mariadb-galera-server-5.5.files.in
	debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in
	storage/tokudb/CMakeLists.txt
	support-files/build-tags
 2015-02-18 17:15:57 -05:00
Sergei Golubchik
d7e7862364 Merge branch '5.5' into 10.0 2015-02-18 15:16:27 +01: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
f007f82881 MDEV-7351 5.5 build fails on Ubuntu Utopic in buildbot 
include oqgraph into deb packages conditionally, just like we do with tokudb
 2015-02-09 20:53:28 +01:00
Sergei Golubchik
bceb0b0be1 MDEV-7151 ha_archive.so missing from .deb 
add missing plugins to debs
 2015-02-08 20:44:46 +01:00
Elena Stepanova
0d73bc1c25 MDEV-7519 debian / ubuntu packaging creation of plugin table (if not exists) 
Previously IF NOT EXISTS was added in Debian version in revno 3543. 
Now added the same for Ubuntu.
 2015-02-08 15:47:00 +03: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
Sergey Vojtovich
8c616cd347 MDEV-7053 - WSREP_STATUS & WSREP_MEMBERSHIP I_S tables 
wsrep_status was renamed to wsrep_info. Adjusted deb build scripts accordingly.
 2014-12-26 19:44:38 +04: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
86d7512f42 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:27:49 -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
717a264ef4 MDEV-6894 Enable SEQUENCE engine by default 2014-12-04 10:41:52 +01:00
Sergei Golubchik
1caee39307 disable mroonga temporarily: see MDEV-7246 2014-12-02 22:25:53 +01: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
Nirbhay Choubey
deffb95bc2 MDEV-7161: Build failure in buildbot on work-amd64-valgrind 
Fix for embedded build failure.
Also added wsrep_info plugin library to server debian package.
 2014-11-23 09:55:57 -05:00
Sergei Golubchik
17956118ca debian packaging: add mroonga and example engines 2014-11-18 22:27:26 +01:00
Nirbhay Choubey
5ff6f6f883 Added SST scripts to the server package. 2014-10-27 21:19:12 -04:00
Sergei Golubchik
f62c12b405 Merge 10.0.14 into 10.1 2014-10-15 12:59:13 +02: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
7f5e51b940 MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes) 
remove:
* NDB from everywhere
* IM from mtr-v1
* packaging/rpm-oel and packaging/rpm-uln
* few unused spec files
* plug.in file
* .bzrignore
 2014-10-11 18:53:06 +02:00
Sergei Golubchik
d103e359f8 followup changes to timeout commit 
* fix debian patch
* update the copyright
* rename include guards to follow conventions
* restore incorectly deleted test file, add clarification in a comment
* capitalize the first letter of the status variable
 2014-10-10 22:27:36 +02:00
Nirbhay Choubey
068fb8569f bzr merge -rtag:mariadb-5.5.40 maria/5.5 2014-10-09 17:25:08 -04:00
Sergei Golubchik
1b75bed00f 5.5.40+ merge 2014-10-09 10:30:11 +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
c1a4f0c5ab include mariadb.pc in debian builds 2014-10-08 00:45:56 +02:00
Sergei Golubchik
e73e1e7c7a packaging issues: 
* skip debian 44_scripts__mysql_config__libs.dpatch it does not apply anymore
  (and anyway it would not work for a static library)
* fix the path for install(mariadb.pc)
 2014-10-07 16:21:53 +02:00