From c436f75580c3f22eb8ce6ccd08ec085a082a9da9 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Thu, 13 May 2010 15:14:38 +0000 Subject: [PATCH] 2010-05-13 Miguel de Dios MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * pandoradb.sql: fixed the syntax of sql for compatibility of mysql 5.0 that this versión is used in Debian Lenny for example. Now run in 5.0 and next versións. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2719 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++++++ pandora_console/pandoradb.sql | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 444cf1e100..686cfb20d4 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2010-05-13 Miguel de Dios + + * pandoradb.sql: fixed the syntax of sql for compatibility of mysql 5.0 that + this versión is used in Debian Lenny for example. Now run in 5.0 and next + versións. + 2010-05-13 Sergio Martin * include/functions_ui.php: Fixed negative timestamp diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 8c3e48f9de..25c3f57d32 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -71,7 +71,7 @@ CREATE TABLE IF NOT EXISTS `tagente_datos` ( `datos` double(18,2) default NULL, `utimestamp` bigint(20) default '0', KEY `data_index1` (`id_agente_modulo`), - KEY `idx_utimestamp` (`utimestamp`) USING BTREE + KEY `idx_utimestamp` USING BTREE (`utimestamp`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ; CREATE TABLE IF NOT EXISTS `tagente_datos_inc` ( @@ -89,7 +89,7 @@ CREATE TABLE IF NOT EXISTS `tagente_datos_string` ( `datos` text NOT NULL, `utimestamp` int(20) unsigned NOT NULL default 0, KEY `data_string_index_1` (`id_agente_modulo`), - KEY `idx_utimestamp` (`utimestamp`) USING BTREE + KEY `idx_utimestamp` USING BTREE (`utimestamp`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `tagente_datos_log4x` ( @@ -193,7 +193,7 @@ CREATE TABLE IF NOT EXISTS `tagent_access` ( `id_agent` int(10) unsigned NOT NULL default '0', `utimestamp` bigint(20) NOT NULL default '0', KEY `agent_index` (`id_agent`), - KEY `idx_utimestamp` (`utimestamp`) USING BTREE + KEY `idx_utimestamp` USING BTREE (`utimestamp`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `talert_snmp` ( @@ -921,8 +921,8 @@ CREATE TABLE IF NOT EXISTS `tgis_data_history` ( `number_of_packages` INT NOT NULL DEFAULT 1 COMMENT 'Number of data packages received with this position from the start_timestampa to the_end_timestamp' , `tagente_id_agente` INT(10) UNSIGNED NOT NULL COMMENT 'reference to the agent' , PRIMARY KEY (`id_tgis_data`) , - INDEX `start_timestamp_index` (`start_timestamp` ASC) USING BTREE, - INDEX `end_timestamp_index` (`end_timestamp` ASC) USING BTREE ) + INDEX `start_timestamp_index` USING BTREE (`start_timestamp` ASC), + INDEX `end_timestamp_index` USING BTREE (`end_timestamp` ASC) ) ENGINE = InnoDB COMMENT = 'Table to store historical GIS information of the agents'; @@ -943,7 +943,7 @@ CREATE TABLE IF NOT EXISTS `tgis_data_status` ( `manual_placement` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '0 to show that the position cames from the agent, 1 to show that the position was established manualy' , `description` TEXT NULL COMMENT 'description of the region correoponding to this placemnt' , PRIMARY KEY (`tagente_id_agente`) , - INDEX `start_timestamp_index` (`start_timestamp` ASC) USING BTREE, + INDEX `start_timestamp_index` USING BTREE (`start_timestamp` ASC), INDEX `fk_tgisdata_tagente1` (`tagente_id_agente` ASC) , CONSTRAINT `fk_tgisdata_tagente1` FOREIGN KEY (`tagente_id_agente` )