summaryrefslogtreecommitdiff
path: root/tests
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | Small CMake fixes :Vladislav Vaintroub2011-05-151-2/+2
* | | | | 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 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
* | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-17/+194
|\ \ \ \ | |/ / /
| * | | Fixed warnings and build failures after last pushMichael Widenius2010-08-021-1/+1
| * | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-17/+194
| |\ \ \ | | |/ /
| | * | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.Davi Arnaut2010-06-281-0/+58
| | |\ \ | | | |/
| | | * Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite runDavi Arnaut2010-06-281-0/+58
| | * | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-101-17/+16
| | * | Manual merge.Ramil Kalimullin2010-05-251-0/+38
| | |\ \ | | | |/
| | | * Fix for bug #53907: Table dump command can be abused to dump arbitrary tables.Ramil Kalimullin2010-05-251-0/+38
| | * | Using an initial command with mysql_options(..., MYSQL_INIT_COMMAND, ...)Jim Winstead2010-05-091-0/+82
| | * | Bug #53371: COM_FIELD_LIST can be abused to bypass table level grants.Georgi Kodinov2010-05-041-0/+45
| | |\ \ | | | |/
| | | * Bug #53371: COM_FIELD_LIST can be abused to bypass table level grants.Georgi Kodinov2010-05-031-0/+42
* | | | Automerge MariaDB 5.1->5.2.unknown2010-07-091-0/+2
|\ \ \ \ | |/ / /