summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2016-12-111-0/+3
|\
| * MDEV-11343 LOAD DATA INFILE fails to load data with an escape character follo...Alexander Barkov2016-11-291-0/+3
* | MDEV-10759 Fix Aria to support 2-byte collation IDsMonty2016-12-022-2/+2
* | Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-11-022-18/+0
|\ \
| * \ Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-284-22/+3
| |\ \ | | |/
| | * MDEV-10951 Field_newdate::cmp access violationVladislav Vaintroub2016-10-252-18/+0
| * | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-243-3/+3
| |\ \
| * \ \ Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-243-2/+9
| |\ \ \
| * \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-292-2/+2
| |\ \ \ \
* | \ \ \ \ Merge branch '10.0' into 10.1Sergei Golubchik2016-09-282-4/+3
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-09-272-4/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | MDEV-10725 Server 10.1.17 fails to build using clang with c++11Sergei Golubchik2016-09-261-2/+1
| | * | | | don't use my_copystat in the serverSergei Golubchik2016-09-121-2/+2
* | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-252-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fixed "Packets out of order" warning message on stdout in clients,Monty2016-08-212-2/+2
* | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-07-131-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [MDEV-9127] Crash reporter often fails to show the query that crashedVicențiu Ciorbaru2016-07-121-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-282-2/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '5.5' into bb-10.0Sergei Golubchik2016-06-213-2/+9
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Fixed compilation failure using clangVicențiu Ciorbaru2016-06-141-1/+2
| | * | MDEV-10166 probes_mysql_nodtrace.h is not provided anymore by mariadb-10.0.25Sergei Golubchik2016-06-141-0/+6
| | * | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-06-141-1/+1
| | |\ \
| | | * | BUG#22594514: HANDLE_FATAL_SIGNAL (SIG=11) INNisha Gopalakrishnan2016-03-171-2/+2
| | | * | WL#9072: Backport WL#8785 to 5.5Ramil Kalimullin2016-02-193-5/+27
| | * | | MDEV-9366 : do_shutdown_server fails to detect server shutdown on Windows.Vladislav Vaintroub2016-06-081-1/+1
* | | | | MDEV-10262 ucs2_thai_520_w2: wrong implicit weights on the secondary levelAlexander Barkov2016-06-211-0/+1
* | | | | Multi-level collation in UCA, Thai sorting with contraction for UTF8.pruet2016-05-261-1/+1
* | | | | Merge branch 'bb-10.1-merge' into 10.1Sergei Golubchik2016-05-051-0/+6
|\ \ \ \ \
| * | | | | MDEV-9926 probes_mysql.h includes nonexisting filesSergei Golubchik2016-05-051-0/+6
* | | | | | MDEV-9618 solaris sparc build fails on 10.1.Alexey Botchkov2016-05-045-0/+42
|/ / / / /
* | | | | Fixed wrong counting of global Memory_usedMonty2016-04-286-6/+13
* | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-03-212-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Update AskMonty and Atlassian references to MariaDBiangilfillan2016-03-081-1/+1
| * | | | Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-041-1/+1
* | | | | Fix to ensure updates in gtid_slave_state table do not get binlogged.Nirbhay Choubey2016-02-241-3/+3
* | | | | Merge branch 'bb-10.1-serg' into 10.1Sergei Golubchik2016-02-245-19/+17
|\ \ \ \ \
| * \ \ \ \ Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-02-241-0/+9
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-236-21/+14
| | |\ \ \ \ | | | |/ / /
| * | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-234-19/+8
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'bb-10.0-serg' into 10.0mariadb-10.0.24Sergei Golubchik2016-02-173-18/+7
| | |\ \ \ \
| | | * | | | MDEV-9308 Fix build errors with recent gcc (isfinite)Sergei Golubchik2016-02-171-0/+3
| | | * | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-02-153-18/+4
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | dtrace in cmakeSergei Golubchik2016-02-151-0/+0
| | | | * | | better inline checkSergei Golubchik2016-02-151-14/+0
| | | | * | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-02-091-3/+3
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | | | * | Updated copyright year in user visible textBjorn Munch2016-01-111-2/+2
| | | | | * | Bug#21770366 backport bug#21657078 to 5.5 and 5.6Ajo Robert2016-01-071-8/+4
| | | | | * | Bug #21221862 NEWEST RHEL/CENTOS OPENSSL UPDATE BREAKS MYSQL DHE CIPHERSV S Murthy Sidagam2015-06-191-2/+2
| | | | | * | Raise version number after cloning 5.5.42Bala2015-01-051-2/+2
| | | | * | | MDEV-9024 Build fails with VS2015Sergei Golubchik2016-02-061-0/+2