Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 1 | -2/+2 |
|\ | |||||
| * | Merge branch 'bb-10.0-vicentiu' into 10.0mariadb-10.0.30 | Vicențiu Ciorbaru | 2017-03-06 | 1 | -2/+2 |
| |\ | |||||
| | * | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-03-03 | 1 | -2/+2 |
| | |\ | |||||
| | | * | race-condition safe implementation of test_if_data_home_dir() | Sergei Golubchik | 2017-02-27 | 1 | -1/+1 |
| | | * | cleanup: mysys_test_invalid_symlink | Sergei Golubchik | 2017-02-27 | 1 | -1/+1 |
* | | | | MDEV-10646 - System Unit File After network-online | Sergey Vojtovich | 2017-03-07 | 1 | -0/+6 |
* | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-03 | 1 | -67/+34 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-11221 - main.events_restart failed in bb | Sergey Vojtovich | 2017-03-01 | 1 | -17/+0 |
| |/ / | |||||
| * | | Add protection to not access is_open() without LOCK_log mutex | Monty | 2017-02-28 | 1 | -3/+11 |
| * | | Added a separate lock for start/stop/reset slave. | Monty | 2017-02-28 | 1 | -1/+2 |
| * | | MDEV-9573 'Stop slave' hangs on replication slave | Monty | 2017-02-28 | 1 | -42/+24 |
| * | | Windows : Fix server compile errors when compile with /Zc:strictStrings option | Vladislav Vaintroub | 2017-02-28 | 1 | -1/+1 |
* | | | Post merge review fixes | Vicențiu Ciorbaru | 2017-01-17 | 1 | -4/+0 |
* | | | Merge remote-tracking branch 'origin/10.1' into 10.1bb-10.1-vicentiu-galera | Vicențiu Ciorbaru | 2017-01-16 | 1 | -3/+11 |
|\ \ \ | |||||
| * | | | max_session_mem_used server variable | Sergei Golubchik | 2017-01-15 | 1 | -0/+9 |
| * | | | cleanup: make malloc_size_cb_func always defined | Sergei Golubchik | 2017-01-15 | 1 | -3/+2 |
* | | | | Merge remote-tracking branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2017-01-16 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * \ \ \ | Merge tag 'mariadb-10.0.29' into 10.0-galera | Nirbhay Choubey | 2017-01-13 | 1 | -85/+35 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Merge tag 'mariadb-10.0.28' into 10.0-galera | Nirbhay Choubey | 2016-10-28 | 1 | -0/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-08-24 | 1 | -31/+18 |
| |\ \ \ \ \ | |||||
| * | | | | | | Refs: MW-279 | sjaakola | 2016-08-21 | 1 | -2/+9 |
| * | | | | | | refs: MW-279 | sjaakola | 2016-08-21 | 1 | -1/+1 |
| * | | | | | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 1 | -2/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge tag 'mariadb-10.0.24' into 10.0-galera | Nirbhay Choubey | 2016-02-23 | 1 | -20/+48 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-01-16 | 1 | -83/+27 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/5.5' into 10.0 | vicentiu | 2017-01-06 | 1 | -83/+27 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-12-22 | 1 | -4/+17 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Bug#24707666: DEFAULT SETTING FOR SECURE-FILE-PRIV SHOULD BE | Arun Kuruvila | 2016-09-28 | 1 | -19/+225 |
| | | * | | | | | | Bug#23303391: HANDLE_FATAL_SIGNAL (SIG=11) IN ALLOC_QUERY | Arun Kuruvila | 2016-08-29 | 1 | -3/+18 |
| | | * | | | | | | Bug#24388753: PRIVILEGE ESCALATION USING MYSQLD_SAFE | Sivert Sorumgard | 2016-08-24 | 1 | -1/+17 |
| | * | | | | | | | move check_user/set_user from mysqld.cc to mysys | Sergei Golubchik | 2016-12-22 | 1 | -72/+11 |
| | * | | | | | | | MDEV-11543 Buildbot tests fail with warnings on server shutdown after rpl.rpl... | Sergei Golubchik | 2016-12-17 | 1 | -1/+1 |
* | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-12-11 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-12-09 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | MDEV-9409 Windows - workaround VS2015 CRT bug that makes | Vladislav Vaintroub | 2016-10-27 | 1 | -0/+6 |
* | | | | | | | | MDEV-10823 amend : Use opt_log_basename instead of hostname to test | Vladislav Vaintroub | 2016-10-10 | 1 | -2/+2 |
* | | | | | | | | MDEV-9312: storage engine not enforced during galera cluster replicationmariadb-10.1.18 | Nirbhay Choubey | 2016-09-29 | 1 | -1/+3 |
* | | | | | | | | MDEV-9312: storage engine not enforced during galera cluster replication | Nirbhay Choubey | 2016-09-28 | 1 | -0/+15 |
* | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-09-28 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-09-27 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | / | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | don't use my_copystat in the server | Sergei Golubchik | 2016-09-12 | 1 | -0/+1 |
* | | | | | | | MDEV-10823 Certain unicode characters in hostname prevent mysqld from starting | Vladislav Vaintroub | 2016-09-27 | 1 | -4/+6 |
* | | | | | | | Parallel replication async deadlock kill | Kristian Nielsen | 2016-09-08 | 1 | -13/+18 |
* | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -31/+18 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | MDEV-10563 Crash during shutdown in Master_info_index::any_slave_sql_running | Vicențiu Ciorbaru | 2016-08-23 | 1 | -1/+4 |
| * | | | | | | Added new status variables to make it easier to debug certain problems: | Monty | 2016-08-21 | 1 | -0/+3 |
| * | | | | | | Cleanups and minor fixes | Monty | 2016-08-21 | 1 | -10/+0 |
| * | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-08-10 | 1 | -20/+11 |
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | / | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | MDEV-10383 Named pipes : multiple servers can listen on the same pipename | Vladislav Vaintroub | 2016-08-02 | 1 | -20/+11 |
* | | | | | | MDEV-10161: wsrep_sync_wait not enabled when set to 1 in config file | Nirbhay Choubey | 2016-06-27 | 1 | -0/+10 |