Commit c5a33802 authored by df@pippilotta.erinye.com's avatar df@pippilotta.erinye.com
Browse files

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
parents d3985375 59b504a5

libmysql/libmysql.c

+3 −1
Original line number Diff line number Diff line
@@ -4682,10 +4682,12 @@ int cli_read_binary_rows(MYSQL_STMT *stmt) 
  NET        *net;

  DBUG_ENTER("cli_read_binary_rows");



  DBUG_ENTER("cli_read_binary_rows");

  

  if (!mysql)

  {

    set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate);

    return 1;

    DBUG_RETURN(1);

  }



  net = &mysql->net;

mysql-test/include/have_bug25714.inc

+1 −1
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ 
#

--require r/have_bug25714.require

disable_query_log;

eval select LENGTH("MYSQL_BUG25714") > 0 as "have_bug25714_exe";

eval select LENGTH("$MYSQL_BUG25714") > 0 as "have_bug25714_exe";

enable_query_log;