summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
Commit message (Expand)AuthorAgeFilesLines
* Merge bk@192.168.21.1:mysql-5.1holyfoot/hf@hfmain.(none)2007-03-221-1/+1
|\
| * Merge bk@192.168.21.1:mysql-5.1holyfoot/hf@hfmain.(none)2007-03-221-1/+1
| |\
| | * Merge mysql.com:/home/hf/work/mrg/mysql-5.0-optholyfoot/hf@hfmain.(none)2007-03-221-1/+1
| | |\
| | | * Bug#23345: Wrongly allowed INTO in a non-last select of a UNION.evgen@moonbone.local2007-03-211-1/+1
| | | * Merge bk-internal:/home/bk/mysql-5.0-optgkodinov/kgeorge@magare.gmz2007-03-091-4/+13
| | | |\
| | | | * WL#3527: Extend IGNORE INDEX so places where index is ignored can gkodinov/kgeorge@macbook.gmz2007-03-091-4/+13
* | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1tsmith@quadxeon.mysql.com2007-03-221-56/+38
|\ \ \ \ \ | |/ / / /
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2007-03-201-56/+38
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtimemalff/marcsql@weblab.(none)2007-03-141-27/+16
| | |\ \ \
| | | * | | Bug#26503 (Illegal SQL exception handler code causes the server to crash)malff/marcsql@weblab.(none)2007-03-141-27/+16
| | | |/ /
| | * | | Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1kroki/tomash@moonlight.home2007-03-091-21/+21
| | |\ \ \
| | | * | | Resolve one shift/reduce conflict introduced with the push of the fixkroki/tomash@moonlight.home2007-03-091-21/+21
| | * | | | Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1kroki/tomash@moonlight.home2007-03-091-8/+1
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | BUG#9953: CONVERT_TZ requires mysql.time_zone_name to be lockedkroki/tomash@moonlight.home2007-03-091-8/+1
* | | | | | BUG#27270 Can't compile latest 5.1-maindf@pippilotta.erinye.com2007-03-191-3/+3
|/ / / / /
* | | | | WL3527: post-merge updatesgkodinov/kgeorge@magare.gmz2007-03-111-1/+1
* | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-optgkodinov/kgeorge@magare.gmz2007-03-091-78/+80
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | WL#3527: Extend IGNORE INDEX so places where index is ignored gkodinov/kgeorge@macbook.gmz2007-03-051-78/+80
* | | | | A post merge fix.kostja@bodhi.local2007-03-071-16/+16
* | | | | Merge bodhi.local:/opt/local/work/mysql-5.0-26750kostja@bodhi.local2007-03-071-386/+453
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | A fix for Bug#26750 "valgrind leak in sp_head" (and post-reviewkostja@bodhi.local2007-03-071-327/+394
* | | | | Post-merge fixes.kostja@bodhi.local2007-03-061-2/+2
* | | | | Merge bodhi.local:/opt/local/work/mysql-5.0-runtimekostja@bodhi.local2007-03-061-19/+24
|\ \ \ \ \ | |/ / / /
| * | | | Freeze the number of conflicts. We should not introduce any morekostja@bodhi.local2007-03-021-0/+5
| * | | | Rename a macro to better reflect the action taken.kostja@bodhi.local2007-03-021-19/+19
| * | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-basemalff/marcsql@weblab.(none)2007-03-011-33/+110
| |\ \ \ \
| | * \ \ \ Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-basemalff/marcsql@weblab.(none)2007-02-161-33/+110
| | |\ \ \ \
| | | * | | | Bug#24532 (The return data type of IS TRUE is different from similarmalff/marcsql@weblab.(none)2007-02-121-16/+12
| | | * | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimemalff/marcsql@weblab.(none)2007-01-301-17/+98
| | | |\ \ \ \
| * | | \ \ \ \ Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rplrafal@quant.(none)2007-03-011-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fixes of compilation warnings and errors.rafal@quant.(none)2007-03-011-0/+1
| * | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145k.mysql.com2007-02-281-0/+7
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge mysql.com:/home/gluh/MySQL/Merge/5.0gluh@mysql.com/eagle.(none)2007-02-261-1/+12
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-rplkostja@bodhi.local2007-03-061-0/+7
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/bar/mysql-5.0.mergebar@mysql.com2007-03-011-0/+7
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rplbar@mysql.com2007-02-281-0/+7
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Bug#15126 character_set_database is not replicated (LOAD DATA INFILE need it)bar@mysql.com2007-02-281-0/+7
| | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-02-211-6/+1
| | |\ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-02-281-11/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.1gluh@eagle.(none)2007-02-261-1/+12
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/gluh/MySQL/Merge/5.0-optgluh@eagle.(none)2007-02-261-1/+12
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | item.cc:evgen@moonbone.local2007-02-241-0/+6
| | | * | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optgkodinov/kgeorge@rakia.gmz2007-02-191-1/+6
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.gkodinov/kgeorge@macbook.gmz2007-02-191-1/+6
| | | | | |_|/ / / / / | | | | |/| | | | | |
| * | | | | | | | | | Fixed compilations problems and warnings on windowsmonty@mysql.com/narttu.mysql.fi2007-02-231-10/+10
| * | | | | | | | | | Merge ppcg5.local:/Users/antony/Work/p3-bug12204.4antony@ppcg5.local2007-02-081-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | / / / / / / | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Bug#12204antony@ppcg5.local2007-02-071-0/+1
| | |/ / / / / / /
* | | | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-02-151-44/+40
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-02-031-38/+30
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2007-01-291-38/+30
| | |\ \ \ \ \ \ \ \