diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql
index b0b086c0e..5d5879012 100644
--- a/install/sql/mysql.sql
+++ b/install/sql/mysql.sql
@@ -39,7 +39,6 @@ DROP TABLE IF EXISTS `bb_categories`;
DROP TABLE IF EXISTS `bb_config`;
DROP TABLE IF EXISTS `bb_countries`;
DROP TABLE IF EXISTS `bb_cron`;
-DROP TABLE IF EXISTS `bb_datastore`;
DROP TABLE IF EXISTS `bb_disallow`;
DROP TABLE IF EXISTS `bb_extension_groups`;
DROP TABLE IF EXISTS `bb_extensions`;
@@ -695,30 +694,6 @@ INSERT INTO `bb_cron` VALUES (22, 1, 'Manage Antibroot', 'bb_manage_untrusted.ph
-- --------------------------------------------------------
---
--- Структура таблицы `bb_datastore`
---
-
-CREATE TABLE `bb_datastore` (
- `ds_title` varchar(255) NOT NULL default '',
- `ds_data` longtext NOT NULL,
- PRIMARY KEY (`ds_title`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Дамп данных таблицы `bb_datastore`
---
-
-INSERT INTO `bb_datastore` VALUES ('cat_forums', 'a:6:{s:15:"not_auth_forums";a:4:{s:10:"guest_view";s:0:"";s:10:"guest_read";s:0:"";s:9:"user_view";s:0:"";s:9:"user_read";s:0:"";}s:14:"tracker_forums";s:0:"";s:14:"cat_title_html";a:1:{i:1;s:15:"Ваша первая категория";}s:15:"forum_name_html";a:1:{i:1;s:12:"Ваш первый форум 1";}s:1:"c";a:1:{i:1;a:4:{s:6:"cat_id";s:1:"1";s:9:"cat_title";s:15:"Ваша первая категория 1";s:9:"cat_order";s:2:"10";s:6:"forums";a:1:{i:0;s:1:"1";}}}s:1:"f";a:1:{i:1;a:20:{s:8:"forum_id";s:1:"1";s:6:"cat_id";s:1:"1";s:10:"forum_name";s:12:"Ваш первый форум";s:10:"forum_desc";s:26:"Ваш первый форум";s:12:"forum_status";s:1:"0";s:11:"forum_posts";s:1:"1";s:12:"forum_topics";s:1:"1";s:9:"auth_view";s:1:"0";s:9:"auth_read";s:1:"0";s:9:"auth_post";s:1:"1";s:10:"auth_reply";s:1:"1";s:9:"auth_edit";s:1:"1";s:11:"auth_delete";s:1:"1";s:11:"auth_sticky";s:1:"3";s:13:"auth_announce";s:1:"3";s:9:"auth_vote";s:1:"1";s:15:"auth_pollcreate";s:1:"1";s:16:"auth_attachments";s:1:"1";s:13:"auth_download";s:1:"1";s:12:"forum_parent";s:1:"0";}}}');
-INSERT INTO `bb_datastore` VALUES ('jumpbox', 'a:2:{s:5:"guest";s:241:"\n\n";s:4:"user";s:241:"\n\n";}');
-INSERT INTO `bb_datastore` VALUES ('viewtopic_forum_select', 'a:1:{s:22:"viewtopic_forum_select";s:187:"\n\n";}');
-INSERT INTO `bb_datastore` VALUES ('latest_news', 'a:1:{i:0;a:3:{s:8:"topic_id";s:1:"1";s:10:"topic_time";s:9:"972086460";s:11:"topic_title";s:18:"Добро пожаловать в TorrentPier II";}}');
-INSERT INTO `bb_datastore` VALUES ('ads', 'a:0:{}');
-INSERT INTO `bb_datastore` VALUES ('stats', 'a:4:{s:9:"usercount";s:1:"3";s:10:"newestuser";a:2:{s:7:"user_id";s:1:"2";s:8:"username";s:5:"admin";}s:9:"postcount";s:1:"1";s:10:"topiccount";s:1:"1";}');
-INSERT INTO `bb_datastore` VALUES ('moderators', 'a:6:{s:10:"name_users";a:0:{}s:11:"name_groups";a:0:{}s:9:"mod_users";a:0:{}s:10:"mod_groups";a:0:{}s:10:"moderators";a:0:{}s:6:"admins";a:1:{i:2;s:5:"admin";}}');
-
--- --------------------------------------------------------
-
--
-- Структура таблицы `bb_disallow`
--
diff --git a/upload/common.php b/upload/common.php
index 7b691a135..947783dab 100644
--- a/upload/common.php
+++ b/upload/common.php
@@ -1718,37 +1718,6 @@ class datastore_file extends datastore_common
}
}
-class datastore_mysql extends datastore_common
-{
- var $engine = 'MySQL';
-
- function store ($item_name, $item_data)
- {
- $this->data[$item_name] = $item_data;
-
- $args = DB()->build_array('INSERT', array(
- 'ds_title' => (string) $item_name,
- 'ds_data' => (string) serialize($item_data),
- ));
- DB()->query("REPLACE INTO ". BB_DATASTORE . $args);
- }
-
- function _fetch_from_store ()
- {
- if (!$items = $this->queued_items) return;
-
- array_deep($items, 'mysql_escape_string');
- $items_list = join("','", $items);
-
- $sql = "SELECT ds_title, ds_data FROM ". BB_DATASTORE ." WHERE ds_title IN('$items_list')";
-
- foreach (DB()->fetch_rowset($sql) as $row)
- {
- $this->data[$row['ds_title']] = unserialize($row['ds_data']);
- }
- }
-}
-
// Initialize Datastore
switch ($bb_cfg['datastore_type'])
{
@@ -1780,13 +1749,9 @@ switch ($bb_cfg['datastore_type'])
case 'apc':
$datastore = new datastore_apc();
break;
-
+
case 'filecache':
- $datastore = new datastore_file($bb_cfg['cache']['db_dir'] . 'datastore/');
- break;
-
- default: //mysql
- $datastore = new datastore_mysql();
+ default: $datastore = new datastore_file($bb_cfg['cache']['db_dir'] . 'datastore/');
}
function sql_dbg_enabled ()
diff --git a/upload/config.php b/upload/config.php
index ff270cc17..682d19059 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -53,8 +53,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
// Increase number of revision after update
$bb_cfg['tp_version'] = '2.1 Stable';
-$bb_cfg['tp_release_state'] = 'R273';
-$bb_cfg['tp_release_date'] = '31-08-2011';
+$bb_cfg['tp_release_state'] = 'R274';
+$bb_cfg['tp_release_date'] = '01-09-2011';
// Database
$charset = 'utf8';
@@ -98,7 +98,7 @@ $bb_cfg['cache']['engines'] = array(
);
// Datastore
-// Available datastore types: memcache, sqlite, redis, eaccelerator, apc, xcache (default of mysql)
+// Available datastore types: memcache, sqlite, redis, eaccelerator, apc, xcache (default filecache)
$bb_cfg['datastore_type'] = 'filecache';
// Server