summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
Commit message (Expand)AuthorAgeFilesLines
* Post-merge fix.igor@olga.mysql.com2007-06-041-1/+4
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.(none)2007-06-011-3/+3
|\
| * Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-05-241-3/+3
| |\
| | * WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-101-3/+3
* | | Manual mergemalff/marcsql@weblab.(none)2007-05-291-3/+6
* | | 5.1 version of a fix and test cases for bugs:kostja@vajra.(none)2007-05-281-0/+47
* | | Fix warnings.kostja@vajra.(none)2007-05-251-2/+0
|/ /
* | Merge bk@192.168.21.1:mysql-5.1holyfoot/hf@hfmain.(none)2007-05-181-1/+1
|\ \
| * | valgrind error fix(addon)gluh@mysql.com/eagle.(none)2007-05-171-1/+1
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@vajra.(none)2007-05-151-148/+162
|\ \ \ | |/ / |/| |
| * | Merge vajra.(none):/opt/local/work/mysql-5.0-runtimekostja@vajra.(none)2007-05-111-4/+4
| |\ \
| | * | Cleanup: now that we have Lex_input_stream, finish the transitionkostja@vajra.(none)2007-05-111-4/+4
| | * | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-basemalff/marcsql@weblab.(none)2007-05-021-154/+169
| | |\ \
| * | \ \ Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-05-021-145/+159
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | fix merge issuesmalff/marcsql@weblab.(none)2007-04-301-1/+1
| | * | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtimemalff/marcsql@weblab.(none)2007-04-301-34/+30
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Bug#21513 (SP having body starting with quoted label rendered unusable)malff/marcsql@weblab.(none)2007-04-271-34/+30
| | | * | code review fixmalff/marcsql@weblab.(none)2007-04-251-3/+3
| | | * | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimemalff/marcsql@weblab.(none)2007-04-241-140/+159
| | | |\ \
| | | | * | Bug#25411 (trigger code truncated), PART Imalff/marcsql@weblab.(none)2007-04-241-140/+159
| | * | | | manual merge 5.0-runtime -> 5.1->runtime, with 25411 part Imalff/marcsql@weblab.(none)2007-04-251-133/+151
| * | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0serg@janus.mylan2007-04-171-1/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | reverted the fix for Bug#5507serg@janus.mylan2007-04-171-1/+0
| | |/ /
| * | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-optepotemkin@bk-internal.mysql.com2007-04-131-0/+1
| |\ \ \ | | |/ /
| | * | Bug#5507: TRUNCATE does not work with views.gshchepa/uchum@gshchepa.localdomain2007-04-121-0/+1
| | |/
| | * Merge bk@192.168.21.1:mysql-5.0holyfoot/hf@mysql.com/hfmain.(none)2007-03-081-0/+1
| | |\
* | | | compilation failureserg@sergbook.mysql.com2007-04-291-2/+0
* | | | fix windows build failureantony@ppcg5.local2007-04-291-0/+2
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@sergbook.mysql.com2007-04-161-0/+25
|\ \ \ \ | |/ / / |/| | |
| * | | WL#2936antony@ppcg5.local2007-03-231-0/+3
| * | | WL#2936antony@ppcg5.local2007-03-021-0/+22
* | | | Remove unnecessary casts to uchar. The casts are stemming fromkostja@bodhi.local2007-03-271-33/+23
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2007-03-201-27/+0
|\ \ \ \
| * \ \ \ Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1kroki/tomash@moonlight.home2007-03-091-27/+0
| |\ \ \ \
| | * | | | BUG#9953: CONVERT_TZ requires mysql.time_zone_name to be lockedkroki/tomash@moonlight.home2007-03-091-27/+0
* | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-optgkodinov/kgeorge@magare.gmz2007-03-091-20/+71
|\ \ \ \ \ \
| * | | | | | WL#3527: Extend IGNORE INDEX so places where index is ignored gkodinov/kgeorge@macbook.gmz2007-03-051-20/+71
* | | | | | | Merge bk@192.168.21.1:mysql-5.1holyfoot/hf@hfmain.(none)2007-03-081-0/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Merge mysql.com:/home/hf/work/mrg/mysql-5.0-optholyfoot/hf@hfmain.(none)2007-03-081-0/+1
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge moonbone.local:/mnt/gentoo64/work/22331-bug-5.0-opt-mysqlevgen@moonbone.local2007-03-071-0/+1
| | |\ \ \ \ \
| | | * | | | | Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimizedevgen@moonbone.local2007-03-071-0/+1
* | | | | | | | Merge bodhi.local:/opt/local/work/mysql-5.0-runtimekostja@bodhi.local2007-03-071-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | A fix for the windows build (harmless warning).kostja@bodhi.local2007-03-071-1/+1
* | | | | | | | Merge bodhi.local:/opt/local/work/mysql-5.0-26750kostja@bodhi.local2007-03-071-0/+30
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | A fix for Bug#26750 "valgrind leak in sp_head" (and post-reviewkostja@bodhi.local2007-03-071-0/+30
| * | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-basemalff/marcsql@weblab.(none)2007-03-011-0/+11
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-basemalff/marcsql@weblab.(none)2007-02-161-0/+11
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0gluh@mysql.com/eagle.(none)2007-02-261-0/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-02-211-17/+20
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-02-281-0/+3
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | |
View Lorry Controller Status