DB scheme: remove default MySQL engine definition

* remove default MySQL engine definition from table definitions
* if nothing is specified then MySQL server will choose the default from its cfg
* if you like to specify it, change the MYSQL_TABLE_TYPE define in
  lib/srdb1/schema/entities.xml and run "make dbschema" in the top level directory
* the stylesheet doesn't check the engine type, Kamailio supports MyISAM and InnoDB

doc/stylesheets/dbschema_k/xsl/mysql.xsl

@@ -43,8 +43,10 @@
     <xsl:template name="table.close">
 	<xsl:text>)</xsl:text>
 	<xsl:if test="type[@db=$db]">
-	    <xsl:text> ENGINE=</xsl:text>
-	    <xsl:value-of select="normalize-space(type[@db=$db])"/>
+            <xsl:if test="not(type[@db]='')">
+		<xsl:text> ENGINE=</xsl:text>
+		<xsl:value-of select="normalize-space(type[@db=$db])"/>
+	    </xsl:if>
 	</xsl:if>
 	<xsl:text>;&#x0A;&#x0A;</xsl:text>	
     </xsl:template>

lib/srdb1/schema/entities.xml

@@ -19,7 +19,7 @@
 <!ENTITY expires_len "11">
 <!ENTITY flag_len "11">
 <!ENTITY description_len "255">
-<!ENTITY MYSQL_TABLE_TYPE "MyISAM">
+<!ENTITY MYSQL_TABLE_TYPE "">
 <!ENTITY USERCOL "username">
 <!ENTITY DEFAULT_ALIASES_EXPIRES "2030-05-28 21:32:15">
 <!ENTITY DEFAULT_LOCATION_EXPIRES "2030-05-28 21:32:15">

utils/kamctl/mysql/acc-create.sql

@@ -8,7 +8,7 @@ CREATE TABLE acc (
     sip_code VARCHAR(3) DEFAULT '' NOT NULL,
     sip_reason VARCHAR(32) DEFAULT '' NOT NULL,
     time DATETIME NOT NULL
-) ENGINE=MyISAM;
+);
 
 CREATE INDEX callid_idx ON acc (callid);
 
@@ -22,7 +22,7 @@ CREATE TABLE missed_calls (
     sip_code VARCHAR(3) DEFAULT '' NOT NULL,
     sip_reason VARCHAR(32) DEFAULT '' NOT NULL,
     time DATETIME NOT NULL
-) ENGINE=MyISAM;
+);
 
 CREATE INDEX callid_idx ON missed_calls (callid);
 

utils/kamctl/mysql/alias_db-create.sql

@@ -6,7 +6,7 @@ CREATE TABLE dbaliases (
     username VARCHAR(64) DEFAULT '' NOT NULL,
     domain VARCHAR(64) DEFAULT '' NOT NULL,
     CONSTRAINT alias_idx UNIQUE (alias_username, alias_domain)
-) ENGINE=MyISAM;
+);
 
 CREATE INDEX target_idx ON dbaliases (username, domain);
 

utils/kamctl/mysql/auth_db-create.sql

@@ -9,7 +9,7 @@ CREATE TABLE subscriber (
     ha1b VARCHAR(64) DEFAULT '' NOT NULL,
     rpid VARCHAR(64) DEFAULT NULL,
     CONSTRAINT account_idx UNIQUE (username, domain)
-) ENGINE=MyISAM;
+);
 
 CREATE INDEX username_idx ON subscriber (username);
 

utils/kamctl/mysql/avpops-create.sql

@@ -8,7 +8,7 @@ CREATE TABLE usr_preferences (
     type INT(11) DEFAULT 0 NOT NULL,
     value VARCHAR(128) DEFAULT '' NOT NULL,
     last_modified DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL
-) ENGINE=MyISAM;
+);
 
 CREATE INDEX ua_idx ON usr_preferences (uuid, attribute);
 CREATE INDEX uda_idx ON usr_preferences (username, domain, attribute);

utils/kamctl/mysql/carrierroute-create.sql

@@ -12,7 +12,7 @@ CREATE TABLE carrierroute (
     rewrite_prefix VARCHAR(64) DEFAULT '' NOT NULL,
     rewrite_suffix VARCHAR(64) DEFAULT '' NOT NULL,
     description VARCHAR(255) DEFAULT NULL
-) ENGINE=MyISAM;
+);
 
 INSERT INTO version (table_name, table_version) values ('carrierfailureroute','2');
 CREATE TABLE carrierfailureroute (
@@ -26,17 +26,17 @@ CREATE TABLE carrierfailureroute (
     mask INT(11) UNSIGNED DEFAULT 0 NOT NULL,
     next_domain INT(10) UNSIGNED DEFAULT 0 NOT NULL,
     description VARCHAR(255) DEFAULT NULL
-) ENGINE=MyISAM;
+);
 
 INSERT INTO version (table_name, table_version) values ('carrier_name','1');
 CREATE TABLE carrier_name (
     id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
     carrier VARCHAR(64) DEFAULT NULL
-) ENGINE=MyISAM;
+);
 
 INSERT INTO version (table_name, table_version) values ('domain_name','1');
 CREATE TABLE domain_name (
     id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
     domain VARCHAR(64) DEFAULT NULL
-) ENGINE=MyISAM;
+);
 

