summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'mariadb-10.2.6' into bb-10.2-extAlexander Barkov2017-05-2610-61/+186
|\
| * Merge branch '10.1' into 10.2Sergei Golubchik2017-05-0910-45/+67
| |\
| | * Merge pull request #362 from grooverdan/10.1-MDEV-XXXX-mysqltest-replace-rege...Jan Lindström2017-05-021-25/+49
| | |\
| | | * Add replace_regex to not ignore the regex in "$var /regex/val/"Daniel Black2017-04-181-25/+49
| | * | Merge branch '10.0' 10.1Sergei Golubchik2017-04-2810-21/+19
| | |\ \
| | | * \ Merge branch '5.5' into 10.0Sergei Golubchik2017-04-2110-23/+20
| | | |\ \
| | | | * | MDEV-12276 Missing DBUG_RETURN or DBUG_VOID_RETURN macro in function "do_exec"Sergei Golubchik2017-04-201-10/+10
| | | | * | Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55Sergei Golubchik2017-04-1110-13/+10
| | | | |\ \
| | | | | * | Bug #25717383: MYSQLDUMP MAY EXECUTE ANY ARBITRARY QUERYmysql-5.5.55Bharathy Satish2017-03-181-12/+42
| | | | | * | BUG#25575605: SETTING --SSL-MODE=REQUIRED SENDS CREDENTIALS BEFORE VERIFYING ...Ramil Kalimullin2017-03-1010-30/+49
| * | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-061-16/+119
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | MDEV-9566 prepare mysqltest for mariabackupVladislav Vaintroub2017-04-271-16/+119
| | | |_|_|/ | | |/| | |
* | | | | | Fixed compiler warnings and warnings from build.tagsMonty2017-05-081-0/+2
* | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-05-051-1/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-10431: Please implement mysqldump --add-drop-trigger from MySQL 5.6Oleksandr Byelkin2017-05-041-1/+13
* | | | | | Fixed compiler warnings and wrong test resultsMonty2017-04-231-1/+1
* | | | | | Avoid DBUG_ASSERT in mysqlcheck when working with viewsMonty2017-04-181-2/+17
|/ / / / /
* | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-308-31/+193
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | cleanup: mysqltestSergei Golubchik2017-03-291-103/+94
* | | | | Fix many -Wconversion warnings.Marko Mäkelä2017-03-071-8/+8
* | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-02-101-2/+4
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | mysqlbinlog memory leaksSergei Golubchik2017-01-281-4/+5
* | | | | [MDEV-10570] Add Flashback supportMonty2017-01-202-4/+251
* | | | | Fixed issues found by buildbotMonty2017-01-111-0/+1
* | | | | Merge 10.1 to 10.2Marko Mäkelä2017-01-051-0/+12
|\ \ \ \ \ | |/ / / /
| * | | | 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.1' into 10.2Sergei Golubchik2016-12-294-53/+105
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-12-111-5/+21
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '5.5' into 10.0Sergei Golubchik2016-12-091-5/+21
| | |\ \ \ | | | |/ /