bug #4675 phpMyAdmin should be able to work without 'examples' DIR - move SQL scripts to sql directory

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>

4 files changed, 0 insertions, 789 deletions

diff --git a/examples/create_tables.sql b/examples/create_tables.sql
deleted file mode 100644
index e11bf019b6..0000000000
--- a/examples/create_tables.sql
+++ /dev/null
@@ -1,323 +0,0 @@
--- --------------------------------------------------------
--- SQL Commands to set up the pmadb as described in the documentation.
---
--- This file is meant for use with MySQL 5 and above!
---
--- This script expects the user pma to already be existing. If we would put a
--- line here to create him too many users might just use this script and end
--- up with having the same password for the controluser.
---
--- This user "pma" must be defined in config.inc.php (controluser/controlpass)
---
--- Please don't forget to set up the tablenames in config.inc.php
---
-
--- --------------------------------------------------------
-
---
--- Database : `phpmyadmin`
---
-CREATE DATABASE IF NOT EXISTS `phpmyadmin`
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-USE phpmyadmin;
-
--- --------------------------------------------------------
-
---
--- Privileges
---
--- (activate this statement if necessary)
--- GRANT SELECT, INSERT, DELETE, UPDATE, ALTER ON `phpmyadmin`.* TO
---    'pma'@localhost;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__bookmark`
---
-
-CREATE TABLE IF NOT EXISTS `pma__bookmark` (
-  `id` int(11) NOT NULL auto_increment,
-  `dbase` varchar(255) NOT NULL default '',
-  `user` varchar(255) NOT NULL default '',
-  `label` varchar(255) COLLATE utf8_general_ci NOT NULL default '',
-  `query` text NOT NULL,
-  PRIMARY KEY  (`id`)
-)
-  COMMENT='Bookmarks'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__column_info`
---
-
-CREATE TABLE IF NOT EXISTS `pma__column_info` (
-  `id` int(5) unsigned NOT NULL auto_increment,
-  `db_name` varchar(64) NOT NULL default '',
-  `table_name` varchar(64) NOT NULL default '',
-  `column_name` varchar(64) NOT NULL default '',
-  `comment` varchar(255) COLLATE utf8_general_ci NOT NULL default '',
-  `mimetype` varchar(255) COLLATE utf8_general_ci NOT NULL default '',
-  `transformation` varchar(255) NOT NULL default '',
-  `transformation_options` varchar(255) NOT NULL default '',
-  `input_transformation` varchar(255) NOT NULL default '',
-  `input_transformation_options` varchar(255) NOT NULL default '',
-  PRIMARY KEY  (`id`),
-  UNIQUE KEY `db_name` (`db_name`,`table_name`,`column_name`)
-)
-  COMMENT='Column information for phpMyAdmin'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__history`
---
-
-CREATE TABLE IF NOT EXISTS `pma__history` (
-  `id` bigint(20) unsigned NOT NULL auto_increment,
-  `username` varchar(64) NOT NULL default '',
-  `db` varchar(64) NOT NULL default '',
-  `table` varchar(64) NOT NULL default '',
-  `timevalue` timestamp NOT NULL,
-  `sqlquery` text NOT NULL,
-  PRIMARY KEY  (`id`),
-  KEY `username` (`username`,`db`,`table`,`timevalue`)
-)
-  COMMENT='SQL history for phpMyAdmin'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__pdf_pages`
---
-
-CREATE TABLE IF NOT EXISTS `pma__pdf_pages` (
-  `db_name` varchar(64) NOT NULL default '',
-  `page_nr` int(10) unsigned NOT NULL auto_increment,
-  `page_descr` varchar(50) COLLATE utf8_general_ci NOT NULL default '',
-  PRIMARY KEY  (`page_nr`),
-  KEY `db_name` (`db_name`)
-)
-  COMMENT='PDF relation pages for phpMyAdmin'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__recent`
---
-
-CREATE TABLE IF NOT EXISTS `pma__recent` (
-  `username` varchar(64) NOT NULL,
-  `tables` text NOT NULL,
-  PRIMARY KEY (`username`)
-)
-  COMMENT='Recently accessed tables'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__favorite`
---
-
-CREATE TABLE IF NOT EXISTS `pma__favorite` (
-  `username` varchar(64) NOT NULL,
-  `tables` text NOT NULL,
-  PRIMARY KEY (`username`)
-)
-  COMMENT='Favorite tables'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__table_uiprefs`
---
-
-CREATE TABLE IF NOT EXISTS `pma__table_uiprefs` (
-  `username` varchar(64) NOT NULL,
-  `db_name` varchar(64) NOT NULL,
-  `table_name` varchar(64) NOT NULL,
-  `prefs` text NOT NULL,
-  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`username`,`db_name`,`table_name`)
-)
-  COMMENT='Tables'' UI preferences'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__relation`
---
-
-CREATE TABLE IF NOT EXISTS `pma__relation` (
-  `master_db` varchar(64) NOT NULL default '',
-  `master_table` varchar(64) NOT NULL default '',
-  `master_field` varchar(64) NOT NULL default '',
-  `foreign_db` varchar(64) NOT NULL default '',
-  `foreign_table` varchar(64) NOT NULL default '',
-  `foreign_field` varchar(64) NOT NULL default '',
-  PRIMARY KEY  (`master_db`,`master_table`,`master_field`),
-  KEY `foreign_field` (`foreign_db`,`foreign_table`)
-)
-  COMMENT='Relation table'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__table_coords`
---
-
-CREATE TABLE IF NOT EXISTS `pma__table_coords` (
-  `db_name` varchar(64) NOT NULL default '',
-  `table_name` varchar(64) NOT NULL default '',
-  `pdf_page_number` int(11) NOT NULL default '0',
-  `x` float unsigned NOT NULL default '0',
-  `y` float unsigned NOT NULL default '0',
-  PRIMARY KEY  (`db_name`,`table_name`,`pdf_page_number`)
-)
-  COMMENT='Table coordinates for phpMyAdmin PDF output'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__table_info`
---
-
-CREATE TABLE IF NOT EXISTS `pma__table_info` (
-  `db_name` varchar(64) NOT NULL default '',
-  `table_name` varchar(64) NOT NULL default '',
-  `display_field` varchar(64) NOT NULL default '',
-  PRIMARY KEY  (`db_name`,`table_name`)
-)
-  COMMENT='Table information for phpMyAdmin'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__tracking`
---
-
-CREATE TABLE IF NOT EXISTS `pma__tracking` (
-  `db_name` varchar(64) NOT NULL,
-  `table_name` varchar(64) NOT NULL,
-  `version` int(10) unsigned NOT NULL,
-  `date_created` datetime NOT NULL,
-  `date_updated` datetime NOT NULL,
-  `schema_snapshot` text NOT NULL,
-  `schema_sql` text,
-  `data_sql` longtext,
-  `tracking` set('UPDATE','REPLACE','INSERT','DELETE','TRUNCATE','CREATE DATABASE','ALTER DATABASE','DROP DATABASE','CREATE TABLE','ALTER TABLE','RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX','CREATE VIEW','ALTER VIEW','DROP VIEW') default NULL,
-  `tracking_active` int(1) unsigned NOT NULL default '1',
-  PRIMARY KEY  (`db_name`,`table_name`,`version`)
-)
-  COMMENT='Database changes tracking for phpMyAdmin'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__userconfig`
---
-
-CREATE TABLE IF NOT EXISTS `pma__userconfig` (
-  `username` varchar(64) NOT NULL,
-  `timevalue` timestamp NOT NULL,
-  `config_data` text NOT NULL,
-  PRIMARY KEY  (`username`)
-)
-  COMMENT='User preferences storage for phpMyAdmin'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__users`
---
-
-CREATE TABLE IF NOT EXISTS `pma__users` (
-  `username` varchar(64) NOT NULL,
-  `usergroup` varchar(64) NOT NULL,
-  PRIMARY KEY (`username`,`usergroup`)
-)
-  COMMENT='Users and their assignments to user groups'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__usergroups`
---
-
-CREATE TABLE IF NOT EXISTS `pma__usergroups` (
-  `usergroup` varchar(64) NOT NULL,
-  `tab` varchar(64) NOT NULL,
-  `allowed` enum('Y','N') NOT NULL DEFAULT 'N',
-  PRIMARY KEY (`usergroup`,`tab`,`allowed`)
-)
-  COMMENT='User groups with configured menu items'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__navigationhiding`
---
-
-CREATE TABLE IF NOT EXISTS `pma__navigationhiding` (
-  `username` varchar(64) NOT NULL,
-  `item_name` varchar(64) NOT NULL,
-  `item_type` varchar(64) NOT NULL,
-  `db_name` varchar(64) NOT NULL,
-  `table_name` varchar(64) NOT NULL,
-  PRIMARY KEY (`username`,`item_name`,`item_type`,`db_name`,`table_name`)
-)
-  COMMENT='Hidden items of navigation tree'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__savedsearches`
---
-
-CREATE TABLE IF NOT EXISTS `pma__savedsearches` (
-  `id` int(5) unsigned NOT NULL auto_increment,
-  `username` varchar(64) NOT NULL default '',
-  `db_name` varchar(64) NOT NULL default '',
-  `search_name` varchar(64) NOT NULL default '',
-  `search_data` text NOT NULL,
-  PRIMARY KEY  (`id`),
-  UNIQUE KEY `u_savedsearches_username_dbname` (`username`,`db_name`,`search_name`)
-)
-  COMMENT='Saved searches'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__central_columns`
---
-
-CREATE TABLE IF NOT EXISTS `pma__central_columns` (
-  `db_name` varchar(64) NOT NULL,
-  `col_name` varchar(64) NOT NULL,
-  `col_type` varchar(64) NOT NULL,
-  `col_length` text,
-  `col_collation` varchar(64) NOT NULL,
-  `col_isNull` boolean NOT NULL,
-  `col_extra` varchar(255) default '',
-  `col_default` text,
-  PRIMARY KEY (`db_name`,`col_name`)
-)
-  COMMENT='Central list of columns'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
diff --git a/examples/create_tables_drizzle.sql b/examples/create_tables_drizzle.sql
deleted file mode 100644
index 4bce72f2d8..0000000000
--- a/examples/create_tables_drizzle.sql
+++ /dev/null
@@ -1,275 +0,0 @@
--- --------------------------------------------------------
--- SQL Commands to set up the pmadb as described in the documentation.
---
--- This file is meant for use with Drizzle 2011.03.13 and above!
---
--- This script expects that you take care of database permissions.
---
--- Please don't forget to set up the tablenames in config.inc.php
---
-
--- --------------------------------------------------------
-
---
--- Database : `phpmyadmin`
---
-CREATE DATABASE IF NOT EXISTS `phpmyadmin`
-  COLLATE utf8_bin;
-USE phpmyadmin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__bookmark`
---
-
-CREATE TABLE IF NOT EXISTS `pma__bookmark` (
-  `id` int(11) NOT NULL auto_increment,
-  `dbase` varchar(255) NOT NULL default '',
-  `user` varchar(255) NOT NULL default '',
-  `label` varchar(255) COLLATE utf8_general_ci NOT NULL default '',
-  `query` text NOT NULL,
-  PRIMARY KEY  (`id`)
-)
-  COMMENT='Bookmarks'
-  COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__column_info`
---
-
-CREATE TABLE IF NOT EXISTS `pma__column_info` (
-  `id` int(5) NOT NULL auto_increment,
-  `db_name` varchar(64) NOT NULL default '',
-  `table_name` varchar(64) NOT NULL default '',
-  `column_name` varchar(64) NOT NULL default '',
-  `comment` varchar(255) COLLATE utf8_general_ci NOT NULL default '',
-  `mimetype` varchar(255) COLLATE utf8_general_ci NOT NULL default '',
-  `transformation` varchar(255) NOT NULL default '',
-  `transformation_options` varchar(255) NOT NULL default '',
-  `input_transformation` varchar(255) NOT NULL default '',
-  `input_transformation_options` varchar(255) NOT NULL default '',
-  PRIMARY KEY  (`id`),
-  UNIQUE KEY `db_name` (`db_name`,`table_name`,`column_name`)
-)
-  COMMENT='Column information for phpMyAdmin'
-  COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__history`
---
-
-CREATE TABLE IF NOT EXISTS `pma__history` (
-  `id` bigint(20) NOT NULL auto_increment,
-  `username` varchar(64) NOT NULL default '',
-  `db` varchar(64) NOT NULL default '',
-  `table` varchar(64) NOT NULL default '',
-  `timevalue` timestamp NOT NULL,
-  `sqlquery` text NOT NULL,
-  PRIMARY KEY  (`id`),
-  KEY `username` (`username`,`db`,`table`,`timevalue`)
-)
-  COMMENT='SQL history for phpMyAdmin'
-  COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__pdf_pages`
---
-
-CREATE TABLE IF NOT EXISTS `pma__pdf_pages` (
-  `db_name` varchar(64) NOT NULL default '',
-  `page_nr` int(10) NOT NULL auto_increment,
-  `page_descr` varchar(50) COLLATE utf8_general_ci NOT NULL default '',
-  PRIMARY KEY  (`page_nr`),
-  KEY `db_name` (`db_name`)
-)
-  COMMENT='PDF relation pages for phpMyAdmin'
-  COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__recent`
---
-
-CREATE TABLE IF NOT EXISTS `pma__recent` (
-  `username` varchar(64) NOT NULL,
-  `tables` text NOT NULL,
-  PRIMARY KEY (`username`)
-)
-  COMMENT='Recently accessed tables'
-  COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__table_uiprefs`
---
-
-CREATE TABLE IF NOT EXISTS `pma__table_uiprefs` (
-  `username` varchar(64) NOT NULL,
-  `db_name` varchar(64) NOT NULL,
-  `table_name` varchar(64) NOT NULL,
-  `prefs` text NOT NULL,
-  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`username`,`db_name`,`table_name`)
-)
-  COMMENT='Tables'' UI preferences'
-  COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__relation`
---
-
-CREATE TABLE IF NOT EXISTS `pma__relation` (
-  `master_db` varchar(64) NOT NULL default '',
-  `master_table` varchar(64) NOT NULL default '',
-  `master_field` varchar(64) NOT NULL default '',
-  `foreign_db` varchar(64) NOT NULL default '',
-  `foreign_table` varchar(64) NOT NULL default '',
-  `foreign_field` varchar(64) NOT NULL default '',
-  PRIMARY KEY  (`master_db`,`master_table`,`master_field`),
-  KEY `foreign_field` (`foreign_db`,`foreign_table`)
-)
-  COMMENT='Relation table'
-  COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__table_coords`
---
-
-CREATE TABLE IF NOT EXISTS `pma__table_coords` (
-  `db_name` varchar(64) NOT NULL default '',
-  `table_name` varchar(64) NOT NULL default '',
-  `pdf_page_number` int(11) NOT NULL default '0',
-  `x` float NOT NULL default '0',
-  `y` float NOT NULL default '0',
-  PRIMARY KEY  (`db_name`,`table_name`,`pdf_page_number`)
-)
-  COMMENT='Table coordinates for phpMyAdmin PDF output'
-  COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__table_info`
---
-
-CREATE TABLE IF NOT EXISTS `pma__table_info` (
-  `db_name` varchar(64) NOT NULL default '',
-  `table_name` varchar(64) NOT NULL default '',
-  `display_field` varchar(64) NOT NULL default '',
-  PRIMARY KEY  (`db_name`,`table_name`)
-)
-  COMMENT='Table information for phpMyAdmin'
-  COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__tracking`
---
-
-CREATE TABLE IF NOT EXISTS `pma__tracking` (
-  `db_name` varchar(64) NOT NULL,
-  `table_name` varchar(64) NOT NULL,
-  `version` int(10) NOT NULL,
-  `date_created` datetime NOT NULL,
-  `date_updated` datetime NOT NULL,
-  `schema_snapshot` text NOT NULL,
-  `schema_sql` text,
-  `data_sql` text,
-  `tracking` varchar(15) default NULL,
-  `tracking_active` int(1) NOT NULL default '1',
-  PRIMARY KEY  (`db_name`,`table_name`,`version`)
-)
-  COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__userconfig`
---
-
-CREATE TABLE IF NOT EXISTS `pma__userconfig` (
-  `username` varchar(64) NOT NULL,
-  `timevalue` timestamp NOT NULL,
-  `config_data` text NOT NULL,
-  PRIMARY KEY  (`username`)
-)
-  COMMENT='User preferences storage for phpMyAdmin'
-  COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__users`
---
-
-CREATE TABLE IF NOT EXISTS `pma__users` (
-  `username` varchar(64) NOT NULL,
-  `usergroup` varchar(64) NOT NULL,
-  PRIMARY KEY (`username`,`usergroup`)
-)
-  COMMENT='Users and their assignments to user groups'
-  COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__usergroups`
---
-
-CREATE TABLE IF NOT EXISTS `pma__usergroups` (
-  `usergroup` varchar(64) NOT NULL,
-  `tab` varchar(64) NOT NULL,
-  `allowed` enum('Y','N') NOT NULL DEFAULT 'N',
-  PRIMARY KEY (`usergroup`,`tab`,`allowed`)
-)
-  COMMENT='User groups with configured menu items'
-  COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__navigationhiding`
---
-
-CREATE TABLE IF NOT EXISTS `pma__navigationhiding` (
-  `username` varchar(64) NOT NULL,
-  `item_name` varchar(64) NOT NULL,
-  `item_type` varchar(64) NOT NULL,
-  `db_name` varchar(64) NOT NULL,
-  `table_name` varchar(64) NOT NULL,
-  PRIMARY KEY (`username`,`item_name`,`item_type`,`db_name`,`table_name`)
-)
-  COMMENT='Hidden items of navigation tree'
-  COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__savedsearches`
---
-
-CREATE TABLE IF NOT EXISTS `pma__savedsearches` (
-  `id` int(5) unsigned NOT NULL auto_increment,
-  `username` varchar(64) NOT NULL default '',
-  `db_name` varchar(64) NOT NULL default '',
-  `search_name` varchar(64) NOT NULL default '',
-  `search_data` text NOT NULL,
-  PRIMARY KEY  (`id`),
-  UNIQUE KEY `u_savedsearches_username_dbname` (`username`,`db_name`,`search_name`)
-)
-  COMMENT='Saved searches'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
diff --git a/examples/upgrade_column_info_4_3_0+.sql b/examples/upgrade_column_info_4_3_0+.sql
deleted file mode 100644
index b5bdc0c1fe..0000000000
--- a/examples/upgrade_column_info_4_3_0+.sql
+++ /dev/null
@@ -1,47 +0,0 @@
--- -------------------------------------------------------------
--- SQL Commands to upgrade pmadb.pma__column_info table
--- for normal phpMyAdmin operation
---
--- This file is meant for use with phpMyAdmin 4.3.0 and above!
--- For older releases, please use create_tables.sql
---
--- Please don't forget to set up the table names in config.inc.php
---
-
--- --------------------------------------------------------
-
---
--- Database : `phpmyadmin`
---
-USE `phpmyadmin`;
-
--- --------------------------------------------------------
-
---
--- Update table structure for table `pma__column_info`
---
-UPDATE `pma__column_info`
-  SET `mimetype` = REPLACE(`mimetype`, 'octet-stream', 'octetstream');
-UPDATE `pma__column_info`
-  SET `transformation` = REPLACE(REPLACE(`transformation`, '__', '_'), 'inc.php', 'class.php');
-UPDATE `pma__column_info`
-  SET `transformation` = ''
-  WHERE `transformation` = '_';
-UPDATE `pma__column_info`
-  SET `transformation` = CONCAT('output/', `transformation`)
-  WHERE `transformation` IN (
-    'application_octetstream_download.class.php',
-    'application_octetstream_hex.class.php',
-    'image_jpeg_inline.class.php',
-    'image_jpeg_link.class.php',
-    'image_png_inline.class.php',
-    'text_plain_bool2text.class.php',
-    'text_plain_dateformat.class.php',
-    'text_plain_external.class.php',
-    'text_plain_formatted.class.php',
-    'text_plain_imagelink.class.php',
-    'text_plain_sql.class.php'
-  );
-ALTER TABLE `pma__column_info`
-  ADD `input_transformation` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
-  ADD `input_transformation_options` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
diff --git a/examples/upgrade_tables_mysql_4_1_2+.sql b/examples/upgrade_tables_mysql_4_1_2+.sql
deleted file mode 100644
index df4046a497..0000000000
--- a/examples/upgrade_tables_mysql_4_1_2+.sql
+++ /dev/null
@@ -1,144 +0,0 @@
--- -------------------------------------------------------------
--- SQL Commands to upgrade pmadb for normal phpMyAdmin operation
--- with MySQL 4.1.2 and above.
---
--- This file is meant for use with MySQL 4.1.2 and above!
--- For older MySQL releases, please use create_tables.sql
---
--- If you are running one MySQL 4.1.0 or 4.1.1, please create the tables using
--- create_tables.sql, then use this script.
---
--- Please don't forget to set up the tablenames in config.inc.php
---
-
--- --------------------------------------------------------
-
---
--- Database : `phpmyadmin`
---
-ALTER DATABASE `phpmyadmin`
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-USE phpmyadmin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__bookmark`
---
-ALTER TABLE `pma__bookmark`
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
-ALTER TABLE `pma__bookmark`
-  CHANGE `dbase` `dbase` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__bookmark`
-  CHANGE `user` `user` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__bookmark`
-  CHANGE `label` `label` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
-ALTER TABLE `pma__bookmark`
-  CHANGE `query` `query` TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__column_info`
---
-
-ALTER TABLE `pma__column_info`
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
-ALTER TABLE `pma__column_info`
-  CHANGE `db_name` `db_name` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__column_info`
-  CHANGE `table_name` `table_name` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__column_info`
-  CHANGE `column_name` `column_name` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__column_info`
-  CHANGE `comment` `comment` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
-ALTER TABLE `pma__column_info`
-  CHANGE `mimetype` `mimetype` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
-ALTER TABLE `pma__column_info`
-  CHANGE `transformation` `transformation` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__column_info`
-  CHANGE `transformation_options` `transformation_options` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__history`
---
-ALTER TABLE `pma__history`
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
-ALTER TABLE `pma__history`
-  CHANGE `username` `username` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__history`
-  CHANGE `db` `db` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__history`
-  CHANGE `table` `table` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__history`
-  CHANGE `sqlquery` `sqlquery` TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__pdf_pages`
---
-
-ALTER TABLE `pma__pdf_pages`
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
-ALTER TABLE `pma__pdf_pages`
-  CHANGE `db_name` `db_name` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__pdf_pages`
-  CHANGE `page_descr` `page_descr` VARCHAR(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL default '';
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__relation`
---
-ALTER TABLE `pma__relation`
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
-ALTER TABLE `pma__relation`
-  CHANGE `master_db` `master_db` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__relation`
-  CHANGE `master_table` `master_table` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__relation`
-  CHANGE `master_field` `master_field` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__relation`
-  CHANGE `foreign_db` `foreign_db` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__relation`
-  CHANGE `foreign_table` `foreign_table` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__relation`
-  CHANGE `foreign_field` `foreign_field` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__table_coords`
---
-
-ALTER TABLE `pma__table_coords`
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
-ALTER TABLE `pma__table_coords`
-  CHANGE `db_name` `db_name` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__table_coords`
-  CHANGE `table_name` `table_name` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__table_info`
---
-
-ALTER TABLE `pma__table_info`
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
-ALTER TABLE `pma__table_info`
-  CHANGE `db_name` `db_name` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-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 '';