summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
Commit message (Expand)AuthorAgeFilesLines
* Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1tomas@poseidon.2006-12-271-2/+4
|\
| * bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: ALTE...mskold/marty@mysql.com/linux.site2006-12-191-2/+4
* | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-231-2/+1
|\ \
| * | Many files:kent@mysql.com/kent-amd64.(none)2006-12-231-2/+1
| * | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marveldf@kahlann.erinye.com2006-12-011-1/+0
| |\ \
| | * | Fixed portability issue in my_thr_init.c (was added in my last push)monty@mysql.com/narttu.mysql.fi2006-11-301-1/+0
* | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-archpatg@govinda.patg.net2006-12-081-0/+84
|\ \ \ \
| * | | | WL# 3031patg@govinda.patg.net2006-12-081-0/+1
| * | | | WL# 3031patg@radha.tangent.org2006-12-011-0/+83
* | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1pgalbraith@bk-internal.mysql.com2006-12-091-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Additional fix for bug#22369andrey@example.com2006-12-071-1/+1
| * | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1msvensson@neptunus.(none)2006-12-041-15/+4
| |\ \ \ \
| | * | | | Bug#24736: UDF functions parsed as Stored Functionsmalff/marcsql@weblab.(none)2006-12-011-15/+4
* | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1baker@bk-internal.mysql.com2006-12-061-15/+4
|\ \ \ \ \ \
| * | | | | | Apply malff@weblab.(none) fix for bug 24736 directly totsmith/tim@siva.hindu.god2006-12-041-15/+4
| |/ / / / /
* | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1baker@bk-internal.mysql.com2006-12-031-44/+44
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | This finishes the work (someone) started to remove FIELD_ types and use the E...brian@zim.(none)2006-12-011-44/+44
| | |/ / / | |/| | |
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2006-11-301-7/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixed compiler warnings (Mostly VC++):monty@mysql.com/narttu.mysql.fi2006-11-301-7/+4
| |/ / /
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-11-301-3/+4
|\ \ \ \ | | |/ / | |/| |
| * | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0kroki/tomash@moonlight.intranet2006-11-291-0/+2
| |\ \ \
| * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-11-291-8/+30
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge bk@192.168.21.1:mysql-5.0-optholyfoot/hf@mysql.com/deer.(none)2006-11-171-8/+30
| | |\ \ \
| * | | | | Bug#23703 (DROP TRIGGER needs an IF EXISTS)malff/marcsql@weblab.(none)2006-11-131-2/+3
| |/ / / /
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimekostja@bodhi.local2006-11-301-15/+30
|\ \ \ \ \
| * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-11-291-15/+30
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge bk-internal:/home/bk/mysql-5.1gkodinov@dl145s.mysql.com2006-11-281-15/+30
| | |\ \ \ \
| | | * | | | 5.0-opt -> 5.1-opt merge fixed.gkodinov/kgeorge@macbook.gmz2006-11-201-4/+3
| | | * | | | mergingholyfoot/hf@mysql.com/deer.(none)2006-11-181-2/+1
| | | * | | | Merge bk@192.168.21.1:mysql-5.1-optholyfoot/hf@deer.(none)2006-11-171-10/+27
| | | |\ \ \ \
| | | | * \ \ \ Merge mysql.com:/home/hf/work/mysql-5.0.cleanholyfoot/hf@deer.(none)2006-11-081-8/+30
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| |
| | | | | * | | Bug #21809: Error 1356 while selecting from view with grouping though underlyinggkodinov/kgeorge@macbook.gmz2006-10-241-11/+30
* | | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637kroki/tomash@moonlight.intranet2006-11-291-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | BUG#20637: "load data concurrent infile" locks the tablekroki/tomash@moonlight.intranet2006-11-291-0/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-11-291-17/+21
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marveljani@ua141d10.elisa.omakaista.fi2006-11-161-17/+21
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@ua141d10.elisa.omakaista.fi2006-10-171-17/+21
| | |\ \ \ \
| | | * | | | Changed several char* to LEX_STRING*.jani@ua141d10.elisa.omakaista.fi2006-10-161-17/+21
* | | | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimemalff/marcsql@weblab.(none)2006-11-151-3/+57
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Bug#18239 (Possible to overload internal functions with stored functions)malff/marcsql@weblab.(none)2006-11-141-3/+57
* | | | | | | Merge alik.:/mnt/raid/alik/MySQL/devel/5.1anozdrin/alik@alik.2006-11-071-0/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.cornsilk.net2006-11-021-0/+7
| |\ \ \ \ \ \
| | * | | | | | Bug#18888 Trying to overwrite sql/lex_hash.h during buildmsvensson@shellback.(none)2006-10-261-0/+7
| | | |_|_|/ / | | |/| | | |
* | | | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimemalff/marcsql@weblab.(none)2006-11-021-781/+675
|\ \ \ \ \ \ \
| * | | | | | | Bug#21114 (Foreign key creation fails to table with name format)malff/marcsql@weblab.(none)2006-11-021-781/+675
* | | | | | | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeandrey@example.com2006-11-021-13/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Better fix for bug#22830andrey@example.com2006-11-021-13/+3
| |/ / / / / /
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-11-021-41/+115
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge bodhi.local:/opt/local/work/mysql-5.0-runtimekostja@bodhi.local2006-10-231-6/+11
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0kroki/tomash@moonlight.intranet2006-10-121-35/+104
| | |\ \ \ \ \