summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Merge from mysql-5.6 fix for bug#11761752 (was already partially merged)Sergey Petrunya2013-07-051-0/+63
* ha_partition.cc and ha_partition.h are now completely mergedMichael Widenius2013-06-271-0/+2
* Fixed some memory leaksMichael Widenius2013-06-191-2/+2
* Applied all changes from Igor and SanjaMichael Widenius2013-06-154-357/+86
* Temporary commit of 10.0-mergeMichael Widenius2013-03-2627-2228/+239
* mergeunknown2013-02-041-1/+1
|\
| * missing cast addedSergei Golubchik2013-02-041-1/+1
* | 10.0-base mergeSergei Golubchik2013-01-3132-804/+3308
|\ \ | |/
| * 5.5 mergeSergei Golubchik2013-01-291-7/+3
| |\
| | * 5.3 mergeSergei Golubchik2013-01-151-7/+3
| | |\
| | | * 5.2->5.3 mergeSergei Golubchik2013-01-101-7/+3
| | | |\
| | | | * mergeVladislav Vaintroub2012-12-211-7/+3
| | | | |\
| | | | | * MDEV-3918: myisamchk bogus error for files larger than 4GB.Vladislav Vaintroub2012-12-061-7/+3
| * | | | | 32-bit fix: first cast the value to a signed type, then subtractSergei Golubchik2013-01-231-1/+1
| * | | | | cleanup:Sergei Golubchik2013-01-233-43/+47
| * | | | | cleanup:Sergei Golubchik2013-01-231-3/+1
| * | | | | cleanup: remove unused init_dynamic_array and init_dynamic_array2 symbols,Sergei Golubchik2013-01-231-4/+4
| * | | | | cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-236-13/+12
| * | | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-2331-104/+294
| * | | | | Compiler warning fixed.unknown2013-01-141-6/+3
| * | | | | Windows compiler warnings fix.unknown2013-01-111-7/+9
| * | | | | Fix windows compiler warnings.unknown2013-01-111-24/+32
| * | | | | fixed crossplatform double values representation.unknown2013-01-101-1/+1
| * | | | | 32 bit systems warnings fixed.unknown2013-01-101-6/+6
| * | | | | pre-mergeunknown2012-12-232-669/+2979
| |\ \ \ \ \
| | * | | | | Post-post review fixes.unknown2012-12-231-13/+47
| | * | | | | backport to 5.5 dyncol changes and names supportunknown2012-12-232-490/+891
| | * | | | | MDEV-506 Cassandra dynamic columns accessunknown2012-09-281-20/+269
| | * | | | | MDEV-377 Name support for dynamic columnsunknown2012-09-282-540/+2166
* | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-182-8/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-165-15/+36
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | 5.3->5.5 mergeSergei Golubchik2012-11-221-7/+8
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge MariaDB 5.2->5.3unknown2012-11-201-7/+7
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | Merge MariaDB 5.1->5.2.unknown2012-11-201-7/+7
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | | | * | MDEV-3849 - 1 bytes stack overwrite in normalize_dirname().Vladislav Vaintroub2012-11-101-7/+7
| | | | | * | Fix compiler warningsunknown2012-08-241-1/+1
| | | | | * | Merge with latest 5.1.unknown2012-08-241-3/+51
| | | | | |\ \
| | | | * | \ \ Merge into latest 5.2.unknown2012-08-241-3/+51
| | | | |\ \ \ \
| | * | | | | | | MDEV-3830 - fix compilation for Intel compiler, Vladislav Vaintroub2012-11-041-1/+1
* | | | | | | | | Merge 5.5 -> 10.0-sergSergey Petrunya2012-11-041-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | MDEV-3830 - fix build on Intel compilerVladislav Vaintroub2012-11-031-1/+1
* | | | | | | | | merge with 5.5Sergei Golubchik2012-11-034-7/+25
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix crashes on 32-bit async client lib when -fomit-frame-pointerunknown2012-10-311-5/+16
| * | | | | | | | do not print return address when callstack is output on Windows, it does not ...Vladislav Vaintroub2012-10-181-1/+0
| * | | | | | | | mysql-5.5.28Sergei Golubchik2012-10-162-1/+11
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Bug #14399795 : ISSUES RELATED TO SETTING AUDIT_LOG_STRATEGY Georgi Kodinov2012-08-171-0/+5
| | * | | | | | | | Follow up patch for BUG#13961678. Fixing compilation warning given below.Sujatha Sivakumar2012-07-251-1/+1
| | * | | | | | | | Bug#13961678:MULTI-STATEMENT TRANSACTION REQUIRED MORE THANSujatha Sivakumar2012-07-241-1/+6
* | | | | | | | | | fix async client code for i386 (assembly)Sergei Golubchik2012-10-301-3/+3
* | | | | | | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-1916-110/+134
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |