summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
Commit message (Expand)AuthorAgeFilesLines
* Merge siva.hindu.god:/usr/home/tim/m/bk/50tsmith/tim@siva.hindu.god2006-09-291-0/+8
|\
| * Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0gkodinov@dl145s.mysql.com2006-09-281-0/+8
| |\
| | * Fixed bug #21646.igor@rurik.mysql.com2006-09-251-0/+8
* | | Merge siva.hindu.god:/usr/home/tim/m/bk/g51tsmith/tim@siva.hindu.god2006-09-291-2/+2
|\ \ \
| * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.cornsilk.net2006-09-231-2/+2
| |\ \ \
| | * \ \ Merge shellback.(none):/home/msvensson/mysql/mysql-5.1msvensson@shellback.(none)2006-09-211-72/+78
| | |\ \ \
| | * | | | Fix typos, evidently from previous bad merges, in mysql-test-run.pl and sql_y...tsmith/tim@siva.hindu.god2006-09-211-2/+2
* | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0gluh@gluh.(none)2006-09-281-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | additional 'after merge' fixgluh@mysql.com/gluh.(none)2006-09-271-3/+3
| * | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145j.mysql.com2006-09-211-0/+6
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145j.mysql.com2006-09-151-0/+6
| | |\ \ \
* | | \ \ \ Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2006-09-211-0/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2006-09-151-0/+3
| |\ \ \ \ \
| | * | | | | manual mergelars/lthalmann@mysql.com/dl145k.mysql.com2006-09-111-4/+1
| | * | | | | Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-mergelars/lthalmann@dl145k.mysql.com2006-09-111-0/+6
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Fix WARN_DEPRECATED for 5.0 (it is in 5.1 we should have the extra arguments)lars/lthalmann@mysql.com/dl145j.mysql.com2006-09-111-2/+2
| | | * | | | Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-mergelars/lthalmann@mysql.com/dl145j.mysql.com2006-09-111-0/+6
| | | |\ \ \ \
| | | | * | | | BUG#18822 LOAD DATA FROM MASTER corrupts dataaelkin/elkin@dsl-hkigw8-feaaf900-177.dhcp.inet.fi2006-08-311-1/+3
* | | | | | | | Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-optgkodinov@dl145s.mysql.com2006-09-181-72/+78
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge dl145s.mysql.com:/data/bk/team_tree_merge/CLEAN/mysql-5.0gkodinov@dl145s.mysql.com2006-09-151-72/+78
| |\ \ \ \ \ \
| | * | | | | | Bug #21772: can not name a column 'upgrade' when create a table in version 5....gkodinov/kgeorge@macbook.gmz2006-09-081-0/+1
| | * | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optgkodinov/kgeorge@rakia.(none)2006-09-041-2/+5
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge macbook.gmz:/Users/kgeorge/mysql/work/B21392-4.1-optgkodinov/kgeorge@macbook.gmz2006-09-041-2/+5
| | | |\ \ \ \ \ \
| | | | * | | | | | Bug #21392: multi-table delete with alias table name fails withgkodinov/kgeorge@macbook.gmz2006-09-041-2/+5
| | | | | |_|_|/ / | | | | |/| | | |
| | * | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optgkodinov/kgeorge@rakia.(none)2006-09-041-70/+72
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Bug#14654 : Cannot select from the same table twice within a UNION statement ...gkodinov/kgeorge@macbook.gmz2006-08-311-70/+72
* | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1ramil/ram@myoffice.izhnet.ru2006-09-151-269/+151
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1dlenev@mockturtle.local2006-09-141-269/+151
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | WL#3337 (Event scheduler new architecture)andrey@example.com2006-09-121-11/+0
| | * | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-runtimeahristov@bk-internal.mysql.com2006-09-061-258/+151
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | | * | | | | | | Cleanup patch for handling of subselects in commands which cannotandrey@example.com2006-08-231-12/+20
| | | * | | | | | | WL#3337 (Event scheduler new architecture)andrey@example.com2006-08-171-19/+20
| | | * | | | | | | post-merge and testing fixesandrey@example.com2006-08-151-2/+13
| | | * | | | | | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337andrey@example.com2006-08-141-254/+127
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | WL #3337 (Events new architecture)andrey@lmy004.2006-07-131-0/+7
| | | | * | | | | | | WL#3337 (Event scheduler new architecture)andrey@lmy004.2006-07-111-1/+2
| | | | * | | | | | | Manual mergeandrey@lmy004.2006-07-101-243/+121
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | fix for bug#16394 "Events: Crash if schedule contains SELECT"andrey@lmy004.2006-06-291-8/+18
| | | | | * | | | | | | WL#3337 (Events new architecture)andrey@lmy004.2006-06-291-146/+5
| | | | | * | | | | | | Mergeandrey@lmy004.2006-06-281-104/+113
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | WL#3337 (Event scheduler new architecture) Fourth cut of refactoringandrey@lmy004.2006-06-271-74/+82
| | | | | | * | | | | | | WL#3337 (Event scheduler new architecture)andrey@lmy004.2006-06-271-27/+3
| | | | | | * | | | | | | WL#3337 (Events new infrasctructure)andrey@lmy004.2006-06-271-8/+33
| | | | | | * | | | | | | first cut of WL#3337 (New event scheduler locking infrastructure).andrey@lmy004.2006-06-271-1/+1
* | | | | | | | | | | | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50tsmith@maint2.mysql.com2006-09-131-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | / / / / / / | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | after merge fixgluh@mysql.com/gluh.(none)2006-09-081-4/+6
| * | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-optmsvensson@neptunus.(none)2006-09-041-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | BUG#21477 "memory overruns for certain kinds of subqueries":sergefp@mysql.com2006-09-011-0/+2
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/41tsmith@maint2.mysql.com2006-09-011-2/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-08-301-19/+40
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |