Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | manual merge | Tatiana A. Nurnberg | 2008-09-18 | 1 | -5/+7 |
|\ | |||||
| * | Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DAT... | Tatiana A. Nurnberg | 2008-09-18 | 1 | -4/+5 |
* | | auto-merge | Tatiana A. Nurnberg | 2008-09-17 | 1 | -1/+185 |
|\ \ | |/ | |||||
| * | Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DAT... | Tatiana A. Nurnberg | 2008-09-17 | 1 | -1/+180 |
* | | Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-bt | anozdrin/alik@quad.opbmk | 2008-03-28 | 1 | -0/+82 |
|\ \ | |/ | |||||
| * | Fix tree: | anozdrin/alik@quad.opbmk | 2008-03-28 | 1 | -4/+4 |
| * | Fix for Bug#35469: server crash with LOAD DATA INFILE to a VIEW. | anozdrin/alik@quad.opbmk | 2008-03-28 | 1 | -0/+82 |
| * | Remove unportable constructs in loaddata.test | msvensson@pilot.(none) | 2007-08-28 | 1 | -12/+10 |
* | | Remove unportable construct in loaddata.test | msvensson@pilot.(none) | 2007-08-28 | 1 | -1/+1 |
* | | Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint | msvensson@pilot.(none) | 2007-08-28 | 1 | -12/+10 |
|\ \ | |||||
| * | | Remove unportable constructs in loaddata.test | msvensson@pilot.(none) | 2007-08-28 | 1 | -12/+10 |
| |/ | |||||
* | | Merge gleb.loc:/home/uchum/work/bk/5.0-opt | gshchepa/uchum@gleb.loc | 2007-07-07 | 1 | -0/+25 |
|\ \ | |/ | |||||
| * | Fixed bug #29442. | gshchepa/uchum@gleb.loc | 2007-07-06 | 1 | -0/+25 |
* | | Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-opt | gkodinov/kgeorge@magare.gmz | 2007-07-04 | 1 | -0/+35 |
|\ \ | |/ | |||||
| * | loaddata.result, loaddata.test: | gshchepa/uchum@gleb.loc | 2007-07-04 | 1 | -7/+7 |
| * | Merge gleb.loc:/home/uchum/work/bk/4.1-opt | gshchepa/uchum@gleb.loc | 2007-07-04 | 1 | -0/+35 |
| |\ | |||||
| | * | loaddata.result, loaddata.test: | gshchepa/uchum@gleb.loc | 2007-07-03 | 1 | -2/+1 |
| | * | Fixed bug #29294. | gshchepa/uchum@gleb.loc | 2007-07-03 | 1 | -1/+37 |
* | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt | epotemkin@bk-internal.mysql.com | 2007-05-09 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | loaddata.result, loaddata.test: | evgen@moonbone.local | 2007-05-09 | 1 | -2/+2 |
* | | | Merge olga.mysql.com:/home/igor/mysql-5.0-opt | igor@olga.mysql.com | 2007-05-08 | 1 | -0/+26 |
|\ \ \ | |/ / | |||||
| * | | Bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP default value for a | evgen@moonbone.local | 2007-05-09 | 1 | -0/+26 |
* | | | Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt | holyfoot/hf@hfmain.(none) | 2007-04-09 | 1 | -0/+16 |
|\ \ \ | |/ / | |||||
| * | | Bug#27586: Wrong autoinc value assigned by LOAD DATA in the | evgen@moonbone.local | 2007-04-07 | 1 | -0/+16 |
* | | | Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build | kent@kent-amd64.(none) | 2007-03-20 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Fix bug#27212, test case "loaddata": Take the file to read from the binary pa... | joerg@trift2. | 2007-03-16 | 1 | -2/+2 |
* | | | Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint | msvensson@pilot.mysql.com | 2007-02-14 | 1 | -0/+23 |
|\ \ \ | |/ / | |||||
| * | | Bug#18628 mysql-test-run: security problem(part1) | msvensson@pilot.mysql.com | 2007-02-14 | 1 | -0/+23 |
* | | | This changeset is largely a handler cleanup changeset (WL#3281), but includes... | monty@mysql.com | 2006-06-04 | 1 | -0/+4 |
* | | | Fix test cases to work with non-standard --vardir. | knielsen@mysql.com | 2006-02-22 | 1 | -1/+1 |
* | | | Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var | msvensson@neptunus.(none) | 2006-01-24 | 1 | -21/+21 |
|\ \ \ | |/ / | |||||
| * | | Make it possible to run mysql-test-run.pl with default test suite in differen... | msvensson@neptunus.(none) | 2006-01-24 | 1 | -21/+21 |
* | | | loaddata.result, loaddata.test: | bar@mysql.com | 2006-01-18 | 1 | -0/+24 |
|/ / | |||||
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-clean | jimw@mysql.com | 2005-10-26 | 1 | -1/+11 |
|\ \ | |/ | |||||
| * | Fix merge of test that left out a drop table. | jimw@mysql.com | 2005-10-21 | 1 | -0/+1 |
| * | Merge mysql.com:/home/jimw/my/mysql-4.1-11203 | jimw@mysql.com | 2005-10-21 | 1 | -1/+9 |
| |\ | |||||
| | * | Fix LOAD DATA to handle having the escape and enclosed-by character | jimw@mysql.com | 2005-06-22 | 1 | -0/+8 |
* | | | Merge from 4.1 to 5.0 | msvensson@neptunus.(none) | 2005-09-23 | 1 | -0/+1 |
* | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 | msvensson@neptunus.(none) | 2005-09-23 | 1 | -0/+27 |
|\ \ \ | |/ / | |||||
| * | | Fix for bug#12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting | gluh@eagle.intranet.mysql.r18.ru | 2005-09-22 | 1 | -0/+27 |
* | | | Merge mysql.com:/home/my/mysql-4.1 | monty@mysql.com | 2005-07-28 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | Added end marker for tests to make future merges easier | monty@mysql.com | 2005-07-28 | 1 | -0/+1 |
| |/ | |||||
* | | Fixed behavior of LOAD DATA with subqueries in SET clause. | dlenev@brandersnatch.localdomain | 2005-03-16 | 1 | -2/+11 |
* | | WL#874 "Extended LOAD DATA". | dlenev@brandersnatch.localdomain | 2005-03-16 | 1 | -0/+34 |
|/ | |||||
* | Merge with 4.0.17 | monty@mysql.com | 2003-12-17 | 1 | -0/+11 |
|\ | |||||
| * | Extend max_allowed_packet to 2G in mysql and mysqldump (Bug #2105) | monty@mysql.com | 2003-12-14 | 1 | -0/+11 |
* | | merge with 4.0.15 | monty@narttu.mysql.fi | 2003-08-29 | 1 | -0/+5 |
|\ \ | |/ | |||||
| * | Move test that uses many tables (in query_cache.test) to separate test so tha... | monty@narttu.mysql.fi | 2003-08-22 | 1 | -3/+4 |
* | | Cleanups | monty@narttu.mysql.fi | 2003-08-26 | 1 | -4/+0 |
* | | Merge with 4.0.13 | monty@narttu.mysql.fi | 2003-06-04 | 1 | -0/+8 |
|\ \ | |/ |