summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-optgkodinov/kgeorge@magare.gmz2007-07-041-0/+1
|\
| * Merge gleb.loc:/home/uchum/work/bk/4.1-optgshchepa/uchum@gleb.loc2007-07-041-0/+1
| |\
| | * Fixed bug #29294.gshchepa/uchum@gleb.loc2007-07-031-0/+1
| * | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpllars/lthalmann@dl145h.mysql.com2007-05-281-3/+3
| |\ \
| | * | BUG#17233 : LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not f...cbell/Chuck@mysql_cab.2007-05-071-3/+3
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.(none)2007-06-011-20/+20
|\ \ \ \
| * \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-05-241-20/+20
| |\ \ \ \
| | * | | | WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-101-20/+20
* | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145h.mysql.com2007-05-281-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | BUG#17233 : LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not f...cbell/Chuck@mysql_cab.2007-05-081-3/+3
| |/ / / /
* | | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optigor@olga.mysql.com2007-05-081-0/+4
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP default value for aevgen@moonbone.local2007-05-091-0/+4
| |/ /
| * | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@ua141d10.elisa.omakaista.fi2007-04-121-8/+9
| |\ \
| * \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.0jamppa@bk-internal.mysql.com2007-04-031-8/+8
| |\ \ \
* | \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@ua141d10.elisa.omakaista.fi2007-04-101-8/+8
|\ \ \ \ \
| * \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marveljani@ua141d10.elisa.omakaista.fi2007-04-031-8/+8
| |\ \ \ \ \
| | * \ \ \ \ Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marveljani@ua141d10.elisa.omakaista.fi2007-03-291-8/+8
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF()aelkin/elkin@andrepl.(none)2007-03-231-8/+8
* | | | | | | Merge mysql.com:/d2/hf/mrg/mysql-5.0-optholyfoot/hf@hfmain.(none)2007-04-091-7/+8
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2007-04-071-7/+8
| |\ \ \ \ \ \
| | * | | | | | Bug#27586: Wrong autoinc value assigned by LOAD DATA in theevgen@moonbone.local2007-04-071-7/+8
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0mskold/marty@mysql.com/linux.site2007-04-051-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Bug #26242 UPDATE with subquery and triggers failing with cluster tablesmskold/marty@mysql.com/linux.site2007-04-041-1/+1
* | | | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1mskold/marty@linux.site2007-04-041-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge from 5.0mskold/marty@mysql.com/linux.site2007-04-041-1/+1
* | | | | | | Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-optevgen@moonbone.local2007-03-311-2/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | / / / | |_|_|/ / / |/| | | | |
| * | | | | Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the evgen@sunlight.local2007-03-301-2/+1
| | |_|/ / | |/| | |
| * | | | Merge bk@192.168.21.1:mysql-5.0holyfoot/hf@mysql.com/hfmain.(none)2007-03-081-1/+1
| |\ \ \ \
| * \ \ \ \ Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0msvensson@pilot.blaudden2007-03-011-3/+9
| |\ \ \ \ \
* | \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.1holyfoot/hf@hfmain.(none)2007-03-081-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge mysql.com:/home/hf/work/mrg/mysql-5.0-optholyfoot/hf@hfmain.(none)2007-03-081-1/+1
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | / / / | | |_|_|/ / / | |/| | | | |
| | * | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2007-03-021-1/+1
| | |\ \ \ \ \
| | | * | | | | Bug#25122: Views based on a self-joined table aren't insertable.evgen@moonbone.local2007-03-021-1/+1
* | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimetsmith@quadxeon.mysql.com2007-03-071-0/+9
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.mysql.com2007-02-141-0/+9
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | / / / / | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Bug#18628 mysql-test-run: security problem(part1)msvensson@pilot.mysql.com2007-02-141-0/+9
| | | |/ / / / | | |/| | | |
* | | | | | | Merge mysql.com:/home/bar/mysql-5.0.mergebar@mysql.com2007-03-011-1/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rplbar@mysql.com2007-02-281-1/+2
| |\ \ \ \ \ \
| | * | | | | | Bug#15126 character_set_database is not replicated (LOAD DATA INFILE need it)bar@mysql.com2007-02-281-1/+2
| | | |/ / / / | | |/| | | |
* | | | | | | Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-mergelars/lthalmann@dl145k.mysql.com2007-02-271-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-mergelars/lthalmann@mysql.com/dl145j.mysql.com2007-02-271-1/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| |
| | * | | Fix for BUG#26050 "LOAD DATA INFILE breaks ACID"; the ok must be sentgbichot@dl145h.mysql.com2007-02-261-1/+3
* | | | | Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-01-271-1/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-221-1/+5
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-12-151-1/+5
| | |\ \ \
| | | * | | Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-151-1/+5
| | | | |/ | | | |/|
* | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2007-01-121-2/+0
|\ \ \ \ \
| * | | | | WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.cbell/Chuck@suse.vabb.com2006-12-071-2/+0
* | | | | | 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