summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merging from 5.5Alexander Barkov2012-08-172-5/+14
|\
| * Backporting Bug 14100466 from 5.6.Alexander Barkov2012-08-172-5/+14
* | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-08-163-33/+48
|\ \ | |/
| * Bug#12595091 POSSIBLY INVALID ASSERTION IN BTR_CUR_PESSIMISTIC_UPDATE()Marko Mäkelä2012-08-162-1/+12
| * Bug#12845774 OPTIMISTIC INSERT/UPDATE USES WRONG HEURISTICS FORMarko Mäkelä2012-08-163-20/+26
| * Bug#13523839 ASSERTION FAILURES ON COMPRESSED INNODB TABLESMarko Mäkelä2012-08-163-13/+28
* | Bug #12992993 MYSQLHOTCOPY FAILS IF VIEW EXISTSVenkata Sidagam2012-08-141-19/+69
* | merge from 5.1 to 5.5Sujatha Sivakumar2012-08-141-1/+1
|\ \ | |/
| * Bug#13596613:SHOW SLAVE STATUS GIVES WRONG OUTPUT WITHSujatha Sivakumar2012-08-141-1/+1
* | mergeMattias Jonsson2012-08-131-16/+24
|\ \
| * | Bug#14342883: SELECT QUERY RETURNS NOT ALLMattias Jonsson2012-08-091-16/+24
* | | Bug #13115401: -SSL-KEY VALUE IS NOT VALIDATED AND IT ALLOWS INSECURE Venkata Sidagam2012-08-114-41/+65
|\ \ \ | |/ / |/| / | |/
| * Bug #13115401: -SSL-KEY VALUE IS NOT VALIDATED AND IT ALLOWS INSECURE Venkata Sidagam2012-08-114-41/+65
* | 5.1 -> 5.5 mergeSergey Glukhov2012-08-093-6/+7
|\ \ | |/
| * Bug #14409015 MEMORY LEAK WHEN REFERENCING OUTER FIELD IN HAVINGSergey Glukhov2012-08-093-6/+7
* | (no commit message)unknown2012-08-090-0/+0
|\ \
| * | (no commit message)unknown2012-08-090-0/+0
* | | Null merge from mysql-5.1.Marko Mäkelä2012-08-090-0/+0
|\ \ \ | |/ / |/| / | |/
| * Merge from mysql-5.1 to working copy.Marko Mäkelä2012-08-092-8/+1
| |\
| | * Merge from mysql-5.1.65-releaseSunanda Menon2012-08-092-8/+1
| | |\
| | | * Merge unpushed changes from 5.1.64-releaseBjorn Munch2012-07-122-8/+1
| | | |\
| | | | * Solve a linkage problem with "libmysqld" on several Solaris platforms:Kent Boortz2012-06-262-8/+1
| | | | * Fixing wrong comment syntax (discovered by Kent)Joerg Bruehe2012-06-211-1/+1
| | | | * Version for this release build is 5.1.64Kent Boortz2012-06-201-1/+1
| | | | * MergeKent Boortz2012-06-203-60/+5
| | | | |\
* | | | | \ Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-08-092-36/+45
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Bug#14399148 INNODB TABLES UNDER LOAD PRODUCE DUPLICATE COPIES OF ROWSMarko Mäkelä2012-08-094-73/+83
| |/ / / /
* | | | | upmerge from mysql-5.1=>mysql-5.5Rohit Kalhans2012-08-081-1/+12
|\ \ \ \ \ | |/ / / /
| * | | | BUG#11757312: MYSQLBINLOG DOES NOT ACCEPT INPUT FROM STDINRohit Kalhans2012-08-081-1/+12
* | | | | Merge of patch for Bug#13928675 from mysql-5.1.Nirbhay Choubey2012-08-0714-36/+39
|\ \ \ \ \ | |/ / / /
| * | | | Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUSTNirbhay Choubey2012-08-0714-34/+40
* | | | | Bug#14068244: INCOMPATIBILITY BETWEEN LIBMYSQLCLIENT/LIBMYSQLCLIENT_RHarin Vadodaria2012-08-071-37/+0
|\ \ \ \ \ | |/ / / /
| * | | | Bug#14068244: INCOMPATIBILITY BETWEEN LIBMYSQLCLIENT/LIBMYSQLCLIENT_RHarin Vadodaria2012-08-072-38/+1
* | | | | Bug#13058122 - DML, LOCK/UNLOCK TABLES AND SELECT LEAD TO Praveenkumar Hulakund2012-08-072-8/+118
* | | | | Merge from 5.1 to 5.5Chaithra Gopalareddy2012-08-061-17/+34
|\ \ \ \ \ | |/ / / /
| * | | | Bug #14099846: EXPORT_SET CRASHES DUE TO OVERALLOCATION OF MEMORYChaithra Gopalareddy2012-08-051-17/+34
* | | | | Merge from mysql-5.5.27-releaseunknown2012-08-020-0/+0
* | | | | INSTALL-BINARY placeholder (upmerge from 5.1): change invalid URLs (request f...Joerg Bruehe2012-07-311-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | INSTALL-BINARY placeholder: change invalid URLs (request from Kristofer)Joerg Bruehe2012-07-311-3/+3
* | | | | merge 5.1 => 5.5Tor Didriksen2012-07-271-4/+2
|\ \ \ \ \ | |/ / / /
| * | | | Bug#14111180 HANDLE_FATAL_SIGNAL IN PTR_COMPARE_1 / QUEUE_INSERTTor Didriksen2012-07-271-3/+2
* | | | | Bug #12876932 - INCORRECT SELECT RESULT ON FEDERATED TABLEVenkata Sidagam2012-07-270-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Bug #12876932 - INCORRECT SELECT RESULT ON FEDERATED TABLEVenkata Sidagam2012-07-271-0/+1
* | | | | Merge from 5.1 to 5.5Praveenkumar Hulakund2012-07-263-7/+24
|\ \ \ \ \ | |/ / / /
| * | | | BUG#13868860 - LIMIT '5' IS EXECUTED WITHOUT ERROR WHEN '5' Praveenkumar Hulakund2012-07-261-0/+8
* | | | | Bug #12876932 - INCORRECT SELECT RESULT ON FEDERATED TABLEVenkata Sidagam2012-07-261-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Bug #12876932 - INCORRECT SELECT RESULT ON FEDERATED TABLEVenkata Sidagam2012-07-261-1/+1
* | | | | Merge of patch for Bug#13741677 from mysql-5.1.Nirbhay Choubey2012-07-262-8/+20
|\ \ \ \ \ | |/ / / /
| * | | | Bug#13741677 MYSQL_SECURE_INSTALLATION DOES NOTNirbhay Choubey2012-07-262-8/+20
* | | | | merge 5.1 => 5.5Tor Didriksen2012-07-262-6/+14
|\ \ \ \ \ | |/ / / /