summaryrefslogtreecommitdiff
path: root/sql/lex.h
Commit message (Expand)AuthorAgeFilesLines
* 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 flush2009-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.jani@a88-113-38-195.elisa-laajakaista.fi2008-02-121-1/+0
* Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-02-081-1/+5
|\
| * Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1monty@mysql.com/narttu.mysql.fi2007-10-111-1/+5
* | Fix up merge. Some macros are now functions. Some functions arecmiller@zippy.cornsilk.net2007-05-021-0/+1
* | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-former...cmiller@zippy.cornsilk.net2007-04-271-0/+11
|\ \ | |/ |/|
| * Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community-formerge51cmiller@zippy.cornsilk.net2007-04-251-0/+13
| |\
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0-communitycmiller@zippy.cornsilk.net2007-01-031-0/+13
| | |\
| | | * Bug#24795: Add SHOW PROFILEcmiller@zippy.cornsilk.net2007-01-031-0/+13
| * | | Fix -ansi -pedantic warning (can't cast a pointer to function kostja@bodhi.local2007-03-081-2/+2
| |/ /
* | | Merge pilot.blaudden:/home/msvensson/mysql/bug19991/my51-bug19991msvensson@pilot.blaudden2007-03-291-0/+1
|\ \ \
| * | | Bug#19991 CHANGE MASTER need option ssl-verify-server-certmsvensson@pilot.blaudden2007-03-291-0/+1
* | | | Fixed compilations problems and warnings on windowsmonty@mysql.com/narttu.mysql.fi2007-02-231-1/+1
|/ / /
* | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimemalff/marcsql@weblab.(none)2007-01-121-2/+0
|\ \ \
| * | | Bug#22687 (Functions UNIQUE_USERS, GROUP_UNIQUE_USERS)malff/marcsql@weblab.(none)2007-01-111-2/+0
* | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-231-2/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-231-2/+1
| | |/ | |/|
* | | WL# 3031patg@radha.tangent.org2006-12-011-0/+7
| |/ |/|
* | Merge alik.:/mnt/raid/alik/MySQL/devel/5.1anozdrin/alik@alik.2006-11-071-2/+4
|\ \
| * | Bug#18888 Trying to overwrite sql/lex_hash.h during buildmsvensson@shellback.(none)2006-10-261-2/+4
* | | Bug#21114 (Foreign key creation fails to table with name format)malff/marcsql@weblab.(none)2006-11-021-211/+5
|/ /
* | WL#3337 (Event scheduler new architecture)andrey@example.com2006-09-121-1/+0
* | This is the second patch for bdb removeal. This takes care of all options and...brian@zim.(none)2006-08-101-2/+0
* | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newbrian@zim.(none)2006-05-231-0/+1
|\ \
| * \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newbrian@zim.(none)2006-05-081-0/+1
| |\ \
| | * | Added new show contributors command. brian@zim.(none)2006-05-021-0/+1
* | | | fix for bug #17619 Scheduler race conditionsandrey@lmy004.2006-05-221-0/+1
|/ / /
* | | Added support for key_block_size for key and table level (WL#602)monty@mysql.com2006-05-031-0/+1
|/ /
* | Merge mysql.com:/extern/mysql/5.1/generic/mysql-5.0-mergepem@mysql.com2006-04-251-7/+0
|\ \ | |/
| * Fixed BUG#18949: Test case sp-goto is disabledpem@mysql.com2006-04-181-7/+0
* | BUG#15561: Possible to strange things with partitions defined although no par...mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se2006-04-101-0/+2
* | Bug#17112 - SHOW PLUGIN should be SHOW PLUGINSserg@serg.mylan2006-04-061-0/+1
* | BUG#17754pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se2006-03-201-0/+2
* | Merging 5.0->5.1holyfoot@mysql.com2006-02-171-0/+1
|\ \ | |/
View Lorry Controller Status