Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
292
Merge Requests
292
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
2671e98d
Commit
2671e98d
authored
Apr 25, 2009
by
webchick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#301362
by moshe weitzman, David Strauss, Narayan Newton, and chx: Default to InnoDB in MySQL.
parent
96ca81fb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
4 deletions
+11
-4
CHANGELOG.txt
CHANGELOG.txt
+2
-0
INSTALL.mysql.txt
INSTALL.mysql.txt
+3
-0
includes/database/mysql/schema.inc
includes/database/mysql/schema.inc
+6
-4
No files found.
CHANGELOG.txt
View file @
2671e98d
...
...
@@ -8,6 +8,8 @@ Drupal 7.0, xxxx-xx-xx (development version)
* Support for master/slave replication, transactions, multi-insert queries,
delayed inserts, and other features.
* Added support for the SQLite database engine.
* Default to InnoDB engine, rather than MyISAM, on MySQL when available.
This offers increased scalability and data integrity.
- Security:
* Protected cron.php -- cron will only run if the proper key is provided.
* Implemented much stronger password hashes that are also compatible with the
...
...
INSTALL.mysql.txt
View file @
2671e98d
...
...
@@ -38,3 +38,6 @@ If successful, MySQL will reply with:
Query OK, 0 rows affected
If the InnoDB storage engine is available, it will be used for all database
tables. InnoDB provides features over MyISAM such as transaction support,
row-level locks, and consistent non-locking reads.
includes/database/mysql/schema.inc
View file @
2671e98d
...
...
@@ -59,9 +59,11 @@ protected function buildTableNameCondition($table_name, $operator = '=') {
* An array of SQL statements to create the table.
*/
protected
function
createTableSql
(
$name
,
$table
)
{
if
(
empty
(
$table
[
'mysql_suffix'
]))
{
$table
[
'mysql_suffix'
]
=
'DEFAULT CHARACTER SET UTF8'
;
}
// Provide some defaults if needed
$table
+=
array
(
'mysql_engine'
=>
'InnoDB'
,
'mysql_character_set'
=>
'UTF8'
,
);
$sql
=
"CREATE TABLE {"
.
$name
.
"} (
\n
"
;
...
...
@@ -79,7 +81,7 @@ protected function createTableSql($name, $table) {
// Remove the last comma and space.
$sql
=
substr
(
$sql
,
0
,
-
3
)
.
"
\n
) "
;
$sql
.
=
$table
[
'mysql_suffix
'
];
$sql
.
=
'ENGINE = '
.
$table
[
'mysql_engine'
]
.
' DEFAULT CHARACTER SET '
.
$table
[
'mysql_character_set
'
];
// Add table comment.
if
(
!
empty
(
$table
[
'description'
]))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment