summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.2' into 10.3Sergei Golubchik2018-03-281-2/+1
|\
| * After-merge fix for commit 98eb9518db1da854048b09d94244a982a1d32f9aMarko Mäkelä2018-03-161-2/+1
* | MDEV-15689 Fix Item_func_set_collation to pass the collation using CHARSET_IN...Alexander Barkov2018-03-271-1/+1
* | MDEV-15501 : Make `proxy_protocol_networks` variable read-write.Vladislav Vaintroub2018-03-231-2/+2
* | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-03-131-0/+4
|\ \
| * \ Merge 10.2 into bb-10.2-extMarko Mäkelä2018-03-131-0/+4
| |\ \ | | |/
| | * MDEV-14581 Warning info not cleared when caching THDVladislav Vaintroub2018-03-121-0/+4
| * | MDEV-11952 Oracle-style packages: stage#5Alexander Barkov2018-02-271-0/+11
* | | MDEV-11952 Oracle-style packages: stage#5mariadb-10.3.5bb-10.3-compatibilityAlexander Barkov2018-02-251-0/+11
* | | Merge branch 'bb-10.2-ext' into 10.3Sergei Golubchik2018-02-231-1/+3
|\ \ \ | |/ /
| * | Merge branch '10.2' into bb-10.2-extSergei Golubchik2018-02-221-1/+3
| |\ \ | | |/
| | * Merge branch '10.1' into 10.2Sergei Golubchik2018-02-221-1/+3
| | |\
| | | * Windows : remove freopen(), "to keep fd = 0 busy".Vladislav Vaintroub2018-02-201-1/+3
* | | | Make possible to use clang on Windows (clang-cl)Vladislav Vaintroub2018-02-201-8/+5
* | | | merge two the same consistently 'if' clauses into oneAlexander Kuleshov2018-02-171-3/+0
* | | | remove duplicated inclusion of derror.hAlexander Kuleshov2018-02-161-1/+0
* | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-02-151-5/+106
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2018-02-081-5/+106
| |\ \ \ | | |/ /
| | * | Merge branch 'github/10.1' into 10.2Sergei Golubchik2018-02-061-1/+1
| | |\ \ | | | |/
| | | * Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-021-1/+1
| | | |\
| | | | * Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-241-1/+1
| | | | |\
| | | | | * Fix error message typoKarim Geiger2018-01-231-1/+1
| | * | | | Fix sql_print_warning formattingVladislav Vaintroub2018-02-011-1/+1
| | * | | | MDEV-15089 Ensure that connection ID is in 32bit rangeVladislav Vaintroub2018-02-011-4/+105
* | | | | | Windows, compiling : reenable warning C4996 (deprecated functions)Vladislav Vaintroub2018-02-071-72/+71
* | | | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ...Vladislav Vaintroub2018-02-061-5/+5
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2018-02-041-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Added name to MEM_ROOT for esier debuggingMonty2018-02-021-2/+2
* | | | | | Changed database, tablename and alias to be LEX_CSTRINGMonty2018-01-301-1/+1
* | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-01-301-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2018-01-301-3/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-14485 Server hangs on startup in THD::initVladislav Vaintroub2018-01-291-3/+3
* | | | | | Merge branch 'github/10.3' into bb-10.3-temporalmariadb-10.3.4Sergei Golubchik2018-01-171-3/+4
|\ \ \ \ \ \
| * | | | | | MDEV-14822 binlog.binlog_killed fails with wrong resultMonty2018-01-101-3/+4
* | | | | | | remove dead VERS_EXPERIMENTAL codeSergei Golubchik2018-01-131-5/+0
* | | | | | | remove "Transaction-based system versioning is EXPERIMENTAL" warningSergei Golubchik2018-01-131-32/+0
* | | | | | | System Versioning 1.0 pre8Aleksey Midenkov2018-01-101-21/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-01-041-21/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fixed simple failures:Monty2018-01-021-1/+1
| | * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extMonty2018-01-011-20/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge remote-tracking branch 'origin/10.1' into 10.2Vicențiu Ciorbaru2017-12-221-20/+1
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | MDEV-14265 - RPMLint warning: shared-lib-calls-exitSergey Vojtovich2017-12-191-20/+1
| | * | | | | mysqlbinlog now prints "# Number of rows" and stops on errorsMonty2017-12-291-1/+1
| * | | | | | @@in_predicate_conversion_thresholdSergei Golubchik2017-12-211-0/+2
* | | | | | | Daemon: debug_system_versioning_show, debug_system_versioning_forceAleksey Midenkov2018-01-101-0/+2
* | | | | | | remove ifdefs around PSI_THREAD_CALLSergei Golubchik2018-01-091-15/+7
* | | | | | | System Versioning 1.0 pre7Aleksey Midenkov2017-12-211-20/+87
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MDEV-13073. This part converts the Ali patch`s identifiers to the MariaDB sta...Andrei Elkin2017-12-181-10/+9
| * | | | | | MDEV-13073. This part patch weeds out RUN_HOOK from the server as semisyncAndrei Elkin2017-12-181-11/+1
| * | | | | | MDEV-13073 This part merges the Ali semisync related changesAndrei Elkin2017-12-181-9/+24