summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge with MariaDB 5.2Michael Widenius2012-02-211-4/+65
|\
| * Merge with MariaDB 5.1 and MySQL 5.1.61Michael Widenius2012-02-201-4/+65
| |\
| | * Merge with MYSQL 5.1.61Michael Widenius2012-02-201-4/+65
| | |\
| | | * Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2011-11-301-4/+65
* | | | Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc.Igor Babaev2012-02-011-2/+2
|\ \ \ \ | |/ / /
| * | | Fix MDEV-49 : version_compile_machine server variable is 'unknown' for x64 bu...Vladislav Vaintroub2012-01-101-2/+2
* | | | 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
| | | |\ \ | | | | |/
| | | | * BUG#11759349 - 51655: CREATE TABLE IN MEMORY ENGINE DOESN'T STOREAshish Agarwal2011-09-271-0/+2
| | | | * Merge from mysql-5.1.59-releaseunknown2011-09-151-0/+9
| | | | |\
| | | | | * Manual merge from mysql-5.1.Ramil Kalimullin2011-08-092-1/+32
| | | | | |\
| | | | | * \ merge 5.0-security => 5.1-securityTor Didriksen2011-07-151-0/+9
| | | | | |\ \
| | | | | | * | Bug#12406055 BUFFER OVERFLOW OF VARIABLE 'BUFF' IN STRING::SET_REALTor Didriksen2011-07-151-0/+9
| | | * | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-2128-60/+156
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | BUG#12911710 - VALGRIND FAILURE IN ROW-DEBUG:PERFSCHEMA.SOCKET_SUMMARY_BY_INS...Tor Didriksen2011-08-291-0/+9
| | | | | |_|/ | | | | |/| |
| | | | * | | BUG#12695969Luis Soares2011-07-121-1/+1
| | | | |\ \ \
| | | | | * | | BUG#12695969Luis Soares2011-07-121-1/+1
| | | | * | | | BUG#12695969Luis Soares2011-07-111-0/+31
| | | | |\ \ \ \ | | | | | |/ / / | | | | | | / / | | | | | |/ / | | | | |/| |
| | | | | * | BUG#12695969: FIX OUTDATED COPYRIGHT NOTICES IN REPLACTIONLuis Soares2011-07-111-0/+31
| | | | | |/
| | | | | * Updated/added copyright headersKent Boortz2011-06-305-25/+20
| | | | | |\
| | | | | | * Bug#11896296 REMOVE LGPL LICENSED FILES IN MYSQL 5.0Magne Mahre2011-03-225-22/+19
| | | | * | | Updated/added copyright headersKent Boortz2011-07-0310-149/+138
| | | | |\ \ \
| | | | | * | | BUG 11763056 - 55721: AIX 5.1.50 build failing, cannot locate bzeroDavi Arnaut2011-05-271-1/+1
| | | | | * | | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'.Guilhem Bichot2011-05-161-3/+5
| | | | * | | | Updated/added copyright headersKent Boortz2011-06-3026-51/+121
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| |
| | | | | * | | Updated/added copyright headersKent Boortz2011-06-3014-26/+38
| | | | | | |/ | | | | | |/|
| * | | | | | 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
* | | | | | 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