diff options
| author | Dries Buytaert <dries@buytaert.net> | 2006-07-02 19:53:39 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2006-07-02 19:53:39 +0000 |
| commit | ea0ccd13cc5a38a20be35035ba7d3f2d19019975 (patch) | |
| tree | ca8034211476b9747031af892d07a2d44cd141fe | |
| parent | c990f2e1c8fecd413c289255c56ac6a6c9256972 (diff) | |
| download | brdo-ea0ccd13cc5a38a20be35035ba7d3f2d19019975.tar.gz brdo-ea0ccd13cc5a38a20be35035ba7d3f2d19019975.tar.bz2 | |
- Patch #71389 by agentrickard, sime, me et al: removed limitations of number of access control rules and boxes.
| -rw-r--r-- | database/database.4.0.mysql | 4 | ||||
| -rw-r--r-- | database/database.4.1.mysql | 4 | ||||
| -rw-r--r-- | database/updates.inc | 15 | ||||
| -rw-r--r-- | includes/common.inc | 2 |
4 files changed, 20 insertions, 5 deletions
diff --git a/database/database.4.0.mysql b/database/database.4.0.mysql index cb842043d..1247c6e11 100644 --- a/database/database.4.0.mysql +++ b/database/database.4.0.mysql @@ -4,7 +4,7 @@ -- Table structure for table 'access' -- CREATE TABLE access ( - aid tinyint(10) NOT NULL auto_increment, + aid int(10) NOT NULL auto_increment, mask varchar(255) NOT NULL default '', type varchar(255) NOT NULL default '', status tinyint(2) NOT NULL default '0', @@ -147,7 +147,7 @@ CREATE TABLE book ( -- CREATE TABLE boxes ( - bid tinyint(4) NOT NULL auto_increment, + bid int(4) NOT NULL auto_increment, title varchar(64) NOT NULL default '', body longtext, info varchar(128) NOT NULL default '', diff --git a/database/database.4.1.mysql b/database/database.4.1.mysql index 7fa953939..e24bc66ed 100644 --- a/database/database.4.1.mysql +++ b/database/database.4.1.mysql @@ -4,7 +4,7 @@ -- Table structure for table 'access' -- CREATE TABLE access ( - aid tinyint(10) NOT NULL auto_increment, + aid int(10) NOT NULL auto_increment, mask varchar(255) NOT NULL default '', type varchar(255) NOT NULL default '', status tinyint(2) NOT NULL default '0', @@ -157,7 +157,7 @@ DEFAULT CHARACTER SET utf8; -- CREATE TABLE boxes ( - bid tinyint(4) NOT NULL auto_increment, + bid int(4) NOT NULL auto_increment, title varchar(64) NOT NULL default '', body longtext, info varchar(128) NOT NULL default '', diff --git a/database/updates.inc b/database/updates.inc index b5aeea6c6..3fe357b34 100644 --- a/database/updates.inc +++ b/database/updates.inc @@ -2087,3 +2087,18 @@ function system_update_186() { } +function system_update_187() { + // Increase the size of bid in boxes and aid in access + $ret = array(); + switch ($GLOBALS['db_type']) { + case 'mysql': + case 'mysqli': + $ret[] = update_sql("ALTER TABLE {access} CHANGE `aid` `aid` INT( 10 ) NOT NULL AUTO_INCREMENT "); + $ret[] = update_sql("ALTER TABLE {boxes} CHANGE `bid` `bid` INT( 10 ) NOT NULL AUTO_INCREMENT "); + break; + case 'pgsql': + // No database update required for PostgreSQL because it already uses big SERIAL numbers. + break; + } + return $ret; +} diff --git a/includes/common.inc b/includes/common.inc index 79a1d8286..e1bda87d1 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -1301,7 +1301,7 @@ function drupal_urlencode($text) { urlencode($text)); } else { - return str_replace('%2F', '/', urlencode($text)); + return str_replace('%2F', '/', urlencode($text)); } } |