summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Fix the build on Windows.Vladislav Vaintroub2017-04-021-0/+17
* move rocksdb specific changes into rocksdbSergei Golubchik2017-03-311-17/+0
* don't export all charsets to pluginsSergei Golubchik2017-03-311-78/+78
* remove my_hash_const_element(), use Hash_set in C++ codeSergei Golubchik2017-03-311-1/+0
* Merge 10.2 into bb-10.2-mariarocksSergei Petrunia2017-03-3137-1121/+1623
|\
| * Merge branch '10.1' into 10.2Sergei Golubchik2017-03-3034-1117/+1618
| |\
| | * Merge branch '10.0' into 10.1Sergei Golubchik2017-03-212-2/+45
| | |\
| | | * compiler warningSergei Golubchik2017-03-161-2/+2
| | | * MDEV-12261 build failure without P_SSergei Golubchik2017-03-152-2/+45
| | * | Correct FSF addressiangilfillan2017-03-1013-13/+13
| | * | MDEV-11752 Unsafe strmov - function definition in include/m_string.hSergei Golubchik2017-03-101-0/+2
| | * | small plugin API related fixesSergei Golubchik2017-03-102-2/+6
| | * | cleanup: sort various lists of servicesSergei Golubchik2017-03-107-1110/+1109
| | * | thd_rnd serviceSergei Golubchik2017-03-108-0/+94
| | * | Auth Plugin API: add THD to MYSQL_SERVER_AUTH_INFOSergei Golubchik2017-03-102-1/+7
| | * | base64 serviceSergei Golubchik2017-03-109-62/+164
| | * | remove old API for SHA2Sergei Golubchik2017-03-101-72/+0
| | * | my_sha2 serviceSergei Golubchik2017-03-109-4/+386
| | * | 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
| * | | | MDEV-11059 don't build the server with jemallocSergei Golubchik2017-03-291-0/+1
| * | | | MDEV-11720 main.signal_demo3 fails in buildbot on labradorSergei Golubchik2017-03-291-1/+1
| * | | | Do not send MARIADB_CLIENT_STMT_BULK_OPERATIONS server capability,Vladislav Vaintroub2017-03-171-2/+1
| * | | | MDEV-11856 json_search doesn't search for values with double quotesAlexey Botchkov2017-03-141-0/+1
| * | | | MDEV-12244: C API header file contains C++ comment for COM_BINLOG_DUMP_GTIDOleksandr Byelkin2017-03-131-1/+1
* | | | | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocksSergei Petrunia2017-03-1120-269/+325
|\ \ \ \ \ | |/ / / /
| * | | | Fix many -Wconversion warnings.Marko Mäkelä2017-03-0716-262/+266
| * | | | Merge branch 'bb-10.2-serg-merge' into 10.2Sergei Golubchik2017-02-111-0/+4
| |\ \ \ \
| | * \ \ \ Merge branch '10.1' into 10.2Sergei Golubchik2017-02-101-0/+4
| | |\ \ \ \ | | | |/ / /
| | | * | | 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
| * | | | | MDEV-10340: support COM_RESET_CONNECTIONOleksandr Byelkin2017-02-102-0/+4
| |/ / / /
| * | | | MDEV-11557 port MySQL-5.7 JSON tests to MariaDB.Alexey Botchkov2017-02-061-1/+6
| * | | | MDEV-11557 port MySQL-5.7 JSON tests to MariaDB.Alexey Botchkov2017-01-241-2/+23
| * | | | Make atomic writes generalSergei Golubchik2017-01-111-0/+8
| * | | | Improve mysys/hash by caching hash_nrMonty2017-01-111-1/+1
| * | | | MDEV-11713 Optimize DBUG_PRINT and introduce DBUG_LOGMarko Mäkelä2017-01-051-4/+14
* | | | | MDEV-11901 : MariaRocks on WindowsVladislav Vaintroub2017-02-013-103/+114