summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-78/+44
|\
| * Merge 10.0 into 10.1Marko Mäkelä2017-03-091-2/+2
| |\
| | * Merge branch 'bb-10.0-vicentiu' into 10.0mariadb-10.0.30Vicențiu Ciorbaru2017-03-061-2/+2
| | |\
| | | * Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-031-2/+2
| | | |\
| | | | * race-condition safe implementation of test_if_data_home_dir()Sergei Golubchik2017-02-271-1/+1
| | | | * cleanup: mysys_test_invalid_symlinkSergei Golubchik2017-02-271-1/+1
| * | | | MDEV-10646 - System Unit File After network-onlineSergey Vojtovich2017-03-071-0/+6
| * | | | Merge 10.0 into 10.1Marko Mäkelä2017-03-031-67/+34
| |\ \ \ \ | | |/ / /
| | * | | MDEV-11221 - main.events_restart failed in bbSergey Vojtovich2017-03-011-17/+0
| | |/ /
| | * | Add protection to not access is_open() without LOCK_log mutexMonty2017-02-281-3/+11
| | * | Added a separate lock for start/stop/reset slave.Monty2017-02-281-1/+2
| | * | MDEV-9573 'Stop slave' hangs on replication slaveMonty2017-02-281-42/+24
| | * | Windows : Fix server compile errors when compile with /Zc:strictStrings optionVladislav Vaintroub2017-02-281-1/+1
* | | | Fix many -Wconversion warnings.Marko Mäkelä2017-03-071-1/+1
* | | | cleanup: mtr startup warningSergei Golubchik2017-02-141-1/+1
* | | | Merge branch 'bb-10.2-serg-merge' into 10.2Sergei Golubchik2017-02-111-83/+27
|\ \ \ \
| * \ \ \ Merge branch '10.1' into 10.2Sergei Golubchik2017-02-101-83/+27
| |\ \ \ \ | | |/ / /
| | * | | Post merge review fixesVicențiu Ciorbaru2017-01-171-4/+0
| | * | | Merge remote-tracking branch 'origin/10.1' into 10.1bb-10.1-vicentiu-galeraVicențiu Ciorbaru2017-01-161-3/+11
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch '10.0-galera' into 10.1Vicențiu Ciorbaru2017-01-161-0/+4
| | |\ \ \ \
| | | * \ \ \ Merge tag 'mariadb-10.0.29' into 10.0-galeraNirbhay Choubey2017-01-131-85/+35
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | * | | | Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-281-0/+1
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-241-31/+18
| | | |\ \ \ \ \
| | | * | | | | | Refs: MW-279sjaakola2016-08-211-2/+9
| | | * | | | | | refs: MW-279sjaakola2016-08-211-1/+1
| | | * | | | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-291-2/+3
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-231-20/+48
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-01-161-83/+27
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | | * | | | | | | | Merge remote-tracking branch 'origin/5.5' into 10.0vicentiu2017-01-061-83/+27
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
| | | | * | | | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-12-221-4/+17
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Bug#24707666: DEFAULT SETTING FOR SECURE-FILE-PRIV SHOULD BEArun Kuruvila2016-09-281-19/+225
| | | | | * | | | | | | Bug#23303391: HANDLE_FATAL_SIGNAL (SIG=11) IN ALLOC_QUERYArun Kuruvila2016-08-291-3/+18
| | | | | * | | | | | | Bug#24388753: PRIVILEGE ESCALATION USING MYSQLD_SAFESivert Sorumgard2016-08-241-1/+17
| | | | * | | | | | | | move check_user/set_user from mysqld.cc to mysysSergei Golubchik2016-12-221-72/+11
| | | | * | | | | | | | MDEV-11543 Buildbot tests fail with warnings on server shutdown after rpl.rpl...Sergei Golubchik2016-12-171-1/+1
* | | | | | | | | | | | MDEV-11908: New default configuration produces warnings about itself upon sta...Nirbhay Choubey2017-02-101-1/+4
* | | | | | | | | | | | MDEV-7635: Part 1Nirbhay Choubey2017-02-101-2/+2
|/ / / / / / / / / / /
* | | | | | | | | | | [MDEV-10570] Add Flashback supportMonty2017-01-201-1/+17
* | | | | | | | | | | Merge 10.1 to 10.2.Marko Mäkelä2017-01-191-5/+13
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | max_session_mem_used server variableSergei Golubchik2017-01-151-0/+9
| * | | | | | | | | | cleanup: make malloc_size_cb_func always definedSergei Golubchik2017-01-151-3/+2
| |/ / / / / / / / /
* | | | | | | | | | Make atomic writes generalSergei Golubchik2017-01-111-0/+3
* | | | | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-291-6/+15
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-12-111-0/+6
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-12-091-0/+6
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | MDEV-9409 Windows - workaround VS2015 CRT bug that makesVladislav Vaintroub2016-10-271-0/+6
| * | | | | | | | MDEV-10823 amend : Use opt_log_basename instead of hostname to testVladislav Vaintroub2016-10-101-2/+2
| * | | | | | | | MDEV-9312: storage engine not enforced during galera cluster replicationmariadb-10.1.18Nirbhay Choubey2016-09-291-1/+3
| * | | | | | | | MDEV-9312: storage engine not enforced during galera cluster replicationNirbhay Choubey2016-09-281-0/+15
| * | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-09-281-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /