nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The linked-tables infrastructure is now called phpMyAdmin configuration storage.

Browse Source
This commit is contained in:
Michal Čihař
2010-07-26 17:16:55 +02:00
parent 639dc7fcf6
commit cfc7fd7a2d
5 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -95,6 +95,8 @@ $Id$
now. now.
+ [validator] SQL validator works also with SOAP PHP extension. + [validator] SQL validator works also with SOAP PHP extension.
- [interface] Better formatting for SQL validator results. - [interface] Better formatting for SQL validator results.
- [doc] The linked-tables infrastructure is now called phpMyAdmin
configuration storage.
3.3.6.0 (not yet released) 3.3.6.0 (not yet released)
- bug #3033063 [core] Navi gets wrong db name - bug #3033063 [core] Navi gets wrong db name

41
Documentation.html
View File

@@ -170,7 +170,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<ol><li><a href="#quick_install">Quick Install</a></li> <ol><li><a href="#quick_install">Quick Install</a></li>
<li><a href="#setup_script">Setup script usage</a></li> <li><a href="#setup_script">Setup script usage</a></li>
<li><a href="#linked-tables">Linked-tables infrastructure</a></li> <li><a href="#linked-tables">phpMyAdmin configuration storage</a></li>
<li><a href="#upgrading">Upgrading from an older version</a></li> <li><a href="#upgrading">Upgrading from an older version</a></li>
<li><a href="#authentication_modes">Using authentication modes</a></li> <li><a href="#authentication_modes">Using authentication modes</a></li>
</ol> </ol>
@@ -326,7 +326,7 @@ rm -rf config # remove not needed directory
</li> </li>
</ol> </ol>
<h3 id="linked-tables">Linked-tables infrastructure</h3> <h3 id="linked-tables">phpMyAdmin configuration storage</h3>
<p> For a whole set of new features (bookmarks, comments, <p> For a whole set of new features (bookmarks, comments,
<abbr title="structured query language">SQL</abbr>-history, <abbr title="structured query language">SQL</abbr>-history,
@@ -373,7 +373,7 @@ rm -rf config # remove not needed directory
is version-specific.</p> is version-specific.</p>
<p> If you have upgraded your MySQL server from a version previous to 4.1.2 to <p> If you have upgraded your MySQL server from a version previous to 4.1.2 to
version 4.1.2 or newer and if you use the pmadb/linked table infrastructure, version 4.1.2 or newer and if you use the phpMyAdmin configuration storage,
you should run the SQL script found in you should run the SQL script found in
<tt>scripts/upgrade_tables_mysql_4_1_2+.sql</tt>.</p> <tt>scripts/upgrade_tables_mysql_4_1_2+.sql</tt>.</p>
@@ -443,8 +443,9 @@ GRANT SELECT (Host, Db, User, Table_name, Table_priv, Column_priv)
GRANT SELECT, INSERT, UPDATE, DELETE ON &lt;pma_db&gt;.* TO 'pma'@'localhost'; GRANT SELECT, INSERT, UPDATE, DELETE ON &lt;pma_db&gt;.* TO 'pma'@'localhost';
</pre> </pre>
(this of course requires that your <a href="#linked-tables">linked-tables (this of course requires that your <a href="#linked-tables">phpMyAdmin
infrastructure</a> be set up).<br /></li> configuration storage</a> be set up).
<br /></li>
<li>Then each of the <i>true</i> users should be granted a set of privileges <li>Then each of the <i>true</i> users should be granted a set of privileges
on a set of particular databases. Normally you shouldn't give global on a set of particular databases. Normally you shouldn't give global
@@ -865,11 +866,11 @@ since this link provides funding for phpMyAdmin.
<dt id="pmadb"> <dt id="pmadb">
<span id="cfg_Servers_pmadb">$cfg['Servers'][$i]['pmadb']</span> string <span id="cfg_Servers_pmadb">$cfg['Servers'][$i]['pmadb']</span> string
</dt> </dt>
<dd>The name of the database containing the linked-tables infrastructure. <dd>The name of the database containing the phpMyAdmin configuration storage.
<br /><br /> <br /><br />
See the <a href="#linked-tables">Linked-tables infrastructure</a> See the <a href="#linked-tables">phpMyAdmin configuration storage</a>
section in this document to see the benefits of this infrastructure, section in this document to see the benefits of this feature,
and for a quick way of creating this database and the needed tables. and for a quick way of creating this database and the needed tables.
<br /><br /> <br /><br />
@@ -878,7 +879,7 @@ since this link provides funding for phpMyAdmin.
case, just put your current database name in case, just put your current database name in
<tt>$cfg['Servers'][$i]['pmadb']</tt>. For a multi-user installation, <tt>$cfg['Servers'][$i]['pmadb']</tt>. For a multi-user installation,
set this parameter to the name of your central database containing set this parameter to the name of your central database containing
the linked-tables infrastructure.</dd> the phpMyAdmin configuration storage.</dd>
<dt id="bookmark"> <dt id="bookmark">
<span id="cfg_Servers_bookmarktable">$cfg['Servers'][$i]['bookmarktable']</span> string <span id="cfg_Servers_bookmarktable">$cfg['Servers'][$i]['bookmarktable']</span> string
@@ -887,7 +888,7 @@ since this link provides funding for phpMyAdmin.
useful for queries you often run.<br /><br /> useful for queries you often run.<br /><br />
To allow the usage of this functionality: To allow the usage of this functionality:
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
<li>enter the table name in <li>enter the table name in
<tt>$cfg['Servers'][$i]['bookmarktable']</tt></li> <tt>$cfg['Servers'][$i]['bookmarktable']</tt></li>
</ul> </ul>
@@ -923,8 +924,8 @@ since this link provides funding for phpMyAdmin.
To allow the usage of this functionality: To allow the usage of this functionality:
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin
infrastructure</li> configuration storage</li>
<li>put the relation table name in <li>put the relation table name in
<tt>$cfg['Servers'][$i]['relation']</tt></li> <tt>$cfg['Servers'][$i]['relation']</tt></li>
<li>now as normal user open phpMyAdmin and for each one of your <li>now as normal user open phpMyAdmin and for each one of your
@@ -948,7 +949,7 @@ since this link provides funding for phpMyAdmin.
cursor over the corresponding key.<br /> cursor over the corresponding key.<br />
This configuration variable will hold the name of this special This configuration variable will hold the name of this special
table. To allow the usage of this functionality: table. To allow the usage of this functionality:
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
<li>put the table name in <li>put the table name in
<tt>$cfg['Servers'][$i]['table_info']</tt> (e.g. <tt>$cfg['Servers'][$i]['table_info']</tt> (e.g.
'pma_table_info')</li> 'pma_table_info')</li>
@@ -975,8 +976,7 @@ since this link provides funding for phpMyAdmin.
To allow the usage of this functionality: To allow the usage of this functionality:
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
infrastructure</li>
<li>put the correct table names in <li>put the correct table names in
<tt>$cfg['Servers'][$i]['table_coords']</tt> and <tt>$cfg['Servers'][$i]['table_coords']</tt> and
<tt>$cfg['Servers'][$i]['pdf_pages']</tt></li> <tt>$cfg['Servers'][$i]['pdf_pages']</tt></li>
@@ -1007,8 +1007,7 @@ since this link provides funding for phpMyAdmin.
<br /><br /> <br /><br />
To allow the usage of this functionality: To allow the usage of this functionality:
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
infrastructure</li>
<li>put the table name in <li>put the table name in
<tt>$cfg['Servers'][$i]['column_info']</tt> (e.g. <tt>$cfg['Servers'][$i]['column_info']</tt> (e.g.
'pma_column_info')</li> 'pma_column_info')</li>
@@ -1048,8 +1047,7 @@ ALTER TABLE `pma_column_comments`
To allow the usage of this functionality: To allow the usage of this functionality:
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
infrastructure</li>
<li>put the table name in <tt>$cfg['Servers'][$i]['history']</tt> <li>put the table name in <tt>$cfg['Servers'][$i]['history']</tt>
(e.g. 'pma_history') (e.g. 'pma_history')
</li> </li>
@@ -1081,7 +1079,7 @@ ALTER TABLE `pma_column_comments`
To allow the usage of this functionality: To allow the usage of this functionality:
<ul> <ul>
<li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> <li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
<li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt> (e.g. 'pma_tracking')</li> <li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt> (e.g. 'pma_tracking')</li>
</ul> </ul>
</dd> </dd>
@@ -1152,8 +1150,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
To allow the usage of this functionality: To allow the usage of this functionality:
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
infrastructure</li>
<li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> (e.g. 'pma_designer_coords') <li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> (e.g. 'pma_designer_coords')
</li> </li>
</ul> </ul>

2
db_operations.php
View File

@@ -461,7 +461,7 @@ if (!$is_information_schema) {
if ($num_tables > 0 if ($num_tables > 0
&& !$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) { && !$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) {
$message = PMA_Message::notice(__('The additional features for working with linked tables have been deactivated. To find out why click %shere%s.')); $message = PMA_Message::notice(__('The phpMyAdmin configuration storage has been deactivated. To find out why click %shere%s.'));
$message->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">', false); $message->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">', false);
$message->addParam('</a>', false); $message->addParam('</a>', false);
/* Show error if user has configured something, notice elsewhere */ /* Show error if user has configured something, notice elsewhere */

2
pdf_schema.php
View File

@@ -29,7 +29,7 @@ $cfgRelation = PMA_getRelationsParam();
if (!$cfgRelation['pdfwork']) { if (!$cfgRelation['pdfwork']) {
echo '<font color="red">' . __('Error') . '</font><br />' . "\n"; echo '<font color="red">' . __('Error') . '</font><br />' . "\n";
$url_to_goto = '<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">'; $url_to_goto = '<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">';
echo sprintf(__('The additional features for working with linked tables have been deactivated. To find out why click %shere%s.'), $url_to_goto, '</a>') . "\n"; echo sprintf(__('The phpMyAdmin configuration storage has been deactivated. To find out why click %shere%s.'), $url_to_goto, '</a>') . "\n";
} }
/** /**

2
setup/lib/messages.inc.php
View File

@@ -125,7 +125,7 @@ $strSetupForm_Server_config = __('Server configuration');
$strSetupForm_Server_desc = __('Enter server connection parameters'); $strSetupForm_Server_desc = __('Enter server connection parameters');
$strSetupForm_Server_login_options_desc = __('Enter login options for signon authentication'); $strSetupForm_Server_login_options_desc = __('Enter login options for signon authentication');
$strSetupForm_Server_login_options = __('Signon login options'); $strSetupForm_Server_login_options = __('Signon login options');
$strSetupForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain access to additional features, see [a@../Documentation.html#linked-tables]linked-tables infrastructure[/a] in documentation'); $strSetupForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain access to additional features, see [a@../Documentation.html#linked-tables]phpMyAdmin configuration storage[/a] in documentation');
$strSetupForm_Server_pmadb = __('PMA database'); $strSetupForm_Server_pmadb = __('PMA database');
$strSetupForm_Server_tracking_desc = __('Tracking of changes made in database. Requires configured PMA database.'); $strSetupForm_Server_tracking_desc = __('Tracking of changes made in database. Requires configured PMA database.');
$strSetupForm_Server_tracking = __('Changes tracking'); $strSetupForm_Server_tracking = __('Changes tracking');