summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge with 5.2.Michael Widenius2011-12-111166-15152/+25594
|\
| * Merge with 5.1Michael Widenius2011-12-032-2/+21
| |\
| | * Added suppressionsMichael Widenius2011-12-033-2/+22
| | * mergeVladislav Vaintroub2011-12-011-1/+1
| | |\
| | | * mergeVladislav Vaintroub2011-12-015-12/+13
| | | |\ | | | |/ | | |/|
| | | * Fix main.merge testcase on WindowsVladislav Vaintroub2011-12-011-1/+1
| * | | Fixed buildbot warningsMichael Widenius2011-12-032-3/+2
| * | | Fixed some Aria limits to be more saneMichael Widenius2011-12-021-3/+3
| * | | MergeMichael Widenius2011-12-025-3/+12
| |\ \ \
| | * | | Fixed bug where automaticly zerofilled table was not part of recovery if cras...Michael Widenius2011-12-025-3/+12
| * | | | Fix intermittently failing variables-notembedded test case.Vladislav Vaintroub2011-12-012-2/+7
| |/ / /
| * | | Fixed compiler warningMichael Widenius2011-12-011-0/+2
| * | | Merge with 5.1Michael Widenius2011-12-012-2/+3
| |\ \ \ | | |/ /
| | * | Fixed that --with-libedit --without-readline worksMichael Widenius2011-12-015-12/+13
| | |/
| * | Merge with 5.1Michael Widenius2011-11-3051-241/+191
| |\ \ | | |/
| | * Fixed compiler warning and errorsMichael Widenius2011-11-302-3/+3
| | * Fixed compiler warnings and other bugs found by buildbot.Michael Widenius2011-11-3013-21/+70
| | * test both federated and federatedX in the federated suite.Sergei Golubchik2011-11-3020-184/+74
| | * Cherrypick into XtraDB: Bug#13002783 PARTIALLY UNINITIALIZED CASCADE UPDATE V...unknown2011-11-303-11/+20
| | * Fixed compiler warningsMichael Widenius2011-11-3015-20/+25
| * | Merge with 5.1 + fixes for build failures in 5.2Michael Widenius2011-11-2911-31/+32
| |\ \ | | |/
| | * Fixed that maria-recover works as expected.Michael Widenius2011-11-294-12/+11
| | * Fix Windows build, and a conversion truncation warning.Vladislav Vaintroub2011-11-294-9/+8
| | * Fixed that one can use --maria-recover=backup,forceMichael Widenius2011-11-242-3/+3
| * | Fix testcases:Vladislav Vaintroub2011-11-295-3/+5
| * | merge, fix Windows warningsVladislav Vaintroub2011-11-296-5/+9
| * | after merge fixesSergei Golubchik2011-11-286-12/+18
| * | Automatic mergeMichael Widenius2011-11-241114-14959/+25275
| |\ \
| | * | Added test case forlp:875797 Using 'innodb_sys_indexes' causes core dumpMichael Widenius2011-11-242-0/+38
| | * | 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
| | | | | |\ \ \ | | | | | | |/ /