mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

mysql, use myisam

Browse Source
This commit is contained in:
Garvin Hicking 2012-04-10 22:35:40 +02:00
parent 92a19a968d
commit b62c6072ed
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/NEWS
View File

@ -1,9 +1,16 @@
# $Id$ # $Id$
Version 2.0 ()
------------------------------------------------------------------------
* Use Smarty for backend display output
Version 1.7 () Version 1.7 ()
------------------------------------------------------------------------ ------------------------------------------------------------------------
* Added to use MyISAM handler for s9y tables (we do not use InnoDB
features, but rely on MyISAM fulltext)
* fixed defaultBaseURL did not show up installer. Thanks to onli. * fixed defaultBaseURL did not show up installer. Thanks to onli.
Follow up from c292bad Follow up from c292bad

2
include/db/mysql.inc.php
View File

@ -313,7 +313,7 @@ function serendipity_db_schema_import($query) {
} }
$query = trim(str_replace($search, $replace, $query)); $query = trim(str_replace($search, $replace, $query));
serendipity_db_query("SET storage_engine=MYISAM");
if ($query[0] == '@') { if ($query[0] == '@') {
// Errors are expected to happen (like duplicate index creation) // Errors are expected to happen (like duplicate index creation)
return serendipity_db_query(substr($query, 1), false, 'both', false, false, false, true); return serendipity_db_query(substr($query, 1), false, 'both', false, false, false, true);

2
include/db/mysqli.inc.php
View File

@ -282,6 +282,8 @@ function serendipity_db_schema_import($query) {
} }
} }
serendipity_db_query("SET storage_engine=MYISAM");
$query = trim(str_replace($search, $replace, $query)); $query = trim(str_replace($search, $replace, $query));
if ($query[0] == '@') { if ($query[0] == '@') {
// Errors are expected to happen (like duplicate index creation) // Errors are expected to happen (like duplicate index creation)