summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgkapoor12017-12-23 11:26:12 (GMT)
committergkapoor12017-12-23 11:26:12 (GMT)
commit11765346f7788fd1dcacdbdf3c66c0b181117dac (patch)
tree770f9663bd717e8be918e6035f36fa1b4c318d9c
parentf9e411ca8f8652979b14967aa923b9a9504ccf1c (diff)
Removed Collate = Statement from generated dump7.x-1.1-alpha17.x-1.1-alpha
-rw-r--r--database_mysql_dump.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/database_mysql_dump.inc b/database_mysql_dump.inc
index 9a23847..372c691 100644
--- a/database_mysql_dump.inc
+++ b/database_mysql_dump.inc
@@ -165,16 +165,16 @@ function _demo_dump_table_schema($fp, $table) {
// first underscore is the character set.
// @see PMA_exportDBCreate()
if (strpos($status['collation'], '_')) {
- $collate = 'COLLATE=' . $status['collation'];
+ //$collate = 'COLLATE=' . $status['collation'];
}
// If there is a character set defined already, just append the collation.
// Only look for the table definition (on the last line); column definitions
// may use a special collation, which must not be changed.
if (preg_match('@^\).+(?:CHARSET|CHARACTER SET)@m', $output)) {
- $output = preg_replace('@((?:DEFAULT )?(?:CHARSET|CHARACTER SET) \w+)@', '$1 ' . $collate, $output);
+ $output = preg_replace('@((?:DEFAULT )?(?:CHARSET|CHARACTER SET) \w+)@', '$1 ', $output);
}
else {
- $output .= ' DEFAULT CHARSET=utf8 ' . $collate;
+ $output .= ' DEFAULT CHARSET=utf8 ';
}
}