summaryrefslogtreecommitdiff
path: root/sql/sql_cursor.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'github/10.1' into 10.2Sergei Golubchik2018-02-061-1/+1
|\
| * Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-021-1/+1
| |\
| | * Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-241-1/+1
| | |\
| | | * Correct TRASH() macro usageSergei Golubchik2018-01-221-1/+1
* | | | Fixed bug mdev-11081.Igor Babaev2016-11-211-1/+1
* | | | MDEV-8718 - Obsolete sql_strmake() in favor of THD::strmake() and thd_strmake()Sergey Vojtovich2015-11-261-1/+1
|/ / /
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-09-031-0/+37
|\ \ \ | |/ /
| * | MDEV-7040: Crash in field_conv, memcpy_field_possible, part#2Sergei Petrunia2015-08-031-0/+37
* | | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011-0/+4
|\ \ \ | |/ /
| * | perfschema 5.6.24Sergei Golubchik2015-05-051-0/+4
* | | MDEV-7943 - pthread_getspecific() takes 0.76% in OLTP ROSergey Vojtovich2015-05-131-3/+3
* | | MDEV-7006 MDEV-7007: SET STATEMENT and slow logOleksandr Byelkin2015-03-121-0/+1
|/ /
* | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-0/+1
* | 10.0-base merge.Sergei Golubchik2013-09-211-1/+1
|\ \ | |/
| * MDEV-4978 - Server cursor is broken with blobs in the select list,Sergey Vojtovich2013-09-061-1/+1
* | 10.0-base mergeSergei Golubchik2013-07-181-1/+1
|\ \ | |/
| * mysql-5.5.32 mergeSergei Golubchik2013-07-161-1/+1
| |\
| | * Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-191-1/+1
* | | 10.0-base -> 10.0-montySergei Golubchik2012-10-191-0/+2
|\ \ \ | |/ /
| * | Fix for bug lp:1039277 "Crash in sql_cache.cc".Michael Widenius2012-08-211-0/+2
* | | Next part of merge. See TODO for detailsMichael Widenius2012-08-141-0/+4
|/ /
* | 5.3 mergeSergei Golubchik2012-01-131-1/+2
|\ \
| * \ Merge with 5.2.Michael Widenius2011-12-111-2/+4
| |\ \
| | * \ Merge with MariaDB 5.1Michael Widenius2011-11-241-2/+4
| | |\ \
| | | * \ Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+4
| | | |\ \
| | | | * \ Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | | | |\ \
| | | | | * | Updated/added copyright headersKent Boortz2011-06-301-2/+3
* | | | | | | merge with 5.3Sergei Golubchik2011-10-191-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.Igor Babaev2011-06-041-2/+2
| |\ \ \ \ \ \
| | * \ \ \ \ \ MergeIgor Babaev2011-05-201-2/+2
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merged the code of MWL#106 into 5.3Igor Babaev2011-05-161-2/+2
| | | |\ \ \ \ \ \
| | | | * | | | | | MWL#106: Backport optimizations for derived tables and views.Igor Babaev2010-05-261-2/+2
| * | | | | | | | | Merge 5.3->main -> 5.3-mwl90Sergey Petrunya2011-05-291-8/+10
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | - Release build: Fix compiler warning about unused variableSergey Petrunya2011-04-301-4/+6
| | * | | | | | | | Rename JOIN::top_jtrange_tables to top_join_tab_countSergey Petrunya2011-03-271-2/+2
| | * | | | | | | | MWL#90: Address review feedback part #14Sergey Petrunya2011-03-271-4/+4
| | |/ / / / / / /
| * | | | | | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge Mariadb 5.1->5.2unknown2011-04-121-1/+1
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Bug fix for lp:732124 union + limit returns wrong resultMichael Widenius2011-03-091-1/+1
| | | | |/ / / | | | |/| | |
* | | | | | | 5.5-mergeSergei Golubchik2011-07-021-28/+46
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | A patch for Bug#11763413 (56115: SELECT doesn't work inAlexander Nozdrin2011-03-221-24/+45
| * | | | | | Bug #58350: 5.5.7-rc compile failed at sp_head.ccGeorgi Kodinov2010-12-081-1/+1
| * | | | | | Implement a fix for Bug#57058 -- send SERVER_QUERY_WAS_SLOW overKonstantin Osipov2010-11-121-3/+0
* | | | | | | merge.Sergei Golubchik2010-11-251-3/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Merge 5.2->5.3Sergey Petrunya2010-10-101-2/+7
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| | * | | merge with 5.1Sergei Golubchik2010-09-111-1/+6
| | |\ \ \ | | | |/ /
| | * | | Fix for LP#588251: doStartTableScan() result not checked.Michael Widenius2010-07-171-1/+1
| * | | | Subquery optimizations backport: fix test failures, update test results.Sergey Petrunya2010-02-181-1/+2
| |/ / /
| * | | This is based on the userstatv2 patch from Percona and OurDelta.Michael Widenius2009-10-191-1/+1
* | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-291-1/+6
|\ \ \ \