summaryrefslogtreecommitdiff
path: root/sql/sql_admin.cc
Commit message (Expand)AuthorAgeFilesLines
* bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-051-1/+1
|\
| * MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-1/+1
* | bzr merge -r4104..4120 codership/5.6/Nirbhay Choubey2014-08-121-0/+1
* | bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-111-1/+1
|\ \ | |/
| * MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallelunknown2014-06-031-1/+1
* | bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-6/+8
|\ \ | |/
| * 5.5 mergeSergei Golubchik2014-05-091-1/+4
| |\
| | * Added new states to be able to better diagnose where server hangs.Michael Widenius2014-05-031-1/+5
| * | merge of "BUG# 13975227: ONLINE OPTIMIZE TABLE FOR INNODB TABLES"Sergei Golubchik2014-05-071-4/+4
* | | Merging mariadb-10.0.10.Nirbhay Choubey2014-04-081-0/+11
|\ \ \ | |/ /
| * | MDEV-4360: ANALYZE shows "Table is already up to date" while updating statsSergey Petrunya2014-03-281-0/+11
* | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-3/+4
|\ \ \ | |/ /
| * | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-1/+1
| * | 10.0-base mergeSergei Golubchik2014-02-031-2/+3
| |\ \
| | * \ 5.5 mergeSergei Golubchik2014-02-011-2/+3
| | |\ \ | | | |/
| | | * Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria...Michael Widenius2014-01-221-2/+3
* | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-251-2/+14
|\ \ \ \ | |/ / /
| * | | 10.0-base mergeSergei Golubchik2013-12-161-2/+14
| |\ \ \ | | |/ /
| | * | 5.5 mergeSergei Golubchik2013-11-231-2/+14
| | |\ \ | | | |/
| | | * mysql-5.5.34 mergeSergei Golubchik2013-11-191-2/+14
| | | |\
| | | | * Fix for bug#14188793 - "DEADLOCK CAUSED BY ALTER TABLE DOEN'T CLEARDmitry Lenev2013-08-201-2/+14
* | | | | After merge fixesJan Lindström2013-09-251-1/+3
* | | | | Merge 10.0 to galera-10.0Jan Lindström2013-09-031-73/+91
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-4702 - Reduce usage of LOCK_openSergey Vojtovich2013-08-141-8/+2
| * | | | MDEV-4786 merge 10.0-monty -> 10.0Sergei Golubchik2013-08-121-7/+2
| * | | | MDEV-4786 merge 10.0-monty -> 10.0Sergei Golubchik2013-08-121-2/+1
| * | | | 10.0-monty mergeSergei Golubchik2013-07-211-56/+86
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix merge.test failureSergey Petrunya2013-07-091-0/+8
| | * | | Fixed some wrong format strings.Michael Widenius2013-06-281-17/+48
| | * | | merge of 2876.430.11 & 2876.430.1unknown2013-06-271-2/+1
| | * | | Fixed some merge issues:Michael Widenius2013-06-181-4/+8
| | * | | Fixed patch that was part of last push that didn't apply correctly.Michael Widenius2013-06-151-1/+1
| | * | | Applied all changes from Igor and SanjaMichael Widenius2013-06-151-29/+35
* | | | | Merged with lp:maria revision #3766Seppo Jaakola2013-07-131-2/+3
|\ \ \ \ \ | |/ / / /
| * | | | 5.5 mergeSergei Golubchik2013-06-061-2/+3
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | mysql-5.5.31 mergeSergei Golubchik2013-05-071-2/+3
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONINGMattias Jonsson2013-01-301-2/+3
* | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-0/+3
|/ / / /
* | | | remove ha_create_table_from_engine()Sergei Golubchik2013-04-091-2/+1
* | | | convenience helpers for get_table_share() and tdc_open_view().Sergei Golubchik2013-04-091-7/+2
* | | | moving LOCK_open into get_table_share()Sergei Golubchik2013-04-091-2/+0
* | | | * don't use 1-8 numbers for open_table_error codes, use an enum.Sergei Golubchik2013-04-091-1/+2
* | | | don't use I_S constants for open_table_def and get_table_share,Sergei Golubchik2013-04-091-2/+2
* | | | 5.5 mergeSergei Golubchik2013-03-271-6/+30
|\ \ \ \ | |/ / /
| * | | Automatic mergeMichael Widenius2013-03-011-2/+6
| |\ \ \
| | * | | Fixed bug MPDEV-628 / LP:989055 - Querying myisam table metadata may corrupt ...Michael Widenius2013-03-011-2/+6
| * | | | merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-281-4/+24
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Bug#11751825 - OPTIMIZE PARTITION RECREATES FULL TABLE INSTEAD JUST PARTITIONAditya A2012-11-061-4/+24
* | | | cleanup:Sergei Golubchik2013-01-231-1/+1
* | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-1/+1
| |_|/ |/| |