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

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


libmysql/libmysql.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
configure.in:
  Use local (manual merge)

libmysql/libmysql.c

@@ -4692,7 +4692,7 @@ int cli_read_binary_rows(MYSQL_STMT *stmt)
   NET        *net;
 
   DBUG_ENTER("cli_read_binary_rows");
-  
+
   if (!mysql)
   {
     set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate);