summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
Commit message (Expand)AuthorAgeFilesLines
* bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-281-3/+10
|\
| * Automatic mergeMichael Widenius2014-09-111-0/+7
| |\
| | * Fixed two bugs with CREATE OR REPLACE and LOCK TABLES:Michael Widenius2014-09-081-0/+7
| * | MDEV-6523 CONNECT temporary table createdSergei Golubchik2014-09-101-3/+3
| |/
* | bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-111-43/+55
|\ \ | |/
| * 5.5.39 mergeSergei Golubchik2014-08-071-32/+32
| |\
| | * mysql-5.5.39 mergeSergei Golubchik2014-08-021-32/+32
| | |\
| | | * BUG#17665767 - FAILING ASSERTION: PRIMARY_KEY_NO == -1 || PRIMARY_KEY_NO == 0 Raghav Kapoor2014-06-251-1/+1
| | | * Bug#18776592 INNODB: FAILING ASSERTION: PRIMARY_KEY_NO == -1 ||Gopal Shankar2014-06-251-30/+38
| | * | MDEV-5743 Server crashes in mysql_alter_table on an attempt to add a primary ...Sergei Golubchik2014-04-071-1/+1
| | * | MDEV-5406 add index to an innodb table with a uniqueness violation crashes my...Sergei Golubchik2014-01-231-8/+29
| * | | Fixed MDEV-6451: "Error 'Table 't1' already exists' on query" with slave_ddl_...Michael Widenius2014-07-301-3/+18
| * | | small cleanup of the SHOW CREATE TABLE codeSergei Golubchik2014-07-081-7/+3
* | | | bzr merge -rtag:mariadb-10.0.12 maria/10.0Nirbhay Choubey2014-06-191-29/+79
|\ \ \ \ | |/ / /
| * | | MDEV-4440 IF NOT EXISTS in multi-action ALTER does not work when the problem ...Alexey Botchkov2014-06-101-29/+79
* | | | bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-23/+31
|\ \ \ \ | |/ / /
| * | | merge of "BUG# 13975227: ONLINE OPTIMIZE TABLE FOR INNODB TABLES"Sergei Golubchik2014-05-071-23/+28
| * | | MDEV-6085 ALTER TABLE looses the connection stringSergei Golubchik2014-05-011-0/+3
* | | | Merging mariadb-10.0.10.Nirbhay Choubey2014-04-081-49/+247
|\ \ \ \ | |/ / /
| * | | Fixed that the we don't change CREATE to CREATE OR REPLACE, except if the sla...Michael Widenius2014-03-281-2/+3
| * | | MDEV-5930 Server crashes in thd_get_ha_data on CREATE OR REPLACE TABLEMichael Widenius2014-03-231-4/+6
| * | | MDEV-5818: MySQL WL#6145: Separate the dependence of DATA DIRECTORY from symb...Michael Widenius2014-03-231-1/+1
| * | | MDEV-5850: MySQL Bug#21317: SHOW CREATE DATABASE does not obey to lower_case_...Michael Widenius2014-03-231-4/+10
| * | | MDEV-5909 MySQL BUG#11748924 PARTITIONS: TOO-LONG COMMENT CAUSES NO WARNINGSergei Golubchik2014-03-261-24/+80
| * | | build_frm_image(): don't try to guess the "real table name" from theSergei Golubchik2014-03-261-6/+13
| * | | Fix for MDEV-5589: "Discrepancy in binlog on half-failed CREATE OR REPLACE"Michael Widenius2014-03-201-6/+100
| * | | MDEV-5854 Interrupted CREATE OR REPLACE is written into binlog, and in a wron...Michael Widenius2014-03-191-1/+18
| * | | MDEV-5619: CREATE OR REPLACE does not release MDL_EXCLUSIVE upon failureMichael Widenius2014-03-121-2/+17
* | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-121/+349
|\ \ \ \ | |/ / /
| * | | MDEV-5667 online alter and changed field/index optionsSergei Golubchik2014-03-021-3/+9
| * | | MDEV-4955 discover of table non-existance on CREATESergei Golubchik2014-02-271-6/+6
| * | | Fixed that rpl_row_create_table can be run with --ps-protocolMichael Widenius2014-02-221-34/+37
| * | | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-6/+6
| * | | merge with 10.0-montySergei Golubchik2014-02-061-72/+244
| |\ \ \
| | * | | MDEV-5602: CREATE OR REPLACE obtains stricter locks than the connection had b...Michael Widenius2014-02-051-9/+17
| | * | | Replication changes for CREATE OR REPLACE TABLEMichael Widenius2014-02-051-18/+44
| | * | | Fixes for CREATE_OR_REPLACEMichael Widenius2014-01-311-7/+33
| | * | | Implementation of MDEV-5491: CREATE OR REPLACE TABLEMichael Widenius2014-01-291-51/+163
| * | | | fix the fix and update test results for MDEV-4439Sergei Golubchik2014-02-061-1/+1
| * | | | MDEV-4439 ALTER TABLE .. [ADD|DROP] FOREIGN KEY IF [NOT] EXISTS does not work...Alexey Botchkov2014-02-061-19/+65
| |/ / /
* | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-251-15/+51
|\ \ \ \ | |/ / /
| * | | 10.0-base mergeSergei Golubchik2013-12-161-11/+44
| |\ \ \
| | * \ \ 5.5 mergeSergei Golubchik2013-11-231-11/+44
| | |\ \ \ | | | |/ /
| | | * | mysql-5.5.34 mergeSergei Golubchik2013-11-191-11/+44
| | | |\ \ | | | | |/
| | | | * Fix for bug#14188793 - "DEADLOCK CAUSED BY ALTER TABLE DOEN'T CLEARDmitry Lenev2013-08-201-6/+22
| | | | * BUG#16290902 DROP TEMP TABLE IF EXISTS CAN CAUSE POINTVenkatesh Duggirala2013-07-271-5/+22
| * | | | MDEV-5438 A view can mask a table that supports discoverySergei Golubchik2013-12-131-1/+1
| * | | | MDEV-5281 Partitioning issue after upgrade from 10.0.3-1 to 10.0.5-1Sergei Golubchik2013-11-281-3/+6
* | | | | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-28/+156
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.0-monty -> 10.0Alexander Barkov2013-11-111-1/+12
| |\ \ \ \