summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* - Fix rpl_checksum test. Use basename of file in error messages, not the oVladislav Vaintroub2012-01-201-0/+1
* fix the linking failure on windowsSergei Golubchik2012-01-181-2/+5
* MDEV-69 SET optimizer_switch = REPLACE(...) causes ER_WRONG_VALUE_FOR_VARSergei Golubchik2012-01-171-4/+4
* mysql-5.5 mergeSergei Golubchik2012-01-161-1/+64
|\
| * Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2011-12-021-1/+64
* | 5.3 mergeSergei Golubchik2012-01-1322-65/+78
|\ \
| * \ 5.2->5.3 mergeSergei Golubchik2011-12-125-22/+30
| |\ \
| | * | 1. add --plugin-dir and --default-auth to mysqltest.Sergei Golubchik2011-12-025-22/+30
| * | | Merge with 5.2.Michael Widenius2011-12-1132-59/+184
| |\ \ \ | | |/ /
| | * | Merge with 5.1 + fixes for build failures in 5.2Michael Widenius2011-11-291-0/+2
| | |\ \
| | | * | Fixed that maria-recover works as expected.Michael Widenius2011-11-291-0/+2
| | * | | merge, fix Windows warningsVladislav Vaintroub2011-11-291-0/+3
| | * | | Automatic mergeMichael Widenius2011-11-2428-58/+164
| | |\ \ \
| | | * \ \ Merge with MariaDB 5.1Michael Widenius2011-11-2428-58/+164
| | | |\ \ \ | | | | |/ /
| | | | * | Merge with MySQL 5.1.60Michael Widenius2011-11-232-0/+11
| | | | |\ \
| | | | * \ \ Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-2128-60/+156
| | | | |\ \ \
| | * | | | | | fix dialog plugin to work on windowsSergei Golubchik2011-11-222-0/+15
| | |/ / / / /
| * | | | | | Fixes for netware by Guenter KnaufMichael Widenius2011-12-021-0/+1
| * | | | | | Patch to get MariaDB to compile on CYGWIN; By Guenter KnaufMichael Widenius2011-12-021-0/+2
* | | | | | | new configure option: NOT_FOR_DISTRIBUTIONSergei Golubchik2011-12-141-6/+5
* | | | | | | move safemalloc out of dbug.Sergei Golubchik2011-12-124-11/+6
* | | | | | | another backtrace resolver that prints source file name and line numberSergei Golubchik2011-12-111-0/+18
* | | | | | | win64 sysvar portability fixesSergei Golubchik2011-12-021-1/+1
* | | | | | | install my_valgrind.h tooSergei Golubchik2011-12-021-0/+1
* | | | | | | mergedSergei Golubchik2011-11-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix package names, by removing a trailing "-MariaDB" ,as we already have lead...Vladislav Vaintroub2011-11-231-1/+1
* | | | | | | | compilation fixesSergei Golubchik2011-11-271-1/+1
|/ / / / / / /
* | | | | | | Add support for signed sysvars.Sergei Golubchik2011-11-224-8/+17
* | | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-229-16/+31
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix bug lp:869036unknown2011-11-171-0/+4
| * | | | | | Merge.Igor Babaev2011-10-281-1/+4
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge.Igor Babaev2011-06-011-1/+4
| | |\ \ \ \ \ \
| | | * | | | | | Downported InnoDB support of Index Condition Pushdown from MySQL-5.6 code line.Igor Babaev2011-05-251-1/+3
| * | | | | | | | Fixed lp:879939 "assertion in ha_maria::enable_indexes with derived_with_keys...Michael Widenius2011-10-262-0/+4
| * | | | | | | | mergeSergei Golubchik2011-10-111-5/+19
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | merge with 5.1Sergei Golubchik2011-10-071-5/+19
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | support for plugins on windowsSergei Golubchik2011-10-041-5/+19
| | | * | | | | | Post-fix for LP808233 : replace uint with "unsigned int" in mysql.h.pp, tooVladislav Vaintroub2011-07-101-1/+1
| | | * | | | | | LPBUG#808233: Undefined uint in typelib.hVladislav Vaintroub2011-07-101-1/+1
| * | | | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ...Michael Widenius2011-09-232-6/+9
| * | | | | | | | portability fix: avoid anonymous structs and unions in CSergei Golubchik2011-09-221-6/+6
| * | | | | | | | Merge with 5.2Michael Widenius2011-09-102-1/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fixed that automatic killing of delayed insert thread (in flush, alter table ...Michael Widenius2011-09-091-1/+1
| | * | | | | | | Fixed lp:814238 "safe_mutex issues must be assertions in debug binary"Michael Widenius2011-09-021-0/+1
| * | | | | | | | Merge 5.2->5.3unknown2011-09-021-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Added logging of all errors from my_read/my_write/my_pread/my_pwrite/my_open ...Michael Widenius2011-09-021-2/+2
* | | | | | | | | mergeSergei Golubchik2011-11-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | compilation warnings on WindowsSergei Golubchik2011-11-021-1/+1
* | | | | | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-0371-141/+208
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Bug#11759349 -- Merge of patch from mysql-5.1.Ashish Agarwal2011-09-271-0/+2
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |