summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
Commit message (Expand)AuthorAgeFilesLines
* Bug#25411 (trigger code truncated), PART IIunknown2007-06-121-20/+314
* Resolved merge conflictsunknown2007-06-111-10/+27
* Follow up after work on Bug 4968unknown2007-06-101-4/+4
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-011-6/+6
|\
| * Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-05-241-6/+6
| |\
| | * WL#3817: Simplify string / memory area types and make things more consistent ...unknown2007-05-101-6/+6
* | | Manual mergeunknown2007-05-291-1/+2
* | | 5.1 version of a fix and test cases for bugs:unknown2007-05-281-8/+41
* | | 5.1 version of fix for:unknown2007-05-231-1/+0
|/ /
* | Merge vajra.(none):/opt/local/work/mysql-5.0-21483unknown2007-05-161-0/+6
|\ \
| * \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimeunknown2007-05-161-0/+6
| |\ \
| | * | A fix and a test case for unknown2007-05-161-0/+6
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-05-151-19/+62
|\ \ \ \
| * \ \ \ Merge vajra.(none):/opt/local/work/mysql-5.0-runtimeunknown2007-05-111-5/+5
| |\ \ \ \ | | |/ / /
| | * | | Cleanup: now that we have Lex_input_stream, finish the transitionunknown2007-05-111-5/+5
| | |/ /
| | * | code review fixunknown2007-04-251-1/+4
| | * | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimeunknown2007-04-241-15/+55
| | |\ \
| | | * | Bug#25411 (trigger code truncated), PART Iunknown2007-04-241-15/+55
| * | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-baseunknown2007-05-021-14/+57
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | manual merge 5.0-runtime -> 5.1->runtime, with 25411 part Iunknown2007-04-251-14/+57
* | | | | Merge xiphis.org:/home/antony/work2/mysql-5.1-enginesunknown2007-05-041-0/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesunknown2007-04-271-0/+7
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-04-161-0/+7
| | |\ \ \
| | | * | | WL#2936unknown2007-03-021-0/+7
| * | | | | Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-optunknown2007-04-211-0/+8
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
* | | | | Merge magare.gmz:/home/kgeorge/mysql/work/B27786-5.0-optunknown2007-04-201-0/+7
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Bug #27786:unknown2007-04-201-0/+8
| | |/ | |/|
| * | Merge bk@192.168.21.1:mysql-5.0unknown2007-03-081-0/+2
| |\ \
* | \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-04-041-9/+9
|\ \ \ \
| * | | | Remove unnecessary casts to uchar. The casts are stemming fromunknown2007-03-271-9/+9
* | | | | Merge pilot.blaudden:/home/msvensson/mysql/bug19991/my51-bug19991unknown2007-03-291-6/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bug#19991 CHANGE MASTER need option ssl-verify-server-certunknown2007-03-291-6/+6
| | |_|/ | |/| |
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-03-201-6/+0
|\ \ \ \
| * \ \ \ Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1unknown2007-03-091-6/+0
| |\ \ \ \
| | * | | | BUG#9953: CONVERT_TZ requires mysql.time_zone_name to be lockedunknown2007-03-091-6/+0
* | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-03-091-10/+71
|\ \ \ \ \ \
| * | | | | | WL#3527: Extend IGNORE INDEX so places where index is ignored unknown2007-03-051-10/+71
* | | | | | | Merge bk@192.168.21.1:mysql-5.1unknown2007-03-081-0/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Merge mysql.com:/home/hf/work/mrg/mysql-5.0-optunknown2007-03-081-0/+2
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge moonbone.local:/mnt/gentoo64/work/22331-bug-5.0-opt-mysqlunknown2007-03-071-0/+2
| | |\ \ \ \ \
| | | * | | | | Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimizedunknown2007-03-071-0/+2
* | | | | | | | Merge bodhi.local:/opt/local/work/mysql-5.0-26750unknown2007-03-071-0/+4
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | A fix for Bug#26750 "valgrind leak in sp_head" (and post-reviewunknown2007-03-071-0/+4
| * | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-baseunknown2007-03-011-4/+2
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-baseunknown2007-02-161-4/+2
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0unknown2007-02-261-1/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-02-211-1/+2
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-baseunknown2007-02-281-1/+7
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0-optunknown2007-02-261-1/+7
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | / | | |_|_|_|_|/ | |/| | | | |
| | * | | | | item.cc:unknown2007-02-241-0/+5
View Lorry Controller Status