summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mergeVladislav Vaintroub2012-04-163-8/+101
|\
| * MDEV-221 - Properly escape command line when starting mysql_install_db Vladislav Vaintroub2012-04-163-8/+101
* | merging.Alexey Botchkov2012-04-061-1/+1
|\ \
| * | MDEV-80 Memory engine table full at much less than max_heap_table_size with b...Alexey Botchkov2012-04-061-1/+1
* | | mergeSergei Golubchik2012-04-05269-5656/+6718
|\ \ \ | |/ /
| * | mysql-5.1.62 mergeSergei Golubchik2012-04-05268-5654/+6715
| |\ \
| | * \ 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
| | * | | 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
| | * | | merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-02-1827-583/+1344
| | |\ \ \
| | | * | | Bug#13721257 RACE CONDITION IN UPDATES OR INSERTS OF WIDE RECORDSMarko Mäkelä2012-02-1727-583/+1344
| | * | | | merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2012-02-170-0/+0
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | merged mysql-5.0->mysql-5.0-securityGeorgi Kodinov2012-02-1722-37/+22
| | | |\ \ \
| | * | \ \ \ merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-02-1757-77/+145
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Fix link error on Windows.Marko Mäkelä2012-02-162-6/+18
| | | * | | | MergeKent Boortz2012-02-169-14/+52
| | | |\ \ \ \
| | | | * | | | Add instrumentation for Bug#13721257 RACE CONDITION IN UPDATES OR INSERTSMarko Mäkelä2012-02-164-2/+40
| | | | * | | | Correct a few copyright messages.Marko Mäkelä2012-02-165-12/+12
| | | * | | | | Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
| | | * | | | | MergeKent Boortz2012-02-163-6/+10
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Remove a race condition in innodb_bug53756.test.Marko Mäkelä2012-02-152-6/+6
| | | | * | | | store_create_info(): Fix a compiler warning about unused variable.Marko Mäkelä2012-02-151-0/+4
| | | * | | | | Updated/added copyright headersKent Boortz2012-02-1543-50/+43
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | / / | | | | | |/ / | | | | |/| |
| | | | * | | Updated/added copyright headersMySQL Build Team2012-02-1522-37/+22
| | | * | | | BUG#12739098 - 62401: ASSERTION TRX->ERROR_STATE == DB_SUCCESS, QUE0QUE.C LIN...Sunny Bains2012-02-102-6/+27
| | * | | | | Merge compile fix for AIX into delivery tree.Joerg Bruehe2012-02-161-1/+3
| | |\ \ \ \ \
| | | * | | | | Compile fix needed for AIX,Joerg Bruehe2012-01-191-1/+3
| | * | | | | | merge from 5.0-securityGeorgi Kodinov2012-02-1395-796/+1955
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Bug #13706828: UPGRADE YASSL FROM 1.7.2 TO 2.1.4Georgi Kodinov2012-02-1095-797/+1956
| | * | | | | | mergeGeorgi Kodinov2012-02-103-11/+117
| | |\ \ \ \ \ \
| | | * | | | | | Bug #11765810 58813: SERVER THREAD HANGS WHEN JOIN + WHERE + GROUP BYMartin Hansson2012-02-073-11/+117
| | * | | | | | | empty merge of mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2012-02-100-0/+0
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Bug#13706621 : UNIFY THE YASSL VERSIONS THAT WE USE BY BACKPORTING 5.1 Georgi Kodinov2012-02-1026-260/+372
| | * | | | | | | Bug#13706621 : UNIFY THE YASSL VERSIONS THAT WE USE BY BACKPORTING 5.1 Georgi Kodinov2012-02-1031-134/+93
| | | |/ / / / / | | |/| | | | |
| | * | | | | | empty weave merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2012-02-060-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | merged mysql-5.0->mysql-5.0-securityGeorgi Kodinov2012-02-061-4/+6
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | * | | | | | merged mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-02-0645-3571/+1343
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Fix Bug#11754376 45976: INNODB LOST FILES FOR TEMPORARY TABLES ONVasil Dimov2012-02-067-10/+220
| | | * | | | | BUG#11748748 - 37280: CHECK AND REPAIR TABLE REPORT TABLEAshish Agarwal2012-02-031-0/+6
| | | * | | | | Postfix for Bug#11752408.Alexander Barkov2012-02-022-0/+4
| | | * | | | | Bug#13654923 BOGUS DEBUG ASSERTION IN INDEX CREATION FOR ZERO-LENGTH RECORDMarko Mäkelä2012-02-023-2/+11
| | | * | | | | Suppress messages about long semaphore waits in innodb_bug34300.test.Marko Mäkelä2012-02-022-0/+2
| | | * | | | | BUG#11756869 - 48848: MYISAMCHK DOING SORT RECOVER IN CERTAINAshish Agarwal2012-02-023-8/+35
| | | |\ \ \ \ \
| | | | * | | | | BUG#11756869 - 48848: MYISAMCHK DOING SORT RECOVER IN CERTAINAshish Agarwal2012-02-013-8/+37
| | | * | | | | | Bug#13636122 THE ORIGINAL TABLE MISSING WHILE EXECUTE THE DDL 'ALTER TABLE AD...Inaam Rana2012-01-313-12/+49
| | | * | | | | | (no commit message)unknown2012-01-311-1/+1
| | | * | | | | | Bug #64127: MTR --warnings option misses some of InnoDB errors and warningsunknown2012-01-311-1/+1
| | | * | | | | | Null-merge from mysql-5.0.Ramil Kalimullin2012-01-310-0/+0
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |