diff options
| -rw-r--r-- | install/db/85-database.php | 4 | ||||
| -rw-r--r-- | install/db/90-database.php | 4 | ||||
| -rw-r--r-- | install/piwigo_structure-mysql.sql | 60 | ||||
| -rw-r--r-- | install/upgrade_1.3.1.php | 6 | ||||
| -rw-r--r-- | install/upgrade_1.4.0.php | 8 | ||||
| -rw-r--r-- | install/upgrade_1.6.2.php | 12 |
6 files changed, 47 insertions, 47 deletions
diff --git a/install/db/85-database.php b/install/db/85-database.php index e3bb4b82e..1947db537 100644 --- a/install/db/85-database.php +++ b/install/db/85-database.php @@ -34,7 +34,7 @@ CREATE TABLE ".PREFIX_TABLE."themes ( `version` varchar(64) NOT NULL default '0', `name` varchar(64) default NULL, PRIMARY KEY (`id`) -)"; +) ENGINE=MyISAM"; if (DB_CHARSET == 'utf8') { @@ -48,4 +48,4 @@ echo . $upgrade_description ."\n" ; -?>
\ No newline at end of file +?> diff --git a/install/db/90-database.php b/install/db/90-database.php index 492300218..c908c4fd5 100644 --- a/install/db/90-database.php +++ b/install/db/90-database.php @@ -34,7 +34,7 @@ CREATE TABLE ".PREFIX_TABLE."languages ( `version` varchar(64) NOT NULL default '0', `name` varchar(64) default NULL, PRIMARY KEY (`id`) -)"; +) ENGINE=MyISAM"; if (DB_CHARSET == 'utf8') { @@ -59,4 +59,4 @@ echo . $upgrade_description ."\n" ; -?>
\ No newline at end of file +?> diff --git a/install/piwigo_structure-mysql.sql b/install/piwigo_structure-mysql.sql index 74528ec6b..44c627b5f 100644 --- a/install/piwigo_structure-mysql.sql +++ b/install/piwigo_structure-mysql.sql @@ -13,7 +13,7 @@ CREATE TABLE `piwigo_caddie` ( `user_id` smallint(5) NOT NULL default '0', `element_id` mediumint(8) NOT NULL default '0', PRIMARY KEY (`user_id`,`element_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_categories` @@ -39,7 +39,7 @@ CREATE TABLE `piwigo_categories` ( PRIMARY KEY (`id`), UNIQUE KEY `categories_i3` (`permalink`), KEY `categories_i2` (`id_uppercat`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_comments` @@ -58,7 +58,7 @@ CREATE TABLE `piwigo_comments` ( PRIMARY KEY (`id`), KEY `comments_i2` (`validation_date`), KEY `comments_i1` (`image_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_config` @@ -70,7 +70,7 @@ CREATE TABLE `piwigo_config` ( `value` text, `comment` varchar(255) default NULL, PRIMARY KEY (`param`) -) TYPE=MyISAM COMMENT='configuration table'; +) ENGINE=MyISAM COMMENT='configuration table'; -- -- Table structure for table `piwigo_favorites` @@ -81,7 +81,7 @@ CREATE TABLE `piwigo_favorites` ( `user_id` smallint(5) NOT NULL default '0', `image_id` mediumint(8) unsigned NOT NULL default '0', PRIMARY KEY (`user_id`,`image_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_group_access` @@ -92,7 +92,7 @@ CREATE TABLE `piwigo_group_access` ( `group_id` smallint(5) unsigned NOT NULL default '0', `cat_id` smallint(5) unsigned NOT NULL default '0', PRIMARY KEY (`group_id`,`cat_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_groups` @@ -105,7 +105,7 @@ CREATE TABLE `piwigo_groups` ( `is_default` enum('true','false') NOT NULL default 'false', PRIMARY KEY (`id`), UNIQUE KEY `groups_ui1` (`name`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_history` @@ -126,7 +126,7 @@ CREATE TABLE `piwigo_history` ( `image_type` enum('picture','high','other') default NULL, PRIMARY KEY (`id`), KEY `history_i1` (`summarized`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_history_summary` @@ -140,7 +140,7 @@ CREATE TABLE `piwigo_history_summary` ( `hour` tinyint(2) default NULL, `nb_pages` int(11) default NULL, UNIQUE KEY history_summary_ymdh (`year`,`month`,`day`,`hour`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_image_category` @@ -153,7 +153,7 @@ CREATE TABLE `piwigo_image_category` ( `rank` mediumint(8) unsigned default NULL, PRIMARY KEY (`image_id`,`category_id`), KEY `image_category_i1` (`category_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_image_tag` @@ -165,7 +165,7 @@ CREATE TABLE `piwigo_image_tag` ( `tag_id` smallint(5) unsigned NOT NULL default '0', PRIMARY KEY (`image_id`,`tag_id`), KEY `image_tag_i1` (`tag_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_images` @@ -201,7 +201,7 @@ CREATE TABLE `piwigo_images` ( KEY `images_i4` (`hit`), KEY `images_i5` (`date_creation`), KEY `images_i1` (`storage_category_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_languages` @@ -213,7 +213,7 @@ CREATE TABLE `piwigo_languages` ( `version` varchar(64) NOT NULL default '0', `name` varchar(64) default NULL, PRIMARY KEY (`id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_old_permalinks` @@ -227,7 +227,7 @@ CREATE TABLE `piwigo_old_permalinks` ( `last_hit` datetime default NULL, `hit` int(10) unsigned NOT NULL default '0', PRIMARY KEY (`permalink`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_plugins` @@ -239,7 +239,7 @@ CREATE TABLE `piwigo_plugins` ( `state` enum('inactive','active') NOT NULL default 'inactive', `version` varchar(64) NOT NULL default '0', PRIMARY KEY (`id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_rate` @@ -253,7 +253,7 @@ CREATE TABLE `piwigo_rate` ( `rate` tinyint(2) unsigned NOT NULL default '0', `date` date NOT NULL default '0000-00-00', PRIMARY KEY (`element_id`,`user_id`,`anonymous_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_search` @@ -265,7 +265,7 @@ CREATE TABLE `piwigo_search` ( `last_seen` date default NULL, `rules` text, PRIMARY KEY (`id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_sessions` @@ -277,7 +277,7 @@ CREATE TABLE `piwigo_sessions` ( `data` mediumtext NOT NULL, `expiration` datetime NOT NULL default '0000-00-00 00:00:00', PRIMARY KEY (`id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_sites` @@ -289,7 +289,7 @@ CREATE TABLE `piwigo_sites` ( `galleries_url` varchar(255) NOT NULL default '', PRIMARY KEY (`id`), UNIQUE KEY `sites_ui1` (`galleries_url`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_tags` @@ -302,7 +302,7 @@ CREATE TABLE `piwigo_tags` ( `url_name` varchar(255) binary NOT NULL default '', PRIMARY KEY (`id`), KEY `tags_i1` (`url_name`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_themes` @@ -314,7 +314,7 @@ CREATE TABLE `piwigo_themes` ( `version` varchar(64) NOT NULL default '0', `name` varchar(64) default NULL, PRIMARY KEY (`id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_upgrade` @@ -326,7 +326,7 @@ CREATE TABLE `piwigo_upgrade` ( `applied` datetime NOT NULL default '0000-00-00 00:00:00', `description` varchar(255) default NULL, PRIMARY KEY (`id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_user_access` @@ -337,7 +337,7 @@ CREATE TABLE `piwigo_user_access` ( `user_id` smallint(5) NOT NULL default '0', `cat_id` smallint(5) unsigned NOT NULL default '0', PRIMARY KEY (`user_id`,`cat_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_user_cache` @@ -353,7 +353,7 @@ CREATE TABLE `piwigo_user_cache` ( `image_access_type` enum('NOT IN','IN') NOT NULL default 'NOT IN', `image_access_list` mediumtext default NULL, PRIMARY KEY (`user_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_user_cache_categories` @@ -370,7 +370,7 @@ CREATE TABLE `piwigo_user_cache_categories` ( `count_categories` mediumint(8) unsigned default '0', `user_representative_picture_id` mediumint(8) unsigned default NULL, PRIMARY KEY (`user_id`,`cat_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_user_feed` @@ -382,7 +382,7 @@ CREATE TABLE `piwigo_user_feed` ( `user_id` smallint(5) NOT NULL default '0', `last_check` datetime default NULL, PRIMARY KEY (`id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_user_group` @@ -393,7 +393,7 @@ CREATE TABLE `piwigo_user_group` ( `user_id` smallint(5) NOT NULL default '0', `group_id` smallint(5) unsigned NOT NULL default '0', PRIMARY KEY (`group_id`,`user_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_user_infos` @@ -417,7 +417,7 @@ CREATE TABLE `piwigo_user_infos` ( `enabled_high` enum('true','false') NOT NULL default 'true', `level` tinyint unsigned NOT NULL default '0', UNIQUE KEY `user_infos_ui1` (`user_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_user_mail_notification` @@ -431,7 +431,7 @@ CREATE TABLE `piwigo_user_mail_notification` ( `last_send` datetime default NULL, PRIMARY KEY (`user_id`), UNIQUE KEY `user_mail_notification_ui1` (`check_key`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Table structure for table `piwigo_users` @@ -445,4 +445,4 @@ CREATE TABLE `piwigo_users` ( `mail_address` varchar(255) default NULL, PRIMARY KEY (`id`), UNIQUE KEY `users_ui1` (`username`) -) TYPE=MyISAM; +) ENGINE=MyISAM; diff --git a/install/upgrade_1.3.1.php b/install/upgrade_1.3.1.php index 1c8f0a2b6..e81d63373 100644 --- a/install/upgrade_1.3.1.php +++ b/install/upgrade_1.3.1.php @@ -55,7 +55,7 @@ CREATE TABLE phpwebgallery_config ( value varchar(255) default NULL, comment varchar(255) default NULL, PRIMARY KEY (param) -) TYPE=MyISAM COMMENT='configuration table' +) ENGINE=MyISAM COMMENT='configuration table' ;", " @@ -279,7 +279,7 @@ CREATE TABLE phpwebgallery_rate ( element_id mediumint(8) unsigned NOT NULL default '0', rate tinyint(2) unsigned NOT NULL default '0', PRIMARY KEY (user_id,element_id) -) TYPE=MyISAM +) ENGINE=MyISAM ;", " @@ -288,7 +288,7 @@ CREATE TABLE phpwebgallery_user_forbidden ( need_update enum('true','false') NOT NULL default 'true', forbidden_categories text, PRIMARY KEY (user_id) -) TYPE=MyISAM +) ENGINE=MyISAM ;", " diff --git a/install/upgrade_1.4.0.php b/install/upgrade_1.4.0.php index 430fbc608..9a2a0dc18 100644 --- a/install/upgrade_1.4.0.php +++ b/install/upgrade_1.4.0.php @@ -138,7 +138,7 @@ CREATE TABLE piwigo_caddie ( user_id smallint(5) NOT NULL default '0', element_id mediumint(8) NOT NULL default '0', PRIMARY KEY (user_id,element_id) -) TYPE=MyISAM +) ENGINE=MyISAM ;", " @@ -147,7 +147,7 @@ CREATE TABLE piwigo_user_cache ( need_update enum('true','false') NOT NULL default 'true', forbidden_categories text, PRIMARY KEY (user_id) -) TYPE=MyISAM +) ENGINE=MyISAM ;", " @@ -156,7 +156,7 @@ CREATE TABLE piwigo_user_feed ( user_id smallint(5) NOT NULL default '0', last_check datetime default NULL, PRIMARY KEY (id) -) TYPE=MyISAM +) ENGINE=MyISAM ;", " @@ -174,7 +174,7 @@ CREATE TABLE piwigo_user_infos ( template varchar(255) NOT NULL default 'yoga', registration_date datetime NOT NULL default '0000-00-00 00:00:00', UNIQUE KEY user_infos_ui1 (user_id) -) TYPE=MyISAM +) ENGINE=MyISAM ;" ); diff --git a/install/upgrade_1.6.2.php b/install/upgrade_1.6.2.php index 7e1d8c481..dd7451007 100644 --- a/install/upgrade_1.6.2.php +++ b/install/upgrade_1.6.2.php @@ -77,7 +77,7 @@ CREATE TABLE `".PREFIX_TABLE."history` ( `image_type` enum('picture','high','other') default NULL, PRIMARY KEY (`id`), KEY `history_i1` (`summarized`) -) TYPE=MyISAM +) ENGINE=MyISAM ;", " @@ -135,7 +135,7 @@ CREATE TABLE `".PREFIX_TABLE."history_summary` ( `hour` tinyint(2) default NULL, `nb_pages` int(11) default NULL, PRIMARY KEY (`id`) -) TYPE=MyISAM +) ENGINE=MyISAM ;", " @@ -146,7 +146,7 @@ CREATE TABLE `".PREFIX_TABLE."old_permalinks` ( `last_hit` datetime default NULL, `hit` int(10) unsigned NOT NULL default '0', PRIMARY KEY (`permalink`) -) TYPE=MyISAM +) ENGINE=MyISAM ;", " @@ -155,7 +155,7 @@ CREATE TABLE `".PREFIX_TABLE."plugins` ( `state` enum('inactive','active') NOT NULL default 'inactive', `version` varchar(64) NOT NULL default '0', PRIMARY KEY (`id`) -) TYPE=MyISAM +) ENGINE=MyISAM ;", " @@ -166,7 +166,7 @@ CREATE TABLE `".PREFIX_TABLE."user_cache_categories` ( `count_images` mediumint(8) unsigned default '0', `count_categories` mediumint(8) unsigned default '0', PRIMARY KEY (`user_id`,`cat_id`) -) TYPE=MyISAM +) ENGINE=MyISAM ;", /* TABLE DROPPED BEFORE Butterfly/Piwigo release - see later DROP IF EXISTS @@ -182,7 +182,7 @@ CREATE TABLE `".PREFIX_TABLE."ws_access` ( `comment` varchar(255) default NULL, PRIMARY KEY (`id`), UNIQUE KEY `ws_access_ui1` (`name`) -) TYPE=MyISAM COMMENT='Access for Web Services' +) ENGINE=MyISAM COMMENT='Access for Web Services' ;",*/ " |