[servicecomb-pack] branch master updated: fix mysql master_lock table schema wrong default value

[zhfeng]

This is an automated email from the ASF dual-hosted git repository.

zhfeng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git


The following commit(s) were added to refs/heads/master by this push:
     new 949feb6  fix mysql master_lock table schema wrong default value
     new f6e9498  Merge pull request #446 from loveoobaby/fix_mysql_schema
949feb6 is described below

commit 949feb68f61005304f6b373af3f6e7b5d011e63d
Author: lixingjun <lixing...@ysstech.com>
AuthorDate: Tue Apr 2 18:02:29 2019 +0800

    fix mysql master_lock table schema wrong default value
---
 alpha/alpha-server/src/main/resources/schema-mysql.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/alpha/alpha-server/src/main/resources/schema-mysql.sql 
b/alpha/alpha-server/src/main/resources/schema-mysql.sql
index e5c8a42..ce8d463 100644
--- a/alpha/alpha-server/src/main/resources/schema-mysql.sql
+++ b/alpha/alpha-server/src/main/resources/schema-mysql.sql
@@ -116,8 +116,8 @@ CREATE TABLE IF NOT EXISTS tcc_tx_event (
 
 CREATE TABLE IF NOT EXISTS master_lock (
   serviceName varchar(36) not NULL,
-  expireTime timestamp(3) not NULL,
-  lockedTime timestamp(3) not NULL,
+  expireTime datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  lockedTime datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
   instanceId  varchar(255) not NULL,
   PRIMARY KEY (serviceName)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;