summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal:/home/bk/mysql-5.1unknown2006-11-281-1/+5
|\
| * Merge bk@192.168.21.1:mysql-5.1-optunknown2006-11-171-1/+5
| |\
| | * Merge mysql.com:/home/hf/work/mysql-5.0.cleanunknown2006-11-081-1/+5
| | |\
| | | * Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-11-011-1/+3
| | | |\
| | | | * BUG#8804: wrong results for NULL IN (SELECT ...)unknown2006-10-311-1/+3
| | | * | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-10-311-0/+2
| | | |\ \ | | | | |/ | | | |/|
| | | | * Bug #21809: Error 1356 while selecting from view with grouping though underlyingunknown2006-10-241-0/+2
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2006-11-271-1/+1
|\ \ \ \ \
| * | | | | Fixed a LOT of compiler warningsunknown2006-11-271-1/+1
| |/ / / /
* | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2006-11-161-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-10-171-1/+2
| |\ \ \ \
| | * | | | Changed several char* to LEX_STRING*.unknown2006-10-161-1/+2
* | | | | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2006-11-021-0/+23
|\ \ \ \ \ \
| * | | | | | Better fix for bug#22830unknown2006-11-021-0/+23
* | | | | | | Merge mockturtle.local:/home/dlenev/src/mysql-5.0-hash-2unknown2006-11-011-1/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Small cleanup in code handling stored routines/table prelocking.unknown2006-11-011-1/+10
| * | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0unknown2006-10-121-1/+0
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-10-231-1/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20953unknown2006-10-121-1/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| / / / | | |_|/ / / | |/| | | |
| | * | | | BUG#20953: create proc with a create view that uses local vars/paramsunknown2006-10-121-1/+0
* | | | | | Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-optunknown2006-10-191-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Fixed bug #19579: at range analysis optimizer did not take into unknown2006-10-161-1/+1
| | |/ / | |/| |
* | | | Merge macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.0-optunknown2006-09-271-1/+2
|\ \ \ \ | |/ / /
| * | | Fixed bug #21646.unknown2006-09-251-1/+2
* | | | Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-optunknown2006-09-181-4/+19
|\ \ \ \ | |/ / /
| * | | Merge bk-internal:/home/bk/mysql-5.0-optunknown2006-09-181-4/+19
| |\ \ \
| | * | | Fixed bug #21493: crash for the second execution of a functionunknown2006-09-161-4/+19
* | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-09-151-2/+4
|\ \ \ \ \
| * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-09-141-2/+4
| |\ \ \ \ \
| | * \ \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-runtimeunknown2006-09-061-2/+4
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Cleanup patch for handling of subselects in commands which cannotunknown2006-08-231-0/+1
| | | * | | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337unknown2006-08-141-2/+3
| | | |\ \ \ \
| | | | * | | | WL #3337 (Events new architecture)unknown2006-07-131-0/+1
| | | | * | | | WL#3337 (Events new architecture)unknown2006-06-291-2/+2
* | | | | | | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50unknown2006-09-131-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge bk-internal:/home/bk/mysql-5.0-optunknown2006-09-041-4/+4
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | BUG#21477 "memory overruns for certain kinds of subqueries":unknown2006-09-011-4/+4
| * | | | | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/41unknown2006-09-011-2/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2006-08-231-0/+2
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my50-bug20908unknown2006-08-151-0/+2
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-051-2/+3
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Fix for bug #20695: Charset introducer overrides charset definition for column.unknown2006-08-151-2/+3
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maintunknown2006-08-231-0/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my51-bug20908unknown2006-08-151-0/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my50-bug20908unknown2006-08-151-0/+2
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Bug #20908: Crash if select @@""unknown2006-08-151-0/+2
* | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/tmp_regunknown2006-08-171-12/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2006-08-031-0/+25
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | N'xxx' and _utf8'xxx' are not equivalentunknown2006-07-311-12/+9
| | |_|/ / / / | |/| | | | |
* | | | | | | Manual merge 5.0->5.1. Post-merge fixes.unknown2006-08-141-1/+1