merged fix for 5648, utf8 migration problem

diff --git a/mod/lesson/db/migrate2utf8.xml b/mod/lesson/db/migrate2utf8.xml
index 8fa6f95b0039df2f89aea0b1ac1d32307bce06d6..0e4da1551e5823c97b6975fb83b7048154b83ad5 100755 (executable)
--- a/mod/lesson/db/migrate2utf8.xml
+++ b/mod/lesson/db/migrate2utf8.xml
@@ -47,6 +47,7 @@
            migrate2utf8_lesson_default_password(RECORDID)
           </PHP_FUNCTION>
         </FIELD>
+        <FIELD name="conditions" method="NO_CONV" type="text" length="0" />
         <FIELD name="bgcolor" method="NO_CONV" type="varchar" length="7" default="#FFFFFF" />
       </FIELDS>
     </TABLE>

diff --git a/mod/quiz/db/migrate2utf8.xml b/mod/quiz/db/migrate2utf8.xml
index de721ad4e6497e0128e0752ff71e5e4dc44bc4db..6e198223fd60c8dd0d0c5e650f3e50114765eb1a 100755 (executable)
--- a/mod/quiz/db/migrate2utf8.xml
+++ b/mod/quiz/db/migrate2utf8.xml
@@ -7,6 +7,11 @@
     <TABLE name="quiz_question_versions" />
     <TABLE name="question_randomsamatch" />
     <TABLE name="question_truefalse" />
+    <TABLE name="question_attempts">
+      <FIELDS>
+        <FIELD name="modulename" method="NO_CONV" type="varchar" length="20" />
+      </FIELDS>
+    </TABLE>
     <TABLE name="question_rqp">
       <FIELDS>
         <FIELD name="format" method="NO_CONV" type="varchar" length="255" />