summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-212-28/+48
|\
| * MDEV-5977 MariaDB 10.0 is not installable on Trusty when "trusty-updates ↵Sergei Golubchik2015-06-172-39/+71
| | | | | | | | | | | | | | | | | | | | 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
| * Merge branch '5.5' into 10.0Sergei Golubchik2015-06-112-2/+12
| |\
| | * MDEV-4608 deb packages for jessieSergei Golubchik2015-06-032-2/+12
| | | | | | | | | | | | | | | | | | | | | jessie has newer automake so build-depends could not be satisfied. refresh build-depends, remove automake, libtool, doxygen, texlive-latex-base, ghostscript.
| | * CRLF->LFSergei Golubchik2015-06-022-11/+11
| | |
* | | Update galera package nameNirbhay Choubey2015-03-042-2/+2
| | |
* | | Merge tag 'mariadb-10.0.17' into 10.0-galeraNirbhay Choubey2015-02-274-8/+6
|\ \ \ | |/ / | | | | | | | | | Conflicts: storage/innobase/include/trx0trx.h
| * | MDEV-7520 gtid replication broken during upgrade to debian 10.0.16Sergei Golubchik2015-02-222-4/+6
| | | | | | | | | | | | | | | | | | | | | 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"
| * | fix after 5.5 merge, debian packagingSergei Golubchik2015-02-202-4/+0
| | | | | | | | | | | | | | | * oqgraph is in a separate package in 10.0 * sphinx udf is in the ha_sphinx.so
* | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2015-02-183-1/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Merge branch 10.0 till revision: f37bdd9 - Merge remote-tracking branch 'github/10.0' into 10.0 Conflicts: .bzrignore storage/xtradb/CMakeLists.txt
| * | Merge branch '5.5' into 10.0Sergei Golubchik2015-02-183-1/+5
| |\ \ | | |/
| | * MDEV-7351 5.5 build fails on Ubuntu Utopic in buildbotSergei Golubchik2015-02-092-2/+2
| | | | | | | | | | | | include oqgraph into deb packages conditionally, just like we do with tokudb
| | * MDEV-7519 debian / ubuntu packaging creation of plugin table (if not exists)Elena Stepanova2015-02-081-1/+1
| | | | | | | | | | | | | | | | | | Previously IF NOT EXISTS was added in Debian version in revno 3543. Now added the same for Ubuntu.
* | | MDEV-7470: MariaDB-Galera-server uses 'tar', but 'tar' isNirbhay Choubey2015-01-182-2/+2
| | | | | | | | | | | | | | | | | | | | | not in the dependency list Added tar to the dependency list.
* | | 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-10.0.15 maria/10.0Nirbhay Choubey2014-12-055-10/+19
|\ \ \ | |/ /
| * | debian packaging: add mroonga and example enginesSergei Golubchik2014-11-183-0/+3
| | |
| * | 5.5.40+ mergeSergei Golubchik2014-10-092-2/+8
| |\ \ | | |/
| | * remove mariadb.pc file again, it cannot be added in a GA versionmariadb-5.5.40Sergei Golubchik2014-10-082-2/+1
| | |
| | * include mariadb.pc in debian buildsSergei Golubchik2014-10-081-0/+1
| | |
| | * packaging issues:Sergei Golubchik2014-10-071-1/+1
| | | | | | | | | | | | | | | | | | * 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)
| | * MDEV-6550 Missing dependency on Debian 7 (Wheezy) installation packageSergei Golubchik2014-10-022-2/+8
| | | | | | | | | | | | add bsdutils dependency, because mariadb-server-5.5 deb package uses logger
* | | bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-282-2/+2
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2014-09-182-4/+4
| |\ \ | | |/
| | * support statically linked jemalloc. use that for release buildsSergei Golubchik2014-09-182-4/+4
| | |
| * | 5.5 mergeSergei Golubchik2014-09-162-6/+6
| |\ \ | | |/
| | * debian: require jemalloc >= 3.0.0, because 2.2.5 (on precise) crashesSergei Golubchik2014-09-152-6/+6
| | |
| | * MDEV-6613 build system endianness test fails for ppc64le (i.e. Ubuntu)Sergei Golubchik2014-09-122-6/+6
| | | | | | | | | | | | | | | * remove bundled jemalloc, use the system one * force jemalloc in release builds on linux
| * | MDEV-6118: Unable to install "MariaDB-connect-engine" whenNirbhay Choubey2014-08-062-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | 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. Removed some unnecessary files.
* | | MDEV-6495: local merge from maria-5.5-galera.Nirbhay Choubey2014-08-051-1/+1
| | |
* | | Local merge of patch for MDEV-3896 from maria-5.5-galera.Nirbhay Choubey2014-07-211-1/+15
| | |
* | | bzr merge -rtag:mariadb-10.0.12 maria/10.0Nirbhay Choubey2014-06-1924-764/+0
|\ \ \ | |/ /
| * | 5.5.38 mergeSergei Golubchik2014-06-0628-769/+5
| |\ \ | | |/
| | * don't install ndb related .ini files, remove mysql_fix_privilege_tables.1 ↵Sergei Golubchik2014-06-011-1/+0
| | | | | | | | | | | | and mysqlman.1
| | * MDEV-5485 Minor man pages formatting issuesSergei Golubchik2014-05-3028-768/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-6281 Typo in mysql_install_db scripts and collateral changes: * remove mysql_tableinfo.1 and references to it (there's no mysql_tableinfo) * for debian: create manpages for mysqlrepair, mysqlanalyze, mysqloptimize (as symlinks for mysqlcheck.1, just as executables are symlinks to mysqlcheck) * remove mysqlmanager.8 and references to it * correct "very long line" error in mysqladmin.1 * simplify and fix table formatting in mysqlbinlog.1 and mysqldump.1 * fix a typo in the help text in mysql_install_db * aria_chk: say "for Linux on x86_64", like other tools do (not "for Linux at x86_64") * add simple manpages for aria_* utilities
* | | Fix for a debian build failure (cherry-pickedmariadb-galera-10.0.11Nirbhay Choubey2014-06-092-2/+2
| | | | | | | | | | | | | | | from 10.0:r4231).
* | | Fixed a typo in debian control file.Nirbhay Choubey2014-06-021-1/+0
| | |
* | | Added rsync to galera server's debian dependency list.Nirbhay Choubey2014-05-292-2/+3
| | |
* | | Removing rsync from the debian build dependency list.Nirbhay Choubey2014-05-272-2/+2
| | |
* | | MDEV#6211: MariaDB-Galera-server uses 'socat', but 'socat' isNirbhay Choubey2014-05-252-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | not in the dependency list Added socat, grep, gawk, iproute, coreutils, findutils to the dependency list.
* | | Merging changes from maria-5.5-galera andNirbhay Choubey2014-05-225-10/+171
| | | | | | | | | | | | | | | | | | | | | some test fixes. bzr merge -r3479..3493 maria-5.5-galera
* | | bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-7/+7
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2014-05-093-9/+17
| |\ \ | | |/
| | * MDEV-5625 Debian package mariadb-client-5.5 lacks dependency on ↵Sergei Golubchik2014-04-102-2/+10
| | | | | | | | | | | | libterm-readkey-perl
| | * MDEV-6022 Patch 44_scripts__mysql_config__libs.dpatch is inapplicable, deb ↵Sergei Golubchik2014-04-071-7/+7
| | | | | | | | | | | | package creation fails
| * | MDEV-5454 Dependencies for mariadb-connect-engine-10.0.deb don't look correctSergei Golubchik2014-05-042-2/+4
| | |
* | | MDEV-6192 [Warning] Failed to load slave replication state fromNirbhay Choubey2014-04-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | table mysql.gtid_slave_pos: 1286: Unknown storage engine 'InnoDB' Removed 'loose-innodb' option from mysqld booststrap command in debian post-installation script.
* | | Adding wsrep_sst_xtrabackup-v2 to the list of filesNirbhay Choubey2014-04-152-0/+2
| | | | | | | | | | | | | | | in mariadb-galera-server package.
View Lorry Controller Status