summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Merge in new handler and handlersocket code into 5.3 mainMichael Widenius2011-02-223-11/+30
|\
| * Merge with 5.1Michael Widenius2011-01-112-6/+8
| |\
| | * Automatic merge with 5.1Michael Widenius2011-01-101-0/+4
| | |\
| | | * - Fixed that Aria works with HANDLER commandsMichael Widenius2011-01-101-0/+4
| * | | Implementation of MWL#172: Add support for prepared statements to HANDLER READMichael Widenius2011-01-042-11/+26
* | | | Fix for lp:711565 "Index Condition Pushdown can make a thread hold MyISAM loc...Michael Widenius2011-02-181-2/+2
* | | | Fix compile errors:Vladislav Vaintroub2011-02-011-1/+2
* | | | Removed some old comments.Sergei Golubchik2011-01-141-1/+1
* | | | MergeIgor Babaev2010-12-272-6/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Merge: mwl#24+mwl#21 5.1->5.2Igor Babaev2010-12-241-0/+2
| |\ \ \ | | |/ / | |/| |
| | * | MergeIgor Babaev2010-12-091-0/+2
| | |\ \
| | | * \ MergeIgor Babaev2010-09-271-0/+2
| | | |\ \
| | | | * | An implementation of index intersect via a modified Unique class.Igor Babaev2010-09-131-0/+2
| * | | | | merge with 5.1Michael Widenius2010-12-131-6/+4
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Fixed typo that caused compile failure in thr_lock.cMichael Widenius2010-12-131-1/+1
| | * | | | Better warning message if lock test failsMichael Widenius2010-12-101-6/+4
| | |/ / /
* | | | | mergeVladislav Vaintroub2010-12-061-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | mergeVladislav Vaintroub2010-12-061-1/+0
| |\ \ \ \ | | |/ / /
| | * | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-061-1/+0
* | | | | Merge with 5.1-release.Michael Widenius2010-12-0611-59/+121
|\ \ \ \ \ | |/ / / /
| * | | | merge with 5.1Michael Widenius2010-11-308-45/+84
| |\ \ \ \ | | |/ / /
| | * | | Fixed some compiler warningsMichael Widenius2010-11-301-0/+2
| | * | | Merge with MySQL 5.1.53Michael Widenius2010-11-255-31/+38
| | |\ \ \
| | | * \ \ merge to 5.1-securityGeorgi Kodinov2010-10-294-30/+46
| | | |\ \ \
| | | | * | | Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-202-21/+15
| | | | * | | Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-191-1/+1
| | | | * | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-10-192-8/+30
| | | * | | | Bug#57359 Possible to circumvent secure_file_priv using '..' on WindowsKristofer Pettersson2010-10-171-1/+16
| | | |/ / /
| | * | | | Merge with MySQL 5.1.52Michael Widenius2010-11-232-14/+44
| | |\ \ \ \ | | | |/ / /
| | | * | | mergeGeorgi Kodinov2010-10-051-12/+43
| | | |\ \ \
| | | | * | | Bug #56427 : Replace copyright notice removed from SHA1 codeGeorgi Kodinov2010-10-051-12/+43
| | | | * | | Bug #51893: crash with certain characters given to load_file Georgi Kodinov2010-03-301-0/+3
| | | * | | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-09-241-2/+1
| * | | | | | Merge MariaDB 5.1->5.2unknown2010-11-193-14/+37
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | MWL#74: Shared libmysqld.so library.unknown2010-11-172-6/+12
| | * | | | | Added option BACKUP_ALL to mysqld --myisam-recover to also get a backup of th...Michael Widenius2010-11-071-8/+25
* | | | | | | Merge to get make String reallocation fasterMichael Widenius2010-11-161-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Make SQLString reallocation addaptiveMichael Widenius2010-11-081-0/+4
| |/ / / / / /
* | | | | | | Automerge with 5.2Michael Widenius2010-11-053-61/+152
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Automatic merge with 5.1Michael Widenius2010-11-043-61/+152
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fixed compiler & valgrind warnings from my previous push.Michael Widenius2010-11-031-0/+1
| | * | | | | Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-023-61/+151
* | | | | | | mergeSergei Golubchik2010-11-021-159/+2
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ merge w/ 5.2Sergei Golubchik2010-11-021-159/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | merge w/ 5.1Sergei Golubchik2010-10-291-0/+2
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | sane implementation of Key_% status variables.Sergei Golubchik2010-10-291-159/+0
* | | | | | | | Fixed wrong queue_replace(), which caused timeout failure in pbxt.flush_read_...Michael Widenius2010-11-022-0/+26
|/ / / / / / /
* | | | | | | 5.2 mergeSergei Golubchik2010-10-281-12/+15
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | merge with 5.1Sergei Golubchik2010-10-251-12/+15
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | 5.1.51 mergeSergei Golubchik2010-10-191-12/+15
| | |\ \ \ \ \ | | | |/ / / /
View Lorry Controller Status