diff options
| author | tommy tomson <thomas.bierey@gmx.de> | 2012-04-06 12:58:41 +0200 |
|---|---|---|
| committer | tommy tomson <thomas.bierey@gmx.de> | 2012-04-06 12:58:41 +0200 |
| commit | 0cb2407c94744029be9c892e5e1cc2a743ca18bc (patch) | |
| tree | 13c32b977cd993d035c43a4a0fff342b43ae6555 /update.php | |
| parent | 52d5ef905e580983bf88e06f1a9c4775258b9730 (diff) | |
| parent | 4f9588d9eeb0dea7d824760f899094f0c98763c3 (diff) | |
| download | volse-hubzilla-0cb2407c94744029be9c892e5e1cc2a743ca18bc.tar.gz volse-hubzilla-0cb2407c94744029be9c892e5e1cc2a743ca18bc.tar.bz2 volse-hubzilla-0cb2407c94744029be9c892e5e1cc2a743ca18bc.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'update.php')
| -rw-r--r-- | update.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/update.php b/update.php index ae35d2d50..0c8486c31 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1135 ); +define( 'UPDATE_VERSION' , 1136 ); /** * @@ -1143,16 +1143,21 @@ q("ALTER TABLE `mail` ADD `unknown` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `rep } function update_1134() { + // faulty update merged forward + // had a hardwired tablename of 'friendica' which isn't the right name on most systems +} + +function update_1135() { //there can't be indexes with more than 1000 bytes in mysql, //so change charset to be smaller q("ALTER TABLE `config` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL , CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL"); //and add the index - q("ALTER TABLE `friendica`.`config` ADD UNIQUE `access` ( `cat` , `k` ) "); + q("ALTER TABLE `config` ADD UNIQUE `access` ( `cat` , `k` ) "); //same thing for pconfig q("ALTER TABLE `pconfig` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL , CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL"); - q("ALTER TABLE `friendica`.`pconfig` ADD UNIQUE `access` ( `uid` , `cat` , `k` )"); -} + q("ALTER TABLE `pconfig` ADD UNIQUE `access` ( `uid` , `cat` , `k` )"); +}
\ No newline at end of file |