[Pkg-sympa-commits] [SCM] sympa Debian packaging branch, master, updated. debian/6.1.1_dfsg-2-23-g23bd360

[Emmanuel Bouthenot]

The following commit has been merged in the master branch:
commit 86cd7d5959445539181ad6acb959ae5188089f6e
Author: Emmanuel Bouthenot <kolter at openics.org>
Date:   Sun May 29 20:48:03 2011 +0000

    Add a patch which set the default charset (UTF-8) and engine to the MySQL schema (#574646)

diff --git a/debian/patches/1002_mysql_default_charset_engine.patch b/debian/patches/1002_mysql_default_charset_engine.patch
new file mode 100644
index 0000000..0b1737e
--- /dev/null
+++ b/debian/patches/1002_mysql_default_charset_engine.patch
@@ -0,0 +1,111 @@
+Description: Add default charset and engine to MySQL schema
+Forwarded: https://sourcesup.cru.fr/tracker/index.php?func=detail&aid=7828
+Author: Emmanuel Bouthenot <kolter at debian.org>
+Bug-Debian: http://bugs.debian.org/574646
+Last-Update: 2011-05-29
+--- a/src/etc/script/create_db.mysql
++++ b/src/etc/script/create_db.mysql
+@@ -1,6 +1,6 @@
+ ## MySQL Database creation script
+ 
+-CREATE DATABASE sympa;
++CREATE DATABASE sympa ENGINE=MyISAM DEFAULT CHARSET=utf8;
+ 
+ ## Connect to DB 
+ \r sympa
+@@ -17,7 +17,7 @@
+ 	attributes_user		text,
+ 	data_user		text,
+ 	PRIMARY KEY (email_user)
+-);
++) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+ 
+ CREATE TABLE subscriber_table (
+   	list_subscriber       	varchar (50) NOT NULL,
+@@ -41,7 +41,7 @@
+ 	suspend_end_date_subscriber	int(11),
+ 	PRIMARY KEY (robot_subscriber, list_subscriber, user_subscriber),
+ 	INDEX user_index (user_subscriber)
+-);
++) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+ 
+ CREATE TABLE admin_table (
+ 	list_admin 		varchar(50) NOT NULL,
+@@ -60,7 +60,7 @@
+ 	profile_admin  		enum('privileged','normal'),
+ 	PRIMARY KEY (robot_admin, list_admin, role_admin, user_admin),
+ 	INDEX user_index (user_admin)
+-);
++) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+  
+ CREATE TABLE exclusion_table (
+ 	list_exclusion 		varchar(50) NOT NULL,
+@@ -68,7 +68,7 @@
+ 	date_exclusion 		int(11),
+ 	PRIMARY KEY (list_exclusion, user_exclusion),
+ 	INDEX user_index (user_exclusion)
+-);
++) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+ 
+ CREATE TABLE netidmap_table (
+         netid_netidmap              varchar (100) NOT NULL,
+@@ -76,7 +76,7 @@
+ 	robot_netidmap	            varchar (80) NOT NULL,
+         email_netidmap              varchar (100),
+         PRIMARY KEY (netid_netidmap, serviceid_netidmap, robot_netidmap)
+-);
++) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+ 
+ CREATE TABLE logs_table (
+ 	id_logs			bigint(20) NOT NULL,
+@@ -93,7 +93,7 @@
+ 	client_logs		varchar(100),
+ 	daemon_logs		varchar(10) NOT NULL,
+ 	PRIMARY KEY (id_logs)					  
+-);
++) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+ 
+ 
+ CREATE TABLE session_table (
+@@ -106,7 +106,7 @@
+ 	hit_session     	        int(11),
+ 	data_session		        text,
+ 	PRIMARY KEY (id_session)
+-);
++) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+ 
+ CREATE TABLE one_time_ticket_table (
+ 	ticket_one_time_ticket		varchar(30),
+@@ -117,7 +117,7 @@
+ 	remote_addr_one_time_ticket	varchar(60),
+ 	status_one_time_ticket		varchar(60),
+ 	PRIMARY KEY (ticket_one_time_ticket)
+-);
++) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+ 
+ CREATE TABLE bulkmailer_table (
+ 	messagekey_bulkmailer varchar(80) NOT NULL,
+@@ -135,7 +135,7 @@
+ 	delivery_date_bulkmailer int(11),
+ 	lock_bulkmailer varchar(30) default NULL,
+ 	PRIMARY KEY (messagekey_bulkmailer,packetid_bulkmailer)
+-);
++) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+ 
+ 
+ CREATE TABLE `bulkspool_table` (
+@@ -149,7 +149,7 @@
+   `dkim_d_bulkspool` varchar(50) default NULL COMMENT 'The DKIM signature "d=" tag',
+   `dkim_header_list_bulkspool` varchar(500) default NULL COMMENT 'The list of header part of the signed datas',
+   PRIMARY KEY  (`messagekey_bulkspool`)
+-);
++) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+ 
+ 
+ CREATE TABLE conf_table (
+@@ -157,4 +157,4 @@
+   label_conf varchar(80) default NULL,
+   value_conf varchar(300) default NULL,
+   PRIMARY KEY (robot_conf,label_conf)
+-);
++) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/debian/patches/series b/debian/patches/series
index a732452..8f9275b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 1001_sympa.pl_add_prepare_db_option.patch
+1002_mysql_default_charset_engine.patch
 1004_wizard_support_batch_and_display_mode.patch
 1005_wizard_emit_cmd_and_newline_when_dying.patch
 1006_wizard_add_soap_url_and_archive_default_index.patch

-- 
sympa Debian packaging