summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* cleanup: generalize my_sha1.ccSergei Golubchik2017-03-101-25/+0
* make sql_udf.cc to shorten dlerror() messagesSergei Golubchik2017-03-101-0/+2
* Merge 10.0 into 10.1Marko Mäkelä2017-03-093-44/+9
|\
| * Revert "Add extra HA_ERR message that Percona introduced within TokuDB 5.6.35...Vicențiu Ciorbaru2017-03-062-4/+2
| * Add extra HA_ERR message that Percona introduced within TokuDB 5.6.35-80Vicențiu Ciorbaru2017-03-052-2/+4
| * Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-033-45/+9
| |\
| | * bugfix: remove my_delete_with_symlink()Sergei Golubchik2017-02-272-42/+0
| | * race-condition safe implementation of mi_delete_table/maria_delete_tableSergei Golubchik2017-02-271-0/+3
| | * MDEV-11902 mi_open race conditionSergei Golubchik2017-02-271-3/+3
| | * cleanup: mysys_test_invalid_symlinkSergei Golubchik2017-02-271-0/+2
| | * Fix for memory leak in applications, like QT,that callsMonty2017-01-271-1/+1
* | | Merge 10.0 into 10.1Marko Mäkelä2017-03-031-4/+3
|\ \ \ | |/ /
| * | Windows : Fix server compile errors when compile with /Zc:strictStrings optionVladislav Vaintroub2017-02-281-4/+3
* | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-01-161-0/+4
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.5' into 10.0vicentiu2017-01-061-0/+4
| |\ \ | | |/
| | * move check_user/set_user from mysqld.cc to mysysSergei Golubchik2016-12-221-0/+4
* | | 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