utils/kamctl/mysql/cpl-create.sql

@@ -6,5 +6,5 @@ CREATE TABLE cpl (
     cpl_xml TEXT,
     cpl_bin TEXT,
     CONSTRAINT account_idx UNIQUE (username, domain)
-) ENGINE=MyISAM;
+);
 

utils/kamctl/mysql/dialog-create.sql

@@ -24,7 +24,7 @@ CREATE TABLE dialog (
     toroute_name VARCHAR(32),
     req_uri VARCHAR(128) NOT NULL,
     xdata VARCHAR(512)
-) ENGINE=MyISAM;
+);
 
 CREATE INDEX hash_idx ON dialog (hash_entry, hash_id);
 
@@ -35,7 +35,7 @@ CREATE TABLE dialog_vars (
     hash_id INT(10) UNSIGNED NOT NULL,
     dialog_key VARCHAR(128) NOT NULL,
     dialog_value VARCHAR(512) NOT NULL
-) ENGINE=MyISAM;
+);
 
 CREATE INDEX hash_idx ON dialog_vars (hash_entry, hash_id);
 

utils/kamctl/mysql/dialplan-create.sql

@@ -9,5 +9,5 @@ CREATE TABLE dialplan (
     subst_exp VARCHAR(64) NOT NULL,
     repl_exp VARCHAR(32) NOT NULL,
     attrs VARCHAR(32) NOT NULL
-) ENGINE=MyISAM;
+);
 

utils/kamctl/mysql/dispatcher-create.sql

@@ -7,5 +7,5 @@ CREATE TABLE dispatcher (
     priority INT DEFAULT 0 NOT NULL,
     attrs VARCHAR(128) DEFAULT '' NOT NULL,
     description VARCHAR(64) DEFAULT '' NOT NULL
-) ENGINE=MyISAM;
+);
 

utils/kamctl/mysql/domain-create.sql

@@ -5,7 +5,7 @@ CREATE TABLE domain (
     did VARCHAR(64) DEFAULT NULL,
     last_modified DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL,
     CONSTRAINT domain_idx UNIQUE (domain)
-) ENGINE=MyISAM;
+);
 
 INSERT INTO version (table_name, table_version) values ('domain_attrs','1');
 CREATE TABLE domain_attrs (
@@ -16,5 +16,5 @@ CREATE TABLE domain_attrs (
     value VARCHAR(255) NOT NULL,
     last_modified DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL,
     CONSTRAINT domain_attrs_idx UNIQUE (did, name, value)
-) ENGINE=MyISAM;
+);
 

utils/kamctl/mysql/domainpolicy-create.sql

@@ -7,7 +7,7 @@ CREATE TABLE domainpolicy (
     val VARCHAR(128),
     description VARCHAR(255) NOT NULL,
     CONSTRAINT rav_idx UNIQUE (rule, att, val)
-) ENGINE=MyISAM;
+);
 
 CREATE INDEX rule_idx ON domainpolicy (rule);
 

utils/kamctl/mysql/drouting-create.sql

@@ -7,7 +7,7 @@ CREATE TABLE dr_gateways (
     pri_prefix VARCHAR(64) DEFAULT NULL,
     attrs VARCHAR(255) DEFAULT NULL,
     description VARCHAR(128) DEFAULT '' NOT NULL
-) ENGINE=MyISAM;
+);
 
 INSERT INTO version (table_name, table_version) values ('dr_rules','3');
 CREATE TABLE dr_rules (
@@ -19,14 +19,14 @@ CREATE TABLE dr_rules (
     routeid VARCHAR(64) NOT NULL,
     gwlist VARCHAR(255) NOT NULL,
     description VARCHAR(128) DEFAULT '' NOT NULL
-) ENGINE=MyISAM;
+);
 
 INSERT INTO version (table_name, table_version) values ('dr_gw_lists','1');
 CREATE TABLE dr_gw_lists (
     id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
     gwlist VARCHAR(255) NOT NULL,
     description VARCHAR(128) DEFAULT '' NOT NULL
-) ENGINE=MyISAM;
+);
 
 INSERT INTO version (table_name, table_version) values ('dr_groups','2');
 CREATE TABLE dr_groups (
@@ -35,5 +35,5 @@ CREATE TABLE dr_groups (
     domain VARCHAR(128) DEFAULT '' NOT NULL,
     groupid INT(11) UNSIGNED DEFAULT 0 NOT NULL,
     description VARCHAR(128) DEFAULT '' NOT NULL
-) ENGINE=MyISAM;
+);
 

