From: CiviCRM <info@civicrm.org>
Date: Thu, 7 Jan 2016 01:15:24 +0000 (-0800)
Subject: regen.sh - Ignore civicrm_install_canary
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=46cc21f568218cbf48fe00b30b663a7a8dd5c424;p=civicrm-core.git

regen.sh - Ignore civicrm_install_canary
---

diff --git a/bin/regen.sh b/bin/regen.sh
index 250120e2ed..854bd98ace 100755
--- a/bin/regen.sh
+++ b/bin/regen.sh
@@ -46,7 +46,7 @@ php GenerateData.php
 cd $CIVISOURCEDIR
 "$PHP5PATH"php bin/cli.php -e System -a flush --triggers 1 --session 1
 
-$MYSQLCMD -e "DROP TABLE zipcodes; UPDATE civicrm_domain SET config_backend = NULL; DELETE FROM civicrm_extension; DELETE FROM civicrm_cache; DELETE FROM civicrm_setting;"
+$MYSQLCMD -e "DROP TABLE zipcodes; DROP TABLE IF EXISTS civicrm_install_canary; UPDATE civicrm_domain SET config_backend = NULL; DELETE FROM civicrm_extension; DELETE FROM civicrm_cache; DELETE FROM civicrm_setting;"
 TABLENAMES=$( echo "show tables like 'civicrm_%'" | $MYSQLCMD | grep ^civicrm_ | xargs )
 
 cd $CIVISOURCEDIR/sql