Merge commit '2545d27aacfe57c8f26fccfd45e382fbf5c111ac'

[weathermon.git] / mysql / meteo_unit_conv.sql

diff --git a/mysql/meteo_unit_conv.sql b/mysql/meteo_unit_conv.sql
index f58fa8389ca5c0f8b12e1257a6019d6bf1f50267..4ac573a6f9da5764d3f0b87e434ac85e40bddd93 100644 (file)
--- a/mysql/meteo_unit_conv.sql
+++ b/mysql/meteo_unit_conv.sql
@@ -1,10 +1,8 @@
-CREATE DATABASE  IF NOT EXISTS `meteo` /*!40100 DEFAULT CHARACTER SET utf8 */;
-USE `meteo`;
--- MySQL dump 10.13  Distrib 5.5.35, for debian-linux-gnu (i686)
+-- MySQL dump 10.13  Distrib 5.5.38, for debian-linux-gnu (x86_64)

 --
 --

--- Host: estia    Database: meteo
+-- Host: localhost    Database: meteo

 -- ------------------------------------------------------
 -- ------------------------------------------------------

--- Server version      5.5.35-0ubuntu0.13.10.2
+-- Server version      5.5.38-0ubuntu0.14.04.1

 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;


@@ -54,4 +52,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 

--- Dump completed on 2014-03-17 20:31:31
+-- Dump completed on 2014-09-25 14:49:01