summaryrefslogtreecommitdiff
path: root/tests
Commit message (Expand)AuthorAgeFilesLines
* Merge MWL#192: Non-blocking client library, into MariaDB 5.5.unknown2012-02-215-0/+1049
|\
| * MWL#192: non-blocking client API, after-review fixes.unknown2012-01-063-26/+29
| * MWL#192: Non-blocking client API for libmysqlclient.unknown2011-09-205-0/+1046
* | mysql-5.5 mergeSergei Golubchik2012-01-161-3/+1
|\ \
| * \ Auto-merge from mysql-5.1-security.Alexander Nozdrin2011-10-201-3/+3
| |\ \
| * \ \ merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-10-121-3/+7
| |\ \ \
| * \ \ \ Manual merge from mysql-5.1-security.Alexander Nozdrin2011-09-231-0/+81
| |\ \ \ \
* | \ \ \ \ 5.3 mergeSergei Golubchik2012-01-131-2/+85
|\ \ \ \ \ \
| * \ \ \ \ \ Merge with 5.2.Michael Widenius2011-12-114-6/+110
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge with MariaDB 5.1Michael Widenius2011-11-244-6/+107
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Merge with MySQL 5.1.60Michael Widenius2011-11-231-0/+80
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | Fix Windows-build failure: use my_snprintf() instead of snprintf().Alexander Nozdrin2011-10-201-3/+3
| | | | | |/ / | | | | |/| |
| | | | * | | Fix for Bug#13001491: MYSQL_REFRESH CRASHES WHEN STORED ROUTINES ARE RUN CONC...Alexander Nozdrin2011-09-221-0/+80
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-214-6/+27
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Updated/added copyright headersKent Boortz2011-07-031-1/+119
| | | | |\ \ \
* | | | | \ \ \ mysql-5.5.18 mergeSergei Golubchik2011-11-035-16/+47
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Bug#12912112 MYSQL_CLIENT_TEST FAILS ON TEST_TRUNCATION Magne Mahre2011-10-061-3/+7
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | backport from mysql-trunkGleb Shchepa2011-08-031-0/+29
| * | | | | | Bug#12727287: Maintainer mode compilation fails with gcc 4.6Davi Arnaut2011-07-071-5/+1
| * | | | | | Updated/added copyright headersKent Boortz2011-06-304-8/+10
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Updated/added copyright headersKent Boortz2011-06-303-7/+12
| | |\ \ \ \ \
| | | * | | | | Updated/added copyright headersKent Boortz2011-06-303-5/+7
* | | | | | | | merge with 5.3Sergei Golubchik2011-10-193-8/+185
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table...Michael Widenius2011-07-011-1/+67
| * | | | | | | merge with 5.1-microSergei Golubchik2011-06-071-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | revert a suggested "optimization" that introduced a bugSergei Golubchik2011-06-061-2/+2
| * | | | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-12/+12
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-011-12/+12
| * | | | | | | | Merge with 5.2Michael Widenius2011-05-161-2/+2
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Small CMake fixes :Vladislav Vaintroub2011-05-151-2/+2
| * | | | | | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-0/+119
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Automatic merge with 5.1Michael Widenius2011-05-041-1/+2
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | Fixed build errors on centos5-amd64-minimal, where we compile with very few c...Michael Widenius2011-05-041-1/+2
| | * | | | | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-0/+118
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-0/+118
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | |
| * | | | | | | | Merge various replication-related patches into MariaDB 5.3:unknown2011-04-081-0/+107
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl.unknown2011-04-012-5/+5
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge MWL#116, PBXT part into mariadb-5.2-rplunknown2011-01-311-0/+107
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | MWL#116: Efficient group commit: PBXT partunknown2010-10-151-0/+107
| * | | | | | | | | | Merge with base 5.2Michael Widenius2011-03-232-2/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm...Michael Widenius2011-03-182-2/+4
| | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | merge 5.2Vladislav Vaintroub2011-03-102-5/+5
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-282-5/+5
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | / / / / / / | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Merge with MySQL 5.1.55Michael Widenius2011-02-202-5/+5
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | |
| * | | | | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-291-1/+1
| |/ / / / / / / /
| * | | | | | | | mergeVladislav Vaintroub2010-12-061-1/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-061-1/+0
| * | | | | | | | merge with 5.1Michael Widenius2010-11-301-0/+102
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge with MySQL 5.1.52Michael Widenius2010-11-231-0/+102
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
* | | | | | | | | post-merge fixes.Sergei Golubchik2011-07-021-12/+12
View Lorry Controller Status