summaryrefslogtreecommitdiff
path: root/includes/database/mysql
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-05-25 13:42:56 +0000
committerDries Buytaert <dries@buytaert.net>2009-05-25 13:42:56 +0000
commita98905f5c6696ef166ec797fc6ee80fe8f94f48f (patch)
tree8190afe432c33bf5756340bc432e84cdb5af4a1a /includes/database/mysql
parent76957a25e6eb2ce82fc3f52f6f4f97be4748f6e6 (diff)
downloadbrdo-a98905f5c6696ef166ec797fc6ee80fe8f94f48f.tar.gz
brdo-a98905f5c6696ef166ec797fc6ee80fe8f94f48f.tar.bz2
- Patch #471800 by stella: more code style fixes.
Diffstat (limited to 'includes/database/mysql')
-rw-r--r--includes/database/mysql/schema.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/includes/database/mysql/schema.inc b/includes/database/mysql/schema.inc
index ff380ba9d..45543d253 100644
--- a/includes/database/mysql/schema.inc
+++ b/includes/database/mysql/schema.inc
@@ -372,9 +372,11 @@ class DatabaseSchema_mysql extends DatabaseSchema {
if (isset($column)) {
$condition->condition('column_name', $column);
$condition->compile($this->connection);
+ // Don't use {} around information_schema table.
return db_query("SELECT column_comment FROM information_schema.columns WHERE " . (string) $condition, $condition->arguments())->fetchField();
}
$condition->compile($this->connection);
+ // Don't use {} around information_schema table.
$comment = db_query("SELECT table_comment FROM information_schema.tables WHERE " . (string) $condition, $condition->arguments())->fetchField();
// Work-around for MySQL 5.0 bug http://bugs.mysql.com/bug.php?id=11379
return preg_replace('/; InnoDB free:.*$/', '', $comment);