summaryrefslogtreecommitdiff
path: root/tests
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | 5.5-mergeSergei Golubchik2011-07-0218-95/+784
|\ \ \ \ \ \ \
| * | | | | | | Bug#12337762 : MYSQL_LIST_FIELDS() RETURNS WRONG CHARSET FOR CHAR/VARCHAR/TEXTMayank Prasad2011-06-101-18/+94
| * | | | | | | Fixed cast warnings in introducing the pluggable authentication clientGeorgi Kodinov2011-06-061-2/+2
| * | | | | | | A patch for Bug#11763413 (56115: SELECT doesn't work inAlexander Nozdrin2011-03-221-3/+6
| * | | | | | | Bug #11766854: 60075: MYSQL_LOAD_CLIENT_PLUGIN DOESN'T CLEAR ERRORGeorgi Kodinov2011-03-171-0/+41
| * | | | | | | Manual merge from mysql-5.1 for Bug#11764168 (56976: Severe denialDmitry Shulga2011-03-151-0/+51
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Fixed Bug#11764168 "56976: SEVERE DENIAL OF SERVICE IN PREPARED STATEMENTS".Dmitry Shulga2011-03-151-0/+51
| * | | | | | | Merging from 5.1Alexander Barkov2011-02-181-3/+3
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 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
| | | |_|_|/ / | | |/| | | |
| * | | | | | Bug#11765108 (Bug#58036) client utf32, utf16, ucs2 should be disallowed, they...Alexander Barkov2011-02-181-0/+67
| * | | | | | Remove configuration preprocessor symbols 'THREAD'Magne Mahre2011-01-111-10/+0
| * | | | | | MergeKent Boortz2010-12-2916-2/+235
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | 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
| | | |_|_|_|/ | | |/| | | |
| * | | | | | WL#5665: Removal of the autotools-based build systemDavi Arnaut2010-11-201-62/+0
| * | | | | | Merge from mysql-5.5-bugteam to mysql-5.5-runtimeJon Olav Hauglid2010-11-171-3/+3
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.Davi Arnaut2010-11-161-3/+3
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failureDavi Arnaut2010-11-101-3/+3
| | | | |_|_|/ | | | |/| | |
| * | | | | | Merge from mysql-5.5-bugteam to mysql-5.5-runtimeJon Olav Hauglid2010-11-161-0/+250
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix for Bug#56934 (mysql_stmt_fetch() incorrectly fills MYSQL_TIMEAlexander Nozdrin2010-11-131-0/+250