summaryrefslogtreecommitdiff
path: root/client/mysqltest.cc
Commit message (Expand)AuthorAgeFilesLines
* Temporary commit of 10.0-mergeMichael Widenius2013-03-261-2/+2
* 10.0-base mergeSergei Golubchik2013-01-311-11/+16
|\
| * 5.5 mergeSergei Golubchik2013-01-291-5/+10
| |\
| | * 5.3 mergeSergei Golubchik2013-01-251-1/+4
| | |\
| | | * 5.2 mergeSergei Golubchik2013-01-251-1/+4
| | | |\
| | | | * MDEV-3915 COM_CHANGE_USER allows fast password brute-forcingSergei Golubchik2013-01-251-1/+4
| | | * | Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-091-2/+3
| | | |\ \ | | | | |/
| | | | * Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-081-2/+3
| | | | |\
| | | | | * Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-061-2/+3
| | | | | |\
| | | * | | \ 5.2 merge.Sergei Golubchik2012-08-221-2/+4
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | 5.1 mergeSergei Golubchik2012-08-221-2/+4
| | | | |\ \ \ | | | | | |/ /
| | | | | * | merge with MySQL 5.1.65Sergei Golubchik2012-08-221-2/+4
| | | | | |\ \
| | * | | | | | Buildbot fixes and cleanups:Michael Widenius2013-01-111-4/+6
| * | | | | | | cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-231-4/+4
| * | | | | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-6/+6
| * | | | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-2/+3
| |\ \ \ \ \ \ \ | | |/ / / / / /
* | | | | | | | merge with 5.5Sergei Golubchik2012-11-031-2/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | mysql-5.5.28Sergei Golubchik2012-10-161-2/+3
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge of patch for Bug#13928675 from mysql-5.1.Nirbhay Choubey2012-08-071-1/+1
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUSTNirbhay Choubey2012-08-071-1/+1
| | | | |_|_|_|/ | | | |/| | | |
* | | | | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-191-24/+90
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | SHOW EXPLAIN: merge to 10.0-base.Sergey Petrunya2012-10-061-3/+22
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ SHOW EXPLAIN: merge with 5.5-mainSergey Petrunya2012-10-061-3/+22
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Merge 5.5-main -> 5.5-show-explainSergey Petrunya2012-07-251-11/+39
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ MWL#182: Explain running statementsSergey Petrunya2012-06-151-3/+22
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ MWL#182: SHOW EXPLAIN: Merge 5.3->5.5Sergey Petrunya2012-05-161-3/+22
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ MWL#182: Explain running statements: merge with 5.3-main (needs fixing)Sergey Petrunya2012-01-031-3/+22
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ MWL#182: Explain running statementsSergey Petrunya2011-10-271-3/+22
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | MWL#182: Explain running statementsSergey Petrunya2011-09-241-3/+22
| * | | | | | | | | | | | | Implementation of Multi-source replication (MDEV:253)Michael Widenius2012-09-281-11/+31
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | merge with MySQL 5.5.27Sergei Golubchik2012-08-091-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | undo the fix for MySQL Bug#12998841Sergei Golubchik2012-08-081-7/+1
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Bug #12998841: libmysql divulges plaintext password upon request in 5.5Georgi Kodinov2012-07-051-1/+7
| | * | | | | | | | | | merge bug#13708485 5.1->5.5Georgi Kodinov2012-06-291-0/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Bug #13708485: malformed resultset packet crashes clientGeorgi Kodinov2012-06-281-1/+3
| | * | | | | | | | | | Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING)Jon Olav Hauglid2012-06-291-2/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| * | | | | | | | | | | Allow multiple error codes inside a variable in --error commandElena Stepanova2012-07-161-6/+27
| * | | | | | | | | | | Export sys_errno and errno to variablesElena Stepanova2012-07-161-0/+4
| * | | | | | | | | | | Fixed MDEV-385: mysqltest running with continue-on-error crashes on a non-SQL...Michael Widenius2012-07-101-1/+1
* | | | | | | | | | | | Next part of merge. See TODO for detailsMichael Widenius2012-08-141-0/+4
* | | | | | | | | | | | Fixed compiler warningsMichael Widenius2012-07-061-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge 5.3 -> 5.5Sergey Petrunya2012-06-201-4/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Merge 5.2->5.3Sergey Petrunya2012-06-181-4/+7
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | 5.1 mergeSergei Golubchik2012-06-011-4/+7
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | * | | | | | | MDEV-256 lp:995501 - mysqltest attempts to parse Perl code inside a blockSergei Golubchik2012-06-011-4/+7
| | | * | | | | | | Fix main.merge testcase on WindowsVladislav Vaintroub2011-12-011-1/+1
* | | | | | | | | | 5.3 mergeSergei Golubchik2012-05-211-5/+40
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge 5.2->5.3unknown2012-05-111-5/+40
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Fixed typounknown2012-05-101-1/+1
| | * | | | | | | | MDEV-261 : mysqtest crashes when assigning variable to result of select , like Vladislav Vaintroub2012-05-081-5/+40