summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
Commit message (Expand)AuthorAgeFilesLines
* Automatic mergeMichael Widenius2013-03-011-8/+19
|\
| * Fixed bug MPDEV-628 / LP:989055 - Querying myisam table metadata may corrupt ...Michael Widenius2013-03-011-8/+19
* | merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-281-21/+28
|\ \ | |/ |/|
| * Bug#15972635: Incorrect results returned in 32 table join with HAVINGRoy Lyseng2012-12-211-1/+2
| * Bug #15954872 "MAKE MDL SUBSYSTEM AND TABLE DEFINITION CACHEDmitry Lenev2012-12-111-16/+26
| |\
| | * Bug #15954872 "MAKE MDL SUBSYSTEM AND TABLE DEFINITION CACHE Dmitry Lenev2012-12-111-18/+28
| * | upmerge to bug#14548159Rohit Kalhans2012-09-221-18/+13
| |\ \ | | |/
* | | 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
* | | | | | | 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
* | | | | | | 5.3->5.5 mergeSergei Golubchik2012-11-221-4/+13
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge MariaDB 5.2->5.3unknown2012-11-201-4/+13
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fixed bug mdev-3845.Igor Babaev2012-11-091-4/+13
| | * | | | | Merge into latest 5.2.unknown2012-08-241-11/+11
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge into latest 5.3unknown2012-08-241-11/+11
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ 5.2 merge.Sergei Golubchik2012-08-221-0/+36
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | 5.1 mergeSergei Golubchik2012-08-221-0/+36
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | merge with MySQL 5.1.65Sergei Golubchik2012-08-221-0/+36
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | | | * | | | | Bug#12636001 : deadlock from thd_security_contextGopal Shankar2012-05-171-0/+2
* | | | | | | | | mysql-5.5.28Sergei Golubchik2012-10-161-8/+15
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Bug#14364558 ASSERT `TABLE_LIST->PRELOCKING_PLACEHOLDER==FALSE'Gopal Shankar2012-08-241-8/+15
* | | | | | | | | Added new status variables:Michael Widenius2012-09-091-0/+1
* | | | | | | | | MDEV-510 assert triggered by ./mtr --ps-protocol rpl_mdev382Sergei Golubchik2012-09-061-25/+13
* | | | | | | | | Split ER_NO_SUCH_TABLE into ER_NO_SUCH_TABLE and ER_NO_SUCH_TABLE_IN_ENGINE t...Michael Widenius2012-08-281-3/+7
* | | | | | | | | Merge from 5.3unknown2012-08-241-11/+11
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | merge from 5.2unknown2012-08-241-11/+11
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | / / | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge from 5.1.unknown2012-08-241-11/+11
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | |
| | | * | | | MDEV-382: Incorrect quotingunknown2012-08-241-11/+11
| | | | |/ / | | | |/| |
| * | | | | MDEV-136 Non-blocking "set read_only".Alexey Botchkov2012-05-211-4/+32
* | | | | | mysql-5.5 mergeSergei Golubchik2012-06-141-0/+33
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | merge bug11754117-45670 fixes from 5.1.Andrei Elkin2012-04-211-0/+33
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | BUG#11754117 incorrect logging of INSERT into auto-increment Andrei Elkin2012-04-201-0/+34
* | | | | | 5.3 mergeSergei Golubchik2012-05-211-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Fix for LP bug#998516unknown2012-05-151-1/+1
* | | | | | cSergei Golubchik2012-05-211-0/+26
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | BUG#11765650 Follow-up patch for Valgrind failures on PB2.Rohit Kalhans2012-04-031-0/+2
| * | | | | BUG#11765650 - 58637: MARK UPDATES THAT DEPEND ON ORDER OF TWO KEYS UNSAFERohit Kalhans2012-03-301-0/+24
* | | | | | More fixes for LOCK TABLE and REPAIR/FLUSHMichael Widenius2012-05-171-13/+19
* | | | | | Fixed LP:990187 Assertion `share->reopen == 1' failed at maria_extra on ADD P...Michael Widenius2012-05-161-1/+5
* | | | | | Fixed bug LP:973039 - Assertion `share->in_trans == 0' failed in maria_close ...Michael Widenius2012-05-161-9/+7
* | | | | | 5.3 mergeSergei Golubchik2012-05-041-0/+5
|\ \ \ \ \ \ | | |/ / / / | |/| | | |