summaryrefslogtreecommitdiff
path: root/sql/sql_admin.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| |_|/ |/| |
* | | Addressed all remaining issues from the review of the patchIgor Babaev2012-12-131-1/+2
* | | Addressed the following issues from the review of the patch:Igor Babaev2012-12-051-1/+9
* | | Fixed bug mdev-485.Igor Babaev2012-09-101-10/+0
* | | Merge 5.5->5.5-mwl248.Igor Babaev2012-08-291-0/+1
|\ \ \ | |/ /
| * | Split ER_NO_SUCH_TABLE into ER_NO_SUCH_TABLE and ER_NO_SUCH_TABLE_IN_ENGINE t...Michael Widenius2012-08-281-0/+1
* | | Fixed bug mdev-463.Igor Babaev2012-08-201-0/+11
* | | Made the process of collecting persistent statistics killable.Igor Babaev2012-08-181-0/+2
* | | Performed re-factoring and re-structuring of the code for mwl#248:Igor Babaev2012-07-261-0/+2
* | | Removed the server option --stat-tables.Igor Babaev2012-06-021-5/+3
* | | Fixed a buildbot failure with a testcase from statistics.testIgor Babaev2012-06-011-1/+1
* | | An attempt to fix a buildbot failure with a test case from statistics.testIgor Babaev2012-06-011-1/+2
* | | Merge.Igor Babaev2012-05-221-4/+64
|\ \ \
| * | | Support of the extended syntax for ANALYZE.Igor Babaev2012-05-221-4/+64
* | | | Merge.Igor Babaev2012-05-181-13/+25
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | More fixes for LOCK TABLE and REPAIR/FLUSHMichael Widenius2012-05-171-13/+25
| * | Fixed bug LP:973039 - Assertion `share->in_trans == 0' failed in maria_close ...Michael Widenius2012-05-161-1/+1
* | | Inverted the option --skip-stat-tables for --stat-tables.Igor Babaev2012-05-081-1/+1
* | | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-04-111-6/+4
|\ \ \ | |/ /
| * | mysql-5.5.22 mergeSergei Golubchik2012-03-281-6/+4
| |\ \ | | |/
| | * Bug#13593865 - 64037: CRASH IN HA_PARTITION::CREATE_HANDLERS ONMattias Jonsson2012-02-021-6/+4
* | | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248.Igor Babaev2012-03-191-3/+17
|/ /
* | Merge MySQL 5.5.20 into MariaDB 5.5.unknown2012-02-141-0/+5
|\ \ | |/