summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2019-05-291-4/+4
|\
| * Merge 10.1 into 10.2Marko Mäkelä2019-05-281-4/+4
| |\
| | * MDEV-19614: Fix innodb_plugin on WindowsMarko Mäkelä2019-05-281-4/+4
* | | Merge 10.2 into 10.3Marko Mäkelä2019-05-141-1/+1
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2Marko Mäkelä2019-05-131-1/+1
| |\ \ | | |/
| | * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111-1/+1
| | |\
| | | * Update FSF AddressVicențiu Ciorbaru2019-05-111-1/+1
* | | | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-05-121-1/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.1 into 10.2Marko Mäkelä2019-05-101-1/+1
| |\ \ \ | | |/ /
| | * | MDEV-19399 do not call slow my_timer_init() several timesEugene Kosov2019-05-101-1/+1
* | | | MDEV-17845 Extreme high open file limit usedSergei Golubchik2019-05-071-20/+0
* | | | post-merge: gcc 8 warningsSergei Golubchik2019-03-171-3/+0
* | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-09-281-0/+1
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Oleksandr Byelkin2018-09-141-0/+1
| |\ \ \ | | |/ /
| | * | MDEV-15436: If log_bin and log_bin_index is different SST with rsync fails.Jan Lindström2018-09-051-0/+1
* | | | Merge 10.2 into 10.3Marko Mäkelä2018-08-031-1/+2
|\ \ \ \ | |/ / /
| * | | Merge 10.1 into 10.2Marko Mäkelä2018-08-021-1/+2
| |\ \ \ | | |/ /
| | * | MDEV-16689: core-file should become a real server variablebb-10.1-MDEV-16689Oleksandr Byelkin2018-07-201-1/+2
* | | | Merge 10.2 into 10.3Marko Mäkelä2018-05-121-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'bb-10.2-mariarocks-merge' of github.com:MariaDB/server into 10.2Sergei Petrunia2018-05-071-1/+1
| |\ \ \
| | * | | Fix compilation on windowsSergei Petrunia2018-04-161-1/+1
* | | | | MDEV-15923 option to control who can set session @@timestampSergei Golubchik2018-05-121-0/+3
* | | | | cleanup: quoted_stringSergei Golubchik2018-05-121-1/+0
* | | | | Merge remote-tracking branch '10.2' into 10.3Vicențiu Ciorbaru2018-04-121-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.1' into 10.2Vicențiu Ciorbaru2018-04-101-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2018-04-071-1/+1
| | |\ \ \
| | | * | | increase upper value of max_prepared_stmt_count to UINT32_MAXDaniel Black2018-04-031-1/+1
* | | | | | dead code - related to vtmdSergei Golubchik2018-04-101-3/+1
* | | | | | MDEV-15689 Fix Item_func_set_collation to pass the collation using CHARSET_IN...Alexander Barkov2018-03-271-1/+1
* | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-02-151-9/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2018-02-081-9/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | MDEV-15089 Ensure that connection ID is in 32bit rangeVladislav Vaintroub2018-02-011-9/+1
* | | | | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ...Vladislav Vaintroub2018-02-061-1/+1
* | | | | | | Changed database, tablename and alias to be LEX_CSTRINGMonty2018-01-301-1/+0
* | | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-01-301-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2018-01-301-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | MDEV-14485 Server hangs on startup in THD::initVladislav Vaintroub2018-01-291-1/+1
| | | |_|/ / | | |/| | |
* | | | | | remove dead VERS_EXPERIMENTAL codeSergei Golubchik2018-01-131-9/+0
* | | | | | remove "Transaction-based system versioning is EXPERIMENTAL" warningSergei Golubchik2018-01-131-2/+0
* | | | | | Daemon: debug_system_versioning_show, debug_system_versioning_forceAleksey Midenkov2018-01-101-7/+8
* | | | | | System Versioning 1.0 pre7Aleksey Midenkov2017-12-211-2/+4
|\ \ \ \ \ \
| * | | | | | MDEV-13073. This part patch weeds out RUN_HOOK from the server as semisyncAndrei Elkin2017-12-181-1/+0
| * | | | | | MDEV-13073 This part merges the Ali semisync related changesAndrei Elkin2017-12-181-0/+1
| * | | | | | Optimize RUN_HOOK() callMonty2017-12-181-0/+1
| * | | | | | Changed from using LOCK_log to LOCK_binlog_end_pos for binary logMonty2017-12-181-2/+3
* | | | | | | Timestamp-based versioning for InnoDB [closes #209]Aleksey Midenkov2017-12-181-10/+10
* | | | | | | System Versioning 1.0 pre4Eugene Kosov2017-12-141-11/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MDEV-14505 - Threads_running becomes scalability bottleneckSergey Vojtovich2017-12-131-11/+0
* | | | | | | System Versioning 1.0 pre3Aleksey Midenkov2017-12-111-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MDEV-7702 Spiral patch 004_mariadb-10.0.15.slave-trx-retry.diffMonty2017-12-031-0/+1