Commit 21dc50db authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518 

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


client/mysqltest.c:
  Auto merged
parents c7e8ed38 adff49d9

client/mysqltest.c

+10 −0
Original line number Diff line number Diff line
@@ -5130,6 +5130,14 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command, 
    dynstr_free(&ds_execute_warnings);

  }





  /* Close the statement if - no reconnect, need new prepare */

  if (mysql->reconnect)

  {

    mysql_stmt_close(stmt);

    cur_con->stmt= NULL;

  }



  /*

    We save the return code (mysql_stmt_errno(stmt)) from the last call sent

    to the server into the mysqltest builtin variable $mysql_errno. This
@@ -5935,6 +5943,8 @@ int main(int argc, char **argv) 
        break;

      case Q_ENABLE_RECONNECT:

        set_reconnect(&cur_con->mysql, 1);

        /* Close any open statements - no reconnect, need new prepare */

        close_statements();

        break;

      case Q_DISABLE_PARSING:

        if (parsing_disabled == 0)