summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg25966-2unknown2007-03-151-0/+3
|\
| * Fix for bug #25966 "2MB per second endless memory consumption after LOCKunknown2007-03-151-0/+3
| * Merge bk@192.168.21.1:mysql-5.0unknown2007-03-081-2/+2
| |\
| * \ Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50unknown2007-03-071-27/+7
| |\ \
| * \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimeunknown2007-03-071-2/+1
| |\ \ \
| * \ \ \ Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0unknown2007-03-011-98/+121
| |\ \ \ \
* | \ \ \ \ Merge bk@192.168.21.1:mysql-5.1unknown2007-03-081-2/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge mysql.com:/home/hf/work/mrg/mysql-5.0-optunknown2007-03-081-2/+2
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-03-021-2/+2
| | |\ \ \ \ \
| | | * | | | | Bug#25122: Views based on a self-joined table aren't insertable.unknown2007-03-021-2/+2
* | | | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51unknown2007-03-081-24/+7
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge bodhi.local:/opt/local/work/mysql-5.0-26750unknown2007-03-071-24/+7
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | A fix for Bug#26750 "valgrind leak in sp_head" (and post-reviewunknown2007-03-071-27/+7
| | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-baseunknown2007-03-011-2/+1
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my50-bug23240unknown2007-02-191-2/+1
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
* | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2007-03-071-1/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1unknown2007-03-011-996/+8
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166unknown2007-02-201-1/+12
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Bug#20166 mysql-test-run.pl does not test system privilege tables creationunknown2007-02-201-1/+12
| | | |_|/ / / | | |/| | | |
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-rplunknown2007-03-061-0/+25
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rplunknown2007-03-011-0/+25
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | / / / | | | |_|/ / / | | |/| | | |
| | * | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rplunknown2007-02-271-0/+25
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Bug#24478 DROP TRIGGER is not caught by replicate-*-table filtersunknown2007-02-261-0/+25
| | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-02-211-98/+96
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2007-02-061-7/+6
| | |\ \ \ \ \
| * | | | | | | Remove compiler warningsunknown2007-02-271-1/+3
| * | | | | | | Fixed compiler warningsunknown2007-02-231-995/+5
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1unknown2007-02-061-87/+88
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-02-031-79/+81
| | |\ \ \ \ \ \
| | | * | | | | | Fixed problems detected by pushbuildunknown2007-01-301-1/+5
| | | * | | | | | After merge fixesunknown2007-01-291-1/+1
| | | * | | | | | Merge mysql.com:/home/my/mysql-5.0unknown2007-01-271-78/+76
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-01-221-98/+96
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-12-151-99/+97
| | | | | |\ \ \ \ \
| | | | | | * | | | | Fixed compiler warnings detected by option -Wshadow and -Wunused:unknown2006-12-151-99/+97
| | * | | | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0-optunknown2007-02-021-7/+6
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | | * | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-01-311-7/+6
| | | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | | | * | | | | | | BUG#25575: ERROR 1052 (Column in from clause is ambiguous) with sub-joinunknown2007-01-311-7/+6
| | * | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-02-011-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Bug #23556: TRUNCATE TABLE still maps to DELETEunknown2006-11-211-1/+1
| * | | | | | | | | | Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943unknown2007-01-291-12/+24
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | / / / | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943unknown2007-01-291-12/+24
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | Bug#22943 syscall pruning in libmysqlunknown2007-01-291-12/+25
| | | * | | | | | | Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1unknown2007-01-171-0/+6
| | | |\ \ \ \ \ \ \
* | | | | | | | | | | Manual merge of 5.1 into 5.1-runtimeunknown2007-03-011-995/+17
* | | | | | | | | | | Merge kpettersson@bk-internal:/home/bk/mysql-5.1-runtimeunknown2007-02-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my51-bug23240unknown2007-02-191-2/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my50-bug23240unknown2007-02-191-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | | * | | | | | | | | | Bug#23240 --init_file statements with NOW() reports '1970-01-01 11:00:00'as t...unknown2007-02-191-2/+1
| | | | |/ / / / / / / / | | | |/| | | | | | | |
* | | | | | | | | | | | Fix a merge error (4.1->5.0 merge from 2005)unknown2007-02-191-3/+0
|/ / / / / / / / / / /