summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Fixed valgrind error when storing db_name_length in query_cache.Michael Widenius2011-12-134-26/+41
* Fixed LP bug #901709.Igor Babaev2011-12-111-1/+2
* MergeIgor Babaev2011-12-113-16/+30
|\
| * Fixed LP bug #901478.Igor Babaev2011-12-113-16/+30
* | Merge with 5.1 & fixes to IGNORE handlingMichael Widenius2011-12-11165-978/+2298
|\ \ | |/ |/|
| * Rewrite IGNORE handling:Michael Widenius2011-12-1110-106/+66
| * Merge with 5.2.Michael Widenius2011-12-11165-878/+2238
| |\
| | * Merge with 5.1Michael Widenius2011-11-307-15/+43
| | |\
| | | * Fixed compiler warnings and other bugs found by buildbot.Michael Widenius2011-11-303-11/+39
| | | * Fixed compiler warningsMichael Widenius2011-11-304-4/+4
| | * | Merge with 5.1 + fixes for build failures in 5.2Michael Widenius2011-11-291-2/+3
| | |\ \ | | | |/
| | * | after merge fixesSergei Golubchik2011-11-282-4/+10
| | * | Automatic mergeMichael Widenius2011-11-24165-859/+2194
| | |\ \
| | | * \ Merge with MariaDB 5.1Michael Widenius2011-11-24165-861/+2198
| | | |\ \ | | | | |/
| | | | * Fixes for build failuers found by buildbotMichael Widenius2011-11-241-1/+1
| | | | * Merge with MySQL 5.1.60Michael Widenius2011-11-2320-41/+303
| | | | |\
| | | | | * Backmerge of BUG#12997905Jorgen Loland2011-11-183-1/+21
| | | | | * Merge from mysql-5.1.60-releaseKaren Langford2011-11-177-17/+189
| | | | | |\
| | | | | | * Fix Bug#12661768 UPDATE IGNORE CRASHES SERVER IF TABLE IS INNODB AND IT ISVasil Dimov2011-10-251-1/+7
| | | | | | * Bug12589870 post-merge fixes for Sparc64 and friendsTatjana Azundris Nuernberg2011-10-193-5/+8
| | | | | | * merge 5.0-security => 5.1 securityTor Didriksen2011-10-141-0/+30
| | | | | | |\
| | | | | | | * Bug#12563865 ROUNDED,TMP_BUF,DECIMAL_VALUE STACK CORRUPTION IN ALL VERSIONS >...Tor Didriksen2011-10-141-0/+30
| | | | | | | * auto-merge mysql-5.0->mysql-5.0-securityGeorgi Kodinov2011-10-122-30/+14
| | | | | | | |\
| | | | | | * | \ auto-merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-10-1211-73/+189
| | | | | | |\ \ \
| | | | | | * \ \ \ auto-mergeTatjana Azundris Nuernberg2011-10-103-8/+58
| | | | | | |\ \ \ \
| | | | | | | * | | | BUG#12589870 CRASHES WITH MULTIQUERY PACKET + USE<DB> + QUERY CACHEMagne Mahre2011-10-073-8/+58
| | | | | | * | | | | manual mergeTatjana Azundris Nuernberg2011-10-061-9/+10
| | | | | | |\ \ \ \ \ | | | | | | | | |_|/ / | | | | | | | |/| | |
| | | | | | | * | | | additional clean-up for 11765687Tatjana Azundris Nuernberg2011-10-061-9/+10
| | | | | | * | | | | manual mergeTatjana Azundris Nuernberg2011-09-291-2/+32
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | | | / / / | | | | | | | |/ / / | | | | | | |/| | |
| | | | | | | * | | Bug#11765687 (MySQL58677): No privilege on table / view, but can know #rows /...Tatjana Azundris Nuernberg2011-09-291-2/+32
| | | | | | * | | | Fix for Bug#13001491: MYSQL_REFRESH CRASHES WHEN STORED ROUTINES ARE RUN CONC...Alexander Nozdrin2011-09-221-5/+39
| | | | | | * | | | merge into 5.1-sec of bug#11766879.Mattias Jonsson2011-09-151-1/+19
| | | | | | |\ \ \ \
| | | | | | | * | | | Bug#11766879/Bug#60106: DIFF BETWEEN # OF INDEXES IN MYSQL VS INNODB,Mattias Jonsson2011-08-231-1/+19
| | | | | * | | | | | Bug#11759688 52020: InnoDB can still deadlock on just INSERT...ON DUPLICATE KEYMarko Mäkelä2011-11-101-0/+5
| | | | | * | | | | | Bug#12406055 post-push fix: unused variable 'num_chars' in optimized build.Tor Didriksen2011-11-011-1/+1
| | | | | * | | | | | Bug#12406055 post-push fix: unused variable 'num_chars' in optimized build.Tor Didriksen2011-10-311-1/+2
| | | | | | |_|_|/ / | | | | | |/| | | |
| | | | | * | | | | Bug#11747970 34660: CRASH WHEN FEDERATED TABLE LOSES CONNECTION DURING INSERT...Sergey Glukhov2011-10-053-3/+21
| | | | | * | | | | BUG#11758062 - 50206: ER_TOO_BIG_SELECT REFERS TO OUTMODED Raghav Kapoor2011-09-281-2/+2
| | | | | * | | | | Merge from mysql-5.1.59-releaseunknown2011-09-155-12/+52
| | | | | |\ \ \ \ \ | | | | | | |/ / / /
| | | | | | * | | | Manual merge from mysql-5.1.Ramil Kalimullin2011-08-0913-69/+185
| | | | | | |\ \ \ \
| | | | | | * \ \ \ \ merge 5.0-security => 5.1-securityTor Didriksen2011-07-152-3/+4
| | | | | | |\ \ \ \ \ | | | | | | | | |_|/ / | | | | | | | |/| | |
| | | | | | | * | | | Bug#12406055 BUFFER OVERFLOW OF VARIABLE 'BUFF' IN STRING::SET_REALTor Didriksen2011-07-152-3/+4
| | | | | | * | | | | Bug#11765255 - 58201: VALGRIND/CRASH WHEN ORDERING BY MULTIPLE AGGREGATE FUNC...Tor Didriksen2011-07-112-9/+33
| | | | | | * | | | | weave merge of mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-07-07152-289/+738
| | | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ \ auto-merge of mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-06-169-26/+219
| | | | | | |\ \ \ \ \ \
| | | | | | * | | | | | | Fixed bug#11840395 (formerly known as bug#60347: THE STRING "VERSIONDATA"Dmitry Shulga2011-06-091-0/+15
| | | | * | | | | | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-21163-837/+1907
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / /
| | | | | * | | | | | | | Bug#11765254 - 58200: ASSERTION FAILED: PARAM.SORT_LENGTH WHENNorvald H. Ryeng2011-08-301-2/+3
| | | | | * | | | | | | | BUG#12911710 - VALGRIND FAILURE IN ROW-DEBUG:PERFSCHEMA.SOCKET_SUMMARY_BY_INS...Tor Didriksen2011-08-291-5/+1
| | | | | * | | | | | | | Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEXTor Didriksen2011-08-251-11/+0