summaryrefslogtreecommitdiff
path: root/tests
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | |\
| | | * \ Updated/added copyright headersKent Boortz2011-06-303-7/+12
| | | |\ \
| | | | * | Updated/added copyright headersKent Boortz2011-06-303-5/+7
* | | | | | 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
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Fixed Bug#11764168 "56976: SEVERE DENIAL OF SERVICE IN PREPARED STATEMENTS".Dmitry Shulga2011-03-151-0/+51
| | | * | | | A post-fix for b58036.Alexander Barkov2011-02-181-3/+3
| | | * | | | Bug#11765108 (Bug#58036) client utf32, utf16, ucs2 should be disallowed, they...Alexander Barkov2011-02-181-0/+67
| | | | |/ / | | | |/| |
* | | | | | 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
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | MergeKent Boortz2010-12-2917-4/+237
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | - Added/updated copyright headersKent Boortz2010-12-2817-4/+237
| | | * | | | Assorted post-merge fixes, clean-up, integration, compat with 5.6.Tatiana A. Nurnberg2010-11-251-2/+2
| | | | |_|/ | | | |/| |
| | | * | | Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failureDavi Arnaut2010-11-101-3/+3
* | | | | | 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
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Fixed bug #47485 - mysql_store_result returns a not NULL result setDmitry Shulga2010-09-071-0/+102
* | | | merge with 5.1Sergei Golubchik2010-09-112-18/+44
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.50Michael Widenius2010-08-272-18/+44
| |\ \ \ | | |/ /
| | * | Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite runDavi Arnaut2010-07-301-10/+39
| | * | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-091-13/+13
| | * | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-021-1/+1
* | | | Merge with MariaDB 5.1Michael Widenius2010-08-061-6/+6
|\ \ \ \ | |/ / /
| * | | Fix for LP#614265 Crash in _ma_unpin_all_pages / _ma_search on DELETE with Ar...Michael Widenius2010-08-061-6/+6
View Lorry Controller Status