summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* Correct FSF addressiangilfillan2017-03-101-1/+1
* MDEV-11942 BLACKHOLE is no longer active in 10.1 by default, mysql_upgrade no...Sergei Golubchik2017-03-101-32/+60
* make mysql_upgrade try to install missing storage engine plugins (MDEV-11942)Hartmut Holzgraefe2017-03-101-2/+48
* Merge 10.0 into 10.1Marko Mäkelä2017-03-091-2/+3
|\
| * Merge branch 'bb-10.0-vicentiu' into 10.0mariadb-10.0.30Vicențiu Ciorbaru2017-03-061-2/+3
| |\
| | * Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-031-2/+3
| | |\
| | | * MDEV-11505 wrong databasename in mysqldump commentSergei Golubchik2017-02-271-2/+3
* | | | spelling fixesklemens2017-03-075-16/+16
* | | | Merge 10.0 into 10.1Marko Mäkelä2017-03-032-8/+92
|\ \ \ \ | |/ / /
| * | | MDEV-11610: mysqladmin flush-X-log optionsDaniel Black2017-03-021-4/+74
| * | | MDEV-11610: Add --local to mysqladminDaniel Black2017-03-021-3/+17
| |/ /
| * | Windows : Fix server compile errors when compile with /Zc:strictStrings optionVladislav Vaintroub2017-02-281-1/+1
* | | Merge 10.0 into 10.1Marko Mäkelä2017-02-081-0/+3
|\ \ \ | |/ /
| * | Set sys_errno upon exec commandElena Stepanova2017-02-011-0/+3
* | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-01-161-2/+4
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.5' into 10.0vicentiu2017-01-061-2/+4
| |\ \ | | |/
| | * MDEV-10100 main.pool_of_threads fails sporadically in buildbotElena Stepanova2017-01-041-0/+8
| | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-12-221-2/+4
| | |\
| | | * Bug #24496214: MISLEADING ERROR EXECUTING MYSQLADMIN SHUTDOWN AGAINST A SERVERGeorgi Kodinov2016-09-081-2/+4
| | | * Bug#23540182:MYSQLBINLOG DOES NOT FREE THE EXISTING CONNECTION BEFORE OPENING...Neha Kumari2016-08-051-1/+7
* | | | Merge 10.0 into 10.1Marko Mäkelä2017-01-041-0/+12
|\ \ \ \ | |/ / /
| * | | MDEV-10100 main.pool_of_threads fails sporadically in buildbotElena Stepanova2017-01-011-0/+12
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-12-111-5/+21
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2016-12-091-5/+21
| |\ \ \ | | |/ /
| | * | MDEV-9409 Windows - workaround VS2015 CRT bug that makesVladislav Vaintroub2016-10-271-6/+22
* | | | MDEV-11319 mysqlbinlog crashes or fails with out of memory while reading some...Sergei Golubchik2016-12-061-1/+11
* | | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-11-023-47/+73
|\ \ \ \
| * \ \ \ Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-283-47/+73
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '5.5' into 10.0Sergei Golubchik2016-10-253-47/+73
| | |\ \ \ | | | |/ /
| | | * | mysqldump: comments and identifiers with new linesSergei Golubchik2016-10-141-17/+43
| | | * | mysqltest: don't eat new lines in --execSergei Golubchik2016-10-141-4/+0
| | | * | mysql cli: fix USE command quotingSergei Golubchik2016-10-131-26/+30
| * | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-243-51/+81
| |\ \ \ \ | | |/ / /
| * | | | Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-244-64/+63
| |\ \ \ \
| * \ \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-2911-30/+52
| |\ \ \ \ \
| * \ \ \ \ \ Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-234-41/+52
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-198-157/+269
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-313-4/+5
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.21' into 10.0-galeraNirbhay Choubey2015-08-083-10/+49
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-213-21/+68
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.19' into 10.0-galeraNirbhay Choubey2015-05-094-54/+293
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.17' into 10.0-galeraNirbhay Choubey2015-02-271-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | MDEV-7615: Remove --galera-sst-mode option from mysqldumpNirbhay Choubey2015-02-201-49/+0
| * | | | | | | | | | | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2015-02-181-13/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ maria-10.0.16 mergeNirbhay Choubey2015-01-262-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-056-21/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-284-27/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-117-106/+320
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | MDEV-6490: mysqldump unknown option --galera-sst-modeNirbhay Choubey2014-08-072-17/+9
| * | | | | | | | | | | | | | | | | | Merge of patch for MDEV#5786.Nirbhay Choubey2014-07-112-0/+11