Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-29 | 1 | -1/+2 |
|\ | |||||
| * | MDEV-19076: rpl_parallel_temptable result mismatch '-33 optimistic' | Sujatha | 2019-05-20 | 1 | -1/+2 |
* | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-14 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | | | | Merge branch '10.2' into 10.3 | Oleksandr Byelkin | 2019-05-12 | 1 | -9/+14 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.1' into 10.2 | Oleksandr Byelkin | 2019-05-04 | 1 | -9/+14 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '5.5' into 10.1 | Sergei Golubchik | 2019-04-26 | 1 | -10/+15 |
| | |\ \ | | | |/ | |||||
| | | * | Problem | Venkatesh Venugopal | 2019-04-25 | 1 | -11/+15 |
* | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-04-27 | 1 | -0/+7 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-16240: Assertion `0' failed in row_sel_convert_mysql_key_to_innobasebb-10.2-MDEV-16240 | Oleksandr Byelkin | 2019-04-25 | 1 | -0/+7 |
| * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-03-04 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-18333 Slow_queries count doesn't increase when slow_query_log is turned off | Alexander Barkov | 2019-03-04 | 1 | -1/+1 |
* | | | | Try to fix windows compiler warnings | Oleksandr Byelkin | 2019-02-14 | 1 | -5/+7 |
* | | | | MDEV-10963 manual merge 10.1->10.3. | Andrei Elkin | 2019-02-11 | 1 | -2/+8 |
* | | | | dirty merge | Oleksandr Byelkin | 2019-02-07 | 1 | -60/+318 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-02-02 | 1 | -44/+242 |
| |\ \ \ | | |/ / | |||||
| | * | | postmerge rollbacks and fixes | Oleksandr Byelkin | 2019-01-31 | 1 | -11/+1 |
| | * | | Merge branch '10.0-galera' into 10.1 | Oleksandr Byelkin | 2019-01-31 | 1 | -0/+21 |
| | |\ \ | |||||
| | | * \ | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-10-30 | 1 | -11/+59 |
| | | |\ \ | |||||
| | | | * \ | Merge tag 'mariadb-5.5.62' into 5.5-galeramariadb-galera-5.5.62 | Jan Lindström | 2018-10-29 | 1 | -10/+36 |
| | | | |\ \ | | | | | |/ | |||||
| | * | | | | MDEV-17803: ulonglongization of table_mapping entry::table_id to fix windows ... | Andrei Elkin | 2019-01-25 | 1 | -2/+2 |
| | * | | | | MDEV-10963 Fragmented BINLOG query | Andrei Elkin | 2019-01-24 | 1 | -16/+153 |
* | | | | | | cleanup: trg2bit() helper | Sergei Golubchik | 2019-01-25 | 1 | -5/+4 |
* | | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-01-24 | 1 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fix the build after MDEV-17803 | Marko Mäkelä | 2019-01-24 | 1 | -3/+3 |
* | | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-11-06 | 1 | -11/+38 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-11-06 | 1 | -14/+41 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-10-30 | 1 | -11/+38 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-10-27 | 1 | -11/+38 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | | * | | | MDEV-15919 lower_case_table_names does not behave as expected(nor... | Sachin | 2018-10-17 | 1 | -10/+36 |
* | | | | | | | Merge branch 'gtid_table_garbage_rows' into gtid_table_garbage_rows_10.3 | Kristian Nielsen | 2018-10-07 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Fix accumulation of old rows in mysql.gtid_slave_pos | Kristian Nielsen | 2018-10-07 | 1 | -3/+3 |
* | | | | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-09-28 | 1 | -5/+0 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge branch '10.1' into 10.2 | Oleksandr Byelkin | 2018-09-14 | 1 | -5/+0 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2018-09-07 | 1 | -5/+0 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | Merge tag 'mariadb-10.0.36' into 10.0-galera | Jan Lindström | 2018-08-02 | 1 | -4/+0 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | * | | | | MDEV-16799: Test wsrep.variables crash at sql_class.cc:639 thd_get_ha_data | Jan Lindström | 2018-07-24 | 1 | -5/+0 |
* | | | | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-06-30 | 1 | -20/+14 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-06-26 | 1 | -4/+0 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-06-26 | 1 | -4/+0 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | MDEV-15242 Poor RBR update performance with partitioned tables | Andrei Elkin | 2018-06-25 | 1 | -4/+0 |
| * | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 1 | -20/+14 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | MDEV-13577 slave_parallel_mode=optimistic should not report the mode's specif... | Sergei Golubchik | 2018-06-20 | 1 | -4/+14 |
| | * | | | | | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -16/+0 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | Merge tag 'mariadb-10.0.35' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -0/+34 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | * | | | | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -5/+64 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | | * | | | Merge tag 'mariadb-5.5.60' into 5.5-galera | Jan Lindström | 2018-04-24 | 1 | -5/+115 |
| | | | |\ \ \ | | | | | | |/ | | | | | |/| | |||||
| | | | * | | | Merge tag 'mariadb-5.5.58' into 5.5-galera | Jan Lindström | 2017-10-19 | 1 | -15/+0 |
| | | | |\ \ \ |