summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
Commit message (Expand)AuthorAgeFilesLines
* Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rplmats@kindahl-laptop.dnsalias.net2007-05-311-8/+36
|\
| * WL#3339 (Issue warnings when statement-based replication may fail):mats@romeo.kindahl.net2007-05-141-8/+36
* | Manual mergemalff/marcsql@weblab.(none)2007-05-291-1/+2
* | 5.1 version of a fix and test cases for bugs:kostja@vajra.(none)2007-05-281-8/+41
* | 5.1 version of fix for:dlenev@mockturtle.local2007-05-231-1/+0
* | Merge vajra.(none):/opt/local/work/mysql-5.0-21483kostja@vajra.(none)2007-05-161-0/+6
|\ \
| * \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimekostja@vajra.(none)2007-05-161-0/+6
| |\ \
| | * | A fix and a test case for kostja@vajra.(none)2007-05-161-0/+6
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@vajra.(none)2007-05-151-19/+62
|\ \ \ \
| * \ \ \ Merge vajra.(none):/opt/local/work/mysql-5.0-runtimekostja@vajra.(none)2007-05-111-5/+5
| |\ \ \ \ | | |/ / /
| | * | | Cleanup: now that we have Lex_input_stream, finish the transitionkostja@vajra.(none)2007-05-111-5/+5
| | |/ /
| | * | code review fixmalff/marcsql@weblab.(none)2007-04-251-1/+4
| | * | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimemalff/marcsql@weblab.(none)2007-04-241-15/+55
| | |\ \
| | | * | Bug#25411 (trigger code truncated), PART Imalff/marcsql@weblab.(none)2007-04-241-15/+55
| * | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-05-021-14/+57
| |\ \ \ \
| | * | | | manual merge 5.0-runtime -> 5.1->runtime, with 25411 part Imalff/marcsql@weblab.(none)2007-04-251-14/+57
* | | | | | Merge xiphis.org:/home/antony/work2/mysql-5.1-enginesacurtis/antony@ltamd64.xiphis.org2007-05-041-0/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesistruewing@chilla.local2007-04-271-0/+7
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@sergbook.mysql.com2007-04-161-0/+7
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | WL#2936antony@ppcg5.local2007-03-021-0/+7
| * | | | | Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-optevgen@moonbone.local2007-04-211-0/+8
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
* | | | | Merge magare.gmz:/home/kgeorge/mysql/work/B27786-5.0-optgkodinov/kgeorge@magare.gmz2007-04-201-0/+7
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Bug #27786:gkodinov/kgeorge@magare.gmz2007-04-201-0/+8
| | |/ | |/|
| * | Merge bk@192.168.21.1:mysql-5.0holyfoot/hf@mysql.com/hfmain.(none)2007-03-081-0/+2
| |\ \
* | \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1tsmith@quadxeon.mysql.com2007-04-041-9/+9
|\ \ \ \
| * | | | Remove unnecessary casts to uchar. The casts are stemming fromkostja@bodhi.local2007-03-271-9/+9
* | | | | Merge pilot.blaudden:/home/msvensson/mysql/bug19991/my51-bug19991msvensson@pilot.blaudden2007-03-291-6/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bug#19991 CHANGE MASTER need option ssl-verify-server-certmsvensson@pilot.blaudden2007-03-291-6/+6
| | |_|/ | |/| |
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2007-03-201-6/+0
|\ \ \ \
| * \ \ \ Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1kroki/tomash@moonlight.home2007-03-091-6/+0
| |\ \ \ \
| | * | | | BUG#9953: CONVERT_TZ requires mysql.time_zone_name to be lockedkroki/tomash@moonlight.home2007-03-091-6/+0
* | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-optgkodinov/kgeorge@magare.gmz2007-03-091-10/+71
|\ \ \ \ \ \
| * | | | | | WL#3527: Extend IGNORE INDEX so places where index is ignored gkodinov/kgeorge@macbook.gmz2007-03-051-10/+71
* | | | | | | Merge bk@192.168.21.1:mysql-5.1holyfoot/hf@hfmain.(none)2007-03-081-0/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Merge mysql.com:/home/hf/work/mrg/mysql-5.0-optholyfoot/hf@hfmain.(none)2007-03-081-0/+2
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge moonbone.local:/mnt/gentoo64/work/22331-bug-5.0-opt-mysqlevgen@moonbone.local2007-03-071-0/+2
| | |\ \ \ \ \
| | | * | | | | Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimizedevgen@moonbone.local2007-03-071-0/+2
* | | | | | | | Merge bodhi.local:/opt/local/work/mysql-5.0-26750kostja@bodhi.local2007-03-071-0/+4
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | A fix for Bug#26750 "valgrind leak in sp_head" (and post-reviewkostja@bodhi.local2007-03-071-0/+4
| * | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-basemalff/marcsql@weblab.(none)2007-03-011-4/+2
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-basemalff/marcsql@weblab.(none)2007-02-161-4/+2
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0gluh@mysql.com/eagle.(none)2007-02-261-1/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-02-211-1/+2
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-02-281-1/+7
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0-optgluh@eagle.(none)2007-02-261-1/+7
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | / | | |_|_|_|_|/ | |/| | | | |
| | * | | | | item.cc:evgen@moonbone.local2007-02-241-0/+5
| | * | | | | Bug#23800: Outer fields in correlated subqueries is used in a temporary tableevgen@moonbone.local2007-02-211-1/+2
| | |/ / / /
* | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-02-151-2/+22
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-02-031-1/+2
| |\ \ \ \ \
| | * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2007-01-291-1/+2
| | |\ \ \ \ \
View Lorry Controller Status