diff --git a/CMakeLists.txt b/CMakeLists.txt index b07156919..61f77f6a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ # cmake_minimum_required (VERSION 2.6) project (zoneminder) -set(zoneminder_VERSION "1.28.109") +set(zoneminder_VERSION "1.28.110") # make API version a minor of ZM version set(zoneminder_API_VERSION "${zoneminder_VERSION}.1") diff --git a/configure.ac b/configure.ac index b9d4ef2ee..72753c94c 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ # For instructions on building with cmake, please see INSTALL # AC_PREREQ(2.59) -AC_INIT(zm,1.28.109,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html) +AC_INIT(zm,1.28.110,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR(src/zm.h) AC_CONFIG_HEADERS(config.h) diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in index 53bfa1fa8..8239566df 100644 --- a/db/zm_create.sql.in +++ b/db/zm_create.sql.in @@ -269,6 +269,7 @@ DROP TABLE IF EXISTS `Logs`; CREATE TABLE `Logs` ( `TimeKey` decimal(16,6) NOT NULL, `Component` varchar(32) NOT NULL, + `ServerId` int(10) unsigned, `Pid` smallint(6) DEFAULT NULL, `Level` tinyint(3) NOT NULL, `Code` char(3) NOT NULL, diff --git a/db/zm_update-1.28.110.sql b/db/zm_update-1.28.110.sql new file mode 100644 index 000000000..a9fe04633 --- /dev/null +++ b/db/zm_update-1.28.110.sql @@ -0,0 +1,21 @@ +-- +-- This updates a 1.28.106 database to 1.28.107 +-- + +-- +-- Update Frame table to have a PrimaryKey of ID, insetad of a Composite Primary Key +-- Used primarially for compatibility with CakePHP +-- +SET @s = (SELECT IF( + (SELECT COUNT(*) + FROM INFORMATION_SCHEMA.COLUMNS + WHERE table_name = 'Logs' + AND table_schema = DATABASE() + AND column_name = 'ServerId' + ) > 0, +"SELECT 'Column ServerId already exists in Logs'", +"ALTER TABLE `Logs` ADD COLUMN `ServerId` int(10) unsigned AFTER Component" +)); + +PREPARE stmt FROM @s; +EXECUTE stmt; diff --git a/version b/version index a960d2a6d..03a4bf6e8 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.28.109 +1.28.110