summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3MDEV-9804Alexander Barkov2017-07-135-8/+11
|\
| * Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-07-125-8/+11
| |\
| | * Merge branch '10.1' into 10.2Sergei Golubchik2017-07-085-8/+11
| | |\
| | | * Merge branch '10.0' into 10.1Sergei Golubchik2017-07-075-11/+13
| | | |\
| | | | * coverity medium warningsSergei Golubchik2017-07-065-11/+13
* | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-07-073-16/+102
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-07-073-16/+102
| |\ \ \ \ | | |/ / /
| | * | | mysqltest - increase size of the "die message".Vladislav Vaintroub2017-07-061-1/+1
| | * | | Merge branch '10.1' into 10.2Sergei Golubchik2017-07-052-9/+32
| | |\ \ \ | | | |/ /
| | | * | Merge branch '10.0' into 10.1Sergei Golubchik2017-06-302-5/+17
| | | |\ \ | | | | |/
| | | | * Merge branch '5.5' into 10.0Sergei Golubchik2017-06-291-1/+1
| | | | |\
| | | | | * uninitialized variableSergei Golubchik2017-06-291-1/+1
| | | | * | Merge branch '5.5' into 10.0Sergei Golubchik2017-06-282-4/+16
| | | | |\ \ | | | | | |/
| | | | | * MDEV-13187 incorrect backslash parsing in clientsSergei Golubchik2017-06-272-2/+14
| | | | | * MDEV-13187 incorrect backslash parsing in clientsSergei Golubchik2017-06-272-4/+4
| | | * | | Merge remote-tracking branch '10.0' into 10.1Vicențiu Ciorbaru2017-06-211-4/+15
| | | |\ \ \ | | | | |/ /
| | | | * | Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2017-06-201-4/+15
| | | | |\ \ | | | | | |/
| | | | | * MDEV-13002 mysqltest regex replace results in incorrect resultSergei Golubchik2017-06-181-4/+14
| | * | | | MDEV-12755 Replication tests fail in buildbot with ASANSergei Golubchik2017-07-051-3/+5
| | * | | | MDEV-12067 flashback does not correcly revert update/replace statementsbb-10.2-MDEV-12067Lixun Peng2017-07-031-3/+64
* | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-06-196-49/+73
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-06-156-49/+73
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-261-33/+52
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-12612 mysqladmin --local flush... to use FLUSH LOCALSergei Golubchik2017-05-241-33/+52
| | * | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-236-16/+20
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge 10.0 into 10.1Marko Mäkelä2017-05-236-16/+20
| | | |\ \ \ | | | | |/ /
| | | | * | MDEV-6262 analyze the coverity report on mariadbSergei Golubchik2017-05-196-16/+20
| | | | * | Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-171-0/+1
| | * | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-221-0/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-171-0/+1
* | | | | | MDEV-12292 - port "Report timing with more precision" by @dveedenbb-sachin-gsocSergey Vojtovich2017-06-131-28/+7
* | | | | | replace my_timer_microseconds with microsecond_interval_timerEric Herman2017-06-131-2/+1
* | | | | | Fix whitespace in new codeEric Herman2017-06-131-1/+1
* | | | | | Callers of start_timer should have ulonglong data typeEric Herman2017-06-131-1/+2
* | | | | | port "Report timing with more precision" by @dveedenEric Herman2017-06-131-15/+11
|/ / / / /
* | | | | 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