Roll-back of #333054; needs more discussion.

2 files changed, 8 insertions, 13 deletions

diff --git a/modules/locale/locale.install b/modules/locale/locale.install
index 32d7d18d0..d9ef10afb 100644
--- a/modules/locale/locale.install
+++ b/modules/locale/locale.install
@@ -5,6 +5,10 @@
  * Implementation of hook_install().
  */
 function locale_install() {
+  // locales_source.source and locales_target.target are not used as binary
+  // fields; non-MySQL database servers need to ensure the field type is text
+  // and that LIKE produces a case-sensitive comparison.
+
   // Create tables.
   drupal_install_schema('locale');
 
@@ -350,6 +354,7 @@ function locale_schema() {
       ),
       'source' => array(
         'type' => 'text',
+        'mysql_type' => 'blob',
         'not null' => TRUE,
         'description' => 'The original string in English.',
       ),
@@ -378,6 +383,7 @@ function locale_schema() {
       ),
       'translation' => array(
         'type' => 'text',
+        'mysql_type' => 'blob',
         'not null' => TRUE,
         'description' => 'Translation string value in this language.',
       ),
diff --git a/modules/locale/locale.test b/modules/locale/locale.test
index 258eb5125..9e793dffb 100644
--- a/modules/locale/locale.test
+++ b/modules/locale/locale.test
@@ -391,9 +391,8 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase {
     // This is the language indicator on the translation search screen for
     // untranslated strings. Copied straight from locale.inc.
     $language_indicator = "<em class=\"locale-untranslated\">$langcode</em> ";
-    // This will be the translation of $name. Make sure it contains at least
-    // one lower-case character in order to check case-sensitive search.
-    $translation = $this->randomName(16) . 'x';
+    // This will be the translation of $name.
+    $translation = $this->randomName(16);
 
     // Add custom language.
     $this->drupalLogin($admin_user);
@@ -470,16 +469,6 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase {
     $this->drupalPost('admin/international/translate/translate', $search, t('Filter'));
     $this->assertNoText(t('No strings found for your search.'), t('Search found the translation.'));
 
-    // Ensure string search is case-sensitive.
-    $search = array(
-      'string' => drupal_strtoupper($translation),
-      'language' => 'all',
-      'translation' => 'translated',
-      'group' => 'all',
-    );
-    $this->drupalPost('admin/international/translate/translate', $search, t('Filter'));
-    $this->assertText(t('No strings found for your search.'), t("Search didn't find the translation."));
-
     // Ensure translated source string doesn't appear if searching on 'only
     // untranslated strings'.
     $search = array(