summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | 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-1/+13
|\ \ \ \ \
| * \ \ \ \ Merge mysql.com:/home/hf/work/22372/my50-22372holyfoot/hf@deer.(none)2006-12-071-1/+13
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |
| | * | | mergingholyfoot/hf@mysql.com/deer.(none)2006-12-071-1/+1
| | * | | Merge mysql.com:/home/hf/work/22372/my41-22372holyfoot/hf@mysql.com/deer.(none)2006-12-061-1/+13
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * bug #22372 (LOAD DATA crashes the table with the geometry field)holyfoot/hf@mysql.com/deer.(none)2006-12-061-2/+12
| | | * BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID.kroki/tomash@moonlight.intranet2006-10-061-8/+4
| | * | BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_IDkroki/tomash@moonlight.intranet2006-10-021-8/+4
* | | | This finishes the work (someone) started to remove FIELD_ types and use the E...brian@zim.(none)2006-12-011-1/+1
|/ / /
* | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50tsmith@maint2.mysql.com2006-09-131-5/+0
|\ \ \ | |/ /
| * | Fix for BUG#11151 "LOAD DATA INFILE commits transaction in 5.0".guilhem@gbichot3.local2006-09-051-5/+0
* | | Merge moonbone.local:/work/tmp_merge-5.0-mysqlevgen@moonbone.local2006-08-291-0/+1
|\ \ \ | |/ /
| * | Fixed bug#21261: Wrong access rights was required for an insert into a viewevgen@sunlight.local2006-08-151-0/+1
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-07-131-22/+1
|\ \ \
| * | | WL#3146 "less locking in auto_increment":guilhem@gbichot3.local2006-07-091-22/+1
* | | | After merge fixes for patch solving bug#18437 "Wrong values inserted with adlenev@mysql.com2006-07-061-10/+4
* | | | Merge mysql.com:/home/dlenev/mysql-5.0-bg18437-3dlenev@mysql.com2006-07-021-0/+10
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Fix for bug#18437 "Wrong values inserted with a before update trigger ondlenev@mysql.com2006-07-021-0/+10
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newmonty@mysql.com2006-06-041-26/+22
|\ \ \
| * | | This changeset is largely a handler cleanup changeset (WL#3281), but includes...monty@mysql.com2006-06-041-26/+22
* | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-newguilhem@mysql.com2006-06-021-3/+5
|\ \ \ \
| * | | | First push for WL#3146 "less locking in auto_increment". It is a 0-real-chang...guilhem@mysql.com2006-06-021-3/+5
| |/ / /
* | | | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0jani@a193-229-222-105.elisa-laajakaista.fi2006-05-301-4/+5
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | BUG#18681: View privileges are brokengkodinov@mysql.com2006-05-261-4/+5
* | | Final patch to remove the last of the OS2 support. brian@zim.(none)2006-04-151-3/+1
* | | Merge mysql.com:/opt/local/work/tmp_merge2konstantin@mysql.com2006-03-301-2/+3
|\ \ \ | |/ /
| * | Proposed fix for bug #17764 "Trigger crashes MyISAM table"dlenev@mysql.com2006-03-291-2/+3
| * | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1tomas@poseidon.ndb.mysql.com2006-02-071-2/+5
| |\ \ | | |/