summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge with MariaDB 5.1Michael Widenius2011-11-241136-15057/+25344
|\
| * Fixes for build failuers found by buildbotMichael Widenius2011-11-2413-3491/+34
| * Merge with MySQL 5.1.60Michael Widenius2011-11-23283-5794/+11348
| |\
| | * Bug#13390506 - VALGRIND FAILURE AFTER THE FIX FOR 13371000Inaam Rana2011-11-184-0/+91
| | * Backmerge of BUG#12997905Jorgen Loland2011-11-183-1/+21
| | * Merge from mysql-5.1.60-releaseKaren Langford2011-11-1771-1498/+3712
| | |\
| | | * Patch to fix stdint.h missing from pre Solaris 10 versions.Karen Langford2011-10-292-0/+12
| | | * Patch to fix libedit vis.h problem (OSX/FreeBSD)Karen Langford2011-10-283-9/+9
| | | * Revert revno:3452.71.32 (Bug#12612184 fix).Marko Mäkelä2011-10-2625-597/+192
| | | * Revert most of revno 3560.9.1 (Bug#12704861)Marko Mäkelä2011-10-2629-973/+447
| | | * Copy and adapt innodb_misc1.test from innodb to innodb_plugin.Marko Mäkelä2011-10-263-0/+2061
| | | * Fix results after Bug#12661768 fix.Marko Mäkelä2011-10-261-1/+1
| | | * Fix results after Bug#12661768 fix.Marko Mäkelä2011-10-251-1/+1
| | | * Bug#13002783 PARTIALLY UNINITIALIZED CASCADE UPDATE VECTORMarko Mäkelä2011-10-259-24/+102
| | | * Fix Bug#12661768 UPDATE IGNORE CRASHES SERVER IF TABLE IS INNODB AND IT ISVasil Dimov2011-10-253-1/+59
| | | * Auto-merge from mysql-5.1.Alexander Nozdrin2011-10-2474-3427/+5711
| | | |\
| | | * | Fix Windows-build failure: use my_snprintf() instead of snprintf().Alexander Nozdrin2011-10-201-3/+3
| | | * | Bug12589870 post-merge fixes for Sparc64 and friendsTatjana Azundris Nuernberg2011-10-193-5/+8
| | | * | merge 5.0-security => 5.1 securityTor Didriksen2011-10-144-8/+108
| | | |\ \
| | | | * | Bug#12563865 ROUNDED,TMP_BUF,DECIMAL_VALUE STACK CORRUPTION IN ALL VERSIONS >...Tor Didriksen2011-10-144-8/+108
| | | * | | empty weave merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2011-10-120-0/+0
| | | |\ \ \ | | | | |/ /
| | | | * | auto-merge mysql-5.0->mysql-5.0-securityGeorgi Kodinov2011-10-1213-91/+85
| | | | |\ \
| | | * | \ \ auto-merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-10-12166-1009/+2625
| | | |\ \ \ \
| | | * \ \ \ \ auto-mergeTatjana Azundris Nuernberg2011-10-103-8/+58
| | | |\ \ \ \ \
| | | | * | | | | BUG#12589870 CRASHES WITH MULTIQUERY PACKET + USE<DB> + QUERY CACHEMagne Mahre2011-10-073-8/+58
| | | * | | | | | manual mergeTatjana Azundris Nuernberg2011-10-061-9/+10
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | additional clean-up for 11765687Tatjana Azundris Nuernberg2011-10-061-9/+10
| | | * | | | | | manual mergeTatjana Azundris Nuernberg2011-09-293-15/+604
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | / / / / | | | | |/ / / / | | | |/| | | |
| | | | * | | | Bug#11765687 (MySQL58677): No privilege on table / view, but can know #rows /...Tatjana Azundris Nuernberg2011-09-293-15/+605
| | | * | | | | Fix for Bug#13001491: MYSQL_REFRESH CRASHES WHEN STORED ROUTINES ARE RUN CONC...Alexander Nozdrin2011-09-222-5/+119
| | | * | | | | merge into 5.1-sec of bug#11766879.Mattias Jonsson2011-09-153-3/+68
| | | |\ \ \ \ \
| | | | * | | | | Bug#11766879/Bug#60106: DIFF BETWEEN # OF INDEXES IN MYSQL VS INNODB,Mattias Jonsson2011-08-233-3/+66
| | | * | | | | | merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2011-08-171-2/+2
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | changed the old @sun.com address of security trees.Georgi Kodinov2011-08-171-2/+2
| | | * | | | | | Raise version number after cloning 5.1.59Karen Langford2011-08-111-1/+1
| | * | | | | | | Bug #12842206 INNODB LOCKING REGRESSION FOR INSERT IGNORE: Add a test case.Marko Mäkelä2011-11-104-0/+116
| | * | | | | | | Bug#11759688 52020: InnoDB can still deadlock on just INSERT...ON DUPLICATE KEYMarko Mäkelä2011-11-1010-25/+559
| | * | | | | | | Bug#13358468 ASSERTION FAILURE IN BTR_PCUR_GET_BLOCKMarko Mäkelä2011-11-084-41/+8
| | * | | | | | | Add debug assertions to catch Bug#13345378 earlier.Marko Mäkelä2011-11-072-0/+16
| | * | | | | | | Bug#12406055 post-push fix: unused variable 'num_chars' in optimized build.Tor Didriksen2011-11-012-2/+3
| | * | | | | | | Bug#12406055 post-push fix: unused variable 'num_chars' in optimized build.Tor Didriksen2011-10-311-1/+2
| | * | | | | | | Bug #12884631 62146: TABLES ARE LOST FOR DDLMarko Mäkelä2011-10-272-1/+7
| | * | | | | | | Increased version number after cloning 5.1.60Karen Langford2011-10-261-1/+1
| | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | WL#5945 - Improve libedit libraryNirbhay Choubey2011-10-242-3/+3
| | * | | | | | Bug#13106585 PUSH FOR "WL#5945 : IMPROVE LIBEDIT LIBRARY"Nirbhay Choubey2011-10-216-22/+19
| | * | | | | | Merge.Sergey Vojtovich2011-10-214-5/+58
| | |\ \ \ \ \ \
| | | * | | | | | BUG#11757032 - 49030: OPTIMIZE TABLE BREAKS MYISAM TABLE WHENSergey Vojtovich2011-10-204-5/+58
| | * | | | | | | Bug#13116045 Compilation failure using GCC 4.6.1 in btr/btr0cur.cMarko Mäkelä2011-10-213-26/+15
| | * | | | | | | Remove copyright header from parser_stack.testBjorn Munch2011-10-191-15/+0
| | |/ / / / / /
| | * | | | | | Bug#13102538 : COMPILE ERROR ON SOLARIS WHEN COMPILINGNirbhay Choubey2011-10-185-5/+0