summaryrefslogtreecommitdiff
path: root/sql/unireg.h
Commit message (Expand)AuthorAgeFilesLines
* Merge 5.2->5.3Igor Babaev2012-06-231-4/+1
|\
| * Fixed bug mdev-354.Igor Babaev2012-06-181-4/+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
* | | | | 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.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
| | |/ / | |/| |
* | | | merge with 5.1Sergei Golubchik2010-09-111-2/+2
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-2/+2
| |\ \ \ | | |/ /
| | * | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-021-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
|\ \ \ | |/ /
| * | Auto-mergeIgnacio Galarza2009-07-311-2/+2
| |\ \ | | |/
| | * Bug#17270 - mysql client tool could not find ../share/charsets folder and fails.Ignacio Galarza2009-07-311-2/+2
| | * Bug#37428 Potential security issue with UDFs - linux shellcode execution.Sergey Glukhov2008-08-251-0/+3
| | * Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776unknown2008-04-091-1/+1
| | |\
| | * \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776unknown2008-04-021-0/+1
| | |\ \
* | | | | Added some changes inspired by Zardosht Kasheff:Michael Widenius2009-06-301-1/+1
|/ / / /
* | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776unknown2008-04-091-0/+1
|\ \ \ \
| * \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776unknown2008-04-091-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Follow-up to B-g#15776, test failures on 64-bit linux.unknown2008-04-091-1/+1
| | | |/ | | |/|
| * | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776unknown2008-03-311-0/+1
| |\ \ \ | | |/ /
| | * | Bug#15776: 32-bit signed int used for length of blobunknown2007-08-311-0/+1
* | | | Merge trift2.:/MySQL/M51/mysql-5.1unknown2008-03-141-1/+0
|\ \ \ \
| * \ \ \ Merge kaamos.(none):/data/src/opt/bug31236/my51-bug31236unknown2008-02-201-1/+0
| |\ \ \ \
| | * | | | Fix for bug #31236: Inconsistent division by zero behavior for unknown2008-02-201-1/+0
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2008-03-061-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add new pkgplugindir handling to seperate plugins from libraries,unknown2007-12-191-2/+2
| |/ / / /
* | | | | Doxygenize comments.unknown2007-10-161-5/+5
|/ / / /
* | | | Merge trift2.:/MySQL/M51/target-5.1.22unknown2007-08-221-5/+34
|\ \ \ \
| * | | | fill_schema_table_from_frm() function uses get_table_share() functionunknown2007-08-091-5/+34
* | | | | Merge gleb.loc:/home/uchum/work/bk/5.1unknown2007-08-111-0/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge gleb.loc:/home/uchum/work/bk/5.0-optunknown2007-08-031-0/+2
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Fixed bug #27352.unknown2007-08-031-0/+2
| | |/
* | | WL#3732 Information schema optimizationunknown2007-08-031-0/+5
|/ /
* | Merge mysql.com:/home/ram/work/b28808/b28808.5.0unknown2007-07-091-1/+1
|\ \ | |/