From 36ef345eb6425106f061fb866d9fa66d051e16df Mon Sep 17 00:00:00 2001 From: brettp Date: Mon, 5 Apr 2010 16:08:42 +0000 Subject: Merged 5530:5604 from 1.7 to trunk. git-svn-id: http://code.elgg.org/elgg/trunk@5622 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/schema/upgrades/2009100701.sql | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) (limited to 'engine/schema') diff --git a/engine/schema/upgrades/2009100701.sql b/engine/schema/upgrades/2009100701.sql index 0c89441d4..dbf52b4da 100644 --- a/engine/schema/upgrades/2009100701.sql +++ b/engine/schema/upgrades/2009100701.sql @@ -1,27 +1,2 @@ -SET NAMES utf8; - -ALTER TABLE `prefix_metastrings` DISABLE KEYS; -REPLACE INTO `prefix_metastrings` (id, string) - SELECT id, unhex(hex(convert(string using latin1))) - FROM `prefix_metastrings`; -ALTER TABLE `prefix_metastrings` ENABLE KEYS; - -ALTER TABLE `prefix_groups_entity` DISABLE KEYS; -REPLACE INTO `prefix_groups_entity` (guid, name, description) - SELECT guid, unhex(hex(convert(name using latin1))), unhex(hex(convert(description using latin1))) - FROM `prefix_groups_entity`; -ALTER TABLE `prefix_groups_entity` ENABLE KEYS; - -ALTER TABLE `prefix_objects_entity` DISABLE KEYS; -REPLACE INTO `prefix_objects_entity` (guid, title, description) - SELECT guid, unhex(hex(convert(title using latin1))), unhex(hex(convert(description using latin1))) - FROM `prefix_objects_entity`; -ALTER TABLE `prefix_objects_entity` ENABLE KEYS; - -ALTER TABLE `prefix_users_entity` DISABLE KEYS; -REPLACE INTO `prefix_users_entity` (guid, name, username, password, salt, email, language, code, - banned, last_action, prev_last_action, last_login, prev_last_login) - SELECT guid, unhex(hex(convert(name using latin1))), username, password, salt, email, language, code, - banned, last_action, prev_last_action, last_login, prev_last_login - FROM `prefix_users_entity`; -ALTER TABLE `prefix_users_entity` ENABLE KEYS; +-- Previously was the UTF8 migration that is now in code at 2010033101. +-- Keeping this file to force an overwrite and to avoid confusion with missing migrations. -- cgit v1.2.3