summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Merging mariadb-10.0.10.Nirbhay Choubey2014-04-082-7/+19
|\
| * Revert revision sergii@pisem.net-20130123151853-xc6i3l11aqv0iykkSergei Golubchik2014-03-261-4/+4
| * MDEV-5404 Can't free data returned by mariadb_dyncol_unpack on windowsSergei Golubchik2014-03-191-0/+12
| * MDEV-5173 Cppcheck reportSergei Golubchik2014-03-191-3/+3
* | Merging revision from codership-mysql/5.5 (r3928..3968) andNirbhay Choubey2014-03-271-3/+3
|\ \
| * | bzr merge -r3933..3945 codership/5.5 (Non-InnoDB changes only).Nirbhay Choubey2014-03-251-3/+3
* | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-2646-95/+108
|\ \ \ | |/ / |/| / | |/
| * MDEV-5675 - Performance: my_hash_sort_bin is called too oftenSergey Vojtovich2014-03-062-19/+17
| * mergeSergei Golubchik2014-02-2832-40/+55
| |\
| | * MDEV-4447 MariaDB sources should have unix-style line endings everywhereSergei Golubchik2014-02-271-1/+1
| | * 10.0-base mergeSergei Golubchik2014-02-2631-39/+54
| | |\
| | | * 5.5 mergeSergei Golubchik2014-02-2531-39/+54
| | | |\
| | | | * MDEV-5613 m_string.h exports generic function names without a namespace prefi...Sergei Golubchik2014-02-171-0/+1
| | | | * MySQL-5.5.36 mergeSergei Golubchik2014-02-1730-39/+53
| | | | |\
| | | | | * Updated/added copyright headersMurthy Narkedimilli2014-01-0627-27/+43
| | | | | * Bug#16316074 RFE: MAKE TMPDIR A BUILD-TIME CONFIGURABLE OPTIONTor Didriksen2013-12-182-4/+4
| | | | | * Bug#17702677 WRONG INSTRUMENTATION INTERFACE FOR MYSQL_COND_TIMEDWAITChristopher Powers2013-11-071-2/+2
| * | | | | Merge MDEV-5657 (parallel replication) to 10.0unknown2014-02-261-4/+0
| |\ \ \ \ \
| | * | | | | MDEV-5657: Parallel replication.unknown2014-02-261-4/+0
| | | |/ / / | | |/| | |
| * | | | | MDEV-5612 - my_rename() deletes files when it shouldn'tSergey Vojtovich2014-02-261-8/+7
| | |/ / / | |/| | |
| * | | | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-199-16/+18
| * | | | Fixed errors and warnings found by buildbotMichael Widenius2014-02-061-1/+1
| * | | | Automatic mergeMichael Widenius2014-02-051-5/+5
| |\ \ \ \
| | * | | | Fixes to get valgrind to work with jemallocMichael Widenius2014-01-021-5/+5
| * | | | | 10.0-base mergeSergei Golubchik2014-02-032-2/+6
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | 5.5 mergeSergei Golubchik2014-02-012-2/+6
| | |\ \ \ | | | |/ /
| | | * | MySQL-5.5.35 mergeSergei Golubchik2014-01-222-2/+6
| | | |\ \ | | | | |/
| | | | * Bug 13878021 - WINDOWS PACKAGE THAT INCLUDES .PDB FILES FOR INTERMEDIATE LIBR...Sreedhar.S2013-10-091-0/+5
| | | | * Bug #16978278 : BUFFER OVERFLOW WHEN PRINTING A LARGE 64-BIT INTEGERmithun2013-09-101-2/+2
| | | | |\
| | | | | * Bug #16978278 : BUFFER OVERFLOW WHEN PRINTING A LARGE 64-BIT INTEGERmithun2013-09-101-2/+2
| | | * | | Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria...Michael Widenius2014-01-221-1/+2
* | | | | | * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.Nirbhay Choubey2014-01-301-1/+2
* | | | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-254-2/+20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-4929 Myanmar collationAlexander Barkov2013-12-201-0/+10
| * | | | | 10.0-base mergeSergei Golubchik2013-12-162-2/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | 5.5 mergeSergei Golubchik2013-12-151-0/+4
| | |\ \ \ \ | | | |/ / /
| | | * | | my_addr_resolve: don't resolve unknown addresses to ??:0(??), but return an e...Sergei Golubchik2013-12-121-0/+4
| | | * | | Fix for a compiler warning.Nirbhay Choubey2013-11-251-3/+0
| | * | | | 5.5 mergeSergei Golubchik2013-11-231-2/+4
| | |\ \ \ \ | | | |/ / /
| | | * | | mysql-5.5.34 mergeSergei Golubchik2013-11-191-2/+4
| | | |\ \ \ | | | | |/ /
| | | | * | Bug#16865959 - PLEASE BACKPORT BUG 14749800.Praveenkumar Hulakund2013-07-241-2/+4
| * | | | | MDEV-5277 - Ensure that all MySQL 5.6 options are supported by theSergey Vojtovich2013-11-251-0/+2
* | | | | | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-0414-186/+753
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merging xxx_unicode_520_ci and xxx_vietnamese_ci from MySQL-5.6.Alexander Barkov2013-11-121-0/+20
| * | | | | Merge 10.0-monty -> 10.0Alexander Barkov2013-11-112-7/+17
| |\ \ \ \ \
| | * | | | | MDEV-5241: Collation incompatibilities with MySQL-5.6Michael Widenius2013-11-092-7/+17
| * | | | | | MDEV-4734 Adding ending / to a directory can fail when the directory ends with 0Sergei Golubchik2013-11-101-2/+2
| |/ / / / /
| * | | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.unknown2013-11-011-3/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge MDEV-4506: Parallel replication into 10.0-base.unknown2013-11-011-3/+0
| | |\ \ \ \
| * | \ \ \ \ 10.0-base merge (roles)Sergei Golubchik2013-10-291-0/+17
| |\ \ \ \ \ \ | | |/ / / / /