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 | -27/+13 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-30 | 1 | -16/+1 |
| |\ | |||||
| | * | Fix a warning on Win64 | Vladislav Vaintroub | 2017-10-24 | 1 | -1/+1 |
| | * | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-10-24 | 1 | -16/+1 |
| | |\ | |||||
| | | * | Various compier warnings | Sergei Golubchik | 2017-10-22 | 1 | -2/+2 |
| | | * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-10-22 | 1 | -15/+0 |
| | | |\ | |||||
| | | | * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-10-18 | 1 | -15/+0 |
| | | | |\ | |||||
| | | | | * | MDEV-13459 Warnings, when compiling with gcc-7.x | Sergei Golubchik | 2017-10-17 | 1 | -15/+0 |
| * | | | | | MDEV-14092 NEXTVAL fails on slave | Michael Widenius | 2017-10-19 | 1 | -2/+3 |
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-18 | 1 | -10/+10 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Windows : Fix truncation warnings in sql/ | Vladislav Vaintroub | 2017-10-10 | 1 | -10/+10 |
* | | | | | | Merge branch 'bb-10.2-ext' into 10.3 | Sergei Golubchik | 2017-10-05 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '10.2' into bb-10.2-ext | Sergei Golubchik | 2017-10-04 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | cppcheck harmless warnings | Sergei Golubchik | 2017-10-04 | 1 | -1/+1 |
* | | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-10-04 | 1 | -27/+27 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-02 | 1 | -27/+27 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | MDEV-13384 - misc Windows warnings fixed | Vladislav Vaintroub | 2017-09-28 | 1 | -18/+18 |
| | * | | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -9/+9 |
* | | | | | | Merge branch 'bb-10.2-ext' into 10.3 | Sergei Golubchik | 2017-08-26 | 1 | -14/+7 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '10.2' into bb-10.2-ext | Sergei Golubchik | 2017-08-25 | 1 | -14/+7 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-08-17 | 1 | -14/+7 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | MDEV-13179 main.errors fails with wrong errno | Monty | 2017-08-07 | 1 | -14/+7 |
* | | | | | | Changed KEY names to use LEX_CSTRING | Michael Widenius | 2017-08-24 | 1 | -3/+4 |
* | | | | | | New option for slow logging (log_slow_disable_statements) | Monty | 2017-08-24 | 1 | -4/+4 |
* | | | | | | Added DBUG_ASSERT_AS_PRINTF compile flag | Monty | 2017-08-24 | 1 | -2/+2 |
* | | | | | | Lots of small cleanups | Michael Widenius | 2017-08-24 | 1 | -1/+1 |
* | | | | | | Enusure that my_global.h is included first | Michael Widenius | 2017-08-24 | 1 | -1/+1 |
* | | | | | | Use microsecond_interval_timer() instead of my_time() in replicaiton | Monty | 2017-08-24 | 1 | -5/+4 |
* | | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-07-07 | 1 | -14/+19 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-07-07 | 1 | -14/+19 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-07-05 | 1 | -2/+4 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | MDEV-8075: DROP TEMPORARY TABLE not marked as ddl, causing optimistic paralle... | Kristian Nielsen | 2017-07-03 | 1 | -2/+4 |
| | * | | | | MDEV-12067 flashback does not correcly revert update/replace statementsbb-10.2-MDEV-12067 | Lixun Peng | 2017-07-03 | 1 | -12/+15 |
* | | | | | | MDEV-12179: Per-engine mysql.gtid_slave_pos table | Kristian Nielsen | 2017-07-03 | 1 | -7/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | MDEV-12179: Per-engine mysql.gtid_slave_pos table | Kristian Nielsen | 2017-04-21 | 1 | -7/+11 |
* | | | | | | | Remove XtraDB | Marko Mäkelä | 2017-06-21 | 1 | -37/+0 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-06-15 | 1 | -1/+0 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-06-08 | 1 | -1/+0 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2017-05-26 | 1 | -1/+0 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge | Sachin Setiya | 2017-03-17 | 1 | -7/+11 |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | |||||
| | | * | | | | Fix wsrep_affected_rows. | Sachin Setiya | 2017-03-16 | 1 | -0/+4 |
| | | * | | | | Merge tag 'mariadb-10.0.29' into 10.0-galera | Nirbhay Choubey | 2017-01-13 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge tag 'mariadb-10.0.26' into 10.0-galera | Nirbhay Choubey | 2016-06-24 | 1 | -9/+54 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 1 | -4/+7 |
| | | |\ \ \ \ \ \ | |||||
* | | | | | | | | | | Make SEQUENCE working with replication | Monty | 2017-05-23 | 1 | -1/+30 |
* | | | | | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-05-05 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-04-28 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Fix build on windows | Sachin Setiya | 2017-04-06 | 1 | -1/+2 |
| | * | | | | | | | | MW-313 Enforce wsrep_max_ws_rows also when binlog is enabled | Sachin Setiya | 2017-04-06 | 1 | -0/+4 |
* | | | | | | | | | | Changing field::field_name and Item::name to LEX_CSTRING | Monty | 2017-04-23 | 1 | -20/+19 |