From cfc7fd7a2dda8ce07647369593da3040c3603c72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 26 Jul 2010 17:16:55 +0200 Subject: [PATCH] The linked-tables infrastructure is now called phpMyAdmin configuration storage. --- 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 3adda532e..b75e9c818 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 3e5edeea3..d5c5d4516 100644 --- a/Documentation.html +++ b/Documentation.html @@ -170,7 +170,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
  1. Quick Install
  2. Setup script usage
    3. -
  3. Linked-tables infrastructure
    4. +
  4. phpMyAdmin configuration storage
  5. Upgrading from an older version
  6. Using authentication modes
@@ -326,7 +326,7 @@ rm -rf config # remove not needed directory -

Linked-tables infrastructure

+

phpMyAdmin configuration storage

For a whole set of new features (bookmarks, comments, SQL-history, @@ -373,7 +373,7 @@ rm -rf config # remove not needed directory is version-specific.

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 scripts/upgrade_tables_mysql_4_1_2+.sql.

@@ -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'; - (this of course requires that your linked-tables - infrastructure be set up).
+ (this of course requires that your phpMyAdmin + configuration storage be set up). +
  • Then each of the true 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.
    $cfg['Servers'][$i]['pmadb'] string
    -
    The name of the database containing the linked-tables infrastructure. +
    The name of the database containing the phpMyAdmin configuration storage.

    - See the Linked-tables infrastructure - section in this document to see the benefits of this infrastructure, + See the phpMyAdmin configuration storage + section in this document to see the benefits of this feature, and for a quick way of creating this database and the needed tables.

    @@ -878,7 +879,7 @@ since this link provides funding for phpMyAdmin. case, just put your current database name in $cfg['Servers'][$i]['pmadb']. For a multi-user installation, set this parameter to the name of your central database containing - the linked-tables infrastructure.
    + the phpMyAdmin configuration storage.
    $cfg['Servers'][$i]['bookmarktable'] string @@ -887,7 +888,7 @@ since this link provides funding for phpMyAdmin. useful for queries you often run.

    To allow the usage of this functionality: -
    • set up pmadb and the linked-tables infrastructure
      • +
      • set up pmadb and the phpMyAdmin configuration storage
      • enter the table name in $cfg['Servers'][$i]['bookmarktable']
      @@ -923,8 +924,8 @@ since this link provides funding for phpMyAdmin. To allow the usage of this functionality: -
      • set up pmadb and the linked-tables - infrastructure
        • +
        • set up pmadb and the phpMyAdmin + configuration storage
        • put the relation table name in $cfg['Servers'][$i]['relation']
        • 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.
          This configuration variable will hold the name of this special table. To allow the usage of this functionality: -
          • set up pmadb and the linked-tables infrastructure
            • +
            • set up pmadb and the phpMyAdmin configuration storage
            • put the table name in $cfg['Servers'][$i]['table_info'] (e.g. 'pma_table_info')
              • @@ -975,8 +976,7 @@ since this link provides funding for phpMyAdmin. To allow the usage of this functionality: -
              • set up pmadb and the linked-tables - infrastructure
                • +
                • set up pmadb and the phpMyAdmin configuration storage
                • put the correct table names in $cfg['Servers'][$i]['table_coords'] and $cfg['Servers'][$i]['pdf_pages']
                  • @@ -1007,8 +1007,7 @@ since this link provides funding for phpMyAdmin.

                  To allow the usage of this functionality: -
                  • set up pmadb and the linked-tables - infrastructure
                    • +
                    • set up pmadb and the phpMyAdmin configuration storage
                    • put the table name in $cfg['Servers'][$i]['column_info'] (e.g. 'pma_column_info')
                      • @@ -1048,8 +1047,7 @@ ALTER TABLE `pma_column_comments` To allow the usage of this functionality: -
                      • set up pmadb and the linked-tables - infrastructure
                        • +
                        • set up pmadb and the phpMyAdmin configuration storage
                        • put the table name in $cfg['Servers'][$i]['history'] (e.g. 'pma_history')
                          • @@ -1081,7 +1079,7 @@ ALTER TABLE `pma_column_comments` To allow the usage of this functionality:
                            -
                          • set up pmadb and the linked-tables infrastructure
                            • +
                          • set up pmadb and the phpMyAdmin configuration storage
                          • put the table name in $cfg['Servers'][$i]['tracking'] (e.g. 'pma_tracking')
                          @@ -1152,8 +1150,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE To allow the usage of this functionality: -
                          • set up pmadb and the linked-tables - infrastructure
                            • +
                            • set up pmadb and the phpMyAdmin configuration storage
                            • put the table name in $cfg['Servers'][$i]['designer_coords'] (e.g. 'pma_designer_coords')
                            diff --git a/db_operations.php b/db_operations.php index c2464b030..eb8c6a2f2 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('', false); $message->addParam('', false); /* Show error if user has configured something, notice elsewhere */ diff --git a/pdf_schema.php b/pdf_schema.php index a1c16e6bb..dd7426f1b 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -29,7 +29,7 @@ $cfgRelation = PMA_getRelationsParam(); if (!$cfgRelation['pdfwork']) { echo '' . __('Error') . '
                            ' . "\n"; $url_to_goto = ''; - echo sprintf(__('The additional features for working with linked tables have been deactivated. To find out why click %shere%s.'), $url_to_goto, '') . "\n"; + echo sprintf(__('The phpMyAdmin configuration storage has been deactivated. To find out why click %shere%s.'), $url_to_goto, '') . "\n"; } /** diff --git a/setup/lib/messages.inc.php b/setup/lib/messages.inc.php index ef1f42b84..d1ceb05ed 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');