Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-10-30 | 1 | -1/+0 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-30 | 1 | -1/+0 |
| |\ | |||||
| | * | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-10-24 | 1 | -1/+0 |
| | |\ | |||||
| | | * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-10-22 | 1 | -1/+0 |
| | | |\ | |||||
| | | | * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-10-18 | 1 | -1/+0 |
| | | | |\ | |||||
| | | | | * | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2017-10-17 | 1 | -1/+0 |
| | | | | |\ | |||||
| | | | | | * | Bug#24763131 LOCAL-INFILE DEFAULT SHOULD BE DISABLED | Venkatesh Duggirala | 2017-08-23 | 1 | -1/+0 |
* | | | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-10-04 | 1 | -6/+6 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-02 | 1 | -6/+6 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | MDEV-13384 - misc Windows warnings fixed | Vladislav Vaintroub | 2017-09-28 | 1 | -4/+4 |
| | * | | | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -2/+2 |
* | | | | | | | Merge branch 'bb-10.2-ext' into 10.3 | Sergei Golubchik | 2017-08-26 | 1 | -3/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch '10.2' into bb-10.2-ext | Sergei Golubchik | 2017-08-25 | 1 | -3/+4 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-08-17 | 1 | -3/+6 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-08-08 | 1 | -3/+4 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | move the error message where it belongs | Sergei Golubchik | 2017-07-27 | 1 | -1/+1 |
| | | | * | | | Merge remote-tracking branch 'origin/5.5' into 10.0 | Vicențiu Ciorbaru | 2017-07-25 | 1 | -2/+3 |
| | | | |\ \ \ | | | | | |/ / | |||||
| | | | | * | | Merge remote-tracking branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2017-07-18 | 1 | -2/+4 |
| | | | | |\ \ | | | | | | |/ | |||||
| | | | | | * | Bug#24901077: RESET SLAVE ALL DOES NOT ALWAYS RESET SLAVE | Sujatha Sivakumar | 2017-02-28 | 1 | -1/+3 |
| | | | | | * | Bug#23251517: SEMISYNC REPLICATION HANGING | Sujatha Sivakumar | 2016-05-13 | 1 | -26/+12 |
| | | * | | | | Fixed compiler warnings | Monty | 2017-08-07 | 1 | -0/+2 |
* | | | | | | | New option for slow logging (log_slow_disable_statements) | Monty | 2017-08-24 | 1 | -2/+8 |
* | | | | | | | Enusure that my_global.h is included first | Michael Widenius | 2017-08-24 | 1 | -1/+1 |
* | | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3MDEV-9804 | Alexander Barkov | 2017-07-13 | 1 | -2/+27 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-07-12 | 1 | -2/+27 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-07-08 | 1 | -2/+27 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-07-07 | 1 | -3/+29 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | Fix for MDEV-9670 server_id mysteriously set to 0 | Andrei Elkin | 2017-07-02 | 1 | -3/+29 |
* | | | | | | | MDEV-12179 post-merge fixes. | Kristian Nielsen | 2017-07-03 | 1 | -4/+4 |
* | | | | | | | MDEV-12179: Per-engine mysql.gtid_slave_pos table | Kristian Nielsen | 2017-07-03 | 1 | -2/+224 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | MDEV-12179: Per-engine mysql.gtid_slave_pos table | Kristian Nielsen | 2017-05-10 | 1 | -2/+4 |
| * | | | | | | MDEV-12179: Per-engine mysql.gtid_slave_pos table | Kristian Nielsen | 2017-04-23 | 1 | -0/+8 |
| * | | | | | | MDEV-12179: Per-engine mysql.gtid_slave_pos table | Kristian Nielsen | 2017-04-21 | 1 | -2/+214 |
* | | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-06-15 | 1 | -3/+2 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-22 | 1 | -3/+2 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-19 | 1 | -3/+2 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 1 | -3/+2 |
| | | * | | | | MDEV-9998 Fix issues caught by Clang's -Wpointer-bool-conversion warning | Sergei Golubchik | 2017-05-15 | 1 | -3/+2 |
| | * | | | | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 1 | -3/+2 |
* | | | | | | | Merge tag 'mariadb-10.2.6' into bb-10.2-ext | Alexander Barkov | 2017-05-26 | 1 | -5/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | MDEV-10332 support for OpenSSL 1.1 and LibreSSL | Sergei Golubchik | 2017-05-09 | 1 | -18/+1 |
| * | | | | | | MDEV-10332 support for OpenSSL 1.1 and LibreSSL | Georg Richter | 2017-05-09 | 1 | -0/+13 |
* | | | | | | | Fixed compiler warnings and warnings from build.tags | Monty | 2017-05-08 | 1 | -2/+1 |
* | | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-05-05 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-04-28 | 1 | -1/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | | | |||||
| | * | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-04-21 | 1 | -1/+2 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | MDEV-11201: gtid_ignore_duplicates incorrectly ignores statements when GTID r... | Kristian Nielsen | 2017-04-10 | 1 | -1/+2 |
* | | | | | | Changing field::field_name and Item::name to LEX_CSTRING | Monty | 2017-04-23 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -68/+92 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-03-21 | 1 | -7/+16 |
| |\ \ \ \ | | |/ / / |