summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* auto mere mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2012-04-061-1/+1
|\
| * Bug #13934049: 64884: LOGINS WITH INCORRECT PASSWORD ARE ALLOWEDGeorgi Kodinov2012-04-061-1/+1
* | 5.1-security -> 5.5-security mergeSergey Glukhov2012-04-044-1/+125
|\ \ | |/
| * Bug#11766300 59387: FAILING ASSERTION: CURSOR->POS_STATE == 1997660512 (BTR_P...Sergey Glukhov2012-04-045-1/+124
* | Bug #11880012: INDEX_SUBQUERY, BLACKHOLE,Gleb Shchepa2012-03-283-1/+40
* | Fix Bug #13849910 - INNODB ASSERTS ON TOO LONG TABLENAME WHEN USING PARTITIONSJimmy Yang2012-03-221-5/+11
* | empty weave merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2012-03-210-0/+0
|\ \ | |/
| * empty weave merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2012-03-210-0/+0
| |\
| | * weave merge mysql-5.0->mysql-5.0-securityGeorgi Kodinov2012-03-218-18/+68
| | |\
| * | \ merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-03-2130-134/+480
| |\ \ \
* | \ \ \ merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-03-2129-130/+392
|\ \ \ \ \
| * \ \ \ \ Upmerge of empty merge changesets from the release backmerges (5.0.96, 5.1.62).Joerg Bruehe2012-03-210-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Upmerge an empty merge changeset (backmerge of 5.0.96 into main 5.0),Joerg Bruehe2012-03-210-0/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge from mysql-5.0.96-releaseunknown2012-03-20101-1042/+2363
| | | |\ \ \
| | * | \ \ \ Merge from mysql-5.1.62-releaseunknown2012-03-20124-979/+2558
| | |\ \ \ \ \
| * | | | | | | backport Bug #47707 print some progress messages during shutdown of innodbJimmy Yang2012-03-215-39/+207
| * | | | | | | Fix tree setup: Wrong mailing list for commit mails.Joerg Bruehe2012-03-201-2/+2
| * | | | | | | Merge the 5.5.22 release build into main 5.5,Joerg Bruehe2012-03-20127-963/+2736
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Further upmerge the yaSSL upgrade (to 2.2.0) from MySQL 5.1 to 5.5.Joerg Bruehe2012-03-028-19/+69
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Upmerge the yaSSL upgrade (to 2.2.0) from MySQL 5.0 to 5.1.Joerg Bruehe2012-03-027-17/+67
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | Further upgrade the yaSSL library to version 2.2.0Joerg Bruehe2012-03-027-17/+67
| | | * | | | | | AIX builds fail for comments using //Karen Langford2012-02-281-2/+2
| | * | | | | | | fix for the windows platform for bug: 13788143Hery Ramilison2012-03-011-2/+2
| | * | | | | | | Upmerge the copyright year change, from 5.1 to 5.5.Joerg Bruehe2012-02-281-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Upmerge the copyright year change, from 5.0 to 5.1.Joerg Bruehe2012-02-281-1/+1
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | The current year is 2012, and nobody noticed ...Joerg Bruehe2012-02-281-1/+1
| * | | | | | | | Fix Bug #13860722 - INCOMPLETE PERFORMANCE SCHEMA INSTRUMENTATION IN INNODBJimmy Yang2012-03-204-13/+31
| * | | | | | | | Bug#13832953 MY_STRNXFRM_UNICODE: ASSERTION `SRC' FAILED. | MY_STRNXFRM_UNIC...Alexander Barkov2012-03-203-2/+21
| * | | | | | | | BUG #13619394: fixing incorrect revertBjorn Munch2012-03-161-1/+1
| * | | | | | | | Merging from mysql-5.1 to mysql-5.5. Annamalai Gurusami2012-03-161-0/+4
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Bug #11766634 59783: INNODB DATA GROWS UNEXPECTEDLY WHEN INSERTING, TRUNCATIN...Annamalai Gurusami2012-03-162-0/+8
| * | | | | | | | merge from 5.1Inaam Rana2012-03-154-49/+54
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Bug#13825266 RACE IN LOCK_VALIDATE() WHEN ACCESSING PAGES DIRECTLYInaam Rana2012-03-155-43/+58
| * | | | | | | | merge from 5.1Inaam Rana2012-03-151-0/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Bug#13851171 STRING OVERFLOW IN INNODB CODE FOUND BY STATIC ANALYSISInaam Rana2012-03-152-0/+8
| * | | | | | | | merge from 5.1Inaam Rana2012-03-151-4/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Bug#13537504 VALGRIND: COND. JUMP/MOVE DEPENDS ON UNINITIALISED VALUESInaam Rana2012-03-152-4/+6
* | | | | | | | | Merge from mysql-5.5 to mysql-5.5-securityJon Olav Hauglid2012-03-1510-147/+289
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Bug#13833438: ERROR CODES MUST HAVE SAME VALUE ACROSS MYSQL VERSIONSJon Olav Hauglid2012-03-151-0/+3
| * | | | | | | | This patch fixes the bug#13737343 (formerly known as 64374): XA TRANSACTIONSDmitry Shulga2012-03-153-3/+1
| * | | | | | | | BUG #13619394 - 62572: "MAKE TEST" FAILS ON "MY_VSNPRINTF"Reverting Back sigh...unknown2012-03-151-1/+1
| * | | | | | | | merge of bug#1364811 into mysql-5.5Mattias Jonsson2012-03-145-143/+284
| |\ \ \ \ \ \ \ \
| | * | | | | | | | bug#13694811Mattias Jonsson2012-03-141-10/+4
| | * | | | | | | | Bug#13694811: THE OPTIMIZER WRONGLY USES THE FIRST INNODBMattias Jonsson2012-02-225-155/+303
* | | | | | | | | | Merge from mysql-5.5 to mysql-5.5-securityJon Olav Hauglid2012-03-153-1/+89
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Bug#13832772 ASSERTION `THD->IS_ERROR() || KILL_ERRNO'Tor Didriksen2012-03-143-1/+89
* | | | | | | | | | Merge from mysql-5.5 to mysql-5.5-securityJon Olav Hauglid2012-03-1518-119/+380
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | BUG #13619394: "MAKE TEST" FAILS ON "MY_VSNPRINTF"unknown2012-03-141-1/+1
| * | | | | | | | | Bug#12626844 : WE ARE NOT CHECKING VIEW TABLE NAMESChaithra Gopalareddy2012-03-143-0/+25
| * | | | | | | | | BUG#12400313Luis Soares2012-03-121-0/+1
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |