summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* merge mwl#55Vladislav Vaintroub2011-03-111-2/+0
|\
| * merge 5.2Vladislav Vaintroub2011-03-1013-33/+282
| |\
| * | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-291-2/+0
* | | Merge with 5.2Michael Widenius2011-03-0913-33/+278
|\ \ \ | | |/ | |/|
| * | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-2813-33/+278
| |\ \
| | * | - maria/ma_test_all.sh can now be run with --tmpdir=/dev/shm for faster testingMichael Widenius2011-02-251-2/+2
| | * | - Reduced memory requirements for mysqltest to 1/4.th This also gave a speed...Michael Widenius2011-02-244-12/+18
| | * | Merge with MySQL 5.1.55Michael Widenius2011-02-208-18/+253
| | |\ \
| | | * | Updating header copyright/README in source for 2011Karen Langford2011-01-252-2/+2
| | | * | Bug#42054: SELECT CURDATE() is returning bad valueDavi Arnaut2011-01-111-1/+7
| | | * | Bug#51023: Mysql server crashes on SIGHUP and destroys InnoDB filesDavi Arnaut2011-01-071-3/+3
| | | * | Bug#51023: Mysql server crashes on SIGHUP and destroys InnoDB filesDavi Arnaut2011-01-071-1/+134
| | | * | MergeKent Boortz2010-12-291-1/+1
| | | |\ \
| | | | * | - Added/updated copyright headersKent Boortz2010-12-2812-1312/+2
| | | * | | Fix for bug#48451: my_seek and my_tell ignore MY_WME flagRamil Kalimullin2010-12-093-5/+13
| | | * | | Workaround a GCC warning about a pointer being cast to a largerDavi Arnaut2010-11-301-1/+4
| | | * | | Bug#51817: incorrect assumption: thd->query at 0x2ab2a8360360 is an invalid p...Davi Arnaut2010-11-261-7/+96
| | | * | | mergeGeorgi Kodinov2010-11-261-1/+16
| | | |\ \ \
| | | * | | | Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failureDavi Arnaut2010-11-102-6/+7
| | | * | | | Bug #45288 pb2 returns a lot of compilation warningsJon Olav Hauglid2010-11-081-1/+3
| | * | | | | fix "./configure --with-debug" buildsSergei Golubchik2011-01-261-1/+1
| | * | | | | Fixed bugs found by buildbot:Michael Widenius2011-01-261-2/+6
| * | | | | | Merge with alias as StringMichael Widenius2011-02-281-0/+4
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
* | | | | | | Fixed compiler warnings and some test failures found by buildbotMichael Widenius2011-02-231-8/+11
* | | | | | | 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