Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-29 | 1 | -4/+4 |
|\ | |||||
| * | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-28 | 1 | -4/+4 |
| |\ | |||||
| | * | MDEV-19614: Fix innodb_plugin on Windows | Marko Mäkelä | 2019-05-28 | 1 | -4/+4 |
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-14 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | | | | Merge branch '10.2' into 10.3 | Oleksandr Byelkin | 2019-05-12 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-10 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-19399 do not call slow my_timer_init() several times | Eugene Kosov | 2019-05-10 | 1 | -1/+1 |
* | | | | MDEV-17845 Extreme high open file limit used | Sergei Golubchik | 2019-05-07 | 1 | -20/+0 |
* | | | | post-merge: gcc 8 warnings | Sergei Golubchik | 2019-03-17 | 1 | -3/+0 |
* | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-09-28 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.1' into 10.2 | Oleksandr Byelkin | 2018-09-14 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-15436: If log_bin and log_bin_index is different SST with rsync fails. | Jan Lindström | 2018-09-05 | 1 | -0/+1 |
* | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-08-03 | 1 | -1/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-08-02 | 1 | -1/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-16689: core-file should become a real server variablebb-10.1-MDEV-16689 | Oleksandr Byelkin | 2018-07-20 | 1 | -1/+2 |
* | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-05-12 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'bb-10.2-mariarocks-merge' of github.com:MariaDB/server into 10.2 | Sergei Petrunia | 2018-05-07 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Fix compilation on windows | Sergei Petrunia | 2018-04-16 | 1 | -1/+1 |
* | | | | | MDEV-15923 option to control who can set session @@timestamp | Sergei Golubchik | 2018-05-12 | 1 | -0/+3 |
* | | | | | cleanup: quoted_string | Sergei Golubchik | 2018-05-12 | 1 | -1/+0 |
* | | | | | Merge remote-tracking branch '10.2' into 10.3 | Vicențiu Ciorbaru | 2018-04-12 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.1' into 10.2 | Vicențiu Ciorbaru | 2018-04-10 | 1 | -1/+1 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2018-04-07 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | increase upper value of max_prepared_stmt_count to UINT32_MAX | Daniel Black | 2018-04-03 | 1 | -1/+1 |
* | | | | | | dead code - related to vtmd | Sergei Golubchik | 2018-04-10 | 1 | -3/+1 |
* | | | | | | MDEV-15689 Fix Item_func_set_collation to pass the collation using CHARSET_IN... | Alexander Barkov | 2018-03-27 | 1 | -1/+1 |
* | | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2018-02-15 | 1 | -9/+1 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2018-02-08 | 1 | -9/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | MDEV-15089 Ensure that connection ID is in 32bit range | Vladislav Vaintroub | 2018-02-01 | 1 | -9/+1 |
* | | | | | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ... | Vladislav Vaintroub | 2018-02-06 | 1 | -1/+1 |
* | | | | | | | Changed database, tablename and alias to be LEX_CSTRING | Monty | 2018-01-30 | 1 | -1/+0 |
* | | | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2018-01-30 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge 10.2 into bb-10.2-ext | Marko Mäkelä | 2018-01-30 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | MDEV-14485 Server hangs on startup in THD::init | Vladislav Vaintroub | 2018-01-29 | 1 | -1/+1 |
| | | |_|/ / | | |/| | | | |||||
* | | | | | | remove dead VERS_EXPERIMENTAL code | Sergei Golubchik | 2018-01-13 | 1 | -9/+0 |
* | | | | | | remove "Transaction-based system versioning is EXPERIMENTAL" warning | Sergei Golubchik | 2018-01-13 | 1 | -2/+0 |
* | | | | | | Daemon: debug_system_versioning_show, debug_system_versioning_force | Aleksey Midenkov | 2018-01-10 | 1 | -7/+8 |
* | | | | | | System Versioning 1.0 pre7 | Aleksey Midenkov | 2017-12-21 | 1 | -2/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | MDEV-13073. This part patch weeds out RUN_HOOK from the server as semisync | Andrei Elkin | 2017-12-18 | 1 | -1/+0 |
| * | | | | | | MDEV-13073 This part merges the Ali semisync related changes | Andrei Elkin | 2017-12-18 | 1 | -0/+1 |
| * | | | | | | Optimize RUN_HOOK() call | Monty | 2017-12-18 | 1 | -0/+1 |
| * | | | | | | Changed from using LOCK_log to LOCK_binlog_end_pos for binary log | Monty | 2017-12-18 | 1 | -2/+3 |
* | | | | | | | Timestamp-based versioning for InnoDB [closes #209] | Aleksey Midenkov | 2017-12-18 | 1 | -10/+10 |
* | | | | | | | System Versioning 1.0 pre4 | Eugene Kosov | 2017-12-14 | 1 | -11/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | MDEV-14505 - Threads_running becomes scalability bottleneck | Sergey Vojtovich | 2017-12-13 | 1 | -11/+0 |
* | | | | | | | System Versioning 1.0 pre3 | Aleksey Midenkov | 2017-12-11 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | MDEV-7702 Spiral patch 004_mariadb-10.0.15.slave-trx-retry.diff | Monty | 2017-12-03 | 1 | -0/+1 |