[Linpha-cvs] SF.net SVN: linpha: [4421] trunk/linpha2

[<bz...@us...>]

Revision: 4421
Author:   bzrudi
Date:     2006-03-20 06:47:56 -0800 (Mon, 20 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/linpha/?rev=4421&view=rev

Log Message:
-----------
removed DEFAULT CHARSET option, as it's mysql >=4.1 only 
and I stuck with 4.0 ;-)

Modified Paths:
--------------
    trunk/linpha2/db_data.sql
    trunk/linpha2/db_mysql.sql
Modified: trunk/linpha2/db_data.sql
===================================================================
--- trunk/linpha2/db_data.sql	2006-03-20 14:46:30 UTC (rev 4420)
+++ trunk/linpha2/db_data.sql	2006-03-20 14:47:56 UTC (rev 4421)
@@ -1,7 +1,7 @@
 -- 
 -- Daten f?r Tabelle `linpha_photos`
 -- 
-
+use linpha2;
 TRUNCATE `linpha_config`;
 INSERT INTO `linpha_config` (`option_name`, `option_value`, `userid`) VALUES ('sys_db_adodb_cache_path', 'var/tmp/adocache', 0);
 INSERT INTO `linpha_config` (`option_name`, `option_value`, `userid`) VALUES ('sys_db_adodb_caching', '0', 0);

Modified: trunk/linpha2/db_mysql.sql
===================================================================
--- trunk/linpha2/db_mysql.sql	2006-03-20 14:46:30 UTC (rev 4420)
+++ trunk/linpha2/db_mysql.sql	2006-03-20 14:47:56 UTC (rev 4421)
@@ -16,6 +16,8 @@
 -- Tabellenstruktur f?r Tabelle `linpha_config`
 -- 
 
+use linpha2;
+
 DROP TABLE IF EXISTS `linpha_config`;
 CREATE TABLE `linpha_config` (
   `ID` smallint(5) unsigned NOT NULL auto_increment,
@@ -26,7 +28,7 @@
   UNIQUE KEY `option_name_2` (`option_name`),
   KEY `option_name` (`option_name`),
   KEY `option_value` (`option_value`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+); 
 
 -- --------------------------------------------------------
 
@@ -39,7 +41,7 @@
   `id` int(11) NOT NULL auto_increment,
   `name` varchar(100) NOT NULL default '',
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+);
 
 -- --------------------------------------------------------
 
@@ -54,7 +56,7 @@
   `perm_type` varchar(255) NOT NULL default '0',
   `permission` varchar(255) NOT NULL default '',
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+);
 
 -- --------------------------------------------------------
 
@@ -76,17 +78,17 @@
   `stats_views` int(11) NOT NULL default '0',
   `stats_downloads` int(11) NOT NULL default '0',
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+);
 
 
-DROP TABLE IF EXISTS linpha_meta_fields;
+DROP TABLE IF EXISTS `linpha_meta_fields`;
 CREATE TABLE IF NOT EXISTS linpha_meta_fields (
   id int(11) NOT NULL auto_increment,
   name varchar(255) NOT NULL default '',
   field_type int(11) NOT NULL default '0',
   flags int(11) NOT NULL default '0',
   PRIMARY KEY  (id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+);
 
 
 DROP TABLE IF EXISTS `linpha_meta_category`;
@@ -96,7 +98,7 @@
   name varchar(255) NOT NULL default '',
   isprivate int(11) default NULL,
   PRIMARY KEY  (id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+);
 
 -- 
 -- Tabellenstruktur f?r Tabelle `linpha_meta_exif`
@@ -104,22 +106,22 @@
 
 DROP TABLE IF EXISTS linpha_meta_exif;
 CREATE TABLE IF NOT EXISTS linpha_meta_exif (
-  md5sum varchar(32) collate latin1_general_ci NOT NULL default '',
-  datetimeoriginal varchar(255) collate latin1_general_ci default NULL,
-  make varchar(255) collate latin1_general_ci default NULL,
-  model varchar(255) collate latin1_general_ci default NULL,
-  artist varchar(255) collate latin1_general_ci default NULL,
-  copyright varchar(255) collate latin1_general_ci default NULL,
-  aperturevalue varchar(255) collate latin1_general_ci default NULL,
-  shutterspeedvalue varchar(255) collate latin1_general_ci default NULL,
-  exposuretime varchar(255) collate latin1_general_ci default NULL,
-  isospeedratings varchar(255) collate latin1_general_ci default NULL,
-  flash varchar(255) collate latin1_general_ci default NULL,
-  focallength varchar(255) collate latin1_general_ci default NULL,
-  fnumber varchar(255) collate latin1_general_ci default NULL,
+  md5sum varchar(32) NOT NULL default '',
+  datetimeoriginal varchar(255) default NULL,
+  make varchar(255) default NULL,
+  model varchar(255) default NULL,
+  artist varchar(255) default NULL,
+  copyright varchar(255) default NULL,
+  aperturevalue varchar(255) default NULL,
+  shutterspeedvalue varchar(255) default NULL,
+  exposuretime varchar(255) default NULL,
+  isospeedratings varchar(255) default NULL,
+  flash varchar(255) default NULL,
+  focallength varchar(255) default NULL,
+  fnumber varchar(255) default NULL,
   PRIMARY KEY  (md5sum),
   KEY md5sum (md5sum)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+);
 
 -- 
 -- Tabellenstruktur f?r Tabelle `linpha_meta_iptc`
@@ -127,10 +129,10 @@
 
 DROP TABLE IF EXISTS linpha_meta_iptc;
 CREATE TABLE IF NOT EXISTS linpha_meta_iptc (
-  md5sum varchar(32) collate latin1_general_ci NOT NULL default '',
+  md5sum varchar(32) NOT NULL default '',
   PRIMARY KEY  (md5sum),
   KEY md5sum (md5sum)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+);
 
 
 
@@ -146,7 +148,7 @@
   author varchar(255) NOT NULL default '',
   `comment` text NOT NULL,
   PRIMARY KEY  (id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+);
 
 
 -- 
@@ -160,4 +162,4 @@
   md5sum varchar(32) NOT NULL default '',
   meta_data varchar(255) NOT NULL default '',
   PRIMARY KEY  (id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
\ No newline at end of file
+);
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.