? includes/database.mysqli.inc ? modules/devel.module Index: database/updates.inc =================================================================== RCS file: /cvs/drupal/drupal/database/updates.inc,v retrieving revision 1.131 diff -u -r1.131 updates.inc --- database/updates.inc 8 Sep 2005 19:17:34 -0000 1.131 +++ database/updates.inc 9 Sep 2005 19:04:11 -0000 @@ -4,6 +4,27 @@ /** * @file * All incremental database updates performed between Drupal releases. + * + * For all updates after 147, please use the following syntax: + * + * function update_N() { + * $ret = array(); + * + * switch ($GLOBALS['db_type']) { + * case 'pgsql': + * // PostgreSQL code goes here + * break; + * case 'mysql': + * case 'mysqli': + * // MySQL code goes here + * break; + * default: + * break; + * } + * + * return $ret; + * } + * */ // Define the various updates in an array("date : comment" => "function"); Index: includes/database.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/database.inc,v retrieving revision 1.44 diff -u -r1.44 database.inc --- includes/database.inc 8 Sep 2005 19:17:34 -0000 1.44 +++ includes/database.inc 9 Sep 2005 18:53:11 -0000 @@ -118,7 +118,7 @@ else { drupal_maintenance_theme(); drupal_set_title('Unsupported database type'); - print theme('maintenance_page', '

The database type '. theme('placeholder', $db_type) .' is unsupported. Please use either mysql for MySQL databases or pgsql for PostgreSQL databases. The database information is in your settings.php file.

+ print theme('maintenance_page', '

The database type '. theme('placeholder', $db_type) .' is unsupported. Please use either mysql for MySQL 3.x & 4.0.x databases, mysqli for MySQL 4.1.x+ databases, or pgsql for PostgreSQL databases. The database information is in your settings.php file.

For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.

'); exit; } Index: sites/default/settings.php =================================================================== RCS file: /cvs/drupal/drupal/sites/default/settings.php,v retrieving revision 1.17 diff -u -r1.17 settings.php --- sites/default/settings.php 28 Aug 2005 18:26:20 -0000 1.17 +++ sites/default/settings.php 9 Sep 2005 19:10:07 -0000 @@ -76,6 +76,7 @@ * * Database URL format: * $db_url = 'mysql://username:password@localhost/database'; + * $db_url = 'mysqli://username:password@localhost/database'; * $db_url = 'pgsql://username:password@localhost/database'; */ $db_url = 'mysql://username:password@localhost/database';