summaryrefslogtreecommitdiff
path: root/sql/sql_alter.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2019-06-121-0/+12
|\
| * MDEV-19653 Add class Sql_cmd_create_tableAlexander Barkov2019-05-311-0/+12
* | Merge 10.1 into 10.2Marko Mäkelä2019-05-131-1/+1
|\ \ | |/
| * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111-1/+1
| |\
| | * Update FSF AddressVicențiu Ciorbaru2019-05-111-1/+1
* | | Merge branch '10.1' into 10.2Sergei Golubchik2019-03-151-5/+5
|\ \ \ | |/ /
| * | fix gcc 8 compiler warningsSergei Golubchik2019-03-141-5/+5
* | | Merge 10.1 into 10.2Marko Mäkelä2019-03-041-4/+0
|\ \ \ | |/ /
| * | MDEV-18333 Slow_queries count doesn't increase when slow_query_log is turned offAlexander Barkov2019-03-041-4/+0
* | | Merge 10.1 into 10.2Marko Mäkelä2018-11-061-7/+4
|\ \ \ | |/ /
| * | wsrep: create a macro for the error: labelSergei Golubchik2018-10-241-7/+4
* | | Merge branch '10.1' into 10.2Oleksandr Byelkin2018-09-141-7/+13
|\ \ \ | |/ /
| * | Merge branch '10.0-galera' into 10.1Sergei Golubchik2018-09-071-7/+13
| |\ \
| | * | Add missing WSREP(thd) condition and remove unnecessary DBUG_RETURN.Jan Lindström2018-08-021-3/+2
| | * | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-08-021-5/+12
| | |\ \
| | | * | Follow up to previous commit for codership/mysql-wsrep#332mariadb-galera-5.5.61Daniele Sciascia2018-08-021-1/+1
| | | * | Fix FK constraint violation in applier, after ALTER TABLE ADD FKDaniele Sciascia2018-08-021-8/+9
| | | * | MDEV#6148 main.flush_read_lock fails due to conflictingNirbhay Choubey2014-04-211-2/+3
| | | * | Merged revisions 3931--3942 from from lp:~codership/codership-mysql/5.5-23.Jan Lindström2013-11-251-8/+13
| | | * | Merged changes from lp:codership-mysql up to rev 3743Seppo Jaakola2012-04-261-2/+5
| | | * | Initial push of codership-wsrep API implementation for MariaDB. Seppo Jaakola2012-04-131-1/+16
| | | |/
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-06-211-3/+0
|\ \ \ \ | |/ / /
| * | | fix compilation w/o partitioningSergei Golubchik2018-06-141-1/+0
* | | | Merge 10.1 into 10.2Marko Mäkelä2018-05-291-2/+5
|\ \ \ \ | |/ / /
| * | | MDEV-10679 Crash in performance schema and partitioning with discoveryMonty2018-05-261-2/+3
* | | | various cleanupsSergei Golubchik2016-06-301-1/+1
* | | | MDEV-7563 Support CHECK constraint as in (or close to) SQL StandardMichael Widenius2016-06-301-0/+1
* | | | MDEV-5535: Cannot reopen temporary tableNirbhay Choubey2016-06-101-4/+2
|/ / /
* | | - Renaming variables so that they don't shadow others (After this patch one c...Monty2015-07-061-2/+2
* | | Merge 10.0-galera into 10.1Sergei Golubchik2015-02-061-9/+11
|\ \ \ | |/ /
| * | bzr merge -r4123..4144 codership/5.6Nirbhay Choubey2014-09-301-10/+10
| * | Fixes for some test failures.Nirbhay Choubey2014-04-091-1/+2
| * | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-13/+2
| |\ \
| * \ \ Merge 10.0 to galera-10.0Jan Lindström2013-09-031-12/+261
| |\ \ \
| * | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-1/+19
| | |_|/ | |/| |
* | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-0/+17
| |_|/ |/| |
* | | Implementation of MDEV-5491: CREATE OR REPLACE TABLEMichael Widenius2014-01-291-13/+2
| |/ |/|
* | Applied all changes from Igor and SanjaMichael Widenius2013-06-151-12/+261
|/
* mysql-5.5.18 mergeSergei Golubchik2011-11-031-1/+1
|\
| * Updated/added copyright headersKent Boortz2011-06-301-1/+1
* | merge with 5.3Sergei Golubchik2011-10-191-1/+1
|/
* Remove check_merge_table_access().Alexander Nozdrin2010-08-311-5/+8
* Rename of sql_alter_table -> sql_alter and sql_table_maintenance -> sql_adminMattias Jonsson2010-08-161-0/+106