Changeset 9086


Ignore:
Timestamp:
Feb 3, 2011, 10:59:51 PM (10 years ago)
Author:
plg
Message:

bug 2155 fixed: for MySQL, use the "ENGINE=MyISAM" syntax instead of the
deprecated "TYPE=MyISAM", so that SQL creation table statements complies
with MySQL 5.5

Location:
trunk/install
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/install/db/85-database.php

    r8728 r9086  
    3535  `name` varchar(64) default NULL,
    3636  PRIMARY KEY  (`id`)
    37 )";
     37) ENGINE=MyISAM";
    3838
    3939if (DB_CHARSET == 'utf8')
  • trunk/install/db/90-database.php

    r8728 r9086  
    3535  `name` varchar(64) default NULL,
    3636  PRIMARY KEY  (`id`)
    37 )";
     37) ENGINE=MyISAM";
    3838
    3939if (DB_CHARSET == 'utf8')
  • trunk/install/piwigo_structure-mysql.sql

    r9073 r9086  
    1414  `element_id` mediumint(8) NOT NULL default '0',
    1515  PRIMARY KEY  (`user_id`,`element_id`)
    16 ) TYPE=MyISAM;
     16) ENGINE=MyISAM;
    1717
    1818--
     
    4040  UNIQUE KEY `categories_i3` (`permalink`),
    4141  KEY `categories_i2` (`id_uppercat`)
    42 ) TYPE=MyISAM;
     42) ENGINE=MyISAM;
    4343
    4444--
     
    5959  KEY `comments_i2` (`validation_date`),
    6060  KEY `comments_i1` (`image_id`)
    61 ) TYPE=MyISAM;
     61) ENGINE=MyISAM;
    6262
    6363--
     
    7171  `comment` varchar(255) default NULL,
    7272  PRIMARY KEY  (`param`)
    73 ) TYPE=MyISAM COMMENT='configuration table';
     73) ENGINE=MyISAM COMMENT='configuration table';
    7474
    7575--
     
    8282  `image_id` mediumint(8) unsigned NOT NULL default '0',
    8383  PRIMARY KEY  (`user_id`,`image_id`)
    84 ) TYPE=MyISAM;
     84) ENGINE=MyISAM;
    8585
    8686--
     
    9393  `cat_id` smallint(5) unsigned NOT NULL default '0',
    9494  PRIMARY KEY  (`group_id`,`cat_id`)
    95 ) TYPE=MyISAM;
     95) ENGINE=MyISAM;
    9696
    9797--
     
    106106  PRIMARY KEY  (`id`),
    107107  UNIQUE KEY `groups_ui1` (`name`)
    108 ) TYPE=MyISAM;
     108) ENGINE=MyISAM;
    109109
    110110--
     
    127127  PRIMARY KEY  (`id`),
    128128  KEY `history_i1` (`summarized`)
    129 ) TYPE=MyISAM;
     129) ENGINE=MyISAM;
    130130
    131131--
     
    141141  `nb_pages` int(11) default NULL,
    142142  UNIQUE KEY history_summary_ymdh (`year`,`month`,`day`,`hour`)
    143 ) TYPE=MyISAM;
     143) ENGINE=MyISAM;
    144144
    145145--
     
    154154  PRIMARY KEY  (`image_id`,`category_id`),
    155155  KEY `image_category_i1` (`category_id`)
    156 ) TYPE=MyISAM;
     156) ENGINE=MyISAM;
    157157
    158158--
     
    166166  PRIMARY KEY  (`image_id`,`tag_id`),
    167167  KEY `image_tag_i1` (`tag_id`)
    168 ) TYPE=MyISAM;
     168) ENGINE=MyISAM;
    169169
    170170--
     
    202202  KEY `images_i5` (`date_creation`),
    203203  KEY `images_i1` (`storage_category_id`)
    204 ) TYPE=MyISAM;
     204) ENGINE=MyISAM;
    205205
    206206--
     
    214214  `name` varchar(64) default NULL,
    215215  PRIMARY KEY  (`id`)
    216 ) TYPE=MyISAM;
     216) ENGINE=MyISAM;
    217217
    218218--
     
    228228  `hit` int(10) unsigned NOT NULL default '0',
    229229  PRIMARY KEY  (`permalink`)
    230 ) TYPE=MyISAM;
     230) ENGINE=MyISAM;
    231231
    232232--
     
    240240  `version` varchar(64) NOT NULL default '0',
    241241  PRIMARY KEY  (`id`)
    242 ) TYPE=MyISAM;
     242) ENGINE=MyISAM;
    243243
    244244--
     
    254254  `date` date NOT NULL default '0000-00-00',
    255255  PRIMARY KEY  (`element_id`,`user_id`,`anonymous_id`)
    256 ) TYPE=MyISAM;
     256) ENGINE=MyISAM;
    257257
    258258--
     
    266266  `rules` text,
    267267  PRIMARY KEY  (`id`)
    268 ) TYPE=MyISAM;
     268) ENGINE=MyISAM;
    269269
    270270--
     
    278278  `expiration` datetime NOT NULL default '0000-00-00 00:00:00',
    279279  PRIMARY KEY  (`id`)
    280 ) TYPE=MyISAM;
     280) ENGINE=MyISAM;
    281281
    282282--
     
    290290  PRIMARY KEY  (`id`),
    291291  UNIQUE KEY `sites_ui1` (`galleries_url`)
    292 ) TYPE=MyISAM;
     292) ENGINE=MyISAM;
    293293
    294294--
     
    303303  PRIMARY KEY  (`id`),
    304304  KEY `tags_i1` (`url_name`)
    305 ) TYPE=MyISAM;
     305) ENGINE=MyISAM;
    306306
    307307--
     
    315315  `name` varchar(64) default NULL,
    316316  PRIMARY KEY  (`id`)
    317 ) TYPE=MyISAM;
     317) ENGINE=MyISAM;
    318318
    319319--
     
    327327  `description` varchar(255) default NULL,
    328328  PRIMARY KEY  (`id`)
    329 ) TYPE=MyISAM;
     329) ENGINE=MyISAM;
    330330
    331331--
     
    338338  `cat_id` smallint(5) unsigned NOT NULL default '0',
    339339  PRIMARY KEY  (`user_id`,`cat_id`)
    340 ) TYPE=MyISAM;
     340) ENGINE=MyISAM;
    341341
    342342--
     
    354354  `image_access_list` mediumtext default NULL,
    355355  PRIMARY KEY  (`user_id`)
    356 ) TYPE=MyISAM;
     356) ENGINE=MyISAM;
    357357
    358358--
     
    371371  `user_representative_picture_id` mediumint(8) unsigned default NULL,
    372372  PRIMARY KEY  (`user_id`,`cat_id`)
    373 ) TYPE=MyISAM;
     373) ENGINE=MyISAM;
    374374
    375375--
     
    383383  `last_check` datetime default NULL,
    384384  PRIMARY KEY  (`id`)
    385 ) TYPE=MyISAM;
     385) ENGINE=MyISAM;
    386386
    387387--
     
    394394  `group_id` smallint(5) unsigned NOT NULL default '0',
    395395  PRIMARY KEY  (`group_id`,`user_id`)
    396 ) TYPE=MyISAM;
     396) ENGINE=MyISAM;
    397397
    398398--
     
    418418  `level` tinyint unsigned NOT NULL default '0',
    419419  UNIQUE KEY `user_infos_ui1` (`user_id`)
    420 ) TYPE=MyISAM;
     420) ENGINE=MyISAM;
    421421
    422422--
     
    432432  PRIMARY KEY  (`user_id`),
    433433  UNIQUE KEY `user_mail_notification_ui1` (`check_key`)
    434 ) TYPE=MyISAM;
     434) ENGINE=MyISAM;
    435435
    436436--
     
    446446  PRIMARY KEY  (`id`),
    447447  UNIQUE KEY `users_ui1` (`username`)
    448 ) TYPE=MyISAM;
     448) ENGINE=MyISAM;
  • trunk/install/upgrade_1.3.1.php

    r8728 r9086  
    5656  comment varchar(255) default NULL,
    5757  PRIMARY KEY  (param)
    58 ) TYPE=MyISAM COMMENT='configuration table'
     58) ENGINE=MyISAM COMMENT='configuration table'
    5959;",
    6060
     
    280280  rate tinyint(2) unsigned NOT NULL default '0',
    281281  PRIMARY KEY  (user_id,element_id)
    282 ) TYPE=MyISAM
     282) ENGINE=MyISAM
    283283;",
    284284
     
    289289  forbidden_categories text,
    290290  PRIMARY KEY  (user_id)
    291 ) TYPE=MyISAM
     291) ENGINE=MyISAM
    292292;",
    293293
  • trunk/install/upgrade_1.4.0.php

    r8728 r9086  
    139139  element_id mediumint(8) NOT NULL default '0',
    140140  PRIMARY KEY  (user_id,element_id)
    141 ) TYPE=MyISAM
     141) ENGINE=MyISAM
    142142;",
    143143
     
    148148  forbidden_categories text,
    149149  PRIMARY KEY  (user_id)
    150 ) TYPE=MyISAM
     150) ENGINE=MyISAM
    151151;",
    152152
     
    157157  last_check datetime default NULL,
    158158  PRIMARY KEY  (id)
    159 ) TYPE=MyISAM
     159) ENGINE=MyISAM
    160160;",
    161161
     
    175175  registration_date datetime NOT NULL default '0000-00-00 00:00:00',
    176176  UNIQUE KEY user_infos_ui1 (user_id)
    177 ) TYPE=MyISAM
     177) ENGINE=MyISAM
    178178;"
    179179  );
  • trunk/install/upgrade_1.6.2.php

    r8728 r9086  
    7878  PRIMARY KEY  (`id`),
    7979  KEY `history_i1` (`summarized`)
    80 ) TYPE=MyISAM
     80) ENGINE=MyISAM
    8181;",
    8282
     
    136136  `nb_pages` int(11) default NULL,
    137137  PRIMARY KEY  (`id`)
    138 ) TYPE=MyISAM
     138) ENGINE=MyISAM
    139139;",
    140140
     
    147147  `hit` int(10) unsigned NOT NULL default '0',
    148148  PRIMARY KEY  (`permalink`)
    149 ) TYPE=MyISAM
     149) ENGINE=MyISAM
    150150;",
    151151
     
    156156  `version` varchar(64) NOT NULL default '0',
    157157  PRIMARY KEY  (`id`)
    158 ) TYPE=MyISAM
     158) ENGINE=MyISAM
    159159;",
    160160
     
    167167  `count_categories` mediumint(8) unsigned default '0',
    168168  PRIMARY KEY  (`user_id`,`cat_id`)
    169 ) TYPE=MyISAM
     169) ENGINE=MyISAM
    170170;",
    171171
     
    183183  PRIMARY KEY  (`id`),
    184184  UNIQUE KEY `ws_access_ui1` (`name`)
    185 ) TYPE=MyISAM COMMENT='Access for Web Services'
     185) ENGINE=MyISAM COMMENT='Access for Web Services'
    186186;",*/
    187187
Note: See TracChangeset for help on using the changeset viewer.