diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2008-01-20 22:37:27 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2008-01-20 22:37:27 +0000 |
| commit | cc7b504abf7ebc6a6623fd207661f6380c721310 (patch) | |
| tree | f06a2d4fcaed4360a8d71389d6bdd99fc818e556 /Makefile | |
| parent | 61e5e7a14cce8aea66e2296f81211b7e1c32d328 (diff) | |
| download | xxv-cc7b504abf7ebc6a6623fd207661f6380c721310.tar.gz xxv-cc7b504abf7ebc6a6623fd207661f6380c721310.tar.bz2 | |
* contrib/upgrade-xxv-db.sql dump always database before update executed
* Bug #12986, upgrade failed if remote mysql server used
* CHANNELS: Merge twice SQL to single query
* RECORDS: Fix typo
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -4,7 +4,7 @@ # $Id$ XXV = xxv -VERSION = 1.0.1 +VERSION = 1.1 ### The name of the distribution archive: @@ -28,7 +28,7 @@ clean: tmpfolder: @-rm -rf $(TMPDIR)/$(ARCHIVE) - @mkdir -p $(TMPDIR)/$(ARCHIVE) + @mkdir -p $(TMPDIR)/$(ARCHIVE)/contrib/ copyfiles: @for i in $(INCLUDE) ;\ @@ -55,7 +55,8 @@ updateversion: DBTABLES = $(shell cat ./contrib/update-xxv | grep tables= | cut -d '=' -f 2 | sed -e s/\'//g;) updatesql: @echo Please type the DB-Password for root: - @mysqldump -p -n -d --add-drop-table --compatible=mysql40,no_table_options -p -u root xxv $(DBTABLES) -r ./contrib/upgrade-xxv-db.sql + @mysqldump --skip-opt -u root -p -n -d --compatible=mysql40,no_table_options xxv $(DBTABLES) -r $(TMPDIR)/$(ARCHIVE)/contrib/upgrade-xxv-db.sql + @sed -e "s/CREATE TABLE/CREATE TABLE IF NOT EXISTS/g" $(TMPDIR)/$(ARCHIVE)/contrib/upgrade-xxv-db.sql > ./contrib/upgrade-xxv-db.sql setpermission: @find $(TMPDIR)/$(ARCHIVE) -type d -exec chmod 755 {} \; |