Ticket #6013: mythtv-6013-restore-handle_character_set_for_partial_restore.patch

programs/scripts/database/mythconverg_restore.pl

@@ -13 +13 @@
 
 # Script info
     $NAME           = 'MythTV Database Restore Script';
-    $VERSION        = '1.0.2';
+    $VERSION        = '1.0.3';
 
 # Some variables we'll use here
     our ($username, $homedir, $mythconfdir, $database_information_file);
@@ -1435 +1435 @@
             {
                 $filter = '^INSERT INTO \`(' .
                           join('|', @partial_restore_tables) . ')\` ';
+                # If doing a whitelist restore, ensure we keep the character
+                # set info to prevent data corruption
+                if (!defined($with_plugin_data))
+                {
+                    $filter = '(40101 SET NAMES |'.$filter.')';
+                }
                 verbose($verbose_level_debug,
                         "\nRestoring partial backup with filter:", $filter);
             }