summaryrefslogtreecommitdiff
path: root/sql/unireg.h
Commit message (Expand)AuthorAgeFilesLines
* 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
* | fix compile error, when building with oqgraphVladislav Vaintroub2012-06-251-3/+0
* | Merge 5.3->5.5.Igor Babaev2012-06-241-4/+1
|\ \
| * \ Merge 5.2->5.3Igor Babaev2012-06-231-4/+1
| |\ \
| | * | Fixed bug mdev-354.Igor Babaev2012-06-181-4/+1
* | | | mergeSergei Golubchik2012-04-071-1/+1
|\ \ \ \ | |/ / /
| * | | mergeSergei Golubchik2012-04-051-1/+1
| |\ \ \ | | |/ /
| | * | mergeSergei Golubchik2012-04-051-1/+1
| | |\ \
| | | * \ mysql-5.1.62 mergeSergei Golubchik2012-04-051-1/+1
| | | |\ \
| | | | * \ Updated/added copyright headersKent Boortz2012-02-151-1/+1
| | | | |\ \
| | | | | * | Updated/added copyright headersMySQL Build Team2012-02-151-2/+1
* | | | | | | 5.3 mergeSergei Golubchik2012-01-131-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge with 5.2.Michael Widenius2011-12-111-3/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge with MariaDB 5.1Michael Widenius2011-11-241-3/+4
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge with MySQL 5.1.60Michael Widenius2011-11-231-1/+0
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | merge 5.0-security => 5.1-securityTor Didriksen2011-07-151-1/+0
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Bug#12406055 BUFFER OVERFLOW OF VARIABLE 'BUFF' IN STRING::SET_REALTor Didriksen2011-07-151-1/+0
| | | * | | | 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-1/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | merge with 5.1-microSergei Golubchik2011-06-071-1/+1
| |\ \ \ \ \ \
| | * | | | | | revert a suggested "optimization" that introduced a bugSergei Golubchik2011-06-061-1/+1
| * | | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-1/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-011-1/+4
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge: mwl#24+mwl#21 5.1->5.2Igor Babaev2010-12-241-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | MWL #21: "index_merge: non-ROR intersection".Igor Babaev2010-12-011-1/+1
| | | |/ / / | | |/| | |
* | | | | | 5.5-mergeSergei Golubchik2011-07-021-3/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Bug #36022 please log more information about "Sort aborted" queriesTor Didriksen2011-02-021-3/+1
* | | | | | merge.Sergei Golubchik2010-11-251-0/+7
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | merge with 5.1Sergei Golubchik2010-09-111-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-2/+2
| | |\ \ \ | | | |/ /
| * | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.Igor Babaev2009-10-161-0/+7
| |/ / /
| * | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-2/+2
| |\ \ \
| * | | | Added some changes inspired by Zardosht Kasheff:Michael Widenius2009-06-301-1/+1
* | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-021-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-021-2/+2
| | |/ / | |/| |
* | | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-67/+19
* | | | mergeMattias Jonsson2010-02-101-0/+3
|\ \ \ \
| * | | | Bug#50201: Server crashes in explain_filename on an InnoDB partitioned tableMattias Jonsson2010-02-101-0/+3
* | | | | backported:Sergey Glukhov2010-01-151-0/+5
* | | | | Manual merge of WL#4738 from mysql-next-mr: Alexey Kopytov2009-12-281-2/+2
|\ \ \ \ \
| * | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-2/+2
* | | | | | Backport of WL #2934: Make/find library for doing float/double Alexey Kopytov2009-12-221-1/+0
|/ / / / /
* | | | | Backport of:Konstantin Osipov2009-11-231-1/+1
|/ / / /
* | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-2/+3
|\ \ \ \
| * | | | WL#5016: Fix header file include guardsMats Kindahl2009-09-231-2/+3
| |/ / /
* | | | WL#751 Error message construction, backportSergey Glukhov2009-10-151-1/+5
|/ / /
* | | Auto-mergeIgnacio Galarza2009-07-311-2/+2
|\ \ \ | |/ / |/| / | |/