From b0664f1eb44024913109276e25c75349f07b8c26 Mon Sep 17 00:00:00 2001 From: brettp Date: Wed, 28 Oct 2009 19:17:13 +0000 Subject: Got rid of the silly conditional comments in the db upgrade now that I know what they are. git-svn-id: http://code.elgg.org/elgg/trunk@3595 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/schema/upgrades/2009100701.sql | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'engine/schema') diff --git a/engine/schema/upgrades/2009100701.sql b/engine/schema/upgrades/2009100701.sql index 1ba083416..62ffac354 100644 --- a/engine/schema/upgrades/2009100701.sql +++ b/engine/schema/upgrades/2009100701.sql @@ -1,35 +1,35 @@ SET NAMES utf8; LOCK TABLES `prefix_metastrings` WRITE; -/*!40000 ALTER TABLE `prefix_metastrings` DISABLE KEYS */; -REPLACE INTO `prefix_metastrings` (id, string) - SELECT id, unhex(hex(convert(string using latin1))) +ALTER TABLE `prefix_metastrings` DISABLE KEYS; +REPLACE INTO `prefix_metastrings` (id, string) + SELECT id, unhex(hex(convert(string using latin1))) FROM `prefix_metastrings`; -/*!40000 ALTER TABLE `prefix_metastrings` ENABLE KEYS */; +ALTER TABLE `prefix_metastrings` ENABLE KEYS; UNLOCK TABLES; LOCK TABLES `prefix_groups_entity` WRITE; -/*!40000 ALTER TABLE `prefix_groups_entity` DISABLE KEYS */; -REPLACE INTO `prefix_groups_entity` (guid, name, description) +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`; -/*!40000 ALTER TABLE `prefix_groups_entity` ENABLE KEYS */; +ALTER TABLE `prefix_groups_entity` ENABLE KEYS; UNLOCK TABLES; LOCK TABLES `prefix_objects_entity` WRITE; -/*!40000 ALTER TABLE `prefix_objects_entity` DISABLE 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`; -/*!40000 ALTER TABLE `prefix_objects_entity` ENABLE KEYS */; +ALTER TABLE `prefix_objects_entity` ENABLE KEYS; UNLOCK TABLES; LOCK TABLES `prefix_users_entity` WRITE; -/*!40000 ALTER TABLE `prefix_users_entity` DISABLE KEYS */; -REPLACE INTO `prefix_users_entity` (guid, name, username, password, salt, email, language, code, +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`; -/*!40000 ALTER TABLE `prefix_users_entity` ENABLE KEYS */; +ALTER TABLE `prefix_users_entity` ENABLE KEYS; UNLOCK TABLES; -- cgit v1.2.3