summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 10.0-base -> 10.0-montySergei Golubchik2012-10-1915-110/+47
|\
| * Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC.Michael Widenius2012-10-034-4/+4
| * Made max_relay_log_size depending on master connection.Michael Widenius2012-10-011-0/+1
| * Automatic mergeMichael Widenius2012-09-224-1/+24
| |\
| | * Fix for MDEV-533: Confusing error code when doing auto-increment insert for o...Michael Widenius2012-09-182-0/+22
| | * 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-0/+1
| | |\
| | | * MDEV-381: fdatasync() does not correctly flush growing binlog file.unknown2012-08-301-0/+1
| | | * Merge from 5.2.unknown2012-08-241-2/+1
| | | |\
| | | | * Merge from 5.1.unknown2012-08-241-2/+1
| | | | |\
| | | | | * Fix compiler warningsunknown2012-08-241-2/+1
| | | | | * Merge with latest 5.1.unknown2012-08-241-0/+2
| | | | | |\
| | | | * | \ Merge into latest 5.2.unknown2012-08-241-0/+3
| | | | |\ \ \
| | | * | \ \ \ Merge into latest 5.3unknown2012-08-241-0/+3
| | | |\ \ \ \ \
| | | * \ \ \ \ \ 5.2 merge.Sergei Golubchik2012-08-222-5/+8
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | 5.1 mergeSergei Golubchik2012-08-222-5/+8
| | | | |\ \ \ \ \ | | | | | | |_|/ / | | | | | |/| | |
| | | | | * | | | merge with MySQL 5.1.65Sergei Golubchik2012-08-222-5/+7
| | | | | |\ \ \ \
| * | | | | \ \ \ \ Merge MDEV-415 -> 10.0-base.Igor Babaev2012-09-011-0/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | MDEV-415: Back-port of the WL task #1393 from the mysql-5.6 code line.Igor Babaev2012-09-011-0/+1
| * | | | | | | | | | Automatic merge with 5.5Michael Widenius2012-09-018-105/+17
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| / / / / / / / / | | |/ / / / / / / /
| | * | | | | | | | Merge from 5.3unknown2012-08-241-0/+3
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | merge from 5.2unknown2012-08-241-0/+3
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | / / | | | | | |_|_|/ / | | | | |/| | | |
| | | | * | | | | Merge from 5.1.unknown2012-08-241-0/+3
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | |/| | | / | | | | | | |_|/ | | | | | |/| |
| | | | | * | | MDEV-382: Incorrect quotingunknown2012-08-241-0/+2
| | | | | |/ /
| | * | | | | merge with MySQL 5.5.27Sergei Golubchik2012-08-092-6/+7
| | |\ \ \ \ \
| | | * | | | | undo the fix for MySQL Bug#12998841Sergei Golubchik2012-08-083-6/+2
| | | * | | | | Bug #12998841: libmysql divulges plaintext password upon request in 5.5Georgi Kodinov2012-07-053-2/+6
| | | * | | | | merge bug#13708485 5.1->5.5Georgi Kodinov2012-06-291-3/+4
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | Bug #13708485: malformed resultset packet crashes clientGeorgi Kodinov2012-06-281-3/+5
| | | * | | | | Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING)Jon Olav Hauglid2012-06-291-2/+2
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING)Jon Olav Hauglid2012-06-291-2/+2
| | * | | | | | MDEV-419 ensure that all HAVE_XXX constants can be set by cmakeSergei Golubchik2012-07-314-98/+6
| | * | | | | | MDEV-417 - fix typo that prevented use of atomic instructions on WindowsVladislav Vaintroub2012-07-301-1/+1
* | | | | | | | MDEV-3802: Millisecond timeout support in non-blocking client library + fix i...unknown2012-10-124-7/+9
* | | | | | | | compilation and test failuresSergei Golubchik2012-10-041-37/+1
* | | | | | | | more fixes for test casesSergei Golubchik2012-10-011-0/+1
* | | | | | | | fixes for test failuresSergei Golubchik2012-09-277-19/+10
* | | | | | | | Compile 10.0 on WindowsVladislav Vaintroub2012-08-302-6/+9
* | | | | | | | More fixesMichael Widenius2012-08-174-8/+2
* | | | | | | | 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