Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
drupal-3174996
Manage
Activity
Members
Labels
Plan
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Issue forks
drupal-3174996
Commits
2671e98d
Commit
2671e98d
authored
15 years ago
by
Angie Byron
Browse files
Options
Downloads
Patches
Plain Diff
#301362
by moshe weitzman, David Strauss, Narayan Newton, and chx: Default to InnoDB in MySQL.
parent
96ca81fb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.txt
+2
-0
2 additions, 0 deletions
CHANGELOG.txt
INSTALL.mysql.txt
+3
-0
3 additions, 0 deletions
INSTALL.mysql.txt
includes/database/mysql/schema.inc
+6
-4
6 additions, 4 deletions
includes/database/mysql/schema.inc
with
11 additions
and
4 deletions
CHANGELOG.txt
+
2
−
0
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
...
...
This diff is collapsed.
Click to expand it.
INSTALL.mysql.txt
+
3
−
0
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.
This diff is collapsed.
Click to expand it.
includes/database/mysql/schema.inc
+
6
−
4
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'
]))
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment