Commit c28069be authored by salle@geopard.(none)'s avatar salle@geopard.(none)
Browse files

Merge akeremidarski@work.mysql.com:/home/bk/mysql 

into geopard.(none):/storage/bk/mysql-3.23
parents e2f1950c 5d2f8e96

innobase/row/row0mysql.c

+19 −4
Original line number Diff line number Diff line
@@ -1012,10 +1012,25 @@ row_update_cascade_for_mysql( 


	err = trx->error_state;



	/* Note that the cascade node is a subnode of another InnoDB

	query graph node. We do a normal lock wait in this node, but

	all errors are handled by the parent node. */



	if (err == DB_LOCK_WAIT) {

		/* Handle lock wait here */

	

		que_thr_stop_for_mysql(thr);



		row_mysql_handle_errors(&err, trx, thr, NULL);

		srv_suspend_mysql_thread(thr);



		/* Note that a lock wait may also end in a lock wait timeout */



		if (trx->error_state != DB_SUCCESS) {



			return(trx->error_state);

		}



		/* Retry operation after a normal lock wait */

		

		goto run_again;

	}

sql/sql_select.cc

+2 −0
Original line number Diff line number Diff line
@@ -4970,6 +4970,8 @@ end_write_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), 
    }

    else

    {

      if (end_of_records)

	DBUG_RETURN(0);

      join->first_record=1;

      VOID(test_if_group_changed(join->group_fields));

    }