Merge bk-internal:/home/bk/mysql-5.1-new

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

client/mysqlimport.c

@@ -539,7 +539,7 @@ error:
   pthread_mutex_lock(&counter_mutex);
   counter--;
   pthread_mutex_unlock(&counter_mutex);
-  return error;
+  return 0;
 }