[mxbb-commits] core/install/schemas mysql_schema_install.sql,1.5,1.6 upgrade_schemas_map.php,1.5,1.6

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/install/schemas
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20164/install/schemas

Modified Files:
	mysql_schema_install.sql upgrade_schemas_map.php 
Log Message:
fixing up installation

Index: upgrade_schemas_map.php
===================================================================
RCS file: /cvsroot/mxbb/core/install/schemas/upgrade_schemas_map.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** upgrade_schemas_map.php	7 Sep 2005 19:38:10 -0000	1.5
--- upgrade_schemas_map.php	9 Sep 2005 08:57:17 -0000	1.6
***************
*** 41,48 ****
  	array('schema' => 'upgrade_to_2.7.1'	, 'sql' => "SELECT link_target FROM mx_table_menu_nav"),
  	array('schema' => 'upgrade_to_2.7.4'	, 'sql' => "SELECT page_template_id FROM mx_table_page_templates"),
- 	array('schema' => 'upgrade_to_2.8.RC1'	, 'sql' => "SELECT page_desc FROM mx_table_page"),
- 	array('schema' => 'upgrade_to_2.8.RC2'	, 'sql' => "SELECT word_id FROM mx_table_wordlist"),
- 	array('schema' => 'upgrade_to_2.8.RC3'	, 'sql' => "SELECT mx_use_cache FROM mx_table_portal"),
- 	array('schema' => 'upgrade_to_2.8.RC4'	, 'sql' => "SELECT portal_recached FROM mx_table_portal"),
  	array('schema' => 'upgrade_to_2.8.RC5'	, 'sql' => "SELECT parameter_order FROM mx_table_parameter")
  );
--- 41,44 ----

Index: mysql_schema_install.sql
===================================================================
RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_install.sql,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mysql_schema_install.sql	7 Sep 2005 19:38:10 -0000	1.5
--- mysql_schema_install.sql	9 Sep 2005 08:57:17 -0000	1.6
***************
*** 29,33 ****
    `block_editor_id` mediumint(8) unsigned NOT NULL default '0',
    PRIMARY KEY  (`block_id`)
! ) TYPE=MyISAM;
  
  
--- 29,33 ----
    `block_editor_id` mediumint(8) unsigned NOT NULL default '0',
    PRIMARY KEY  (`block_id`)
! );
  
  
***************
*** 73,77 ****
    `sub_id` int(255) unsigned NOT NULL default '0',
    PRIMARY KEY  (`block_id`,`parameter_id`,`sub_id`)
! ) TYPE=MyISAM;
  
  
--- 73,77 ----
    `sub_id` int(255) unsigned NOT NULL default '0',
    PRIMARY KEY  (`block_id`,`parameter_id`,`sub_id`)
! );
  
  
***************
*** 148,152 ****
    PRIMARY KEY  (`column_id`),
    KEY `cat_order` (`column_order`)
! ) TYPE=MyISAM;
  
  
--- 148,152 ----
    PRIMARY KEY  (`column_id`),
    KEY `cat_order` (`column_order`)
! );
  
  
***************
*** 174,178 ****
    `block_id` smallint(5) NOT NULL default '0',
    `block_order` smallint(5) NOT NULL default '0'
! ) TYPE=MyISAM;
  
  
--- 174,178 ----
    `block_id` smallint(5) NOT NULL default '0',
    `block_order` smallint(5) NOT NULL default '0'
! );
  
  
***************
*** 215,219 ****
    PRIMARY KEY  (`column_template_id`),
    KEY `cat_order` (`column_order`)
! ) TYPE=MyISAM;
  
  
--- 215,219 ----
    PRIMARY KEY  (`column_template_id`),
    KEY `cat_order` (`column_order`)
! );
  
  
***************
*** 245,249 ****
    PRIMARY KEY  (`function_id`),
    KEY `module_id` (`module_id`)
! ) TYPE=MyISAM;
  
  
--- 245,249 ----
    PRIMARY KEY  (`function_id`),
    KEY `module_id` (`module_id`)
! );
  
  
***************
*** 290,294 ****
    PRIMARY KEY  (`cat_id`),
    KEY `cat_order` (`cat_order`)
! ) TYPE=MyISAM;
  
  
--- 290,294 ----
    PRIMARY KEY  (`cat_id`),
    KEY `cat_order` (`cat_order`)
! );
  
  
***************
*** 326,330 ****
    PRIMARY KEY  (`menu_id`),
    KEY `cat_id` (`cat_id`)
! ) TYPE=MyISAM;
  
  
--- 326,330 ----
    PRIMARY KEY  (`menu_id`),
    KEY `cat_id` (`cat_id`)
! );
  
  
***************
*** 338,345 ****
  INSERT INTO mx_table_menu_nav VALUES("10", "4", "IncludeX", "IncludeX Demo", "", "0", "40", "f7adaf1201", "icon_dot.gif", "0", "27", "0", "0", "0");
  INSERT INTO mx_table_menu_nav VALUES("11", "4", "phpBB Polls (if any)", "phpBB Polls Demo", "", "0", "50", "a80fe73aee", "icon_dot.gif", "0", "6", "0", "0", "0");
