summaryrefslogtreecommitdiff
path: root/sql/field.cc
Commit message (Expand)AuthorAgeFilesLines
* Removed not used define YY_MAGIC_BELOWmonty@mysql.com/narttu.mysql.fi2007-03-231-48/+73
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2007-03-201-3/+3
|\
| * Manual merge from 5.0-runtime to 5.1-runtimemalff/marcsql@weblab.(none)2007-03-141-3/+3
* | Merge magare.gmz:/home/kgeorge/mysql/work/B26794-5.0-optgkodinov/kgeorge@magare.gmz2007-03-121-0/+1
|\ \
| * | Bug #26794:gkodinov/kgeorge@magare.gmz2007-03-121-0/+1
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-02-211-102/+95
| |\ \
* | \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimetsmith@quadxeon.mysql.com2007-03-071-10/+13
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-mainttnurnberg@sin.intern.azundris.com2007-03-031-10/+13
| |\ \ \
| | * \ \ Merge mysql.com:/home/tnurnberg/21103/50-21103tnurnberg@sin.intern.azundris.com2007-03-021-10/+13
| | |\ \ \
| | | * | | Bug #21103: DATE column not compared as DATEtnurnberg@mysql.com/sin.intern.azundris.com2007-03-021-10/+13
| | | |/ /
* | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145k.mysql.com2007-02-281-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Remove compiler warningsmonty@mysql.com/narttu.mysql.fi2007-02-271-5/+3
| * | | | Fixes for compiler warnings.jani@a88-113-38-195.elisa-laajakaista.fi2007-02-271-0/+2
| |/ / /
* | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145h.mysql.com2007-02-241-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Merge mysql.com:/home/bar/mysql-5.0.b25815bar@mysql.com2007-01-311-1/+1
| |\ \ \
| | * | | Bug#25815 Data truncated for column TEXTbar@mysql.com2007-01-241-1/+1
* | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1msvensson@neptunus.(none)2007-02-061-104/+97
|\ \ \ \ \
| * | | | | After merge fixesmonty@mysql.com/narttu.mysql.fi2007-01-291-7/+7
| * | | | | Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-01-271-97/+90
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-221-102/+95
| | |\ \ \ \
| | | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-12-151-102/+95
| | | |\ \ \ \
| | | | * | | | Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-151-102/+95
* | | | | | | | Merge mysql.com:/home/ram/work/b19690/b19690.5.0ramil/ram@ramil.myoffice.izhnet.ru2007-01-311-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge mysql.com:/home/ram/work/b19690/b19690.4.1ramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-01-311-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | fix for bug #19690: ORDER BY eliminates rows from the resultramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-01-311-1/+1
| * | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/myoffice.izhnet.ru2007-01-181-0/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2007-01-111-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/g50tsmith/tim@siva.hindu.god2006-12-261-2/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/g50tsmith/tim@siva.hindu.god2006-12-211-2/+4
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge polly.local:/tmp/maint/bug24117/my50-bug24117kaa@polly.local2006-12-141-0/+10
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maintramil/ram@myoffice.izhnet.ru2007-01-191-0/+2
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maintramil/ram@myoffice.izhnet.ru2007-01-181-0/+2
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge mysql.com:/usr/home/ram/work/bug22533/my50-bug22533ramil/ram@myoffice.izhnet.ru2007-01-181-0/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | * | | | | | | | | after merge fix.ramil/ram@mysql.com/myoffice.izhnet.ru2007-01-181-0/+2
* | | | | | | | | | | | Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51tsmith@siva.hindu.god2007-01-181-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.cornsilk.net2007-01-071-0/+10
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/g51tsmith/tim@siva.hindu.god2006-12-261-0/+10
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/g51tsmith/tim@siva.hindu.god2006-12-211-2/+4
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge polly.local:/tmp/maint/bug24117/my51-bug24117kaa@polly.local2006-12-151-0/+10
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge polly.local:/tmp/maint/bug24117/my50-bug24117kaa@polly.local2006-12-151-0/+10
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / | | | | |/| | | | / / / / / / | | | | | | |_|_|/ / / / / / | | | | | |/| | | | | | | |
| | | | | * | | | | | | | | Fix for bug #24117 "server crash on a FETCH with a cursor on a table which is...kaa@polly.local2006-12-141-0/+10
| | | | | | |/ / / / / / / | | | | | |/| | | | | | |
* | | | | | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2007-01-121-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merging with mysql-5.1-new-rplmats@romeo.(none)2006-12-111-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | BUG#24490 (segfault inside unpack_row at Field_bit_as_char::set_default()):mats@romeo.(none)2006-12-051-3/+6
| | | |/ / / / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | / / / | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | my_strtoll10-x86.s:kent@mysql.com/kent-amd64.(none)2006-12-311-1/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | 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 bk-internal.mysql.com:/data0/bk/mysql-5.1baker@bk-internal.mysql.com2006-12-181-2/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge mysql.com:/home/hf/work/22372/my50-22372holyfoot/hf@deer.(none)2006-12-071-2/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | / / / / / / | | |/ / / / / / | |/| | | | | |