From 033d656617bd841586d7d9585ce7896c47c26fb1 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Sun, 9 Oct 2011 22:15:27 +0200 Subject: [PATCH 1/2] MDL-29520 - mysql multitable delete, outer join some tables --- question/engine/datalib.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/question/engine/datalib.php b/question/engine/datalib.php index a0eeb38282d..092eaa15851 100644 --- a/question/engine/datalib.php +++ b/question/engine/datalib.php @@ -695,8 +695,8 @@ ORDER BY DELETE qu, qa, qas, qasd FROM {question_usages} qu JOIN {question_attempts} qa ON qa.questionusageid = qu.id - JOIN {question_attempt_steps} qas ON qas.questionattemptid = qa.id - JOIN {question_attempt_step_data} qasd ON qasd.attemptstepid = qas.id + LEFT JOIN {question_attempt_steps} qas ON qas.questionattemptid = qa.id + LEFT JOIN {question_attempt_step_data} qasd ON qasd.attemptstepid = qas.id WHERE qu.id ' . $qubaids->usage_id_in(), $qubaids->usage_id_in_params()); } @@ -713,7 +713,7 @@ ORDER BY $this->db->execute(' DELETE qas, qasd FROM {question_attempt_steps} qas - JOIN {question_attempt_step_data} qasd ON qasd.attemptstepid = qas.id + LEFT JOIN {question_attempt_step_data} qasd ON qasd.attemptstepid = qas.id WHERE qas.questionattemptid ' . $test, $params); } From b77088cd0483167b5c4d2d8419df6796d89b3676 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Sun, 9 Oct 2011 22:40:35 +0200 Subject: [PATCH 2/2] emergency release 2.2dev --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index ae350fd63e4..f9757d8e7e9 100644 --- a/version.php +++ b/version.php @@ -31,10 +31,10 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2011100700.00; // YYYYMMDD = weekly release date of this DEV branch +$version = 2011100700.01; // YYYYMMDD = weekly release date of this DEV branch // RR = release increments - 00 in DEV branches // .XX = incremental changes -$release = '2.2dev (Build: 20111007)'; // Human-friendly version name +$release = '2.2dev (Build: 20111009)'; // Human-friendly version name $maturity = MATURITY_ALPHA; // this version's maturity level