Merge remote-tracking branch 'refs/remotes/origin/master'

[weathermon.git] / mysql / meteo_st_parameters.sql

diff --git a/mysql/meteo_st_parameters.sql b/mysql/meteo_st_parameters.sql
index 2eb093af95395b0091c4dcec0b00c75265957b04..5bcede1182c94a6bd1765f3bedf7e5e446a7cdbf 100644 (file)
--- a/mysql/meteo_st_parameters.sql
+++ b/mysql/meteo_st_parameters.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 */;


@@ -49,7 +47,7 @@ CREATE TABLE `st_parameters` (
 
 LOCK TABLES `st_parameters` WRITE;
 /*!40000 ALTER TABLE `st_parameters` DISABLE KEYS */;
 
 LOCK TABLES `st_parameters` WRITE;
 /*!40000 ALTER TABLE `st_parameters` DISABLE KEYS */;

-INSERT INTO `st_parameters` VALUES (1,3,'TEMPERATURE',1,'Температура','red','red','navy','darkred'),(2,1,'HUMIDITY',2,'Влажность','skyblue','skyblue','blue','royalblue'),(3,2,'TEMPERATURE',1,'Температура','red','red','navy','darkred'),(4,2,'HUMIDITY',2,'Влажность','skyblue','skyblue','blue','royalblue'),(5,3,'PRESSURE',3,'Атмосферное давление','green','green','gold','gold');
+INSERT INTO `st_parameters` VALUES (-1,1,'TEMPERATURE',1,'Температура','red','red','navy','red'),(1,3,'TEMPERATURE',1,'Температура','red','red','navy','darkred'),(2,1,'HUMIDITY',2,'Влажность','skyblue','skyblue','blue','royalblue'),(3,2,'TEMPERATURE',1,'Температура','red','red','navy','darkred'),(4,2,'HUMIDITY',2,'Влажность','skyblue','skyblue','blue','royalblue'),(5,3,'PRESSURE',3,'Атмосферное давление','green','green','gold','gold');

 /*!40000 ALTER TABLE `st_parameters` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 /*!40000 ALTER TABLE `st_parameters` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;


@@ -62,4 +60,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:44
+-- Dump completed on 2014-09-25 14:48:08