summaryrefslogtreecommitdiff
path: root/tests
Commit message (Expand)AuthorAgeFilesLines
* Add C/C as a submodule in libmariadb/Sergei Golubchik2016-09-121-5/+7
* MDEV-9293 - Use MariaDB's Connector/C in serverVladislav Vaintroub2016-08-254-34/+55
* Revert "MDEV-9293 Connector/C integration"Vladislav Vaintroub2016-08-194-55/+34
* MDEV-9293 Connector/C integrationVladislav Vaintroub2016-08-194-34/+55
* Merge branch '10.1' into 10.2Sergei Golubchik2016-06-301-7/+9
|\
| * Merge branch '10.0' into 10.1Sergei Golubchik2016-05-041-7/+9
| |\
| | * tests -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ciSergei Golubchik2016-04-241-7/+7
* | | Cleanups:Monty2016-04-051-2/+3
* | | Merge branch '10.1' into 10.2Sergei Golubchik2016-03-233-6/+6
|\ \ \ | |/ /
| * | Merge branch '10.0' into 10.1Sergei Golubchik2016-03-213-6/+6
| |\ \ | | |/
| | * Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-043-6/+6
* | | Merge branch '10.1' into 10.2Monty2016-02-061-0/+49
|\ \ \ | |/ /
| * | MDEV-5273 Prepared statement doesn't return metadata after prepare.Alexey Botchkov2016-01-281-0/+14
| * | MDEV-5273 Prepared statement doesn't return metadata after prepare.Alexey Botchkov2016-01-281-0/+7
| * | MDEV-5273 Prepared statement doesn't return metadata after prepare.Alexey Botchkov2016-01-281-0/+7
| * | MDEV-5273 Prepared statement doesn't return metadata after prepare.Alexey Botchkov2016-01-281-0/+7
| * | MDEV-5273 Prepared statement doesn't return metadata after prepare.Alexey Botchkov2016-01-281-1/+6
| * | MDEV-5273 Prepared statement doesn't return metadata after prepare.Alexey Botchkov2016-01-261-0/+9
* | | MDEV-9117: Client Server capability negotiation for MariaDB specific function...Oleksandr Byelkin2016-02-021-2/+5
* | | Fix client unit test to drop all used tables.Oleksandr Byelkin2016-02-021-1/+1
|/ /
* | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-212-0/+9
|\ \ | |/
| * Fixes to get all test to run on MacosX Lion 10.7Monty2015-11-292-0/+9
* | add missing DBUG_RETURN-sSergei Golubchik2015-11-161-1/+1
* | MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC can be s...Oleksandr Byelkin2015-09-041-3/+19
* | remove a google specific scriptSergei Golubchik2015-04-081-119/+0
* | Push for testing of encryptionMonty2015-02-101-0/+119
|/
* 5.5 mergeSergei Golubchik2015-01-212-2/+2
|\
| * mysql-5.5.41 mergeSergei Golubchik2014-12-192-2/+2
| |\
| | * Changing the copyright headers a bit to be complaint with the standardsMurthy Narkedimilli2014-08-272-2/+2
* | | 5.5.40+ mergeSergei Golubchik2014-10-091-5/+5
|\ \ \ | |/ /
| * | MDEV-5120 Test suite test maria-no-logging failsSergei Golubchik2014-10-021-5/+5
* | | MDEV-6647 MariaDB CLI client doesnt show CREATE INDEX progressSergei Golubchik2014-09-101-1/+19
* | | Fixed assert in perfschema/pfs.cc::start_idle_wait_v1 when using performance ...Michael Widenius2014-07-191-1/+103
* | | MDEV-5995 MySQL Bug#12750920: EMBEDDED SERVER START/STOP.Alexey Botchkov2014-06-112-11/+175
* | | 5.5.38 mergeSergei Golubchik2014-06-061-0/+1
|\ \ \ | |/ /
| * | cmake: mark AIO_LIBRARY, EVENT_LIBRARY, GROFF, NROFF as advanced;Sergei Golubchik2014-06-031-0/+1
* | | 5.5 mergeSergei Golubchik2014-05-0912-0/+12
|\ \ \ | |/ /
| * | mysql-5.5.37 selective mergeSergei Golubchik2014-03-2712-0/+12
| |\ \ | | |/
| | * Updated/added copyright header. Added line "use is subject to license terms" Murthy Narkedimilli2014-02-1712-0/+12
* | | MDEV-5372 Make "CAST(time_expr AS DATETIME)" compatible with MySQL-5.6 (and t...Alexander Barkov2014-03-071-3/+13
* | | MDEV-4603 mysql_stmt_reset returns "commands out of sync" errorunknown2014-03-061-0/+104
* | | 10.0-base mergeSergei Golubchik2014-02-268-10/+18
|\ \ \
| * \ \ 5.5 mergeSergei Golubchik2014-02-258-10/+18
| |\ \ \ | | |/ /
| | * | MySQL-5.5.36 mergeSergei Golubchik2014-02-178-10/+18
| | |\ \ | | | |/
| | | * Updated/added copyright headersMurthy Narkedimilli2014-01-068-10/+18
* | | | 10.0-base mergeSergei Golubchik2013-12-161-1/+1
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2013-12-151-1/+1
| |\ \ \ | | |/ /
| | * | Fixed compiler errors and warningsMichael Widenius2013-12-021-1/+1
* | | | 10.0-base merge.Sergei Golubchik2013-09-211-0/+2
|\ \ \ \ | |/ / /
| * | | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-181-0/+2
| |\ \ \ | | |/ /