From 8616146e8f9988c9ca8d2d2375902fef482ff0bb Mon Sep 17 00:00:00 2001 From: slerena Date: Wed, 30 Dec 2009 19:26:05 +0000 Subject: [PATCH] 2009-12-29 Sancho Lerena * pandoradb.sql: upps, too small, in huge systems could give a problem in the autoinsert ID. * extras/pandoradb_migrate_v2.x_to_v3.0.sql: Fixed a broken line that make problems in our upgrade script. Added upgrade for update manager from 2.x to 3.0 version URL. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2259 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ .../extras/pandoradb_migrate_v2.x_to_v3.0.sql | 11 +++++++---- pandora_console/pandoradb.sql | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 792ec7c63c..eff552dc86 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,5 +1,12 @@ 2009-12-29 Sancho Lerena + * pandoradb.sql: upps, too small, in huge systems could give a + problem in the autoinsert ID. + + * extras/pandoradb_migrate_v2.x_to_v3.0.sql: Fixed a broken line + that make problems in our upgrade script. Added upgrade for + update manager from 2.x to 3.0 version URL. + * include/Image/image_functions.php: PHP 5.2 and higher does not support (deprecated) get_mimetype. Avoiding headers lets the browser to decide contents of stream and now this works diff --git a/pandora_console/extras/pandoradb_migrate_v2.x_to_v3.0.sql b/pandora_console/extras/pandoradb_migrate_v2.x_to_v3.0.sql index 9e91725d23..60ea33ae5d 100644 --- a/pandora_console/extras/pandoradb_migrate_v2.x_to_v3.0.sql +++ b/pandora_console/extras/pandoradb_migrate_v2.x_to_v3.0.sql @@ -18,9 +18,7 @@ ALTER TABLE `tagente_datos` DROP `timestamp`, DROP `id_agente`; ALTER TABLE `tagente_datos_inc` DROP `timestamp`; ALTER TABLE `tagente_datos_string` DROP `timestamp`, DROP `id_agente`; ALTER TABLE `tagente_estado` DROP `cambio`; -ALTER TABLE `tagente_estado` ADD `status_changes` TINYINT( 4 ) NOT -NULL DEFAULT '0', ADD `last_status` TINYINT( 4 ) NOT NULL DEFAULT -'0'; +ALTER TABLE `tagente_estado` ADD `status_changes` TINYINT( 4 ) NOT NULL DEFAULT '0', ADD `last_status` TINYINT( 4 ) NOT NULL DEFAULT '0'; ALTER TABLE `tagente_estado` ADD INDEX ( `current_interval` ); ALTER TABLE `tagente_estado` ADD INDEX ( `running_by` ); ALTER TABLE `tagente_estado` ADD INDEX ( `last_execution_try` ); @@ -286,7 +284,7 @@ ALTER TABLE trecon_task ADD `recon_ports` varchar(250) NOT NULL default ''; ALTER TABLE tagente ADD `cascade_protection` tinyint(2) NOT NULL default '0'; ALTER TABLE tagente DROP id_wmi_server; -ALTER TABLE tagente DROP id_network_server; +ALTER TABLE tagente DROP id_network_server; ALTER TABLE tagente DROP id_plugin_server; ALTER TABLE tagente DROP id_prediction_server; @@ -302,3 +300,8 @@ ALTER TABLE tplanned_downtime ADD `id_group` mediumint(8) unsigned NULL default ALTER TABLE `pandora`.`tagente` MODIFY COLUMN `nombre` VARCHAR(100) BINARY CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT ''; + +-- Dec 2009 + +UPDATE tupdate_settings SET `value` = "/pandoraupdate3/server.php" WHERE `key` = "update_server_path"; + diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index ba82f9da88..5fae107167 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -612,7 +612,7 @@ CREATE TABLE IF NOT EXISTS `tserver` ( -- TODO: drop 2.x xxxx_server fields, unused since server_type exists. CREATE TABLE IF NOT EXISTS `tsesion` ( - `ID_sesion` bigint(4) unsigned NOT NULL auto_increment, + `ID_sesion` bigint(20) unsigned NOT NULL auto_increment, `ID_usuario` varchar(60) NOT NULL default '0', `IP_origen` varchar(100) NOT NULL default '', `accion` varchar(100) NOT NULL default '',