summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '5.5' into 10.0Sergei Golubchik2015-08-051-7/+51
|\
| * Merge tag 'mysql-5.5.45' into 5.5Sergei Golubchik2015-08-011-7/+51
| |\
| | * Bug #18075170 SQL NODE RESTART REQUIRED TOAjo Robert2015-05-111-7/+51
* | | Merge commit '96badb16afcf' into 10.0Jan Lindström2015-08-031-0/+1
|\ \ \ | |/ /
| * | MDEV-7810 Wrong result on execution of a query as a PS (both 1st and further ...Sergei Golubchik2015-07-311-0/+2
| * | Problem was that for cases like:Monty2015-06-251-2/+1
* | | Merge branch '5.5' into 10.0Sergei Golubchik2015-06-111-1/+2
|\ \ \ | |/ /
| * | MDEV-8114: server crash on updates with joins still on 10.0.18Oleksandr Byelkin2015-06-061-1/+2
* | | Merge MDEV-8103 into 10.0mariadb-10.0.18Kristian Nielsen2015-05-061-1/+1
|\ \ \
| * | | MDEV-8103: Missing DBUG_RETURN in open_table_uncached()Kristian Nielsen2015-05-061-1/+1
* | | | Merge branch '5.5' into 10.0Sergei Golubchik2015-05-041-4/+4
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'openquery/MDEV-6916-maria-5.5-check_view-r4408' into 5.5Sergei Golubchik2015-04-281-2/+7
| |\ \
| | * | correct server side error messagesDaniel Black2015-04-121-1/+0
| | * | MDEV-6916 REPAIR VIEW / mysql migrationOleksandr Byelkin2015-04-121-2/+8
| * | | Merge remote-tracking branch 'mysql/5.5' into 5.5Sergei Golubchik2015-04-271-3/+3
| |\ \ \ | | | |/ | | |/|
| | * | Bug#20094067: BACKPORT BUG#19683834 TO 5.5 AND 5.6Nisha Gopalakrishnan2015-01-271-2/+2
| | * | Fix for bug#14188793 - "DEADLOCK CAUSED BY ALTER TABLE DOEN'T CLEARDmitry Lenev2013-08-201-19/+19
| | * | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-191-1/+1
| | * | 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
| | |\ \ \ | | | |/ /
| | | * | BUG#14548159: NUMEROUS CASES OF INCORRECT IDENTIFIERRohit Kalhans2012-09-221-18/+13
| | | * | Bug#12636001 : deadlock from thd_security_contextGopal Shankar2012-05-171-0/+2
| | * | | Bug#14364558 ASSERT `TABLE_LIST->PRELOCKING_PLACEHOLDER==FALSE'Gopal Shankar2012-08-241-8/+15
| | * | | 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
| | * | | 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
| | * | | Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
| | |\ \ \ | | | |/ /
| | | * | Merge.Sergey Vojtovich2011-08-241-42/+141
| | | |\ \
| | | | * | BUG#11763712 - 56458: KILLING A FLUSH TABLE FOR A MERGE/CHILDSergey Vojtovich2011-08-181-42/+141
| | * | | | BUG#11758263: Modification of indentation in the added code.Rohit Kalhans2012-02-131-11/+11
| | * | | | BUG#11758263 50440: MARK UNORDERED UPDATE WITH AUTOINC UNSAFERohit Kalhans2012-02-091-1/+48
| | * | | | Backout the patch for bug#11758263.Rohit Kalhans2012-02-081-40/+1
| | * | | | BUG#11758263 50440: MARK UNORDERED UPDATE WITH AUTOINC UNSAFERohit Kalhans2012-02-081-1/+40
| | * | | | Fix for bug #13116518 - "OPEN_TABLES() SHOULD NOT ALLOCATE AND FREE Dmitry Lenev2011-10-231-3/+4
| | * | | | 5.1 -> 5.5 mergeSergey Glukhov2011-08-021-4/+4
| | |\ \ \ \ | | | |/ / /
| | | * | | Bug#11766594 59736: SELECT DISTINCT.. INCORRECT RESULT WITH DETERMINISTIC FUN...Sergey Glukhov2011-08-021-4/+4
| | * | | | Fix for bug #11754210 - "45777: CHECK TABLE DOESN'TDmitry Lenev2011-07-221-0/+77
| | * | | | Merge from 5.1.Guilhem Bichot2011-05-211-2/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'.Guilhem Bichot2011-05-161-2/+2
| | | |/ /
| | | * | Bug# 11763784 (former 56541)Jon Olav Hauglid2011-03-291-2/+1
| | * | | Merge from mysql-5.5.12-releasebjorn.munch@oracle.com2011-05-061-9/+6
| | |\ \ \
| | | * | | BUG#11766234: ASSERT (TABLE_REF->TABLE || TABLE_REF->VIEW) Jorgen Loland2011-03-141-9/+6
| | * | | | Bug#12348348 - ASSERTION IN ROW0SEL.C LINE 3698:Jon Olav Hauglid2011-04-121-0/+8
| | |/ / /
| | * | | Bug #11764779 (former 57649)Jon Olav Hauglid2011-03-071-19/+32
| | * | | weave merge from mysql-5.1 to mysql-5.5Georgi Kodinov2011-02-081-1/+1
| | |\ \ \ | | | |/ /
| | | * | Updating header copyright/README in source for 2011Karen Langford2011-01-251-1/+1
| | | * | mergeGeorgi Kodinov2011-01-121-0/+5
| | | |\ \