Merge
This commit is contained in:
commit
5932330839
@ -496,4 +496,11 @@ SELECT * FROM t1;
|
||||
col0
|
||||
test
|
||||
DROP TABLE t1;
|
||||
#
|
||||
# Bug #52512 : Assertion `! is_set()' in
|
||||
# Diagnostics_area::set_ok_status on LOAD DATA
|
||||
#
|
||||
CREATE TABLE t1 (id INT NOT NULL);
|
||||
LOAD DATA LOCAL INFILE 'tb.txt' INTO TABLE t1;
|
||||
DROP TABLE t1;
|
||||
End of 5.1 tests
|
||||
|
@ -560,4 +560,24 @@ let $MYSQLD_DATADIR= `select @@datadir`;
|
||||
remove_file $MYSQLD_DATADIR/test/t1.txt;
|
||||
|
||||
|
||||
--echo #
|
||||
--echo # Bug #52512 : Assertion `! is_set()' in
|
||||
--echo # Diagnostics_area::set_ok_status on LOAD DATA
|
||||
--echo #
|
||||
|
||||
connect (con1,localhost,root,,test);
|
||||
|
||||
CREATE TABLE t1 (id INT NOT NULL);
|
||||
--send LOAD DATA LOCAL INFILE 'tb.txt' INTO TABLE t1
|
||||
# please keep this is a spearate test file : it's important to have no
|
||||
# commands after this one
|
||||
|
||||
connection default;
|
||||
dirty_close con1;
|
||||
|
||||
connect (con1,localhost,root,,test);
|
||||
DROP TABLE t1;
|
||||
connection default;
|
||||
disconnect con1;
|
||||
|
||||
--echo End of 5.1 tests
|
||||
|
@ -902,7 +902,13 @@ my_real_read(NET *net, size_t *complen)
|
||||
("Packets out of order (Found: %d, expected %u)",
|
||||
(int) net->buff[net->where_b + 3],
|
||||
net->pkt_nr));
|
||||
#ifdef EXTRA_DEBUG
|
||||
/*
|
||||
We don't make noise server side, since the client is expected
|
||||
to break the protocol for e.g. --send LOAD DATA .. LOCAL where
|
||||
the server expects the client to send a file, but the client
|
||||
may reply with a new command instead.
|
||||
*/
|
||||
#if defined (EXTRA_DEBUG) && !defined (MYSQL_SERVER)
|
||||
fflush(stdout);
|
||||
fprintf(stderr,"Error: Packets out of order (Found: %d, expected %d)\n",
|
||||
(int) net->buff[net->where_b + 3],
|
||||
|
@ -933,6 +933,10 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
|
||||
DBUG_RETURN(1);
|
||||
}
|
||||
}
|
||||
|
||||
if (thd->is_error())
|
||||
read_info.error= 1;
|
||||
|
||||
if (read_info.error)
|
||||
break;
|
||||
if (skip_lines)
|
||||
|
Loading…
x
Reference in New Issue
Block a user