summaryrefslogtreecommitdiff
path: root/sql/slave.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-10-301-1/+0
|\
| * Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-301-1/+0
| |\
| | * Merge branch '10.1' into 10.2Sergei Golubchik2017-10-241-1/+0
| | |\
| | | * Merge branch '10.0' into 10.1Sergei Golubchik2017-10-221-1/+0
| | | |\
| | | | * Merge branch '5.5' into 10.0Sergei Golubchik2017-10-181-1/+0
| | | | |\
| | | | | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2017-10-171-1/+0
| | | | | |\
| | | | | | * Bug#24763131 LOCAL-INFILE DEFAULT SHOULD BE DISABLEDVenkatesh Duggirala2017-08-231-1/+0
* | | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-10-041-6/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-021-6/+6
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-281-4/+4
| | * | | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.Vladislav Vaintroub2017-09-281-2/+2
* | | | | | | Merge branch 'bb-10.2-ext' into 10.3Sergei Golubchik2017-08-261-3/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '10.2' into bb-10.2-extSergei Golubchik2017-08-251-3/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-08-171-3/+6
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch '10.0' into 10.1Sergei Golubchik2017-08-081-3/+4
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | move the error message where it belongsSergei Golubchik2017-07-271-1/+1
| | | | * | | Merge remote-tracking branch 'origin/5.5' into 10.0Vicențiu Ciorbaru2017-07-251-2/+3
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Merge remote-tracking branch 'mysql/5.5' into 5.5Sergei Golubchik2017-07-181-2/+4
| | | | | |\ \ | | | | | | |/
| | | | | | * Bug#24901077: RESET SLAVE ALL DOES NOT ALWAYS RESET SLAVESujatha Sivakumar2017-02-281-1/+3
| | | | | | * Bug#23251517: SEMISYNC REPLICATION HANGINGSujatha Sivakumar2016-05-131-26/+12
| | | * | | | Fixed compiler warningsMonty2017-08-071-0/+2
* | | | | | | New option for slow logging (log_slow_disable_statements)Monty2017-08-241-2/+8
* | | | | | | Enusure that my_global.h is included firstMichael Widenius2017-08-241-1/+1
* | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3MDEV-9804Alexander Barkov2017-07-131-2/+27
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-07-121-2/+27
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-07-081-2/+27
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch '10.0' into 10.1Sergei Golubchik2017-07-071-3/+29
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Fix for MDEV-9670 server_id mysteriously set to 0Andrei Elkin2017-07-021-3/+29
* | | | | | | MDEV-12179 post-merge fixes.Kristian Nielsen2017-07-031-4/+4
* | | | | | | MDEV-12179: Per-engine mysql.gtid_slave_pos tableKristian Nielsen2017-07-031-2/+224
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | MDEV-12179: Per-engine mysql.gtid_slave_pos tableKristian Nielsen2017-05-101-2/+4
| * | | | | | MDEV-12179: Per-engine mysql.gtid_slave_pos tableKristian Nielsen2017-04-231-0/+8
| * | | | | | MDEV-12179: Per-engine mysql.gtid_slave_pos tableKristian Nielsen2017-04-211-2/+214
* | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-06-151-3/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-221-3/+2
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge 10.0 into 10.1Marko Mäkelä2017-05-191-3/+2
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-171-3/+2
| | | * | | | MDEV-9998 Fix issues caught by Clang's -Wpointer-bool-conversion warningSergei Golubchik2017-05-151-3/+2
| | * | | | | Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-171-3/+2
* | | | | | | Merge tag 'mariadb-10.2.6' into bb-10.2-extAlexander Barkov2017-05-261-5/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MDEV-10332 support for OpenSSL 1.1 and LibreSSLSergei Golubchik2017-05-091-18/+1
| * | | | | | MDEV-10332 support for OpenSSL 1.1 and LibreSSLGeorg Richter2017-05-091-0/+13
* | | | | | | Fixed compiler warnings and warnings from build.tagsMonty2017-05-081-2/+1
* | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-05-051-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-04-281-1/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | |
| | * | | | Merge 10.0 into 10.1Marko Mäkelä2017-04-211-1/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-11201: gtid_ignore_duplicates incorrectly ignores statements when GTID r...Kristian Nielsen2017-04-101-1/+2
* | | | | | Changing field::field_name and Item::name to LEX_CSTRINGMonty2017-04-231-1/+1
|/ / / / /
* | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-68/+92
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.0' into 10.1Sergei Golubchik2017-03-211-7/+16
| |\ \ \ \ | | |/ / /