From 4aa32b31d51dfeea8340d2a98bd4e8fbb4e737ac Mon Sep 17 00:00:00 2001 From: Sebastian Mendel Date: Tue, 27 Mar 2007 13:53:14 +0000 Subject: [PATCH] fixed MySQL #1101 - BLOB/TEXT column 'sqlquery' can't have a default value --- scripts/upgrade_tables_mysql_4_1_2+.sql | 80 ++++++++++++------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/scripts/upgrade_tables_mysql_4_1_2+.sql b/scripts/upgrade_tables_mysql_4_1_2+.sql index bc73ebcd9..3ab0e7401 100644 --- a/scripts/upgrade_tables_mysql_4_1_2+.sql +++ b/scripts/upgrade_tables_mysql_4_1_2+.sql @@ -7,97 +7,97 @@ -- -- 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 --- +-- +-- Please don't forget to set up the tablenames in config.inc.php +-- -- $Id$ -- -------------------------------------------------------- --- +-- -- 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` + +ALTER TABLE `pma_bookmark` CHANGE `dbase` `dbase` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT ''; -ALTER TABLE `pma_bookmark` +ALTER TABLE `pma_bookmark` CHANGE `user` `user` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT ''; -ALTER TABLE `pma_bookmark` +ALTER TABLE `pma_bookmark` CHANGE `label` `label` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT ''; -ALTER TABLE `pma_bookmark` +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` +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` +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` +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` +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` +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` +ALTER TABLE `pma_column_info` CHANGE `transformation` `transformation` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT ''; -ALTER TABLE `pma_column_info` +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` +ALTER TABLE `pma_history` CHANGE `username` `username` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT ''; -ALTER TABLE `pma_history` +ALTER TABLE `pma_history` CHANGE `db` `db` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT ''; -ALTER TABLE `pma_history` +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 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` +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` +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; @@ -116,9 +116,9 @@ ALTER TABLE `pma_relation` -- -------------------------------------------------------- --- +-- -- Table structure for table `pma_table_coords` --- +-- ALTER TABLE `pma_table_coords` DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; @@ -130,9 +130,9 @@ ALTER TABLE `pma_table_coords` -- -------------------------------------------------------- --- +-- -- Table structure for table `pma_table_info` --- +-- ALTER TABLE `pma_table_info` DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; @@ -146,9 +146,9 @@ ALTER TABLE `pma_table_info` -- -------------------------------------------------------- --- +-- -- Table structure for table `pma_designer_coords` --- +-- CREATE TABLE IF NOT EXISTS `pma_designer_coords` ( `db_name` varchar(64) NOT NULL default '',