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 | -9/+10 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-30 | 1 | -8/+9 |
| |\ | |||||
| | * | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-10-24 | 1 | -8/+9 |
| | |\ | |||||
| | | * | MDEV-13049 Querying INFORMATION_SCHEMA becomes slow in MariaDB 10.1 | Sergei Golubchik | 2017-10-09 | 1 | -8/+9 |
| * | | | Reset table->record[1] early for sequences to fix comparision of innodb row | Monty | 2017-10-22 | 1 | -1/+1 |
* | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-10-04 | 1 | -10/+10 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-02 | 1 | -10/+10 |
| |\ \ \ | | |/ / | |||||
| | * | | 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 | -6/+6 |
* | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-09-21 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.2 into bb-10.2-ext | Marko Mäkelä | 2017-09-20 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | compiler warning | Sergei Golubchik | 2017-09-18 | 1 | -1/+1 |
* | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-09-01 | 1 | -9/+39 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.2 into bb-10.2-ext | Marko Mäkelä | 2017-09-01 | 1 | -9/+39 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-08-31 | 1 | -9/+39 |
| | |\ \ | | | |/ | |||||
| | | * | Merge branch '10.0' into 10.1 | Marko Mäkelä | 2017-08-30 | 1 | -9/+34 |
| | | |\ | |||||
| | | | * | MDEV-13437 InnoDB fails to return error for XA COMMIT or XA ROLLBACK in read-... | Andrei Elkin | 2017-08-29 | 1 | -9/+34 |
| | | * | | Merge remote-tracking branch 'origin/10.0-galera' into 10.1 | Jan Lindström | 2017-08-21 | 1 | -0/+5 |
| | | |\ \ | |||||
| | | | * | | MW-378 enabling build with WITH_WSREP=OFF only one fix here, enables build of... | sjaakola | 2017-08-14 | 1 | -0/+5 |
| | | | * | | Merge tag 'mariadb-10.0.32' into 10.0-galera | Jan Lindström | 2017-08-09 | 1 | -0/+4 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | MDEV-8453 Alter table not returning engine errors | Sergei Golubchik | 2017-08-01 | 1 | -0/+4 |
| | | | * | | Merge tag 'mariadb-10.0.31' into 10.0-galera | Sachin Setiya | 2017-05-30 | 1 | -1/+1 |
| | | | |\ \ | | | | | |/ | |||||
* | | | | | | Changed KEY names to use LEX_CSTRING | Michael Widenius | 2017-08-24 | 1 | -4/+9 |
* | | | | | | Lots of small cleanups | Michael Widenius | 2017-08-24 | 1 | -15/+17 |
* | | | | | | Simplify test if we can use table in query cache | Michael Widenius | 2017-08-24 | 1 | -1/+1 |
* | | | | | | 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.3 | Marko Mäkelä | 2017-08-09 | 1 | -4/+14 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge 10.2 into bb-10.2-ext | Marko Mäkelä | 2017-08-09 | 1 | -3/+6 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | A followup to MDEV-13470: remove the code that is now useless | Sergei Petrunia | 2017-08-09 | 1 | -3/+0 |
| | * | | | | MDEV-13470 DELETE IGNORE should not ignore deadlocks (again) | Marko Mäkelä | 2017-08-08 | 1 | -0/+6 |
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-08-07 | 1 | -2/+9 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Follow the upstream MyRocks: provide details in the ER_LOCK_DEADLOCK message | Sergei Petrunia | 2017-07-30 | 1 | -2/+9 |
* | | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-07-07 | 1 | -1/+6 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-07-07 | 1 | -1/+6 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-07-05 | 1 | -1/+6 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | MDEV-13012 Assertion `share->error' failed in discover_handlerton upon execut... | Sergei Golubchik | 2017-06-22 | 1 | -1/+6 |
* | | | | | | MDEV-12179: Per-engine mysql.gtid_slave_pos table | Kristian Nielsen | 2017-07-03 | 1 | -0/+5 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | MDEV-12179: Per-engine mysql.gtid_slave_pos table | Kristian Nielsen | 2017-04-25 | 1 | -0/+5 |
* | | | | | | Merge 10.2 into bb-10.2-ext | Marko Mäkelä | 2017-06-19 | 1 | -38/+0 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Remove the unnecessary method handlerton::release_temporary_latches() | Marko Mäkelä | 2017-06-16 | 1 | -38/+0 |
* | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-06-15 | 1 | -1/+15 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-06-08 | 1 | -0/+14 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2017-05-26 | 1 | -0/+14 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Merge branch '10.0' into bb-10.0-galera | Sachin Setiya | 2017-03-20 | 1 | -2/+2 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge | Sachin Setiya | 2017-03-17 | 1 | -3/+3 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Fix wsrep_affected_rows. | Sachin Setiya | 2017-03-16 | 1 | -1/+1 |
| | | * | | | | | MW-313 Enforce wsrep_max_ws_rows also when binlog is enabled | Daniele Sciascia | 2017-03-14 | 1 | -7/+9 |
| | | * | | | | | MW-309 Fix wsrep_max_ws_rows so that it does not affect queries | Sachin Setiya | 2017-03-13 | 1 | -50/+19 |
| | | * | | | | | Merge tag 'mariadb-10.0.29' into 10.0-galera | Nirbhay Choubey | 2017-01-13 | 1 | -1/+1 |
| | | |\ \ \ \ \ | |||||
| * | | \ \ \ \ \ | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | |