summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-02-18 16:20:14 +0100
committerunknown <msvensson@neptunus.(none)>2006-02-18 16:20:14 +0100
commit309f51cd28625316f2eb2ad34ba0f95b0d986264 (patch)
tree3246bffa82841ea0d2fb4b506cabbc1795680022
parentff94b12491cb6b71e840a6a91769d35617dcc1c3 (diff)
parentc8073e58c66a9415673763444c80ffdc849b6308 (diff)
downloadmariadb-git-309f51cd28625316f2eb2ad34ba0f95b0d986264.tar.gz
Merge bk-internal:/home/bk/mysql-5.1-new
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
-rw-r--r--client/mysqlimport.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c
index 5a3e017399b..df36a9f0c00 100644
--- a/client/mysqlimport.c
+++ b/client/mysqlimport.c
@@ -539,7 +539,7 @@ error:
pthread_mutex_lock(&counter_mutex);
counter--;
pthread_mutex_unlock(&counter_mutex);
- return error;
+ return 0;
}