Merge branch 'master' of github.com:gogits/gogs into dev

11 years ago · 03c2468c2f
parent 75109bbd65 fa17989763
commit 03c2468c2f
1 changed files with 2 additions and 2 deletions
--- a/conf/mysql.sql
+++ b/conf/mysql.sql
@ -1,2 +1,2 @@
-DROP DATABASE gogs;
+DROP DATABASE IF EXISTS gogs;
-CREATE DATABASE IF NOT EXISTS gogs CHARACTER SET utf8 COLLATE utf8_general_ci;
+CREATE DATABASE IF NOT EXISTS gogs CHARACTER SET utf8 COLLATE utf8_general_ci;
`@ -1,2 +1,2 @@`
	`DROP DATABASE gogs;`	`DROP DATABASE IF EXISTS gogs;`
	`CREATE DATABASE IF NOT EXISTS gogs CHARACTER SET utf8 COLLATE utf8_general_ci;`	`CREATE DATABASE IF NOT EXISTS gogs CHARACTER SET utf8 COLLATE utf8_general_ci;`