Merge commit 'debian/0.1-4' into debian

[roundcube.git] / SQL / mysql5.initial.sql

diff --git a/SQL/mysql5.initial.sql b/SQL/mysql5.initial.sql
index 0c0dcb199a2fcd990dc8636cd8f374717f3e66be..1a6ef1990f5ab96d004bf0d1f3a4bfa6cdc975aa 100644 (file)
--- a/SQL/mysql5.initial.sql
+++ b/SQL/mysql5.initial.sql
@@ -12,10 +12,10 @@ CREATE TABLE `session` (
  `sess_id` varchar(40) NOT NULL,
  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
  `changed` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `ip` varchar(15) NOT NULL,
+ `ip` varchar(40) NOT NULL,
  `vars` text NOT NULL,
  PRIMARY KEY(`sess_id`)
-) TYPE=MYISAM CHARACTER SET ascii COLLATE ascii_general_ci;
+) TYPE=MYISAM CHARACTER SET utf8 COLLATE utf8_general_ci;
 
 
 -- Table structure for table `users`
@@ -28,7 +28,7 @@ CREATE TABLE `users` (
  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
  `last_login` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
  `language` varchar(5) NOT NULL DEFAULT 'en',
- `preferences` text NOT NULL DEFAULT '',
+ `preferences` text,
  PRIMARY KEY(`user_id`)
 ) TYPE=MYISAM CHARACTER SET utf8 COLLATE utf8_general_ci;