summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* 10.0-base -> 10.0-montySergei Golubchik2012-10-1916-110/+134
|\
| * Made max_relay_log_size depending on master connection.Michael Widenius2012-10-011-0/+37
| * Automatic mergeMichael Widenius2012-09-225-11/+25
| |\
| | * Fix for MDEV-533: Confusing error code when doing auto-increment insert for o...Michael Widenius2012-09-181-6/+4
| | * Fixed compiler warning on MacMichael Widenius2012-09-101-1/+1
| | * MDEV-481 Assertion `pins->pin[i] == 0' failed in _lf_pinbox_put_pins on concu...Sergei Golubchik2012-09-041-1/+3
| | * 1. fix an old typo. A purgatory must be cleaned on every LF_PURGATORY_SIZE fr...Sergei Golubchik2012-09-041-1/+1
| | * 5.3 mergeSergei Golubchik2012-08-311-2/+16
| | |\
| | | * MDEV-381: fdatasync() does not correctly flush growing binlog file.unknown2012-08-301-2/+16
| | | * Merge into latest 5.3unknown2012-08-241-3/+51
| | | |\
| | | * \ 5.2 merge.Sergei Golubchik2012-08-223-2/+18
| | | |\ \
| | | | * \ 5.1 mergeSergei Golubchik2012-08-223-3/+18
| | | | |\ \
| | | | | * \ merge with MySQL 5.1.65Sergei Golubchik2012-08-223-3/+18
| | | | | |\ \
| * | | | | \ \ Merge MDEV-415 -> 10.0-base.Igor Babaev2012-09-012-1/+6
| |\ \ \ \ \ \ \
| | * | | | | | | MDEV-415: Back-port of the WL task #1393 from the mysql-5.6 code line.Igor Babaev2012-09-012-1/+6
| * | | | | | | | Automatic merge with 5.5Michael Widenius2012-09-019-99/+67
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / /
| | * | | | | | Merge from 5.3unknown2012-08-241-3/+51
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | merge from 5.2unknown2012-08-241-3/+51
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Merge from 5.1.unknown2012-08-241-3/+51
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | | * | | MDEV-382: Incorrect quotingunknown2012-08-241-3/+51
| | | | | |/ /
| | * | | | | MDEV-439 cmake -DWITHOUT_SERVER does not workSergei Golubchik2012-08-231-0/+2
| | * | | | | merge with MySQL 5.5.27Sergei Golubchik2012-08-092-1/+10
| | |\ \ \ \ \
| | | * \ \ \ \ merge from 5.1 to 5.5Sujatha Sivakumar2012-07-101-1/+5
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | BUG#11762670:MY_B_WRITE RETURN VALUE IGNOREDSujatha Sivakumar2012-07-101-1/+5
| | | * | | | | mergeGeorgi Kodinov2012-07-051-1/+2
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Bug #13889741: HANDLE_FATAL_SIGNAL IN _DB_ENTER_ |Georgi Kodinov2012-07-051-1/+2
| | | * | | | | upmerge from mysql-5.1 branch -> mysql-5.5 branchRohit Kalhans2012-05-291-0/+5
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Bug#11762667: MYSQLBINLOG IGNORES ERRORS WHILE WRITING OUTPUTRohit Kalhans2012-05-291-1/+11
| | * | | | | | MDEV-419 ensure that all HAVE_XXX constants can be set by cmakeSergei Golubchik2012-07-316-95/+4
* | | | | | | | compilation and test failuresSergei Golubchik2012-10-041-2/+0
* | | | | | | | fixes for test failuresSergei Golubchik2012-09-275-28/+36
* | | | | | | | Next part of merge. See TODO for detailsMichael Widenius2012-08-142-1/+11
* | | | | | | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-017-51/+851
|/ / / / / / /
* | | | | | | automatic merge with 5.5Michael Widenius2012-06-271-55/+197
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge 5.3 -> 5.5Sergey Petrunya2012-06-201-55/+197
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge 5.2->5.3Sergey Petrunya2012-06-181-55/+197
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Fixed LP bug #1008293.Igor Babaev2012-06-111-55/+197
| | * | | | | 5.2 mergeSergei Golubchik2012-05-201-2/+3
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | 5.1 mergeSergei Golubchik2012-05-181-1/+4
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | merge with mysql-5.1.63Sergei Golubchik2012-05-171-1/+4
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | | | * | merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-03-081-1/+1
| | | | | |\ \
| | | | | * | | Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DMLAnnamalai Gurusami2012-03-011-1/+5
| | * | | | | | mergeSergei Golubchik2012-04-052-2/+4
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | mergeSergei Golubchik2012-04-052-2/+4
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | mysql-5.1.62 mergeSergei Golubchik2012-04-052-2/+4
| | | | |\ \ \ \ | | | | | |/ / /
* | | | | | | | Fixes after Serg's review of %M extenstionsMichael Widenius2012-06-171-94/+0
* | | | | | | | Merge with 5.5Michael Widenius2012-05-311-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | cSergei Golubchik2012-05-211-4/+4
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-04-101-2/+5
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-03-081-1/+1
| | |\ \ \ \ \ \ \