summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Next part of merge. See TODO for detailsMichael Widenius2012-08-142-1/+11
* Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-017-51/+851
* automatic merge with 5.5Michael Widenius2012-06-271-55/+197
|\
| * Merge 5.3 -> 5.5Sergey Petrunya2012-06-201-55/+197
| |\
| | * Merge 5.2->5.3Sergey Petrunya2012-06-181-55/+197
| | |\
| | | * Fixed LP bug #1008293.Igor Babaev2012-06-111-55/+197
| | * | 5.2 mergeSergei Golubchik2012-05-201-2/+3
| | |\ \ | | | |/
| | | * 5.1 mergeSergei Golubchik2012-05-181-1/+4
| | | |\
| | | | * merge with mysql-5.1.63Sergei Golubchik2012-05-171-1/+4
| | | | |\
| | | | | * merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-03-081-1/+1
| | | | | |\
| | | | | * | Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DMLAnnamalai Gurusami2012-03-011-1/+5
| | * | | | | mergeSergei Golubchik2012-04-052-2/+4
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | mergeSergei Golubchik2012-04-052-2/+4
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | mysql-5.1.62 mergeSergei Golubchik2012-04-052-2/+4
| | | | |\ \ \ | | | | | |/ /
* | | | | | | Fixes after Serg's review of %M extenstionsMichael Widenius2012-06-171-94/+0
* | | | | | | Merge with 5.5Michael Widenius2012-05-311-4/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | cSergei Golubchik2012-05-211-4/+4
| |\ \ \ \ \ \
| | * \ \ \ \ \ merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-04-101-2/+5
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-03-081-1/+1
| | |\ \ \ \ \ \ \
| | * | | | | | | | Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DMLAnnamalai Gurusami2012-02-271-4/+5
* | | | | | | | | | Added text for errno in error messages by:Michael Widenius2012-05-302-56/+59
|/ / / / / / / / /
* | | | | | | | | Fix FreeBSD test errors. Also link with libexecinfo on FreeBSD for stacktrac...Vladislav Vaintroub2012-05-041-1/+1
* | | | | | | | | add a space between safemalloc error mesage and a stack traceSergei Golubchik2012-04-181-0/+1
* | | | | | | | | fix compile error on unixesVladislav Vaintroub2012-04-151-1/+2
* | | | | | | | | fix application verifier crashesVladislav Vaintroub2012-04-153-2/+10
* | | | | | | | | mysql 5.5.23 mergeSergei Golubchik2012-04-101-2/+5
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Bug#13898343 THREAD LOOPS ENDLESSLY IN LF_PINBOX_PUT_PINS WHILE HOLDINGMarc Alff2012-03-281-2/+5
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge 5.1 => 5.5Tor Didriksen2012-03-061-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| | * | | | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2012-03-061-1/+1
| | | |_|_|/ | | |/| | |
* | | | | | Merge of compatibility fixesMichael Widenius2012-04-021-4/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Compatibility fixes by U OrsiniMichael Widenius2012-03-301-1/+1
* | | | | | 1. support for testing statically built oqgraphSergei Golubchik2012-03-301-0/+21
* | | | | | 5.3 mergeSergei Golubchik2012-03-281-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fixed lp:963603 "Assertion `lock_type != TL_UNLOCK && (lock_type == TL_IGNORE...Michael Widenius2012-03-261-0/+3
* | | | | | debug_sync is now a service, available to dynamically loaded plugins.Sergei Golubchik2012-03-281-7/+1
* | | | | | mysql-5.5.22 mergeSergei Golubchik2012-03-285-6/+5
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Updated/added copyright headersMySQL Build Team2012-02-163-4/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Updated/added copyright headersKent Boortz2012-02-152-2/+2
| | |\ \ \ \
| | | * | | | Updated/added copyright headersMySQL Build Team2012-02-153-5/+3
| | | * | | | Fix for BUG#13596377: MYSQL CRASHES ON STARTUP ON FREEBSD IN PB2Ramil Kalimullin2012-01-301-4/+6
| | | * | | | Merge from mysql-5.0.94-releaseSunanda Menon2011-07-061-1/+16
| | | |\ \ \ \
| | | * \ \ \ \ Updated/added copyright headersKent Boortz2011-06-307-294/+111
| | | |\ \ \ \ \
* | | | | | | | | move DBUG_END() after my_thread_global_end(), when all threads have already d...Sergei Golubchik2012-03-261-2/+3
* | | | | | | | | a couple of minor post-5.5-merge cleanupsSergei Golubchik2012-03-261-1/+1
* | | | | | | | | Small Windows specific performance fixes:Vladislav Vaintroub2012-03-251-11/+17
* | | | | | | | | Merge mariadb 5.3->mariadb 5.5unknown2012-03-242-184/+6
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | mergeSergei Golubchik2012-03-211-186/+8
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | mergeSergei Golubchik2012-03-211-186/+8
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | restore my_safe_printf_stderr for "crash-safe sigsegv handler"Sergei Golubchik2012-03-141-186/+8
* | | | | | | | | Merge 5.3->5.5Igor Babaev2012-03-171-8/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /