diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-04-05 12:08:49 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-04-05 12:08:49 +0000 |
| commit | ea9a75eb61021520ab0a9b65a42e9670b599762e (patch) | |
| tree | 9c692e6bd5fa8f9594c3283dbd7449f6eabc499b /includes/database/mysql/schema.inc | |
| parent | 562f0ae344b408bb7bba86c12393bbd062cc6da5 (diff) | |
| download | brdo-ea9a75eb61021520ab0a9b65a42e9670b599762e.tar.gz brdo-ea9a75eb61021520ab0a9b65a42e9670b599762e.tar.bz2 | |
- Patch #423994 by pwolanin: working around MySQL bug.
Diffstat (limited to 'includes/database/mysql/schema.inc')
| -rw-r--r-- | includes/database/mysql/schema.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/includes/database/mysql/schema.inc b/includes/database/mysql/schema.inc index 203d8589d..9290cf566 100644 --- a/includes/database/mysql/schema.inc +++ b/includes/database/mysql/schema.inc @@ -373,7 +373,9 @@ class DatabaseSchema_mysql extends DatabaseSchema { return db_query("SELECT column_comment FROM information_schema.columns WHERE " . (string) $condition, $condition->arguments())->fetchField(); } $condition->compile($this->connection); - return db_query("SELECT table_comment FROM information_schema.tables WHERE " . (string) $condition, $condition->arguments())->fetchField(); + $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); } } |