Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-06-12 | 1 | -0/+12 |
|\ | |||||
| * | MDEV-19653 Add class Sql_cmd_create_table | Alexander Barkov | 2019-05-31 | 1 | -0/+12 |
* | | 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.1' into 10.2 | Sergei Golubchik | 2019-03-15 | 1 | -5/+5 |
|\ \ \ | |/ / | |||||
| * | | fix gcc 8 compiler warnings | Sergei Golubchik | 2019-03-14 | 1 | -5/+5 |
* | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-03-04 | 1 | -4/+0 |
|\ \ \ | |/ / | |||||
| * | | MDEV-18333 Slow_queries count doesn't increase when slow_query_log is turned off | Alexander Barkov | 2019-03-04 | 1 | -4/+0 |
* | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-11-06 | 1 | -7/+4 |
|\ \ \ | |/ / | |||||
| * | | wsrep: create a macro for the error: label | Sergei Golubchik | 2018-10-24 | 1 | -7/+4 |
* | | | Merge branch '10.1' into 10.2 | Oleksandr Byelkin | 2018-09-14 | 1 | -7/+13 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2018-09-07 | 1 | -7/+13 |
| |\ \ | |||||
| | * | | Add missing WSREP(thd) condition and remove unnecessary DBUG_RETURN. | Jan Lindström | 2018-08-02 | 1 | -3/+2 |
| | * | | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-08-02 | 1 | -5/+12 |
| | |\ \ | |||||
| | | * | | Follow up to previous commit for codership/mysql-wsrep#332mariadb-galera-5.5.61 | Daniele Sciascia | 2018-08-02 | 1 | -1/+1 |
| | | * | | Fix FK constraint violation in applier, after ALTER TABLE ADD FK | Daniele Sciascia | 2018-08-02 | 1 | -8/+9 |
| | | * | | MDEV#6148 main.flush_read_lock fails due to conflicting | Nirbhay Choubey | 2014-04-21 | 1 | -2/+3 |
| | | * | | Merged revisions 3931--3942 from from lp:~codership/codership-mysql/5.5-23. | Jan Lindström | 2013-11-25 | 1 | -8/+13 |
| | | * | | Merged changes from lp:codership-mysql up to rev 3743 | Seppo Jaakola | 2012-04-26 | 1 | -2/+5 |
| | | * | | Initial push of codership-wsrep API implementation for MariaDB. | Seppo Jaakola | 2012-04-13 | 1 | -1/+16 |
| | | |/ | |||||
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 1 | -3/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | fix compilation w/o partitioning | Sergei Golubchik | 2018-06-14 | 1 | -1/+0 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-05-29 | 1 | -2/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-10679 Crash in performance schema and partitioning with discovery | Monty | 2018-05-26 | 1 | -2/+3 |
* | | | | various cleanups | Sergei Golubchik | 2016-06-30 | 1 | -1/+1 |
* | | | | MDEV-7563 Support CHECK constraint as in (or close to) SQL Standard | Michael Widenius | 2016-06-30 | 1 | -0/+1 |
* | | | | MDEV-5535: Cannot reopen temporary table | Nirbhay Choubey | 2016-06-10 | 1 | -4/+2 |
|/ / / | |||||
* | | | - Renaming variables so that they don't shadow others (After this patch one c... | Monty | 2015-07-06 | 1 | -2/+2 |
* | | | Merge 10.0-galera into 10.1 | Sergei Golubchik | 2015-02-06 | 1 | -9/+11 |
|\ \ \ | |/ / | |||||
| * | | bzr merge -r4123..4144 codership/5.6 | Nirbhay Choubey | 2014-09-30 | 1 | -10/+10 |
| * | | Fixes for some test failures. | Nirbhay Choubey | 2014-04-09 | 1 | -1/+2 |
| * | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -13/+2 |
| |\ \ | |||||
| * \ \ | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -12/+261 |
| |\ \ \ | |||||
| * | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -1/+19 |
| | |_|/ | |/| | | |||||
* | | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -0/+17 |
| |_|/ |/| | | |||||
* | | | Implementation of MDEV-5491: CREATE OR REPLACE TABLE | Michael Widenius | 2014-01-29 | 1 | -13/+2 |
| |/ |/| | |||||
* | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -12/+261 |
|/ | |||||
* | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+1 |
|\ | |||||
| * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+1 |
* | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -1/+1 |
|/ | |||||
* | Remove check_merge_table_access(). | Alexander Nozdrin | 2010-08-31 | 1 | -5/+8 |
* | Rename of sql_alter_table -> sql_alter and sql_table_maintenance -> sql_admin | Mattias Jonsson | 2010-08-16 | 1 | -0/+106 |