summaryrefslogtreecommitdiff
path: root/sql/handler.cc
Commit message (Expand)AuthorAgeFilesLines
* Merged revision 3471, 3472 & 3473 from maria-5.5-galera.Nirbhay Choubey2014-03-281-1/+1
|\
| * Merged r3466 from maria-5.5-galera.Nirbhay Choubey2014-03-271-1/+1
* | Merging revision from codership-mysql/5.5 (r3928..3968) andNirbhay Choubey2014-03-271-7/+46
|\ \
| * | * bzr merge -r4027..4061 codership/5.6Nirbhay Choubey2014-03-261-2/+21
| * | bzr merge -r3946..3968 codership/5.5Nirbhay Choubey2014-03-251-5/+31
| |/
* | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-48/+96
|\ \ | |/ |/|
| * MDEV-5667 online alter and changed field/index optionsSergei Golubchik2014-03-021-0/+1
| * MDEV-4955 discover of table non-existance on CREATESergei Golubchik2014-02-271-31/+65
| * MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-1/+1
| * Automatic mergeMichael Widenius2014-02-051-5/+7
| |\
| | * Replication changes for CREATE OR REPLACE TABLEMichael Widenius2014-02-051-3/+5
| | * Fixes to get valgrind to work with jemallocMichael Widenius2014-01-021-2/+2
| * | 10.0-base mergeSergei Golubchik2014-02-031-6/+16
| |\ \
| | * \ 5.5 mergeSergei Golubchik2014-02-011-1/+4
| | |\ \
| | | * \ MySQL-5.5.35 mergeSergei Golubchik2014-01-221-0/+2
| | | |\ \
| | | | * | Bug#17474166 - EXECUTING STATEMENT LIKE 'SHOW ENGINE INNODB'Praveenkumar Hulakund2013-10-091-0/+6
| | | * | | Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria...Michael Widenius2014-01-221-1/+12
| | * | | | MDEV-5363: Make parallel replication waits killableunknown2014-01-061-2/+8
| | * | | | MDEV-5363: Make parallel replication waits killableunknown2013-12-131-3/+5
| * | | | | MDEV-5544 Custom errors (generated from storage engine) not getting returned ...Sergei Golubchik2014-02-011-3/+5
| | |_|_|/ | |/| | |
* | | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-251-3/+15
|\ \ \ \ \ | |/ / / /
| * | | | 10.0-base mergeSergei Golubchik2013-12-161-3/+9
| |\ \ \ \ | | |/ / /
| | * | | 5.5 mergeSergei Golubchik2013-11-231-3/+9
| | |\ \ \ | | | |/ /
| | | * | mysql-5.5.34 mergeSergei Golubchik2013-11-191-3/+9
| | | |\ \ | | | | |/
| | | | * Fix for bug#14188793 - "DEADLOCK CAUSED BY ALTER TABLE DOEN'T CLEARDmitry Lenev2013-08-201-3/+9
| * | | | MDEV-5281 Partitioning issue after upgrade from 10.0.3-1 to 10.0.5-1Sergei Golubchik2013-11-281-0/+6
* | | | | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-11/+60
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-5241: Collation incompatibilities with MySQL-5.6Alexander Barkov2013-11-111-52/+0
| * | | | MDEV-5241: Collation incompatibilities with MySQL-5.6Michael Widenius2013-11-091-3/+58
| * | | | 10.0-base mergeSergei Golubchik2013-11-041-4/+30
| |\ \ \ \ | | |/ / /
| | * | | MDEV-5080 Assertion `strcmp(share->unique_file_name,filename) || share->last_...Sergei Golubchik2013-11-041-4/+30
| * | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.unknown2013-11-011-1/+14
| |\ \ \ \ | | |/ / /
| | * | | Merge MDEV-4506: Parallel replication into 10.0-base.unknown2013-11-011-1/+14
| | |\ \ \
| | | * | | MDEV-4506: Parallel replication: error handling.unknown2013-10-141-5/+6
| | | * | | Fixes for parallel slave:Michael Widenius2013-10-141-0/+4
| | | * | | MDEV-4506: Parallel replication. Intermediate commit.unknown2013-06-261-0/+8
| * | | | | 10.0-base merge.Sergei Golubchik2013-09-211-0/+6
| |\ \ \ \ \ | | |/ / / /
| | * | | | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-181-0/+6
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | fix an old bug where dd_frm_type() could incorrectly determine the table typeSergei Golubchik2013-08-281-0/+6
* | | | | | bzr merge -r3895..3903 lp:codership-mysql/5.5 Seppo Jaakola2013-11-261-17/+8
* | | | | | After merge fixesJan Lindström2013-09-251-14/+0
* | | | | | Merge fix.Jan Lindström2013-09-091-2/+0
* | | | | | Merge 10.0 to galera-10.0Jan Lindström2013-09-031-105/+404
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-4702 - Reduce usage of LOCK_openSergey Vojtovich2013-08-141-11/+9
| * | | | | MDEV-4786 merge 10.0-monty -> 10.0Sergei Golubchik2013-08-121-10/+0
| * | | | | 10.0-monty mergeSergei Golubchik2013-07-211-61/+364
| |\ \ \ \ \
| | * | | | | Merge the following patch from MySQL 5.6.10, in order to make perfschema.binl...unknown2013-07-111-2/+1
| | * | | | | Fix test errors like:Sergey Petrunya2013-07-081-2/+6
| | * | | | | ha_partition.cc and ha_partition.h are now completely mergedMichael Widenius2013-06-271-9/+17
| | * | | | | Applied all changes from Igor and SanjaMichael Widenius2013-06-151-36/+315