Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove most 'register' use in C++ | Marko Mäkelä | 2018-04-24 | 1 | -1/+1 |
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-04-24 | 1 | -13/+0 |
|\ | |||||
| * | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-04-24 | 1 | -13/+0 |
| |\ | |||||
| | * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-04-20 | 1 | -13/+0 |
| | |\ | |||||
| | | * | MDEV-14185 CREATE TEMPORARY TABLE AS SELECT causes error 1290 with read_only ... | Alexey Botchkov | 2018-04-08 | 1 | -1/+1 |
| | | * | MDEV-14185 CREATE TEMPORARY TABLE AS SELECT causes error 1290 with read_only ... | Alexey Botchkov | 2018-04-07 | 1 | -1/+2 |
| | | * | MDEV-12230 include/my_sys.h:600:43: error: unknown type name ‘PSI_file_keyâ... | Sergei Golubchik | 2017-04-20 | 1 | -1/+1 |
* | | | | Fix unused variable thd warning in embedded | Vicențiu Ciorbaru | 2018-03-22 | 1 | -1/+1 |
* | | | | Merge remote-tracking branch 'origin/10.1' into 10.2 | Vicențiu Ciorbaru | 2018-03-16 | 1 | -56/+24 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.1' into MDEV-13549-fixes-for-galera_var_max_ws_rows | Jan Lindström | 2018-03-15 | 1 | -2/+4 |
| |\ \ \ | |||||
| | * \ \ | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-03-09 | 1 | -2/+4 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | MDEV-14648 Restore fix for MySQL BUG#39053 - UNINSTALL PLUGIN does not allow ... | Marko Mäkelä | 2018-03-09 | 1 | -2/+4 |
| * | | | | MDEV-13549 Fix for test galera.galera_var_max_ws_rows | Daniele Sciascia | 2018-03-13 | 1 | -33/+0 |
| |/ / / | |||||
* | | | | MDEV-14648 Restore fix for MySQL BUG#39053 - UNINSTALL PLUGIN does not allow ... | Marko Mäkelä | 2018-02-15 | 1 | -2/+4 |
* | | | | Merge branch 'github/10.1' into 10.2 | Sergei Golubchik | 2018-02-06 | 1 | -7/+7 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 1 | -7/+7 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix for MDEV-14141 Crash in print_keydup_error() | Monty | 2018-01-24 | 1 | -7/+7 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-11-07 | 1 | -2/+7 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-12633 Error from valgrind related to dd_frm_type | Monty | 2017-11-02 | 1 | -2/+7 |
* | | | | 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 |
* | | | | 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 |
* | | | | compiler warning | Sergei Golubchik | 2017-09-18 | 1 | -1/+1 |
* | | | | 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 |
| | |\ \ \ | | | |/ / | |||||
* | | | | | 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 |
* | | | | | Follow the upstream MyRocks: provide details in the ER_LOCK_DEADLOCK message | Sergei Petrunia | 2017-07-30 | 1 | -2/+9 |
* | | | | | 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 |
* | | | | | Remove the unnecessary method handlerton::release_temporary_latches() | Marko Mäkelä | 2017-06-16 | 1 | -38/+0 |
* | | | | | 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 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | * | | | | | | MDEV-12761 Error return from external_lock make the server crash | Sergei Golubchik | 2017-05-15 | 1 | -1/+1 |
| | | |_|_|/ / | | |/| | | | | |||||
* | | | | | | | ha_start_consistent_snapshot() did not check for errors | Sergei Golubchik | 2017-03-31 | 1 | -3/+10 |