From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 16 Apr 2017 20:08:48 +0000 (+0200)
Subject: Merge branch 'develop' into utf8mb4
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=07faa14361f46b744e4b135d161ad491baa93809;p=friendica.git

Merge branch 'develop' into utf8mb4
---

07faa14361f46b744e4b135d161ad491baa93809
diff --cc friendica_test_data.sql
index f3a0081384,215bded274..8ee0ff7702
--- a/friendica_test_data.sql
+++ b/friendica_test_data.sql
@@@ -121,10 -121,10 +121,10 @@@ DROP TABLE IF EXISTS `cache`
  CREATE TABLE `cache` (
    `k` varchar(255) NOT NULL,
    `v` text NOT NULL,
-   `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+   `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
    PRIMARY KEY (`k`),
    KEY `updated` (`updated`)
 -) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
  /*!40101 SET character_set_client = @saved_cs_client */;
  
  --
@@@ -448,10 -448,10 +448,10 @@@ CREATE TABLE `fcontact` 
    `network` varchar(32) NOT NULL DEFAULT '',
    `alias` varchar(255) NOT NULL DEFAULT '',
    `pubkey` text NOT NULL,
-   `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+   `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
    PRIMARY KEY (`id`),
    KEY `addr` (`addr`)
 -) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
  /*!40101 SET character_set_client = @saved_cs_client */;
  
  --
@@@ -530,9 -530,9 +530,9 @@@ CREATE TABLE `fsuggest` 
    `request` varchar(255) NOT NULL DEFAULT '',
    `photo` varchar(255) NOT NULL DEFAULT '',
    `note` text NOT NULL,
-   `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+   `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
    PRIMARY KEY (`id`)
 -) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
  /*!40101 SET character_set_client = @saved_cs_client */;
  
  --
@@@ -930,9 -930,9 +930,9 @@@ CREATE TABLE `locks` 
    `id` int(11) NOT NULL AUTO_INCREMENT,
    `name` varchar(128) NOT NULL DEFAULT '',
    `locked` tinyint(1) NOT NULL DEFAULT '0',
-   `created` datetime DEFAULT '0000-00-00 00:00:00',
+   `created` datetime DEFAULT '0001-01-01 00:00:00',
    PRIMARY KEY (`id`)
 -) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
  /*!40101 SET character_set_client = @saved_cs_client */;
  
  --
@@@ -1008,9 -1008,9 +1008,9 @@@ CREATE TABLE `mailacct` 
    `action` int(11) NOT NULL DEFAULT '0',
    `movetofolder` varchar(255) NOT NULL DEFAULT '',
    `pubmail` tinyint(1) NOT NULL DEFAULT '0',
-   `last_check` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+   `last_check` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
    PRIMARY KEY (`id`)
 -) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
  /*!40101 SET character_set_client = @saved_cs_client */;
  
  --
@@@ -1353,10 -1353,10 +1353,10 @@@ CREATE TABLE `push_subscriber` 
    `topic` varchar(255) NOT NULL DEFAULT '',
    `nickname` varchar(255) NOT NULL DEFAULT '',
    `push` int(11) NOT NULL DEFAULT '0',
-   `last_update` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+   `last_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
    `secret` varchar(255) NOT NULL DEFAULT '',
    PRIMARY KEY (`id`)
 -) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
  /*!40101 SET character_set_client = @saved_cs_client */;
  
  --