utils/kamctl/mysql/group-create.sql

@@ -6,14 +6,14 @@ CREATE TABLE grp (
     grp VARCHAR(64) DEFAULT '' NOT NULL,
     last_modified DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL,
     CONSTRAINT account_group_idx UNIQUE (username, domain, grp)
-) ENGINE=MyISAM;
+);
 
 INSERT INTO version (table_name, table_version) values ('re_grp','1');
 CREATE TABLE re_grp (
     id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
     reg_exp VARCHAR(128) DEFAULT '' NOT NULL,
     group_id INT(11) DEFAULT 0 NOT NULL
-) ENGINE=MyISAM;
+);
 
 CREATE INDEX group_idx ON re_grp (group_id);
 

utils/kamctl/mysql/htable-create.sql

@@ -6,5 +6,5 @@ CREATE TABLE htable (
     value_type INT DEFAULT 0 NOT NULL,
     key_value VARCHAR(128) DEFAULT '' NOT NULL,
     expires INT DEFAULT 0 NOT NULL
-) ENGINE=MyISAM;
+);
 

utils/kamctl/mysql/imc-create.sql

@@ -5,7 +5,7 @@ CREATE TABLE imc_rooms (
     domain VARCHAR(64) NOT NULL,
     flag INT(11) NOT NULL,
     CONSTRAINT name_domain_idx UNIQUE (name, domain)
-) ENGINE=MyISAM;
+);
 
 INSERT INTO version (table_name, table_version) values ('imc_members','1');
 CREATE TABLE imc_members (
@@ -15,5 +15,5 @@ CREATE TABLE imc_members (
     room VARCHAR(64) NOT NULL,
     flag INT(11) NOT NULL,
     CONSTRAINT account_room_idx UNIQUE (username, domain, room)
-) ENGINE=MyISAM;
+);
 

utils/kamctl/mysql/lcr-create.sql

@@ -14,7 +14,7 @@ CREATE TABLE lcr_gw (
     tag VARCHAR(64) DEFAULT NULL,
     flags INT UNSIGNED DEFAULT 0 NOT NULL,
     defunct INT UNSIGNED DEFAULT NULL
-) ENGINE=MyISAM;
+);
 
 CREATE INDEX lcr_id_idx ON lcr_gw (lcr_id);
 
@@ -27,7 +27,7 @@ CREATE TABLE lcr_rule_target (
     priority TINYINT UNSIGNED NOT NULL,
     weight INT UNSIGNED DEFAULT 1 NOT NULL,
     CONSTRAINT rule_id_gw_id_idx UNIQUE (rule_id, gw_id)
-) ENGINE=MyISAM;
+);
 
 CREATE INDEX lcr_id_idx ON lcr_rule_target (lcr_id);
 
@@ -41,5 +41,5 @@ CREATE TABLE lcr_rule (
     stopper INT UNSIGNED DEFAULT 0 NOT NULL,
     enabled INT UNSIGNED DEFAULT 1 NOT NULL,
     CONSTRAINT lcr_id_prefix_from_uri_idx UNIQUE (lcr_id, prefix, from_uri)
-) ENGINE=MyISAM;
+);
 

utils/kamctl/mysql/matrix-create.sql

@@ -3,7 +3,7 @@ CREATE TABLE matrix (
     first INT(10) NOT NULL,
     second SMALLINT(10) NOT NULL,
     res INT(10) NOT NULL
-) ENGINE=MyISAM;
+);
 
 CREATE INDEX matrix_idx ON matrix (first, second);
 

utils/kamctl/mysql/msilo-create.sql

@@ -13,7 +13,7 @@ CREATE TABLE silo (
     extra_hdrs TEXT DEFAULT '' NOT NULL,
     callid VARCHAR(128) DEFAULT '' NOT NULL,
     status INT DEFAULT 0 NOT NULL
-) ENGINE=MyISAM;
+);
 
 CREATE INDEX account_idx ON silo (username, domain);
 

utils/kamctl/mysql/mtree-create.sql

@@ -4,7 +4,7 @@ CREATE TABLE mtree (
     tprefix VARCHAR(32) DEFAULT '' NOT NULL,
     tvalue VARCHAR(128) DEFAULT '' NOT NULL,
     CONSTRAINT tprefix_idx UNIQUE (tprefix)
-) ENGINE=MyISAM;
+);
 
 INSERT INTO version (table_name, table_version) values ('mtrees','2');
 CREATE TABLE mtrees (
@@ -13,5 +13,5 @@ CREATE TABLE mtrees (
     tprefix VARCHAR(32) DEFAULT '' NOT NULL,
     tvalue VARCHAR(128) DEFAULT '' NOT NULL,
     CONSTRAINT tname_tprefix_tvalue_idx UNIQUE (tname, tprefix, tvalue)
-) ENGINE=MyISAM;
+);
 

