summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
Commit message (Expand)AuthorAgeFilesLines
* 10.0-base mergeSergei Golubchik2013-01-311-3/+10
|\
| * 5.5 mergeSergei Golubchik2013-01-291-1/+6
| |\
| | * Merge 5.3->5.5Igor Babaev2013-01-231-1/+2
| | |\
| | | * Merge 5.2->5.3Igor Babaev2013-01-211-1/+2
| | | |\
| | | | * Fixed bug mdev-3938.Igor Babaev2013-01-151-1/+2
| | | * | 5.2->5.3 mergeSergei Golubchik2013-01-101-27/+10
| | | |\ \ | | | | |/
| | | | * 5.1 mergeSergei Golubchik2013-01-101-27/+10
| | | | |\
| | | | | * mysql-5.1.67 mergeSergei Golubchik2013-01-091-27/+10
| | | | | |\
| | | | | | * BUG#14548159: NUMEROUS CASES OF INCORRECT IDENTIFIERRohit Kalhans2012-09-221-18/+13
| | | | | * | Merge with latest 5.1.unknown2012-08-241-11/+11
| | | | | |\ \
| | * | | | | | Fix for MDEV-4009: main.delayed sporadically fails with "query 'REPLACE DELAY...Michael Widenius2013-01-101-0/+4
| * | | | | | | cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-231-1/+1
| * | | | | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-2/+2
| * | | | | | | Merged the fix for bug mdev-4019.Igor Babaev2013-01-131-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed bug mdev-4019.Igor Babaev2013-01-131-0/+1
| * | | | | | | | Cassandra SE mergeunknown2013-01-101-0/+1
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ pre-mergeunknown2012-12-231-0/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | MDEV-506 Cassandra dynamic columns accessunknown2012-09-281-0/+1
* | | | | | | | | | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-101-14/+124
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge 5.5-mwl248 -> 10.0-baseIgor Babaev2013-01-081-40/+108
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | / / / / / / / | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge 5.5 -> mwl248Igor Babaev2013-01-081-13/+89
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Fixed the CREATE TABLE IF EXIST generates warnings instead of errorsMichael Widenius2012-12-171-16/+34
| | | * | | | | | | Removed lock wait timeout warning when using CREATE TABLE IF EXISTSMichael Widenius2012-12-161-0/+1
| | | * | | | | | | Implemented MDEV-3941: CREATE TABLE xxx IF NOT EXISTS should not block if tab...Michael Widenius2012-12-161-12/+69
| | * | | | | | | | Fixed bug mdev-3979.Igor Babaev2013-01-081-27/+19
| * | | | | | | | | Merge maria-5.5-mwl248 -> 10.0-base.Igor Babaev2012-12-161-0/+42
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Addressed all remaining issues from the review of the patchIgor Babaev2012-12-131-2/+3
| | * | | | | | | | Fixed bug mdev-3891.Igor Babaev2012-12-121-64/+6
| | * | | | | | | | Merge 5.5->mwl248Igor Babaev2012-12-041-4/+13
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | * | | | | | | | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-11-021-0/+99
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge 5.5 -> mwl248Igor Babaev2012-09-081-25/+13
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Fixed bug mdev-504.Igor Babaev2012-09-081-7/+3
| | | * | | | | | | | | Fixed bug mdev-503.Igor Babaev2012-09-011-1/+13
| | | * | | | | | | | | Merge 5.5->5.5-mwl248.Igor Babaev2012-08-291-14/+18
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fixed bug mdev-473.Igor Babaev2012-08-231-4/+0
| | | * | | | | | | | | | Performed re-factoring and re-structuring of the code for mwl#248:Igor Babaev2012-07-261-4/+24
| | | * | | | | | | | | | Added procedures to delete records by keys from statistical tables.Igor Babaev2012-07-101-1/+2
| | | * | | | | | | | | | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-06-261-0/+33
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / | | | | |/| | | | | | | |
| | | * | | | | | | | | | Removed the server option --stat-tables.Igor Babaev2012-06-021-1/+1
| | | * | | | | | | | | | MergeIgor Babaev2012-06-011-1/+27
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge.Igor Babaev2012-05-181-17/+30
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | 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-20/+77
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248.Igor Babaev2012-03-191-0/+74
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ MergeIgor Babaev2012-03-151-0/+11
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merged 5.3 changes into the mwl #248 tree.Igor Babaev2012-03-091-17/+45
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | MWL#248: added the option skip-stat-tables.Igor Babaev2012-01-091-1/+1
| | | | * | | | | | | | | | | | | | | The main patch for the MWL#248 back-ported from Igor Babaev2012-01-041-0/+73
* | | | | | | | | | | | | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-82/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-12/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | |