summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAgeFilesLines
* General spell fixing in comments and stringsOtto Kekäläinen2016-06-082-2/+2
|
* attempt to fix debian build (gssapi plugins require 10.1 client or server ↵Vladislav Vaintroub2016-05-143-4/+8
| | | | instead of 10.2
* Merge branch '10.1' into 10.2Sergei Golubchik2016-03-2310-19/+33
|\
| * Merge branch 'bb-10.1-serg' into 10.1Sergei Golubchik2016-03-226-18/+14
| |\
| | * Merge branch '10.0' into 10.1Sergei Golubchik2016-03-216-18/+14
| | |\
| | | * Fixed false errors returned by logrotate scriptSergey Vojtovich2016-03-101-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logrotate script assumed an error if mysqladmin failed to connect to server and there's mysqld process exists. However there can be non-system instance of mysqld running (e.g. in docker) making this assumption wrong. Check pid file existance instead.
| | | * Update AskMonty and Atlassian references to MariaDBiangilfillan2016-03-081-1/+1
| | | |
| | | * Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-043-4/+4
| | | |
| | | * MDEV-9643: Don't emit any "deb-systemd-helper not found" warningsOtto Kekäläinen2016-02-292-4/+8
| | | |
| | | * MDEV-9354: Debian: unmask the mysql.service on installationOtto Kekäläinen2016-01-112-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unmask the systemd mysql.service if left behind by mysql-server-5.6 Without this a simple 'apt-get install mariadb-server' would end up with a system where mysqld is not running despite it was running OK with mysql-server-5.6 installed, and users might wrongly think mariadb-server package is broken when the real cause was the removal of mysql-server-5.6 that left a /etc/systemd/system/ file behind pointing to /dev/null.
| * | | MDEV-9382: After updating mariadb server apt-configure failsNirbhay Choubey2016-03-221-1/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When acting as a Galera receiver node, server startup may take more than 30 secs (the current default) as it has to wait for SST/IST operation to complete besides spending some time doing wsrep recovery. Fixed by raising the default value of MYSQLD_STARTUP_TIMEOUT to 60 secs. Also sourced /etc/default/mariadb into the init script so that it can be used to set MYSQLD_STARTUP_TIMEOUT.
| * | MDEV-9587 - Debian packaging for GSSAPI pluginSergey Vojtovich2016-03-183-0/+15
| | |
* | | MDEV-7331 - information_schema.user_variablesSergey Vojtovich2016-02-261-0/+1
| | |
* | | Merge branch '10.1' into 10.2Sergei Golubchik2016-02-253-103/+431
|\ \ \ | |/ /
| * | mysqlreport update to 4.0, see MDEV-573 for more informationsJean Weisbuch2016-02-171-101/+429
| | |
| * | MDEV-9484 - Typo fixesDaniel Dent2016-02-172-2/+2
| | |
* | | Merge branch '10.1' into 10.2Monty2016-02-061-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: VERSION cmake/plugin.cmake config.h.cmake configure.cmake plugin/server_audit/server_audit.c sql/sql_yacc.yy
| * | MDEV-9259 Add missing mroonga files to Debian packaging in 10.1Sergei Golubchik2016-01-251-0/+3
| | |
* | | Merge remote-tracking branch 'origin/10.1' into 10.2Alexander Barkov2015-12-295-6/+4
|\ \ \ | |/ /
| * | MDEV-9081 - Debian: insecure debian-sys-maint password handlingSergey Vojtovich2015-12-221-0/+2
| | | | | | | | | | | | | | | | | | Set umask so that newly created file is not readable by others. This is a quick fix to close security gap. To be replaced by MDEV-8375 - passwordless root login.
| * | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-212-2/+1
| |\ \ | | |/
| | * Merge branch '5.5' into 10.0Sergei Golubchik2015-12-131-1/+1
| | |\
| | | * fix debian logrotate slow log filenameChristian Loos2015-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | debian/additions/my.cnf sets slow_query_log_file to /var/log/mysql/mariadb-slow.log. Update the filename to rotate the slow log file.
| | * | Force installation of MariaDB version of mysql-commonOtto Kekäläinen2015-12-111-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make dependency on mysql-common package in debian/control versioned to force that it is installed together with the other mariadb-* packages. This ensures that the init.d and systemd files for MariaDB mysqld are the ones from MariaDB.org repos.
| | * | Make autobake-deb.sh to omit .git directory from source tar.gzOtto Kekäläinen2015-12-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | This is useful for developers who run autobake-deb.sh directly from the source tree as the resulting source tar package will be 90% smaller and all operations regarding it consequently 10x faster.
| | * | Add MySQL 5.6 stanzas next to MySQL 5.5 in debian/control fileOtto Kekäläinen2015-12-111-10/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should make the provides/breaks/replaces/conflicts lines work properly when upgrading from mysql-5.6 to mariadb-packages. Conflicts: debian/control
| | * | Run wrap-and-sort for debian/* files. No functional changes.Otto Kekäläinen2015-12-112-95/+185
| | | |
| | * | Replace two identical debian/control files with a single oneOtto Kekäläinen2015-12-113-290/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only difference between the files was the Debian standards line by one micro version. There was no logical motivation why there was separate control file for Debian and Ubuntu. The new debian/control file lives directly at the correct location and has the correct contents. Modify autobake.sh to take into account new control file location.
| * | | MDEV-9227 : Both CentOS service names mysql and mariadb exist?Nirbhay Choubey2015-12-091-3/+0
| | | | | | | | | | | | | | | | | | | | As 10.1 has systemd support, there is no longer need to set _SYSTEMCTL_SKIP_REDIRECT/SYSTEMD_NO_WRAP.
| * | | switch from myisam_recover to myisam_recover_optionsChristian Loos2015-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | myisam_recover is only an alias for myisam_recover_options. Use the option name instead of the alias is more correct. This also avoids an note about the use of an alias instead of the option name on every server start.
* | | | Merge pull request #123 from ottok/ok-debpkg-10.2Sergey2015-12-231-0/+3
|\ \ \ \ | | | | | | | | | | MDEV-9186 - Debian packaging: extend libcrack hack to create correct control file
| * | | | Debian packaging: extend libcrack hack to create correct control fileOtto Kekäläinen2015-11-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the debian/control gets stripped off the libcrack3 dependency, it should also strip off the mariadb-cracklib-password-check-10.2 package entry, otherwise the resulting Debian source package will not be re-buildable independently later.
* | | | | MDEV-7376 - Removal of the tool "mysql_zap"Sergey Vojtovich2015-11-261-2/+0
| | | | |
* | | | | MDEV-8654 - Remove mysqlbugSergey Vojtovich2015-11-263-4/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | mysqlbug has been obsolete since MySQL 5.5, and has been removed in MySQL 5.7. It's also of no use for reporting MariaDB bugs. The script and the associated man page removed from MariaDB.
* | | | fix debian packaging for 10.2Sergei Golubchik2015-11-2353-566/+578
| | | |
* | | | Bump debian/changelog for 10.2 seriesOtto Kekäläinen2015-11-231-0/+6
|/ / /
* | | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-11-191-1/+11
|\ \ \
| * \ \ Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-09-251-1/+11
| |\ \ \
| | * | | MDEV-8803: Debian jessie 8.2 + MariaDB 10.1.7 + GaleraClusterNirbhay Choubey2015-09-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | * Merge fix for issue #127 from mysql-wsrep (commit : a0ba0d7) * Also, cherry-picked a similar fix for OpenSUSE (commit : 7790cb1)
| | * | | MDEV-8804: bootstrap command missing in debian init scriptNirbhay Choubey2015-09-151-1/+8
| | | | | | | | | | | | | | | | | | | | Add 'bootstrap' to debian init script.
| | * | | Merge tag 'mariadb-5.5.44' into 5.5-galeraNirbhay Choubey2015-06-214-23/+23
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Update galera package nameNirbhay Choubey2015-03-042-2/+2
| | | | |
| | * | | Merge branch '5.5' into 5.5-galeraNirbhay Choubey2015-02-183-3/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | MDEV-7204: mariadb-galera-server el7 rpms packagingNirbhay Choubey2014-12-092-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * | | | bzr merge -rtag:mariadb-5.5.40 maria/5.5Nirbhay Choubey2014-10-092-10/+12
| | |\ \ \ \
| | * | | | | Moved wsrep_slave_threads to optional settings.Nirbhay Choubey2014-09-241-1/+1
| | | | | | |
| | * | | | | Updated config files:Nirbhay Choubey2014-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed QC restriction - Added bind-address Fixed file permissions for wsrep_sst_rsync.sh.
| | * | | | | MDEV-6495: innodb_flush_log_at_trx_commit=0 as suggestionNirbhay Choubey2014-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for galera vs =2 Updated innodb_flush_log_at_trx_commit value in cnfs as per recommendation.
| | * | | | | MDEV-3896: More user-friendly cnf files in MariaDB-Galera rpm/debNirbhay Choubey2014-07-171-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | packages * Added "galera" as default option group. * Updated deb/rpm server config files to include mandatory and optional settings (as comments) required to configure Galera cluster.
| | * | | | | bzr merge -rtag:mariadb-5.5.38 maria/5.5Nirbhay Choubey2014-06-1026-766/+2
| | |\ \ \ \ \