summaryrefslogtreecommitdiff
path: root/sql/share
Commit message (Expand)AuthorAgeFilesLines
* 5.5 mergeSergei Golubchik2013-03-271-7/+7
|\
| * MDEV-4156 Test cases query_cache and query_cache_size_basic fail on 32 bit pp...Sergei Golubchik2013-02-081-7/+7
* | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-162-3/+3
|\ \ | |/
| * mysql-5.5.28Sergei Golubchik2012-10-162-3/+3
| |\
| | * Bug#14498355: DEPRECATION WARNINGS SHOULD NOT CONTAIN MYSQL VERSIONMartin Hansson2012-08-241-2/+2
| | * Merging from 5.1Alexander Barkov2012-07-241-1/+1
| | |\
| | | * Fixing wrong copyright. Index.xml was modified in 2005,Alexander Barkov2012-07-241-1/+1
* | | | SHOW EXPLAIN: merge to 10.0-base.Sergey Petrunya2012-10-061-4/+6
|\ \ \ \
| * \ \ \ SHOW EXPLAIN: merge with 5.5-mainSergey Petrunya2012-10-061-3/+5
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge 5.5-main -> 5.5-show-explainSergey Petrunya2012-07-251-0/+3
| | |\ \ \
| | * | | | MWL#182: Explain running statementsSergey Petrunya2012-07-171-3/+5
* | | | | | Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC.Michael Widenius2012-10-031-12/+18
* | | | | | Fixed issues found by QA (Elena)Michael Widenius2012-09-281-2/+1
* | | | | | Implementation of Multi-source replication (MDEV:253)Michael Widenius2012-09-281-7/+12
* | | | | | Automatic merge with 5.5Michael Widenius2012-09-011-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Split ER_NO_SUCH_TABLE into ER_NO_SUCH_TABLE and ER_NO_SUCH_TABLE_IN_ENGINE t...Michael Widenius2012-08-281-0/+3
| | |/ / / | |/| | |
* | | | | automatic merge with 5.5Michael Widenius2012-06-271-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | mysql-5.5 mergeSergei Golubchik2012-06-141-0/+3
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge 5.5.24 back into main 5.5.Joerg Bruehe2012-05-071-0/+3
| | |\ \
| | * \ \ merge bug11754117-45670 fixes from 5.1.Andrei Elkin2012-04-211-0/+3
| | |\ \ \ | | | | |/ | | | |/|
* | | | | Fixes after Serg's review of %M extenstionsMichael Widenius2012-06-171-2/+2
* | | | | Merge with 5.5Michael Widenius2012-05-312-2/+11
|\ \ \ \ \ | |/ / / /
| * | | | create a new MariaDB-common.rpm that contains files needed both by the client...Sergei Golubchik2012-05-251-2/+2
| * | | | cSergei Golubchik2012-05-211-0/+9
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-04-121-0/+3
| | |\ \ \ | | | |/ /
| | | * | Bug#11815557 60269: MYSQL SHOULD REJECT ATTEMPTS TO CREATE SYSTEMunknown2012-04-111-0/+3
| | * | | merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-04-101-0/+3
| | |\ \ \ | | | |/ /
| | | * | BUG#11765650 - 58637: MARK UPDATES THAT DEPEND ON ORDER OF TWO KEYS UNSAFERohit Kalhans2012-03-301-0/+3
| | * | | Merge from mysql-5.5 to mysql-5.5-securityJon Olav Hauglid2012-03-151-0/+3
| | |\ \ \ | | | |/ /
| | * | | Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DMLAnnamalai Gurusami2012-02-271-0/+3
* | | | | Added text for errno in error messages by:Michael Widenius2012-05-301-583/+583
|/ / / /
* | | | mysql 5.5.23 mergeSergei Golubchik2012-04-101-1/+4
|\ \ \ \ | | |/ / | |/| |
| * | | Bug#13833438: ERROR CODES MUST HAVE SAME VALUE ACROSS MYSQL VERSIONSJon Olav Hauglid2012-03-151-0/+3
| |/ /
* | | mysql-5.5.22 mergeSergei Golubchik2012-03-281-8/+15
|\ \ \ | |/ /
| * | BUG#11758263 50440: MARK UNORDERED UPDATE WITH AUTOINC UNSAFERohit Kalhans2012-02-091-0/+8
| * | Backout the patch for bug#11758263.Rohit Kalhans2012-02-081-8/+0
| * | BUG#11758263 50440: MARK UNORDERED UPDATE WITH AUTOINC UNSAFERohit Kalhans2012-02-081-0/+8
| * | bug#3593869-64035Andrei Elkin2012-01-191-8/+8
* | | Merged the implementation of MDEV-28 LIMIT ROWS EXAMINED into MariaDB 5.5.unknown2012-03-121-0/+2
|\ \ \
| * | | Implementation of MDEV-28 LIMIT ROWS EXAMINEDunknown2012-03-111-1/+2
| * | | Fixed that 'make distcheck' works with automake 1.11.11Michael Widenius2012-02-211-0/+1
* | | | merge with mysql-5.5.21Sergei Golubchik2012-03-091-8/+8
|\ \ \ \ | | |/ / | |/| |
| * | | BUG#13593869 - 64035: SEVERAL ERRORS IN COM_BINLOG_DUMP/MYSQL_BINLOG_SEND CRA...Andrei Elkin2012-01-181-8/+8
* | | | Merge MWL#234: @@skip_replication feature to MariaDB 5.5.unknown2012-03-011-1/+4
|\ \ \ \
* | | | | query cache sysvar fixesSergei Golubchik2012-01-161-2/+1
* | | | | mysql-5.5 mergeSergei Golubchik2012-01-161-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-10-121-93/+164
| |\ \ \ \
| * | | | | Fixed Bug#12621017 - CRASH IF A SP VARIABLE IS USED IN THE LIMIT CLAUSE OF ADmitry Shulga2011-08-131-1/+1
* | | | | | 5.3 mergeSergei Golubchik2012-01-131-0/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge with 5.2.Michael Widenius2011-12-113-6/+6
| |\ \ \ \ \