summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 1. add --plugin-dir and --default-auth to mysqltest.Sergei Golubchik2011-12-025-22/+30
* 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
|/ / / / /
* | | | | 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
* | | | | 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
* | | | | Added logging of all errors from my_read/my_write/my_pread/my_pwrite/my_open ...Michael Widenius2011-09-021-2/+2
* | | | | mergeVladislav Vaintroub2011-07-101-1/+1
* | | | | Fix LPBUG#808233 - undefined uint in typelib.hVladislav Vaintroub2011-07-101-1/+1
* | | | | Merge with MariaDB 5.1Michael Widenius2011-05-0311-90/+159
|\ \ \ \ \ | |/ / / /
| * | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-0211-89/+156
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bug#11900714 REMOVE LGPL LICENSED FILES IN MYSQL 5.1Magne Mahre2011-03-286-132/+115
| | * | | Bug #11752069 (former bug 43152)Jon Olav Hauglid2011-02-162-7/+26
| | |/ /
| | * | Merge from mysql-5.1.55-releaseunknown2011-02-082-2/+2
| | |\ \
| | * \ \ merge to 5.1.Georgi Kodinov2011-02-022-0/+18
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Fixes for Bug #55755 and Bug #52315 part 2Georgi Kodinov2011-02-022-0/+18
* | | | | merge 5.2Vladislav Vaintroub2011-03-1014-16/+33
|\ \ \ \ \
| * \ \ \ \ Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-2814-16/+33
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge with MySQL 5.1.55Michael Widenius2011-02-2013-14/+26
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Updating header copyright/README in source for 2011Karen Langford2011-01-252-2/+2
| | | |/ /
| | | * | Bug#51023: Mysql server crashes on SIGHUP and destroys InnoDB filesDavi Arnaut2011-01-071-1/+3
| | | * | Bug#51023: Mysql server crashes on SIGHUP and destroys InnoDB filesDavi Arnaut2011-01-071-0/+1
| | | * | MergeKent Boortz2010-12-294-6/+6
| | | |\ \ | | | | |/
| | | | * - Added/updated copyright headersKent Boortz2010-12-285-842/+7