solve conflict file
This commit is contained in:
28
build/usr/local/omc/etc/db/install/ne_state.sql
Normal file
28
build/usr/local/omc/etc/db/install/ne_state.sql
Normal file
@@ -0,0 +1,28 @@
|
||||
SET NAMES utf8mb4;
|
||||
SET FOREIGN_KEY_CHECKS = 0;
|
||||
|
||||
--
|
||||
-- Table structure for table `ne_state`
|
||||
--
|
||||
|
||||
|
||||
DROP TABLE IF EXISTS `ne_state`;
|
||||
|
||||
CREATE TABLE `ne_state` (
|
||||
`id` int NOT NULL AUTO_INCREMENT,
|
||||
`ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
|
||||
`ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
|
||||
`version` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
|
||||
`capability` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
|
||||
`serial_num` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
|
||||
`expiry_date` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '-',
|
||||
`cpu_usage` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL,
|
||||
`mem_usage` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL,
|
||||
`disk_space` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL,
|
||||
`timestamp` datetime NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
INDEX `idx_ne_type_id`(`ne_type` ASC, `ne_id` ASC) USING BTREE,
|
||||
INDEX `idx_timestamp`(`timestamp` ASC) USING BTREE
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 8551941 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC;
|
||||
|
||||
SET FOREIGN_KEY_CHECKS=1;
|
||||
Reference in New Issue
Block a user