summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/10.2' into bb-10.2-extMonty2018-01-051-1/+2
|\
| * Fixed wrong arguments to printf and related functionsMonty2018-01-041-3/+4
* | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extMonty2018-01-011-1/+1
|\ \ | |/
| * MDEV-11071 - Assertion `thd->transaction.stmt.is_empty()' failed inSergey Vojtovich2017-12-291-1/+1
* | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-12-191-4/+1
|\ \ | |/
| * Merge 10.1 to 10.2Marko Mäkelä2017-12-191-4/+1
| |\
| | * Merge 10.0 into 10.1Marko Mäkelä2017-12-181-4/+1
| | |\
| | | * MDEV-14641 Incompatible key or row definition between the MariaDB .frm file a...Sergei Golubchik2017-12-181-4/+1
* | | | Add more execution stages (commit, rollback, etc)Monty2017-11-051-1/+1
* | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-301-2/+3
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Sergei Golubchik2017-10-241-2/+3
| |\ \ \ | | |/ /
| | * | Merge branch '10.0' into 10.1Sergei Golubchik2017-10-221-1/+0
| | |\ \ | | | |/
| | | * Merge branch '5.5' into 10.0Sergei Golubchik2017-10-181-1/+0
| | | |\
| | | | * MDEV-13912 Can't refer the same column twice in one ALTER TABLESergei Golubchik2017-10-171-3/+42
| | | | * MDEV-13459 Warnings, when compiling with gcc-7.xSergei Golubchik2017-10-171-1/+1
| | * | | MDEV-10802 TIMESTAMP NOT NULL field with explicit_defaults_for_timestamp and ...Alexander Barkov2017-10-141-1/+3
* | | | | MDEV-13721 Assertion is_lock_owner() failed in mysql_rm_table_no_locksAleksey Midenkov2017-10-221-1/+20
* | | | | MDEV-13715 Server crashes in ha_partition::engine_nameAleksey Midenkov2017-10-221-1/+1
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-181-9/+9
|\ \ \ \ \ | |/ / / /
| * | | | Windows : Fix truncation warnings in sql/Vladislav Vaintroub2017-10-101-9/+9
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-021-6/+6
|\ \ \ \ \ | |/ / / /
| * | | | fix some conversion warningsVladislav Vaintroub2017-09-281-1/+1
| * | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.Vladislav Vaintroub2017-09-281-5/+5
| * | | | Fix -Wimplicit-fallthrough warnings (no functional change)Marko Mäkelä2017-09-201-0/+1
* | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-201-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | bugfix: allow dropping a constraint and a column togetherSergei Golubchik2017-09-181-1/+1
* | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-071-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix a typo to silence -Wimplicit-fallthroughMarko Mäkelä2017-09-061-2/+1
* | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-011-4/+57
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.1 into 10.2Marko Mäkelä2017-08-311-1/+13
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'origin/bb-10.1-jplindst' into 10.1Jan Lindström2017-08-291-1/+13
| | |\ \ \
| | | * \ \ Merge remote-tracking branch 'origin/10.0-galera' into 10.1Jan Lindström2017-08-211-1/+13
| | | |\ \ \
| | | | * | | Refs: MW-360 * fixes required in pull request reviewsjaakola2017-08-111-1/+2
| | | | * | | Refs: MW-360 * merged relevant parts of DROP TABLE query splitting from mysql...sjaakola2017-08-111-88/+0
| | | | * | | Refs: MW-360, fix for compiler warningsjaakola2017-08-111-1/+0
| | | | * | | Refs: MW-360 * splitting DROP TABLE query in separate DROP commands for tempo...sjaakola2017-08-111-0/+100
| | | | * | | Merge tag 'mariadb-10.0.31' into 10.0-galeraSachin Setiya2017-05-301-1/+17
| | | | |\ \ \
| | | | * \ \ \ Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-171-1/+4
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge tag 'mariadb-10.0.29' into 10.0-galeraNirbhay Choubey2017-01-131-16/+20
| | | | |\ \ \ \ \
| * | | | \ \ \ \ \ Merge 10.1 into 10.2Marko Mäkelä2017-08-291-3/+42
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge 10.0 into 10.1Marko Mäkelä2017-08-281-3/+42
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | / / | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | MDEV-8960: Can't refer the same column twice in one ALTER TABLEJan Lindström2017-08-181-3/+42
| | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-171-1/+2
* | | | | | | | Merge branch '10.2' into bb-10.2-extSergei Golubchik2017-08-251-22/+46
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-08-171-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | MDEV-13179 main.errors fails with wrong errnoMonty2017-08-071-1/+1
| * | | | | | | enable innodb tests for virtual indexed columns (sic!)Sergei Golubchik2017-08-141-4/+6
| * | | | | | | MDEV-11114 Cannot drop column referenced by CHECK constraintSergei Golubchik2017-08-141-0/+28
| * | | | | | | small cleanupSergei Golubchik2017-08-141-15/+10
* | | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-07-071-24/+31
|\ \ \ \ \ \ \ \ | |/ / / / / / /