mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge work:/home/bk/mysql-4.0

Browse source 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
This commit is contained in:
serg@serg.mysql.com 2001-09-18 00:46:16 +02:00
commit 6e31331068
3 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
myisam/mi_write.c
View file

@ -156,6 +156,17 @@ err:
save_errno=my_errno;
if (my_errno == HA_ERR_FOUND_DUPP_KEY || my_errno == HA_ERR_RECORD_FILE_FULL)
{
if (info->bulk_insert)
{
int j;
for (j=0 ; j < share->base.keys ; j++)
{
if (is_tree_inited(& info->bulk_insert[j]))
{
reset_tree(& info->bulk_insert[j]);
}
}
}
info->errkey= (int) i;
while ( i-- > 0)
{

5
mysql-test/r/bulk_replace.result Normal file
View file

@ -0,0 +1,5 @@
a b c
3 1 3
2 2 2
Table Op Msg_type Msg_text
test.t1 check status OK

14
mysql-test/t/bulk_replace.test Normal file
View file

@ -0,0 +1,14 @@
#
# this is a test of bulk-insert code
# as used by REPLACE
#
# by Monty
#
drop table if exists t1;
CREATE TABLE t1 (a int, unique (a), b int not null, unique(b), c int not null, index(c));
replace into t1 values (1,1,1),(2,2,2),(3,1,3);
select * from t1;
check table t1;
drop table t1;