! INSERT INTO mx_table_menu_nav VALUES("12", "5", "phpBB TextBlock", "phpBB TextBlock Demo", "", "0", "10", "85d178caa8", "icon_dot.gif", "0", "1", "0", "0", "0");
! INSERT INTO mx_table_menu_nav VALUES("13", "5", "WYSIWYG TextBlock", "WYSIWYG TextBlock Demo", "", "0", "20", "51e2ddb3a7", "icon_dot.gif", "0", "10", "0", "0", "0");
! INSERT INTO mx_table_menu_nav VALUES("14", "5", "Custom TextBlock", "Custom TextBlock Demo", "", "0", "30", "22cb7a4f9f", "icon_dot.gif", "0", "9", "0", "0", "0");
! INSERT INTO mx_table_menu_nav VALUES("15", "6", "Modules Info", "Information", "", "0", "10", "630ce0e7f0", "icon_dot.gif", "0", "30", "0", "0", "0");
  INSERT INTO mx_table_menu_nav VALUES("5", "1", "phpBB Home", "", "http://www.phpbb.com", "0", "20", "71fe54c6a2", "icon_info.gif", "0", "0", "0", "0", "0");
  INSERT INTO mx_table_menu_nav VALUES("3", "3", "SiteStats", "Some Sitestats", "", "0", "30", "62b47107b4", "icon_stats.gif", "0", "0", "4", "0", "0");
--- 338,345 ----
  INSERT INTO mx_table_menu_nav VALUES("10", "4", "IncludeX", "IncludeX Demo", "", "0", "40", "f7adaf1201", "icon_dot.gif", "0", "27", "0", "0", "0");
  INSERT INTO mx_table_menu_nav VALUES("11", "4", "phpBB Polls (if any)", "phpBB Polls Demo", "", "0", "50", "a80fe73aee", "icon_dot.gif", "0", "6", "0", "0", "0");
! INSERT INTO mx_table_menu_nav VALUES("12", "5", "phpBB TextBlock", "phpBB TextBlock Demo", "", "0", "10", "85d178caa8", "icon_dot.gif", "0", "1", "3", "0", "0");
! INSERT INTO mx_table_menu_nav VALUES("13", "5", "WYSIWYG TextBlock", "WYSIWYG TextBlock Demo", "", "0", "20", "51e2ddb3a7", "icon_dot.gif", "0", "10", "3", "0", "0");
! INSERT INTO mx_table_menu_nav VALUES("14", "5", "Custom TextBlock", "Custom TextBlock Demo", "", "0", "30", "22cb7a4f9f", "icon_dot.gif", "0", "9", "3", "0", "0");
! INSERT INTO mx_table_menu_nav VALUES("15", "6", "Modules Info", "Information", "", "0", "10", "630ce0e7f0", "icon_dot.gif", "0", "30", "3", "0", "0");
  INSERT INTO mx_table_menu_nav VALUES("5", "1", "phpBB Home", "", "http://www.phpbb.com", "0", "20", "71fe54c6a2", "icon_info.gif", "0", "0", "0", "0", "0");
  INSERT INTO mx_table_menu_nav VALUES("3", "3", "SiteStats", "Some Sitestats", "", "0", "30", "62b47107b4", "icon_stats.gif", "0", "0", "4", "0", "0");
***************
*** 364,368 ****
    `module_copy` text,
    PRIMARY KEY  (`module_id`)
! ) TYPE=MyISAM;
  
  
--- 364,368 ----
    `module_copy` text,
    PRIMARY KEY  (`module_id`)
! );
  
  
***************
*** 394,398 ****
    `page_graph_border` varchar(255) NOT NULL default '',
    PRIMARY KEY  (`page_id`)
! ) TYPE=MyISAM;
  
  
--- 394,398 ----
    `page_graph_border` varchar(255) NOT NULL default '',
    PRIMARY KEY  (`page_id`)
! );
  
  
***************
*** 416,420 ****
    `template_name` varchar(255) NOT NULL default '',
    PRIMARY KEY  (`page_template_id`)
! ) TYPE=MyISAM;
  
  
--- 416,420 ----
    `template_name` varchar(255) NOT NULL default '',
    PRIMARY KEY  (`page_template_id`)
! );
  
  
***************
*** 443,447 ****
    `parameter_order` smallint(5) unsigned NOT NULL default '0',
    PRIMARY KEY  (`parameter_id`)
! ) TYPE=MyISAM;
  
  
--- 443,447 ----
    `parameter_order` smallint(5) unsigned NOT NULL default '0',
    PRIMARY KEY  (`parameter_id`)
! );
  
  
***************
*** 515,519 ****
    `portal_recached` varchar(255) binary NOT NULL default '',
    PRIMARY KEY  (`portal_id`)
! ) TYPE=MyISAM;
  
  
--- 515,519 ----
    `portal_recached` varchar(255) binary NOT NULL default '',
    PRIMARY KEY  (`portal_id`)
! );
  
  
***************
*** 536,546 ****
    PRIMARY KEY  (`search_id`),
    KEY `session_id` (`session_id`)
! ) TYPE=MyISAM;
! 
! 
! 
! #
! # Dumping data for table 'mx_table_search_results'
! #
  
  
--- 536,540 ----
    PRIMARY KEY  (`search_id`),
    KEY `session_id` (`session_id`)
! );
  
  
***************
*** 556,566 ****
    PRIMARY KEY  (`word_text`),
    KEY `word_id` (`word_id`)
! ) TYPE=MyISAM;
! 
! 
! 
! #
! # Dumping data for table 'mx_table_wordlist'
! #
  
  
--- 550,554 ----
    PRIMARY KEY  (`word_text`),
    KEY `word_id` (`word_id`)
! );
  
  
***************
*** 576,584 ****
    KEY `block_id` (`block_id`),
    KEY `word_id` (`word_id`)
! ) TYPE=MyISAM;
! 
! 
  
- #
- # Dumping data for table 'mx_table_wordmatch'
- #
--- 564,567 ----
    KEY `block_id` (`block_id`),
    KEY `word_id` (`word_id`)
! );