summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* 10.0-base mergeSergei Golubchik2013-01-311-4/+25
|\
| * 5.5 mergeSergei Golubchik2013-01-291-2/+18
| |\
| | * 5.3 mergeSergei Golubchik2013-01-251-0/+1
| | |\
| | | * 5.2 mergeSergei Golubchik2013-01-251-0/+1
| | | |\
| | | | * MDEV-3915 COM_CHANGE_USER allows fast password brute-forcingSergei Golubchik2013-01-251-0/+1
| | * | | Merge 5.3->5.5Igor Babaev2013-01-231-1/+3
| | |\ \ \ | | | |/ /
| | | * | Merge 5.2->5.3Igor Babaev2013-01-211-1/+3
| | | |\ \ | | | | |/
| | | | * Merge 5.1->5.2Igor Babaev2013-01-211-1/+3
| | | | |\
| | | | | * Fixed bug mdev-4063 (bug #56927).Igor Babaev2013-01-211-1/+3
| | | * | | 5.2 merge.Sergei Golubchik2012-08-221-4/+17
| | | |\ \ \ | | | | |/ /
| | | | * | 5.1 mergeSergei Golubchik2012-08-221-4/+17
| | | | |\ \ | | | | | |/
| | | | | * merge with MySQL 5.1.65Sergei Golubchik2012-08-221-4/+17
| | | | | |\
| | | | | | * Solve a linkage problem with "libmysqld" on several Solaris platforms:Kent Boortz2012-06-261-2/+1
| | | | | | * Bug#12636001 : deadlock from thd_security_contextGopal Shankar2012-05-171-2/+14
| | * | | | | simplify THD::binlog_setup_trx_data() usageSergei Golubchik2013-01-181-1/+1
| | * | | | | remove thd_mark_as_hard_kill()Sergei Golubchik2013-01-151-11/+0
| | * | | | | Fixed some race conditons and bugs related to killed queriesMichael Widenius2013-01-111-0/+24
| * | | | | | cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-231-2/+2
| * | | | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-2/+7
* | | | | | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-101-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge maria-5.5-mwl248 -> 10.0-base.Igor Babaev2012-12-161-0/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-11-021-0/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Merge 5.5->5.5-mwl248.Igor Babaev2012-08-291-0/+2
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge 5.5->5.5-mwl248Igor Babaev2012-08-141-1/+1
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-06-261-3/+7
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Removed the server option --stat-tables.Igor Babaev2012-06-021-1/+1
| | | * | | | | | | | MergeIgor Babaev2012-06-011-0/+1
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248.Igor Babaev2012-03-191-0/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merged 5.3 changes into the mwl #248 tree.Igor Babaev2012-03-091-3/+18
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | The main patch for the MWL#248 back-ported from Igor Babaev2012-01-041-0/+1
* | | | | | | | | | | | | | After-merge fixes for merge 10.0-base -> 10.0.unknown2012-12-181-2/+2
* | | | | | | | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | MDEV-532: Async InnoDB commit checkpoint.unknown2012-12-141-1/+2
| * | | | | | | | | | | | | Merge mdev-452 with the latest 10.0-base.unknown2012-10-181-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-0/+10
* | | | | | | | | | | | | | | small code cleanup taken from MySQL 5.6Sergei Golubchik2012-12-161-2/+7
* | | | | | | | | | | | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-191-29/+164
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | SHOW EXPLAIN: merge to 10.0-base.Sergey Petrunya2012-10-061-9/+90
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ SHOW EXPLAIN: merge with 5.5-mainSergey Petrunya2012-10-061-9/+90
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | MWL#182: Explain running statements: merge with 5.5-mainSergey Petrunya2012-08-121-9/+90
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge 5.5-main -> 5.5-show-explainSergey Petrunya2012-07-251-3/+7
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / / / / | | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | | MWL#182: Explain running statementsSergey Petrunya2012-07-171-33/+3
| | | | * | | | | | | | | | | | MWL#182: Explain running statements: address review feedbackSergey Petrunya2012-07-111-1/+8
| | | | * | | | | | | | | | | | MWL#182: Explain running statements: address review feedbackSergey Petrunya2012-07-101-14/+9
| | | | * | | | | | | | | | | | MWL#182: Explain running statements: address review feedbackSergey Petrunya2012-06-291-1/+1
| | | | * | | | | | | | | | | | MWL#182: Explain running statements: address review feedbackSergey Petrunya2012-06-281-4/+5
| | | | * | | | | | | | | | | | SHOW EXPLAIN: better commentsSergey Petrunya2012-06-191-8/+21
| | | | * | | | | | | | | | | | MWL#182: Explain running statementsSergey Petrunya2012-06-151-9/+104
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | | |
| | | | | * | | | | | | | | | | MDEV-324: SHOW EXPLAIN: Plan produced by SHOW EXPLAIN for a query with TEMPTA...Sergey Petrunya2012-06-071-0/+2
| | | | | * | | | | | | | | | | Merge of recent changes in MWL#182 in 5.3 with {Merge of MWL#182 with 5.5}Sergey Petrunya2012-05-171-0/+4
| | | | | |\ \ \ \ \ \ \ \ \ \ \