Merge branch 'master' into issue342

Theoziran Lima
2 parents da437d7c 4789a607
Showing 2 changed files with 2 additions and 2 deletions Show diff stats
Vagrantfile
db/db.sql.bz2
@@ -15,8 +15,8 @@ apt-get install -y subversion
 service apache2 start
 service mysql start
  
-mysql --user=root --password=root -h 127.0.0.1 -e 'drop database participacao'
-mysql --user=root --password=root -h 127.0.0.1 -e 'create database participacao'
+mysql --user=root --password=root -h 127.0.0.1 -e 'DROP DATABASE IF EXISTS participacao'
+mysql --user=root --password=root -h 127.0.0.1 -e 'CREATE DATABASE participacao'
  
 cd /vagrant/db
 bunzip2 db.sql.bz2
...	...	@@ -15,8 +15,8 @@ apt-get install -y subversion
15	15	service apache2 start
16	16	service mysql start
17	17
18		-mysql --user=root --password=root -h 127.0.0.1 -e 'drop database participacao'
19		-mysql --user=root --password=root -h 127.0.0.1 -e 'create database participacao'
	18	+mysql --user=root --password=root -h 127.0.0.1 -e 'DROP DATABASE IF EXISTS participacao'
	19	+mysql --user=root --password=root -h 127.0.0.1 -e 'CREATE DATABASE participacao'
20	20
21	21	cd /vagrant/db
22	22	bunzip2 db.sql.bz2
...	...