tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2014-05-10 Junichi Satoh <junichi@rworks.jp> 

* pandoradb.sql, pandoradb_data.sql: Fixed sql errors with MySQL5.6.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9908 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2014-05-10 16:02:20 +00:00
parent 72a2e2e1cf
commit f79740a036
3 changed files with 647 additions and 644 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/ChangeLog
View File

@ -1,3 +1,7 @@
2014-05-10 Junichi Satoh <junichi@rworks.jp>
* pandoradb.sql, pandoradb_data.sql: Fixed sql errors with MySQL5.6.
2014-05-10 Junichi Satoh <junichi@rworks.jp>
* extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql: Fixed a typo.

40
pandora_console/pandoradb.sql
View File

@ -225,15 +225,15 @@ CREATE TABLE IF NOT EXISTS `tagente_modulo` (
`custom_integer_2` int(10) default 0,
`wizard_level` enum('basic','advanced','nowizard') default 'nowizard',
`macros` text,
`critical_instructions` text NOT NULL default '',
`warning_instructions` text NOT NULL default '',
`unknown_instructions` text NOT NULL default '',
`critical_instructions` text NOT NULL,
`warning_instructions` text NOT NULL,
`unknown_instructions` text NOT NULL,
`quiet` tinyint(1) NOT NULL default '0',
`critical_inverse` tinyint(1) unsigned default '0',
`warning_inverse` tinyint(1) unsigned default '0',
`id_category` int(10) default 0,
`disabled_types_event` TEXT NOT NULL default '',
`module_macros` TEXT NOT NULL default '',
`disabled_types_event` TEXT NOT NULL,
`module_macros` TEXT NOT NULL,
PRIMARY KEY (`id_agente_modulo`),
KEY `main_idx` (`id_agente_modulo`,`id_agente`),
KEY `tam_agente` (`id_agente`),
@ -544,9 +544,9 @@ CREATE TABLE IF NOT EXISTS `tevento` (
`tags` text NOT NULL,
`source` tinytext NOT NULL,
`id_extra` tinytext NOT NULL,
`critical_instructions` text NOT NULL default '',
`warning_instructions` text NOT NULL default '',
`unknown_instructions` text NOT NULL default '',
`critical_instructions` text NOT NULL,
`warning_instructions` text NOT NULL,
`unknown_instructions` text NOT NULL,
`owner_user` VARCHAR(100) NOT NULL DEFAULT '',
`ack_utimestamp` BIGINT(20) NOT NULL DEFAULT '0',
`custom_data` TEXT NOT NULL,
@ -705,15 +705,15 @@ CREATE TABLE IF NOT EXISTS `tnetwork_component` (
`unit` text,
`wizard_level` enum('basic','advanced','nowizard') default 'nowizard',
`macros` text,
`critical_instructions` text NOT NULL default '',
`warning_instructions` text NOT NULL default '',
`unknown_instructions` text NOT NULL default '',
`critical_instructions` text NOT NULL,
`warning_instructions` text NOT NULL,
`unknown_instructions` text NOT NULL,
`critical_inverse` tinyint(1) unsigned default '0',
`warning_inverse` tinyint(1) unsigned default '0',
`id_category` int(10) default 0,
`tags` text NOT NULL,
`disabled_types_event` TEXT NOT NULL default '',
`module_macros` TEXT NOT NULL default '',
`disabled_types_event` TEXT NOT NULL,
`module_macros` TEXT NOT NULL,
PRIMARY KEY (`id_nc`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@ -811,7 +811,7 @@ CREATE TABLE IF NOT EXISTS `trecon_task` (
`id_rt` int(10) unsigned NOT NULL auto_increment,
`name` varchar(100) NOT NULL default '',
`description` varchar(250) NOT NULL default '',
`subnet` text NOT NULL default '',
`subnet` text NOT NULL,
`id_network_profile` int(10) unsigned NOT NULL default '0',
`create_incident` tinyint(3) unsigned NOT NULL default '0',
`id_group` int(10) unsigned NOT NULL default '1',
@ -823,7 +823,7 @@ CREATE TABLE IF NOT EXISTS `trecon_task` (
`recon_ports` varchar(250) NOT NULL default '',
`snmp_community` varchar(64) NOT NULL default 'public',
`id_recon_script` int(10),
`field1` text NOT NULL default '',
`field1` text NOT NULL,
`field2` varchar(250) NOT NULL default '',
`field3` varchar(250) NOT NULL default '',
`field4` varchar(250) NOT NULL default '',
@ -956,7 +956,7 @@ CREATE TABLE IF NOT EXISTS `tusuario` (
`timezone` varchar(50) default '',
`block_size` int(4) NOT NULL DEFAULT 20,
`flash_chart` int(4) NOT NULL DEFAULT 1,
`id_skin` int(10) unsigned NOT NULL,
`id_skin` int(10) unsigned NOT NULL DEFAULT 0,
`disabled` int(4) NOT NULL DEFAULT 0,
`shortcut` tinyint(1) DEFAULT 0,
`shortcut_data` text,
@ -1164,7 +1164,7 @@ CREATE TABLE IF NOT EXISTS `tlayout_data` (
`pos_y` INTEGER UNSIGNED NOT NULL default 0,
`height` INTEGER UNSIGNED NOT NULL default 0,
`width` INTEGER UNSIGNED NOT NULL default 0,
`label` TEXT DEFAULT "",
`label` TEXT,
`image` varchar(200) DEFAULT "",
`type` tinyint(1) UNSIGNED NOT NULL default 0,
`period` INTEGER UNSIGNED NOT NULL default 3600,
@ -1724,9 +1724,9 @@ CREATE TABLE `tupdate` (
checksum varchar(250) default '',
previous_checksum varchar(250) default '',
svn_version int(4) unsigned NOT NULL default 0,
data LONGTEXT default '',
data_rollback LONGTEXT default '',
description TEXT default '',
data LONGTEXT,
data_rollback LONGTEXT,
description TEXT,
db_table_name varchar(140) default '',
db_field_name varchar(140) default '',
db_field_value varchar(1024) default '', PRIMARY KEY (`id`),

1247
pandora_console/pandoradb_data.sql
View File

File diff suppressed because it is too large Load Diff