# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
Index: moodle/lib/db/install.php
--- moodle/lib/db/install.php Base (1.26)
+++ moodle/lib/db/install.php Locally Modified (Based On 1.26)
@@ -119,8 +119,8 @@
     set_config('mnet_all_hosts_id', $mnetallhosts->id);
 
     /// insert log entries - replaces statements section in install.xml
-    update_log_display_entry('user', 'view', 'user', 'CONCAT(firstname,\' \',lastname)');
-    update_log_display_entry('course', 'user report', 'user', 'CONCAT(firstname,\' \',lastname)');
+    update_log_display_entry('user', 'view', 'user', $DB->sql_concat('firstname', "' '" , 'lastname'));
+    update_log_display_entry('course', 'user report', 'user', $DB->sql_concat('firstname', "' '" , 'lastname'));
     update_log_display_entry('course', 'view', 'course', 'fullname');
     update_log_display_entry('course', 'update', 'course', 'fullname');
     update_log_display_entry('course', 'enrol', 'user', 'course', 'fullname'); // there should be some way to store user id of the enrolled user!
@@ -130,12 +130,12 @@
     update_log_display_entry('course', 'report outline', 'course', 'fullname');
     update_log_display_entry('course', 'report participation', 'course', 'fullname');
     update_log_display_entry('course', 'report stats', 'course', 'fullname');
-    update_log_display_entry('message', 'write', 'user', 'CONCAT(firstname,\' \',lastname)');
-    update_log_display_entry('message', 'read', 'user', 'CONCAT(firstname,\' \',lastname)');
-    update_log_display_entry('message', 'add contact', 'user', 'CONCAT(firstname,\' \',lastname)');
-    update_log_display_entry('message', 'remove contact', 'user', 'CONCAT(firstname,\' \',lastname)');
-    update_log_display_entry('message', 'block contact', 'user', 'CONCAT(firstname,\' \',lastname)');
-    update_log_display_entry('message', 'unblock contact', 'user', 'CONCAT(firstname,\' \',lastname)');
+    update_log_display_entry('message', 'write', 'user', $DB->sql_concat('firstname', "' '" , 'lastname'));
+    update_log_display_entry('message', 'read', 'user', $DB->sql_concat('firstname', "' '" , 'lastname'));
+    update_log_display_entry('message', 'add contact', 'user', $DB->sql_concat('firstname', "' '" , 'lastname'));
+    update_log_display_entry('message', 'remove contact', 'user', $DB->sql_concat('firstname', "' '" , 'lastname'));
+    update_log_display_entry('message', 'block contact', 'user', $DB->sql_concat('firstname', "' '" , 'lastname'));
+    update_log_display_entry('message', 'unblock contact', 'user', $DB->sql_concat('firstname', "' '" , 'lastname'));
     update_log_display_entry('group', 'view', 'groups', 'name');
     update_log_display_entry('tag', 'update', 'tag', 'name');
 
Index: moodle/lib/db/upgrade.php
--- moodle/lib/db/upgrade.php Base (1.471)
+++ moodle/lib/db/upgrade.php Locally Modified (Based On 1.471)
@@ -4886,7 +4886,22 @@
         upgrade_main_savepoint(true, 2010072700);
     }
 
+    if ($oldversion < 2010080200) {
 
+        // We need to fix the use of hard coded CONCAT statements that won't work
+        // in some databases.
+        update_log_display_entry('user', 'view', 'user', $DB->sql_concat('firstname', "' '" , 'lastname'));
+        update_log_display_entry('course', 'user report', 'user', $DB->sql_concat('firstname', "' '" , 'lastname'));
+        update_log_display_entry('message', 'write', 'user', $DB->sql_concat('firstname', "' '" , 'lastname'));
+        update_log_display_entry('message', 'read', 'user', $DB->sql_concat('firstname', "' '" , 'lastname'));
+        update_log_display_entry('message', 'add contact', 'user', $DB->sql_concat('firstname', "' '" , 'lastname'));
+        update_log_display_entry('message', 'remove contact', 'user', $DB->sql_concat('firstname', "' '" , 'lastname'));
+        update_log_display_entry('message', 'block contact', 'user', $DB->sql_concat('firstname', "' '" , 'lastname'));
+        update_log_display_entry('message', 'unblock contact', 'user', $DB->sql_concat('firstname', "' '" , 'lastname'));
+
+        upgrade_main_savepoint(true, 2010080200);
+    }
+
     return true;
 }
 
Index: moodle/version.php
--- moodle/version.php Base (1.1694)
+++ moodle/version.php Locally Modified (Based On 1.1694)
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2010072800;  // YYYYMMDD   = date of the last version bump
+    $version = 2010080200;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 Preview 4+ (Build: 20100802)';  // Human-friendly version name