From 88bd611079d841c1efa7daa6781b5c8bc20b9e16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Carlos=20Nieto?= <jose.carlos@menteslibres.net>
Date: Fri, 12 Jun 2015 20:14:23 -0500
Subject: [PATCH] Fixing MySQL in docker.

---
 mysql/_dumps/Makefile    | 2 +-
 mysql/_dumps/structs.sql | 2 +-
 mysql/database_test.go   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mysql/_dumps/Makefile b/mysql/_dumps/Makefile
index e4d3c10c..073f8210 100644
--- a/mysql/_dumps/Makefile
+++ b/mysql/_dumps/Makefile
@@ -6,4 +6,4 @@ DB_PASSWORD ?= upperio_secret
 DB_NAME     ?= upperio_tests
 
 load:
-	cat structs.sql | mysql -u"$(DB_USERNAME)" -p"$(DB_PASSWORD)" "$(DB_NAME)" -h"$(TEST_HOST)" -p$(TEST_PORT)
+	cat structs.sql | mysql -u"$(DB_USERNAME)" -p"$(DB_PASSWORD)" -h"$(TEST_HOST)" -P$(TEST_PORT) "$(DB_NAME)"
diff --git a/mysql/_dumps/structs.sql b/mysql/_dumps/structs.sql
index f0a298be..a67c0179 100644
--- a/mysql/_dumps/structs.sql
+++ b/mysql/_dumps/structs.sql
@@ -51,7 +51,7 @@ CREATE TABLE data_types (
   _nildate DATETIME NULL,
   _ptrdate DATETIME NULL,
   _defaultdate TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  _time BIGINT UNSIGNED NOT NULL
+  _time BIGINT UNSIGNED NOT NULL DEFAULT 0
 );
 
 DROP TABLE IF EXISTS stats_test;
diff --git a/mysql/database_test.go b/mysql/database_test.go
index 5fd4d163..17df86fc 100644
--- a/mysql/database_test.go
+++ b/mysql/database_test.go
@@ -41,8 +41,8 @@ import (
 
 const (
 	databaseName = "upperio_tests"
-	username     = "upperio"
-	password     = "upperio"
+	username     = "upperio_tests"
+	password     = "upperio_secret"
 )
 
 const (
-- 
GitLab