summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.2' into bb-10.2-extSergei Golubchik2017-08-251-1/+1
|\
| * Merge branch '10.1' into 10.2Sergei Golubchik2017-08-171-1/+1
| |\
| | * MDEV-13179 main.errors fails with wrong errnoMonty2017-08-071-1/+1
* | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-06-151-1/+3
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2Marko Mäkelä2017-05-231-1/+1
| |\ \ | | |/
| | * Merge 10.0 into 10.1Marko Mäkelä2017-05-201-1/+1
| | |\
| | | * Change lower_case_file_system definition to feature MYSQL_PLUGIN_IMPORTVicențiu Ciorbaru2017-05-171-1/+1
| * | | Merge 10.1 into 10.2Marko Mäkelä2017-05-221-0/+2
| |\ \ \ | | |/ /
| | * | Merge 10.0 into 10.1Marko Mäkelä2017-05-191-0/+2
| | |\ \ | | | |/
| | | * MDEV-12420 max_recursive_iterations did not prevent a stack-overflow and segf...Sergei Golubchik2017-05-151-0/+2
* | | | Add locks for sequence's to ensure that there is only one writer or many readersMonty2017-05-291-3/+3
* | | | Merge tag 'mariadb-10.2.6' into bb-10.2-extAlexander Barkov2017-05-261-14/+1
|\ \ \ \ | |/ / /
| * | | MDEV-10541: Faking the version string only works with MariaDB-ClientsVicențiu Ciorbaru2017-05-061-0/+1
| * | | Merge 10.1 into 10.2Marko Mäkelä2017-05-061-14/+0
| |\ \ \ | | |/ /
| | * | bugfix: federated/replication did not increment bytes_received status variableSergei Golubchik2017-04-271-14/+0
* | | | Changing field::field_name and Item::name to LEX_CSTRINGMonty2017-04-231-1/+2
* | | | MDEV-10139 Support for SEQUENCE objectsMonty2017-04-071-1/+1
* | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-03-311-3/+3
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-3/+3
| |\ \ \ | | |/ /
| | * | Merge 10.0 into 10.1Marko Mäkelä2017-03-031-3/+3
| | |\ \ | | | |/
| | | * MDEV-11221 - main.events_restart failed in bbSergey Vojtovich2017-03-011-1/+0
| | | * Added a separate lock for start/stop/reset slave.Monty2017-02-281-1/+1
| | | * Windows : Fix server compile errors when compile with /Zc:strictStrings optionVladislav Vaintroub2017-02-281-1/+2
* | | | MDEV-10141: Add support for INTERSECT (and common parts for EXCEPT)Oleksandr Byelkin2017-03-141-2/+4
|/ / /
* | | Fix many -Wconversion warnings.Marko Mäkelä2017-03-071-12/+12
* | | [MDEV-10570] Add Flashback supportMonty2017-01-201-0/+1
* | | store/show vcols as item->print()Sergei Golubchik2016-12-121-6/+8
* | | Binlog compressedvinchen2016-10-191-1/+2
* | | Use sql_mode_t for sql_mode.Monty2016-10-051-2/+2
* | | Merge parallel replication async deadlock kill into 10.2.Kristian Nielsen2016-09-091-4/+7
|\ \ \ | |/ /
| * | Parallel replication async deadlock killKristian Nielsen2016-09-081-4/+7
* | | Merge branch '10.1' into 10.2Sergei Golubchik2016-09-091-5/+0
|\ \ \ | |/ /
| * | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-251-5/+0
| |\ \ | | |/
| | * Cleanups and minor fixesMonty2016-08-211-5/+0
| | * revert part of 69f1a32Sergei Golubchik2016-06-221-3/+3
| | * Replace dynamic loading of mysqld.exe data for plugins, replace with MYSQL_PL...Vladislav Vaintroub2016-06-211-3/+3
* | | MDEV-9593 - Print the real version in the error logSergey Vojtovich2016-09-011-1/+1
* | | Set server_id to 1 by default and disallow to set it to 0Monty2016-08-291-1/+1
* | | Merge branch '10.1' into 10.2Sergei Golubchik2016-06-301-3/+12
|\ \ \ | |/ /
| * | MDEV-10161: wsrep_sync_wait not enabled when set to 1 in config fileNirbhay Choubey2016-06-271-0/+4
| * | Merge branch '10.0' into 10.1Sergei Golubchik2016-05-041-3/+8
| |\ \ | | |/
| | * Merge branch '5.5' into 10.0Sergei Golubchik2016-04-261-3/+9
| | |\
| | | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-04-201-3/+9
| | | |\
| | | | * Bug#21682356: STOP INJECTING DATA ITEMS IN AN ERROR MESSAGEKnut Anders Hatlen2016-01-171-2/+8
* | | | | cleanup: thread_countSergei Golubchik2016-06-041-1/+0
* | | | | Final fixes for Memory_usedMonty2016-04-281-0/+1
* | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-03-231-7/+8
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-9641 MDEV-9644 NULLIF assertionsSergei Golubchik2016-03-051-7/+8
* | | | | Removed TABLE->sort to make it possible to have multiple active calls toMonty2016-03-221-0/+1
* | | | | Fix compilation10.2-sslVladislav Vaintroub2016-02-101-1/+1