utils/kamctl/mysql/pdt-create.sql

@@ -5,5 +5,5 @@ CREATE TABLE pdt (
     prefix VARCHAR(32) NOT NULL,
     domain VARCHAR(128) DEFAULT '' NOT NULL,
     CONSTRAINT sdomain_prefix_idx UNIQUE (sdomain, prefix)
-) ENGINE=MyISAM;
+);
 

utils/kamctl/mysql/permissions-create.sql

@@ -5,7 +5,7 @@ CREATE TABLE trusted (
     proto VARCHAR(4) NOT NULL,
     from_pattern VARCHAR(64) DEFAULT NULL,
     tag VARCHAR(64)
-) ENGINE=MyISAM;
+);
 
 CREATE INDEX peer_idx ON trusted (src_ip);
 
@@ -17,5 +17,5 @@ CREATE TABLE address (
     mask INT DEFAULT 32 NOT NULL,
     port SMALLINT(5) UNSIGNED DEFAULT 0 NOT NULL,
     tag VARCHAR(64)
-) ENGINE=MyISAM;
+);
 

utils/kamctl/mysql/pipelimit-create.sql

@@ -4,5 +4,5 @@ CREATE TABLE pl_pipes (
     pipeid VARCHAR(64) DEFAULT '' NOT NULL,
     algorithm VARCHAR(32) DEFAULT '' NOT NULL,
     plimit INT DEFAULT 0 NOT NULL
-) ENGINE=MyISAM;
+);
 

utils/kamctl/mysql/presence-create.sql

@@ -10,7 +10,7 @@ CREATE TABLE presentity (
     body BLOB NOT NULL,
     sender VARCHAR(128) NOT NULL,
     CONSTRAINT presentity_idx UNIQUE (username, domain, event, etag)
-) ENGINE=MyISAM;
+);
 
 CREATE INDEX presentity_expires ON presentity (expires);
 CREATE INDEX account_idx ON presentity (username, domain, event);
@@ -43,7 +43,7 @@ CREATE TABLE active_watchers (
     updated INT(11) NOT NULL,
     updated_winfo INT(11) NOT NULL,
     CONSTRAINT active_watchers_idx UNIQUE (callid, to_tag, from_tag)
-) ENGINE=MyISAM;
+);
 
 CREATE INDEX active_watchers_expires ON active_watchers (expires);
 CREATE INDEX active_watchers_pres ON active_watchers (presentity_uri, event);
@@ -61,7 +61,7 @@ CREATE TABLE watchers (
     reason VARCHAR(64),
     inserted_time INT(11) NOT NULL,
     CONSTRAINT watcher_idx UNIQUE (presentity_uri, watcher_username, watcher_domain, event)
-) ENGINE=MyISAM;
+);
 
 INSERT INTO version (table_name, table_version) values ('xcap','4');
 CREATE TABLE xcap (
@@ -75,7 +75,7 @@ CREATE TABLE xcap (
     doc_uri VARCHAR(255) NOT NULL,
     port INT(11) NOT NULL,
     CONSTRAINT doc_uri_idx UNIQUE (doc_uri)
-) ENGINE=MyISAM;
+);
 
 CREATE INDEX account_doc_type_idx ON xcap (username, domain, doc_type);
 CREATE INDEX account_doc_type_uri_idx ON xcap (username, domain, doc_type, doc_uri);
@@ -103,7 +103,7 @@ CREATE TABLE pua (
     version INT(11) NOT NULL,
     extra_headers TEXT NOT NULL,
     CONSTRAINT pua_idx UNIQUE (etag, tuple_id, call_id, from_tag)
-) ENGINE=MyISAM;
+);
 
 CREATE INDEX expires_idx ON pua (expires);
 CREATE INDEX dialog1_idx ON pua (pres_id, pres_uri);

utils/kamctl/mysql/purple-create.sql

@@ -5,5 +5,5 @@ CREATE TABLE purplemap (
     ext_user VARCHAR(128) NOT NULL,
     ext_prot VARCHAR(16) NOT NULL,
     ext_pass VARCHAR(64)
-) ENGINE=MyISAM;
+);
 

utils/kamctl/mysql/registrar-create.sql

@@ -20,7 +20,7 @@ CREATE TABLE aliases (
     instance VARCHAR(255) DEFAULT NULL,
     reg_id INT(11) DEFAULT 0 NOT NULL,
     CONSTRAINT ruid_idx UNIQUE (ruid)
-) ENGINE=MyISAM;
+);
 
 CREATE INDEX alias_idx ON aliases (username, domain, contact);