summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Next part of merge. See TODO for detailsMichael Widenius2012-08-1412-54/+157
* Added support of thd->tx_read_onlyMichael Widenius2012-08-071-0/+9
* Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-0119-838/+4271
* automatic merge with 5.5Michael Widenius2012-06-272-4/+5
|\
| * Merge 5.3 -> 5.5Sergey Petrunya2012-06-201-1/+2
| |\
| | * Merge 5.2->5.3Sergey Petrunya2012-06-181-1/+2
| | |\
| | | * Fixed LP bug #1008293.Igor Babaev2012-06-111-1/+2
| | * | 5.2 mergeSergei Golubchik2012-05-202-5/+9
| | |\ \ | | | |/
| | | * 5.1 mergeSergei Golubchik2012-05-182-3/+8
| | | |\
| | | | * merge with mysql-5.1.63Sergei Golubchik2012-05-172-3/+8
| | | | |\
| | | | | * Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DMLAnnamalai Gurusami2012-03-011-1/+6
| * | | | | mysql-5.5 mergeSergei Golubchik2012-06-141-3/+3
| |\ \ \ \ \
| | * \ \ \ \ Merge 5.5.24 back into main 5.5.Joerg Bruehe2012-05-072-8/+12
| | |\ \ \ \ \
* | | | | | | | Fixes after Serg's review of %M extenstionsMichael Widenius2012-06-171-0/+94
* | | | | | | | Merge with 5.5Michael Widenius2012-05-315-28/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Building RPMs with CPackSergei Golubchik2012-05-221-0/+2
| * | | | | | | more portable fix for lp:942266 - 5.5 builds fail with systemtap-sdt-dev inst...Sergei Golubchik2012-05-112-20/+4
| * | | | | | | cSergei Golubchik2012-05-212-8/+12
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DMLAnnamalai Gurusami2012-02-271-5/+6
| | * | | | | | BUG#13431369 - MAIN.VARIABLES-NOTEMBEDDED CRASHES THE SERVER SPORADICALLY ON ...Tatjana Azundris Nuernberg2012-02-191-0/+3
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | |
| | | * | | | BUG#13431369 - MAIN.VARIABLES-NOTEMBEDDED CRASHES THE SERVER SPORADICALLY ON ...Tatjana Azundris Nuernberg2012-02-171-0/+3
* | | | | | | Added text for errno in error messages by:Michael Widenius2012-05-302-9/+13
|/ / / / / /
* | | | | | MDEV-207 Install headers required to build external storage pluginsSergei Golubchik2012-05-051-6/+17
* | | | | | 5.3 mergeSergei Golubchik2012-05-043-106/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | MDEV-207 Install headers required to build external storage pluginsSergei Golubchik2012-04-232-77/+9
* | | | | | mergeSergei Golubchik2012-04-071-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | mergeSergei Golubchik2012-04-053-3/+8
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | mergeSergei Golubchik2012-04-053-3/+8
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | mysql-5.1.62 mergeSergei Golubchik2012-04-053-3/+9
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-02-172-2/+2
| | | | |\ \
* | | | | | | lp:886550 Wrong installation path for some include files.unknown2012-04-031-11/+3
* | | | | | | Define dummy my_init_stacktrace() to allow one to call it without #ifdef HAVE...Michael Widenius2012-04-031-3/+5
* | | | | | | debug_sync is now a service, available to dynamically loaded plugins.Sergei Golubchik2012-03-288-12/+363
* | | | | | | mysql-5.5.22 mergeSergei Golubchik2012-03-286-8/+10
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | merged mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-02-175-5/+5
| |\ \ \ \ \ \
| | * \ \ \ \ \ Updated/added copyright headersMySQL Build Team2012-02-165-5/+5
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Updated/added copyright headersKent Boortz2012-02-152-2/+2
| | | |\ \ \ \ \
| | | | * | | | | Updated/added copyright headersMySQL Build Team2012-02-152-3/+2
| | | | * | | | | auto-merge mysql-5.0->mysql-5.0-securityGeorgi Kodinov2011-10-122-1/+32
| | | | |\ \ \ \ \
| * | | | \ \ \ \ \ Upmerge the AIX compile fix into 5.5.Joerg Bruehe2012-02-161-1/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Merge compile fix for AIX into delivery tree.Joerg Bruehe2012-02-161-1/+3
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Compile fix needed for AIX,Joerg Bruehe2012-01-191-1/+3
| * | | | | | | | BUG#11754145 - 45702: IMPOSSIBE TO SPECIFY MYISAM_SORT_BUFFER > 4GB Ashish Agarwal2012-02-021-2/+2
* | | | | | | | | a couple of minor post-5.5-merge cleanupsSergei Golubchik2012-03-262-7/+2
* | | | | | | | | Merge MariaDB 5.3 into latest MariaDB 5.5unknown2012-03-242-44/+4
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge mariadb 5.3->mariadb 5.5unknown2012-03-242-44/+4
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | mergeSergei Golubchik2012-03-212-44/+4
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | * | | | | | | mergeSergei Golubchik2012-03-212-44/+4
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | |
| | | | * | | | | | restore my_safe_printf_stderr for "crash-safe sigsegv handler"Sergei Golubchik2012-03-142-44/+4
| | * | | | | | | | Fixed lp:925377 "Querying myisam table metadata while 'alter table..enable ke...Michael Widenius2012-02-281-0/+1