Merge branch 'QA_3_3'

This commit is contained in:
Marc Delisle
2010-06-30 09:36:11 -04:00

View File

@@ -946,7 +946,8 @@ since this link provides funding for phpMyAdmin.
table. To allow the usage of this functionality:
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li>
<li>put the table name in
<tt>$cfg['Servers'][$i]['table_info']</tt></li>
<tt>$cfg['Servers'][$i]['table_info']</tt> (e.g.
'pma_table_info')</li>
<li>then for each table where you want to use this feature,
click &quot;Structure/Relation view/Choose column to display&quot;
to choose the column.</li>
@@ -1005,7 +1006,8 @@ since this link provides funding for phpMyAdmin.
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables
infrastructure</li>
<li>put the table name in
<tt>$cfg['Servers'][$i]['column_info']</tt></li>
<tt>$cfg['Servers'][$i]['column_info']</tt> (e.g.
'pma_column_info')</li>
<li>to update your PRE-2.5.0 Column_comments Table use this:
<pre>
@@ -1045,6 +1047,7 @@ ALTER TABLE `pma_column_comments`
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables
infrastructure</li>
<li>put the table name in <tt>$cfg['Servers'][$i]['history']</tt>
(e.g. 'pma_history')
</li>
</ul>
</dd>
@@ -1075,7 +1078,7 @@ ALTER TABLE `pma_column_comments`
<ul>
<li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li>
<li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt></li>
<li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt> (e.g. 'pma_tracking')</li>
</ul>
</dd>
@@ -1147,7 +1150,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables
infrastructure</li>
<li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt>
<li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> (e.g. 'pma_designer_coords')
</li>
</ul>
</dd>