summaryrefslogtreecommitdiff
path: root/sql/lex.h
Commit message (Expand)AuthorAgeFilesLines
* 5.5-mergeSergei Golubchik2011-07-021-2/+3
|\
| * WL#1054: Pluggable authentication supportGeorgi Kodinov2010-08-091-2/+3
* | merge.Sergei Golubchik2010-11-251-2/+14
|\ \ | |/ |/|
| * pluggable auth with plugin examplesSergei Golubchik2010-03-291-0/+1
| * Merge of the patch introducing virtual columns into maria-5.2Igor Babaev2009-11-111-2/+7
| |\
| | * The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.Igor Babaev2009-10-161-2/+7
| * | This is based on the userstatv2 patch from Percona and OurDelta.Michael Widenius2009-10-191-0/+5
| |/
| * Merge MySQL->MariaDBSergey Petrunya2009-09-081-1/+1
| |\
| * | after mergeunknown2007-12-281-2/+1
| * | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2007-12-271-1/+5
| |\ \
| | * | Moved randomize and my_rnd under mysysunknown2007-10-091-1/+3
| | * | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-07-041-0/+2
| | |\ \
| | | * | Fixed REPAIR/CHECK/ANALYZE TABLE for tables with new BLOCK-ROW format.unknown2007-07-011-0/+2
* | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-201-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-0/+4
| |\ \ \ \ \
| * | | | | | Backport of:Konstantin Osipov2009-12-101-1/+1
* | | | | | | WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-02-171-2/+0
| |/ / / / / |/| | | | |
* | | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | WL#5142 FLUSH LOGS should take optional arguments for which log(s) to flushunknown2009-12-031-0/+4
* | | | | | Manual resolving for the following filesAndrei Elkin2009-12-011-2/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-2/+0
* | | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-0/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | merge from 5.1-rpl+2 repo to a local branch with HB and bug@27808 fixesAndrei Elkin2009-10-011-0/+1
| |\ \ \ \ \
| | * | | | | BUG#28777, WL#4293: SHOW BINLOG EVENTS does not work on relay logLuis Soares2009-09-291-0/+1
| * | | | | | backporting bug@27808 fixesAndrei Elkin2009-10-011-0/+1
| * | | | | | WL#342 heartbeatAndrei Elkin2009-09-291-0/+1
| |/ / / / /
| * | | | | WL#5016: Fix header file include guardsMats Kindahl2009-09-231-0/+5
| | |_|_|/ | |/| | |
* | | | | WL#1397 convert XML -> SQLAlexander Barkov2009-10-121-0/+1
* | | | | WL#2110 (SIGNAL)Marc Alff2009-09-101-0/+14
|/ / / /
* | | | Bug#45829 "CREATE TABLE TRANSACTIONAL PAGE_CHECKSUM ROW_FORMAT=PAGE accepted,...Guilhem Bichot2009-07-291-2/+0
* | | | Removed extra symbol during merge.unknown2008-02-121-1/+0
* | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-02-081-1/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1unknown2007-10-111-1/+5
| |/ /
* | | Fix up merge. Some macros are now functions. Some functions areunknown2007-05-021-0/+1
* | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-former...unknown2007-04-271-0/+11
|\ \ \ | |/ / |/| |
| * | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community-formerge51unknown2007-04-251-0/+13
| |\ \
| | * \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-communityunknown2007-01-031-0/+13
| | |\ \
| | | * | Bug#24795: Add SHOW PROFILEunknown2007-01-031-0/+13
| * | | | Fix -ansi -pedantic warning (can't cast a pointer to function unknown2007-03-081-2/+2
| |/ / /
* | | | Merge pilot.blaudden:/home/msvensson/mysql/bug19991/my51-bug19991unknown2007-03-291-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Bug#19991 CHANGE MASTER need option ssl-verify-server-certunknown2007-03-291-0/+1
* | | | Fixed compilations problems and warnings on windowsunknown2007-02-231-1/+1
|/ / /
* | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2007-01-121-2/+0
|\ \ \
| * | | Bug#22687 (Functions UNIQUE_USERS, GROUP_UNIQUE_USERS)unknown2007-01-111-2/+0
* | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0unknown2006-12-231-2/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Many files:unknown2006-12-231-2/+1
| | |/ | |/|
* | | WL# 3031unknown2006-12-011-0/+7
| |/ |/|
* | Merge alik.:/mnt/raid/alik/MySQL/devel/5.1unknown2006-11-071-2/+4
|\ \
| * | Bug#18888 Trying to overwrite sql/lex_hash.h during buildunknown2006-10-261-2/+4
* | | Bug#21114 (Foreign key creation fails to table with name format)unknown2006-11-021-211/+5
|/ /