summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
* | | 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.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
* | | | | | MDEV-13179 main.errors fails with wrong errnoMonty2017-08-071-1/+1
* | | | | | MDEV-8075: DROP TEMPORARY TABLE not marked as ddl, causing optimistic paralle...Kristian Nielsen2017-07-031-6/+21
* | | | | | MDEV-12389 ADD CHECK leaves an orphaned .par fileSergei Golubchik2017-05-241-1/+3
* | | | | | Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-171-1/+2
* | | | | | Merge branch '10.0' 10.1Sergei Golubchik2017-04-281-0/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '5.5' into 10.0Sergei Golubchik2017-04-211-0/+15
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| |
| | * | | Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55Sergei Golubchik2017-04-111-0/+15
| | |\ \ \
| | | * | | BUG#24437124: POSSIBLE BUFFER OVERFLOW ON CREATE TABLEKarthik Kamath2016-11-101-0/+15
* | | | | | Merge 10.0 into 10.1Marko Mäkelä2017-03-031-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-11757 KEY_BLOCK_SIZE strangeness when UNCOMPRESSing COMPRESSed InnoDB ta...Sergei Golubchik2017-02-281-0/+3
* | | | | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-01-161-7/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-01-141-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | MDEV-11527 Virtual columns do not get along well with NO_ZERO_DATESergei Golubchik2017-01-121-1/+1
| * | | | Merge branch 'bb-10.0-vicentiu' into 10.0mariadb-10.0.29Vicențiu Ciorbaru2017-01-121-6/+2
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/5.5' into 10.0vicentiu2017-01-061-6/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | reduce code duplication a littlemariadb-5.5.54Sergei Golubchik2016-12-221-5/+1
| | | * | | MDEV-10274 Bundling insert with create statement for table with unsigned Deci...Alexey Botchkov2016-12-191-1/+1
* | | | | | Merge 10.0 into 10.1Marko Mäkelä2017-01-101-3/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-11548 Reproducible server crash after the 2nd ALTER TABLE ADD FOREIGN KE...Alexey Botchkov2017-01-091-1/+1
| * | | | | MDEV-11317: `! is_set()' or `!is_set() || (m_status == DA_OK_BULK && is_bulk_...Monty2017-01-081-2/+14
| |/ / / /
* | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-12-111-7/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-12-091-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Restore MY_WME flag for my_pread in read_ddl_log_entry, fix errors in buildbotVladislav Vaintroub2016-11-141-1/+1
| | * | | MDEV-11248 Fix passing offset parameter to my_file_pread in read_ddl_log_file...Vladislav Vaintroub2016-11-101-2/+2
| * | | | MDEV-11231 Server crashes in check_duplicate_key on CREATE TABLE ... SELECTSergei Golubchik2016-12-041-6/+2
* | | | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-11-021-1/+3
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-281-1/+3
| |\ \ \ \ | | |/ / /
| | * | | MDEV-11126: Crash while altering persistent virtual columnJan Lindström2016-10-261-0/+1
| | * | | MDEV-10824 - Crash in CREATE OR REPLACE TABLE t1 AS SELECT spfunc()Sergey Vojtovich2016-10-261-1/+2
| * | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-241-4/+6
| |\ \ \ \ | | |/ / /
| * | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-291-2/+20
| |\ \ \ \