summaryrefslogtreecommitdiff
path: root/sql/share
Commit message (Expand)AuthorAgeFilesLines
* mysql 5.5.23 mergeSergei Golubchik2012-04-101-1/+4
|\
| * Bug#13833438: ERROR CODES MUST HAVE SAME VALUE ACROSS MYSQL VERSIONSJon Olav Hauglid2012-03-151-0/+3
* | mysql-5.5.22 mergeSergei Golubchik2012-03-281-8/+15
|\ \ | |/
| * BUG#11758263 50440: MARK UNORDERED UPDATE WITH AUTOINC UNSAFERohit Kalhans2012-02-091-0/+8
| * Backout the patch for bug#11758263.Rohit Kalhans2012-02-081-8/+0
| * BUG#11758263 50440: MARK UNORDERED UPDATE WITH AUTOINC UNSAFERohit Kalhans2012-02-081-0/+8
| * bug#3593869-64035Andrei Elkin2012-01-191-8/+8
* | Merged the implementation of MDEV-28 LIMIT ROWS EXAMINED into MariaDB 5.5.unknown2012-03-121-0/+2
|\ \
| * | Implementation of MDEV-28 LIMIT ROWS EXAMINEDunknown2012-03-111-1/+2
| * | Fixed that 'make distcheck' works with automake 1.11.11Michael Widenius2012-02-211-0/+1
* | | merge with mysql-5.5.21Sergei Golubchik2012-03-091-8/+8
|\ \ \ | | |/ | |/|
| * | BUG#13593869 - 64035: SEVERAL ERRORS IN COM_BINLOG_DUMP/MYSQL_BINLOG_SEND CRA...Andrei Elkin2012-01-181-8/+8
* | | Merge MWL#234: @@skip_replication feature to MariaDB 5.5.unknown2012-03-011-1/+4
|\ \ \
* | | | query cache sysvar fixesSergei Golubchik2012-01-161-2/+1
* | | | mysql-5.5 mergeSergei Golubchik2012-01-161-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-10-121-93/+164
| |\ \ \
| * | | | Fixed Bug#12621017 - CRASH IF A SP VARIABLE IS USED IN THE LIMIT CLAUSE OF ADmitry Shulga2011-08-131-1/+1
* | | | | 5.3 mergeSergei Golubchik2012-01-131-0/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge with 5.2.Michael Widenius2011-12-113-6/+6
| |\ \ \ \
| | * \ \ \ Merge with MariaDB 5.1Michael Widenius2011-11-243-6/+6
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Merge with MySQL 5.1.60Michael Widenius2011-11-231-2/+2
| | | |\ \ \
| | | * \ \ \ Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-212-4/+4
| | | |\ \ \ \
| * | | | | | | test results updated.Alexey Botchkov2011-11-171-3/+2
| * | | | | | | merging.Alexey Botchkov2011-11-121-0/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ gis-related tests fixes.Alexey Botchkov2011-06-201-8/+46
| |\ \ \ \ \ \ \ \
* | | | | | | | | | after merge changes:Sergei Golubchik2011-12-121-175/+175
* | | | | | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-221-0/+4
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Fixed lp:879939 "assertion in ha_maria::enable_indexes with derived_with_keys...Michael Widenius2011-10-261-0/+4
| * | | | | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ...Michael Widenius2011-09-231-0/+2
* | | | | | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-033-96/+169
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Update the German error message translations (by Stefan Hinz)Marko Mäkelä2011-09-291-83/+125
| * | | | | | | | | Bug#11747416 : 32228 A disk full makes binary log corruptAndrei Elkin2011-09-291-8/+8
| * | | | | | | | | BUG#11758262 - 50439: MARK INSERT...SEL...ON DUP KEY UPD,REPLACE...SEL,CREATE...Rohit Kalhans2011-09-291-0/+18
| * | | | | | | | | Merge of fix for bug#11758062 from mysql-5.1.Raghav Kapoor2011-09-281-2/+2
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | BUG#11758062 - 50206: ER_TOO_BIG_SELECT REFERS TO OUTMODED Raghav Kapoor2011-09-281-2/+2
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | merge from 5.5.16Daniel Fischer2011-09-211-0/+6
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Merging into mysql-5.5.16-release.Mats Kindahl2011-08-151-0/+5
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Bug#12547647 UPDATE LOGGING COULD EXCEED LOG PAGE SIZEMarko Mäkelä2011-09-011-0/+3
| * | | | | | | | Fix bug #11830883, SUPPORT "CORRUPTED" BIT FOR INNODB TABLES AND INDEXES.Jimmy Yang2011-08-161-0/+2
| |/ / / / / / /
| * | | | | | | Updated/added copyright headersKent Boortz2011-06-302-3/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Updated/added copyright headersKent Boortz2011-06-302-4/+4
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ merge with 5.3Sergei Golubchik2011-10-191-10/+52
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Fix for LP BUG#806071unknown2011-07-211-0/+2
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-6/+6
| |\ \ \ \ \ \ \
| | * | | | | | | post review changes 2Sergei Golubchik2011-05-191-2/+2
| | * | | | | | | post-review changes 1Sergei Golubchik2011-05-191-4/+4
| | * | | | | | | wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-011-4/+4
| * | | | | | | | Changed MariaDB error numbers to start from 1900 to not conflict with MySQL e...Michael Widenius2011-05-211-0/+13
| * | | | | | | | Rewritten patch of percona - switching query cache on and off, removing comme...unknown2011-05-181-0/+4
| * | | | | | | | Merge with 5.3 mainMichael Widenius2011-05-161-0/+2
| |\ \ \ \ \ \ \ \