summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MDEV-256 lp:995501 - mysqltest attempts to parse Perl code inside a blockSergei Golubchik2012-06-013-4/+25
* post-merge fixesSergei Golubchik2012-05-184-3/+10
* merge with mysql-5.1.63Sergei Golubchik2012-05-17102-319/+2499
|\
| * merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-04-1019-14/+402
| |\
| | * Bug #11766072 59107: MYSQLSLAP CRASHES IF STARTED WITH NO ARGUMENTS ON WINDOWSVenkata Sidagam2012-04-093-3/+19
| | * BUG#13738989 : 62136 : FAILED TO FETCH SELECT RESULT USING EMBEDDED MYSQLDMayank Prasad2012-04-061-0/+2
| | * Bug#11763507 - 56224: FUNCTION NAME IS CASE-SENSITIVEPraveenkumar Hulakund2012-03-286-48/+104
| | * Merge from mysql-5.0Sunny Bains2012-03-284-8/+8
| | |\
| | | * Bug# 13847885 - PURGING STALLS WHEN PURGE_SYS->N_PAGES_HANDLED OVERFLOWSSunny Bains2012-03-282-4/+4
| | * | Backport of fix for Bug#12763207 - ASSERT IN SUBSELECT::SINGLE_VALUE_TRANSFORMERTor Didriksen2012-03-274-1/+112
| | * | Bug#11763507 - 56224: FUNCTION NAME IS CASE-SENSITIVEPraveenkumar Hulakund2012-03-273-2/+207
| * | | Bug #13934049: 64884: LOGINS WITH INCORRECT PASSWORD ARE ALLOWEDGeorgi Kodinov2012-04-061-1/+1
| * | | Bug#11766300 59387: FAILING ASSERTION: CURSOR->POS_STATE == 1997660512 (BTR_P...Sergey Glukhov2012-04-045-1/+124
| * | | 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
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | 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
| | |\ \ \ \
| | * | | | | Bug #11766634 59783: INNODB DATA GROWS UNEXPECTEDLY WHEN INSERTING, TRUNCATIN...Annamalai Gurusami2012-03-162-0/+8
| | * | | | | Bug#13825266 RACE IN LOCK_VALIDATE() WHEN ACCESSING PAGES DIRECTLYInaam Rana2012-03-155-43/+58
| | * | | | | Bug#13851171 STRING OVERFLOW IN INNODB CODE FOUND BY STATIC ANALYSISInaam Rana2012-03-152-0/+8
| | * | | | | Bug#13537504 VALGRIND: COND. JUMP/MOVE DEPENDS ON UNINITIALISED VALUESInaam Rana2012-03-152-4/+6
| | * | | | | BUG#12400313Luis Soares2012-03-121-0/+1
| | * | | | | Automerge merge with latest mysql-5.1.Luis Soares2012-03-122-1/+6
| | |\ \ \ \ \
| | | * | | | | BUG#12400313Luis Soares2012-03-122-1/+6
| | * | | | | | BUG#12400313Luis Soares2012-03-126-11/+191
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | BUG#12400313 RELAY_LOG_SPACE_LIMIT IS NOT WORKING IN MANY CASESLuis Soares2012-03-126-11/+191
| | * | | | | | Bug #11766634 59783: InnoDB data grows unexpectedly when inserting,Annamalai Gurusami2012-03-096-52/+131
| | * | | | | | Fix a compiler warning about possibly uninitiaizlied variable.Marko Mäkelä2012-03-082-4/+2
| * | | | | | | Bug#13031606 VALUES() IN A SELECT STATEMENT CRASHES SERVERNorvald H. Ryeng2012-03-123-12/+36
| * | | | | | | Fixed test case for bug #13105873 "valgrind warning:possibleDmitry Lenev2012-03-112-0/+2
| * | | | | | | empty weave merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2012-03-080-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | empty auto merge of mysql-5.0->mysql-5.0-securityGeorgi Kodinov2012-03-080-0/+0
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| * | | | | | | merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-03-0838-166/+1115
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Bug#13807811 BTR_PCUR_RESTORE_POSITION() CAN SKIP A RECORDMarko Mäkelä2012-03-083-43/+102
| | * | | | | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2012-03-063-5/+2
| | * | | | | | merge into mysql-5.1Mattias Jonsson2012-02-297-36/+288
| | |\ \ \ \ \ \
| | | * | | | | | Bug#11761296: 53775: QUERY ON PARTITIONED TABLE RETURNS CACHEDMattias Jonsson2012-02-207-34/+286
| | * | | | | | | Bug#12601974 - STORED PROCEDURE SQL_MODE=NO_BACKSLASH_ESCAPES IGNORED AND BRE...Praveenkumar Hulakund2012-02-2910-13/+596
| | |\ \ \ \ \ \ \
| | | * | | | | | | Bug#12601974 - STORED PROCEDURE SQL_MODE=NO_BACKSLASH_ESCAPES IGNORED AND BRE...Praveenkumar Hulakund2012-02-2910-13/+596
| | * | | | | | | | Fix a mistake in the Bug#12861864 fix.Marko Mäkelä2012-02-281-12/+12
| | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Bug#12861864 RACE CONDITION IN BTR_GET_SIZE() AND DROP INDEX/TABLE/DATABASEMarko Mäkelä2012-02-289-57/+93
| | * | | | | | | Remove a bogus BLOB debug assertion that was added in Bug#13721257 fix.Marko Mäkelä2012-02-271-9/+5
| | * | | | | | | Bug#13012483:EXPLAIN EXTENDED, PREPARED STATEMENT, CRASH INChaithra Gopalareddy2012-02-243-1/+24
| | |/ / / / / /
| | * | | | | | Fix Bug#13639142 64128: INNODB ERROR IN SERVER LOG OF INNODB_BUG34300Vasil Dimov2012-02-212-0/+2
| | * | | | | | merged and updated the version in mysql-5.1Georgi Kodinov2012-02-211-1/+1
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | bumped up the version of the main tree to match the security treeGeorgi Kodinov2012-02-211-2/+2
| | * | | | | | BUG 13454045 - 63524: BUG #35396 "ABNORMAL/IMPOSSIBLE/LARGE QUERY_TIME AND LO...Tatjana Azundris Nuernberg2012-02-191-2/+3
| * | | | | | | BUG#12537203 - CRASH WHEN SUBSELECTING GLOBAL VARIABLES IN Ramil Kalimullin2012-03-061-0/+1