summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* addendum to the --builtin-innodb depreacation bug. Fixing test suite output.clone-5.5.22-buildGeorgi Kodinov2012-02-191-1/+2
* Addendum to BUG#13586262 : fixed a wrong test suite outputGeorgi Kodinov2012-02-181-1/+2
* empty weave merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2012-02-180-0/+0
|\
| * merge mysql-5.1->mysql-5.1-securityclone-5.1.62-buildGeorgi Kodinov2012-02-1827-583/+1344
| |\
* | \ merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-02-1830-567/+1327
|\ \ \
| * \ \ Merge with mysql-5.5unknown2012-02-1732-582/+1351
| |\ \ \
| | * | | Print a deprecation warning when ignore-builtin-innodb is usedVasil Dimov2012-02-172-0/+5
| | * | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-02-1727-565/+1319
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Bug#13721257 RACE CONDITION IN UPDATES OR INSERTS OF WIDE RECORDSMarko Mäkelä2012-02-1727-583/+1344
| * | | | Bug#64160, Oracle Bug#13698765unknown2012-02-161-2/+3
* | | | | merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2012-02-170-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2012-02-170-0/+0
| |\ \ \ \
| | * \ \ \ merged mysql-5.0->mysql-5.0-securityclone-5.0.96-buildGeorgi Kodinov2012-02-1722-37/+22
| | |\ \ \ \
| * | \ \ \ \ merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-02-1757-77/+145
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
* | | | | | | merged mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-02-17132-160/+361
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Put back a fix that was reverted when reverting the buggy Bug#12612184 fix inMarko Mäkelä2012-02-174-17/+27
| | |_|_|_|/ | |/| | | |
| * | | | | Null merge a fix from mysql-5.1.Marko Mäkelä2012-02-160-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fix link error on Windows.Marko Mäkelä2012-02-162-6/+18
| * | | | | MergeKent Boortz2012-02-160-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | MergeKent Boortz2012-02-169-14/+52
| | |\ \ \ \
| * | \ \ \ \ MergeKent Boortz2012-02-167-13/+32
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-02-167-13/+32
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | 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
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
| * | | | | | | MergeKent Boortz2012-02-160-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | MergeKent Boortz2012-02-163-6/+10
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| * | | | | | | MergeKent Boortz2012-02-162-3/+7
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-02-151-3/+3
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Remove a race condition in innodb_bug53756.test.Marko Mäkelä2012-02-152-6/+6
| | * | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-02-151-0/+4
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | store_create_info(): Fix a compiler warning about unused variable.Marko Mäkelä2012-02-151-0/+4
| * | | | | | | Updated/added copyright headersMySQL Build Team2012-02-1690-94/+90
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | | | |/ / / / | | |/| | | |
| | * | | | | Updated/added copyright headersKent Boortz2012-02-1543-50/+43
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | / | | | | |_|/ | | | |/| |
| | | * | | Updated/added copyright headersMySQL Build Team2012-02-1522-37/+22
| * | | | | fixing test failure on pb2.Rohit Kalhans2012-02-132-4/+2
| * | | | | BUG#11758263: Modification of indentation in the added code.Rohit Kalhans2012-02-135-14/+26
| * | | | | Merge from mysql-5.1.Sunny Bains2012-02-100-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | BUG#12739098 - 62401: ASSERTION TRX->ERROR_STATE == DB_SUCCESS, QUE0QUE.C LIN...Sunny Bains2012-02-102-6/+27
| * | | | | Merge from mysql-5.1-innodb.Sunny Bains2012-02-102-6/+27
| |\ \ \ \ \
| | * | | | | BUG#12739098 - 62401: ASSERTION TRX->ERROR_STATE == DB_SUCCESS, QUE0QUE.C LIN...Sunny Bains2012-02-102-6/+27
| * | | | | | Followup patch for bug#11758263.Rohit Kalhans2012-02-101-22/+0
| * | | | | | BUG#11758263 50440: MARK UNORDERED UPDATE WITH AUTOINC UNSAFERohit Kalhans2012-02-0928-23/+186
| * | | | | | Backout the patch for bug#11758263.Rohit Kalhans2012-02-0827-153/+26
| * | | | | | BUG#11758263 50440: MARK UNORDERED UPDATE WITH AUTOINC UNSAFERohit Kalhans2012-02-0827-26/+153
* | | | | | | Upmerge the AIX compile fix into 5.5.Joerg Bruehe2012-02-161-1/+3
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | 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
* | | | | | | | Bug#13633383 63183: SMALL SORT_BUFFER_SIZE CRASH IN MERGE_BUFFERSTor Didriksen2012-02-144-99/+217
View Lorry Controller Status