summaryrefslogtreecommitdiff
path: root/sql/unireg.cc
Commit message (Expand)AuthorAgeFilesLines
* merge 5.1-> 5.2unknown2009-12-081-4/+4
|\
| * Merge with MySQL 5.1, with following additions:unknown2009-11-161-4/+4
| |\
| | * BUG#46483 - drop table of partitioned table may leaveSergey Vojtovich2009-09-021-4/+4
* | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.Igor Babaev2009-10-161-9/+73
|/ /
* | Merge MySQL->MariaDBSergey Petrunya2009-09-081-2/+1
|\ \ | |/
| * bug#44166Sergei Golubchik2009-05-041-2/+1
* | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-9/+8
|\ \ | |/
| * Bug#41465: confusing error message when comment is too longDavi Arnaut2009-03-051-9/+8
* | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-121-10/+20
|\ \ | |/
| * Merge fix for bug 38145 from 5.0.Chad MILLER2009-01-261-2/+2
| |\
| | * Merge from dev tree.Chad MILLER2009-01-141-2/+2
| | |\
| | | * Fix comment. Boolean function returns true/false, not zero/one.Chad MILLER2009-01-141-2/+2
| * | | manual mergeTatiana A. Nurnberg2008-12-011-8/+18
| |\ \ \ | | |/ /
| | * | Bug#39591: Crash if table comment is longer than 62 charactersTatiana A. Nurnberg2008-11-201-8/+18
| | |/
| | * Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-12-171-0/+8
| | |\
* | | \ Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-3/+1
|\ \ \ \ | |/ / /
| * | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-281-2/+4
| |\ \ \
| | * \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-02-081-2/+4
| | |\ \ \
| | | * \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-11-081-2/+4
| | | |\ \ \
| | | | * | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1unknown2007-10-111-2/+4
| * | | | | | Fix for Bug#34274: Invalid handling of 'DEFAULT 0'unknown2008-03-221-3/+1
| |/ / / / /
* | | | | | Add warning of TRANSACTIONAL=1 is used with handler that doesn't support itunknown2008-02-111-2/+1
* | | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2008-02-051-2/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge ibm.:/home/alik/Documents/MySQL/devel/5.1unknown2008-01-191-2/+2
| |\ \ \ \ \
| | * | | | | A pre-requisite for the fix for Bug#12713 "Error in a stored function unknown2007-12-201-2/+2
| * | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-12-171-0/+8
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge mysql.com:/misc/mysql/31752_/50-31752_unknown2007-12-171-0/+5
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Merge mysql.com:/misc/mysql/31752_/41-31752_unknown2007-12-171-0/+5
| | | |\ \ \ \
| | | | * | | | Bug#31752: check strmake() boundsunknown2007-12-061-0/+5
| | * | | | | | Merge mysql.com:/misc/mysql/31752_/50-31752_unknown2007-11-261-0/+3
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | / / / | | | |_|/ / / | | |/| | | |
| | | * | | | Merge mysql.com:/misc/mysql/31752_/41-31752_unknown2007-11-261-0/+3
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Bug#31752: check strmake() boundsunknown2007-11-261-0/+3
* | | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-161-3/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fixed errors found by valgrindunknown2007-11-211-1/+1
| * | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-09-271-2/+4
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-271-2/+4
| | |\ \ \ \ \
| | | * \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2007-02-281-2/+4
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-12-201-2/+4
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-12-181-2/+4
| | | | | |\ \ \ \ \
| | | | | | * | | | | Maria - post-review fixes about my_sync_dir():unknown2006-11-221-5/+4
| | | | | | * | | | | Maria - various fixes around durability of files:unknown2006-11-211-3/+6
* | | | | | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51unknown2007-12-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge mysql.com:/home/ram/work/mysql-5.0-maintunknown2007-11-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | compiler warnings fixed.unknown2007-11-101-1/+1
| | | |_|_|_|_|/ / | | |/| | | | | |
* | | | | | | | | Use Internal_error_handler mechanism to silence ER_TOO_MANY_FIELDSunknown2007-11-011-6/+42
|/ / / / / / / /
* | | | | | | | Merge magare.gmz:/home/kgeorge/mysql/work/B29325-5.0-optunknown2007-07-111-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | Bug #29325: unknown2007-07-111-0/+2
| * | | | | | Backport of TIME->MYSQL_TIME / Y2K fixsetunknown2007-05-161-1/+3
| * | | | | | Fixed compiler warnings (for linux and win32 and win64)unknown2007-02-221-0/+3
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-02-211-7/+7
| |\ \ \ \ \ \