Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1

into deer.(none):/home/hf/work/mysql-4.1.stmt

libmysqld/lib_sql.cc

@@ -128,6 +128,8 @@ static MYSQL_FIELD * STDCALL emb_list_fields(MYSQL *mysql)
 static my_bool STDCALL emb_read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt)
 {
   THD *thd= (THD*)mysql->thd;
+  if (mysql->net.last_errno)
+    return 1;
   stmt->stmt_id= thd->client_stmt_id;
   stmt->param_count= thd->client_param_count;
   stmt->field_count= mysql->field_count;

sql/sql_prepare.cc

@@ -169,6 +169,7 @@ static bool send_prep_stmt(PREP_STMT *stmt, uint columns __attribute__((unused))
 
   thd->client_stmt_id= stmt->stmt_id;
   thd->client_param_count= stmt->param_count;
+  thd->net.last_errno= 0;
 
   return 0;
 }