[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5792-g5908ab7

[Michal Čihař]

The branch, master has been updated
       via  5908ab72bca63e9efb326e8148c1f8f0fb285de6 (commit)
      from  85dd14612dd4afd296747d26752a0bc5607e116b (commit)


- Log -----------------------------------------------------------------
commit 5908ab72bca63e9efb326e8148c1f8f0fb285de6
Author: Michal Čihař <mcihar at novell.com>
Date:   Wed Jul 21 09:07:59 2010 +0200

    Clarify database upgrade instructions.
    
    We don't want to maintain all new tables in upgrade script as well.

-----------------------------------------------------------------------

Summary of changes:
 Documentation.html                      |    3 ++-
 scripts/upgrade_tables_mysql_4_1_2+.sql |   19 -------------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 4c23ec6..67f9ff1 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -340,7 +340,8 @@ rm -rf config                      # remove not needed directory
     <abbr title="Frequently Asked Questions">FAQ</abbr> 1.23</a>).</p>
 
 <p> If you already had this infrastructure and upgraded to MySQL 4.1.2
-    or newer, please use <i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i>.</p>
+    or newer, please use <i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i>
+    and then create new tables by importing <i>./scripts/create_tables.sql</i>.</p>
 
 <p> You can use your phpMyAdmin to create the tables for you. Please be aware
     that you may need special (administrator) privileges to create the database
diff --git a/scripts/upgrade_tables_mysql_4_1_2+.sql b/scripts/upgrade_tables_mysql_4_1_2+.sql
index 3ab0e74..1ff470e 100644
--- a/scripts/upgrade_tables_mysql_4_1_2+.sql
+++ b/scripts/upgrade_tables_mysql_4_1_2+.sql
@@ -143,22 +143,3 @@ ALTER TABLE `pma_table_info`
   CHANGE `table_name` `table_name` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
 ALTER TABLE `pma_table_info`
   CHANGE `display_field` `display_field` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma_designer_coords`
---
-
-CREATE TABLE IF NOT EXISTS `pma_designer_coords` (
-  `db_name` varchar(64) NOT NULL default '',
-  `table_name` varchar(64) NOT NULL default '',
-  `x` INT,
-  `y` INT,
-  `v` TINYINT,
-  `h` TINYINT,
-  PRIMARY KEY (`db_name`,`table_name`)
-)
-  ENGINE=MyISAM COMMENT='Table coordinates for Designer'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-


hooks/post-receive
-- 
phpMyAdmin