Merge ramayana.hindu.god:/home/tsmith/m/bk/50

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


configure.in:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
libmysql/libmysql.c:
  Manual merge
This commit is contained in:
unknown 2007-09-28 10:54:49 -06:00
commit ba0cd51eb1
19 changed files with 558 additions and 839 deletions

View file

@ -4699,7 +4699,7 @@ int cli_read_binary_rows(MYSQL_STMT *stmt)
if (!mysql)
{
set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate);
return 1;
DBUG_RETURN(1);
}
net = &mysql->net;