The branch, master has been updated via cfc7fd7a2dda8ce07647369593da3040c3603c72 (commit) from 639dc7fcf67b1277f6a0ee4d707d90daefbb975e (commit)
- Log ----------------------------------------------------------------- commit cfc7fd7a2dda8ce07647369593da3040c3603c72 Author: Michal Čihař mcihar@novell.com Date: Mon Jul 26 17:16:55 2010 +0200
The linked-tables infrastructure is now called phpMyAdmin configuration storage.
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 2 ++ Documentation.html | 41 +++++++++++++++++++---------------------- db_operations.php | 2 +- pdf_schema.php | 2 +- setup/lib/messages.inc.php | 2 +- 5 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 3adda53..b75e9c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,6 +95,8 @@ $Id$ now. + [validator] SQL validator works also with SOAP PHP extension. - [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) - bug #3033063 [core] Navi gets wrong db name diff --git a/Documentation.html b/Documentation.html index 3e5edee..d5c5d45 100644 --- a/Documentation.html +++ b/Documentation.html @@ -170,7 +170,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<ol><li><a href="#quick_install">Quick Install</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="#authentication_modes">Using authentication modes</a></li> </ol> @@ -326,7 +326,7 @@ rm -rf config # remove not needed directory </li> </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, <abbr title="structured query language">SQL</abbr>-history, @@ -373,7 +373,7 @@ rm -rf config # remove not needed directory is version-specific.</p>
<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 <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 <pma_db>.* TO 'pma'@'localhost'; </pre>
- (this of course requires that your <a href="#linked-tables">linked-tables - infrastructure</a> be set up).<br /></li> + (this of course requires that your <a href="#linked-tables">phpMyAdmin + configuration storage</a> be set up). + <br /></li>
<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 @@ -865,11 +866,11 @@ since this link provides funding for phpMyAdmin. <dt id="pmadb"> <span id="cfg_Servers_pmadb">$cfg['Servers'][$i]['pmadb']</span> string </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 />
- See the <a href="#linked-tables">Linked-tables infrastructure</a> - section in this document to see the benefits of this infrastructure, + See the <a href="#linked-tables">phpMyAdmin configuration storage</a> + section in this document to see the benefits of this feature, and for a quick way of creating this database and the needed tables. <br /><br />
@@ -878,7 +879,7 @@ since this link provides funding for phpMyAdmin. case, just put your current database name in <tt>$cfg['Servers'][$i]['pmadb']</tt>. For a multi-user installation, set this parameter to the name of your central database containing - the linked-tables infrastructure.</dd> + the phpMyAdmin configuration storage.</dd>
<dt id="bookmark"> <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 />
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 <tt>$cfg['Servers'][$i]['bookmarktable']</tt></li> </ul> @@ -923,8 +924,8 @@ since this link provides funding for phpMyAdmin.
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 relation table name in <tt>$cfg['Servers'][$i]['relation']</tt></li> <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 /> This configuration variable will hold the name of this special 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 <tt>$cfg['Servers'][$i]['table_info']</tt> (e.g. 'pma_table_info')</li> @@ -975,8 +976,7 @@ since this link provides funding for phpMyAdmin.
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 correct table names in <tt>$cfg['Servers'][$i]['table_coords']</tt> and <tt>$cfg['Servers'][$i]['pdf_pages']</tt></li> @@ -1007,8 +1007,7 @@ since this link provides funding for phpMyAdmin. <br /><br />
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 <tt>$cfg['Servers'][$i]['column_info']</tt> (e.g. 'pma_column_info')</li> @@ -1048,8 +1047,7 @@ ALTER TABLE `pma_column_comments`
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 <tt>$cfg['Servers'][$i]['history']</tt> (e.g. 'pma_history') </li> @@ -1081,7 +1079,7 @@ ALTER TABLE `pma_column_comments` To allow the usage of this functionality:
<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> </ul> </dd> @@ -1152,8 +1150,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
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 <tt>$cfg['Servers'][$i]['designer_coords']</tt> (e.g. 'pma_designer_coords') </li> </ul> diff --git a/db_operations.php b/db_operations.php index c2464b0..eb8c6a2 100644 --- a/db_operations.php +++ b/db_operations.php @@ -461,7 +461,7 @@ if (!$is_information_schema) {
if ($num_tables > 0 && !$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>', false); /* Show error if user has configured something, notice elsewhere */ diff --git a/pdf_schema.php b/pdf_schema.php index a1c16e6..dd7426f 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -29,7 +29,7 @@ $cfgRelation = PMA_getRelationsParam(); if (!$cfgRelation['pdfwork']) { echo '<font color="red">' . __('Error') . '</font><br />' . "\n"; $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"; }
/** diff --git a/setup/lib/messages.inc.php b/setup/lib/messages.inc.php index ef1f42b..d1ceb05 100644 --- a/setup/lib/messages.inc.php +++ b/setup/lib/messages.inc.php @@ -125,7 +125,7 @@ $strSetupForm_Server_config = __('Server configuration'); $strSetupForm_Server_desc = __('Enter server connection parameters'); $strSetupForm_Server_login_options_desc = __('Enter login options for signon authentication'); $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_tracking_desc = __('Tracking of changes made in database. Requires configured PMA database.'); $strSetupForm_Server_tracking = __('Changes tracking');
hooks/post-receive