From 6edc68ade19a7f6871db5b0c346e3e7edb177149 Mon Sep 17 00:00:00 2001
From: Andrew Pogrebennyk <apogrebennyk@sipwise.com>
Date: Thu, 29 Mar 2012 16:10:42 +0000
Subject: [PATCH] separate replicated and not replicated db rev scripts

---
 db_scripts/base/5471_not_replicated.down |   2 -
 db_scripts/base/5471_not_replicated.up   |   2 -
 db_scripts/base/5472.down                |   2 +
 db_scripts/base/5472.up                  |   2 +
 db_scripts/base/5708_not_replicated.down |  15 --
 db_scripts/base/5708_not_replicated.up   |  17 +-
 db_scripts/base/5709.down                |  15 ++
 db_scripts/base/5709.up                  |  15 ++
 db_scripts/base/6424_not_replicated.down | 241 ----------------------
 db_scripts/base/6424_not_replicated.up   | 243 +---------------------
 db_scripts/base/6425.down                | 244 +++++++++++++++++++++++
 db_scripts/base/6425.up                  | 244 +++++++++++++++++++++++
 db_scripts/base/6435_not_replicated.down |   9 -
 db_scripts/base/6435_not_replicated.up   |  13 +-
 db_scripts/base/6436.down                |  14 ++
 db_scripts/base/6436.up                  |  16 ++
 16 files changed, 555 insertions(+), 539 deletions(-)
 create mode 100644 db_scripts/base/5472.down
 create mode 100644 db_scripts/base/5472.up
 create mode 100644 db_scripts/base/5709.down
 create mode 100644 db_scripts/base/5709.up
 create mode 100644 db_scripts/base/6425.down
 create mode 100644 db_scripts/base/6425.up
 create mode 100644 db_scripts/base/6436.down
 create mode 100644 db_scripts/base/6436.up

diff --git a/db_scripts/base/5471_not_replicated.down b/db_scripts/base/5471_not_replicated.down
index 8e772225..2744c13e 100644
--- a/db_scripts/base/5471_not_replicated.down
+++ b/db_scripts/base/5471_not_replicated.down
@@ -1,6 +1,4 @@
-ALTER TABLE kamailio.acc CHANGE COLUMN callid callid varchar(64) NOT NULL DEFAULT '';
 ALTER TABLE kamailio.acc_trash CHANGE COLUMN callid callid varchar(64) NOT NULL DEFAULT '';
 ALTER TABLE kamailio.acc_backup CHANGE COLUMN callid callid varchar(64) NOT NULL DEFAULT '';
-ALTER TABLE accounting.acc CHANGE COLUMN callid callid varchar(64) NOT NULL DEFAULT '';
 ALTER TABLE accounting.acc_trash CHANGE COLUMN callid callid varchar(64) NOT NULL DEFAULT '';
 ALTER TABLE accounting.acc_backup CHANGE COLUMN callid callid varchar(64) NOT NULL DEFAULT ''; 
diff --git a/db_scripts/base/5471_not_replicated.up b/db_scripts/base/5471_not_replicated.up
index bc22c8ee..7ea4ab21 100644
--- a/db_scripts/base/5471_not_replicated.up
+++ b/db_scripts/base/5471_not_replicated.up
@@ -1,6 +1,4 @@
-ALTER TABLE kamailio.acc CHANGE COLUMN callid callid varchar(255) NOT NULL DEFAULT '';
 ALTER TABLE kamailio.acc_trash CHANGE COLUMN callid callid varchar(255) NOT NULL DEFAULT '';
 ALTER TABLE kamailio.acc_backup CHANGE COLUMN callid callid varchar(255) NOT NULL DEFAULT '';
-ALTER TABLE accounting.acc CHANGE COLUMN callid callid varchar(255) NOT NULL DEFAULT '';
 ALTER TABLE accounting.acc_trash CHANGE COLUMN callid callid varchar(255) NOT NULL DEFAULT '';
 ALTER TABLE accounting.acc_backup CHANGE COLUMN callid callid varchar(255) NOT NULL DEFAULT ''; 
diff --git a/db_scripts/base/5472.down b/db_scripts/base/5472.down
new file mode 100644
index 00000000..ecc4a690
--- /dev/null
+++ b/db_scripts/base/5472.down
@@ -0,0 +1,2 @@
+ALTER TABLE kamailio.acc CHANGE COLUMN callid callid varchar(64) NOT NULL DEFAULT '';
+ALTER TABLE accounting.acc CHANGE COLUMN callid callid varchar(64) NOT NULL DEFAULT '';
diff --git a/db_scripts/base/5472.up b/db_scripts/base/5472.up
new file mode 100644
index 00000000..491c19f7
--- /dev/null
+++ b/db_scripts/base/5472.up
@@ -0,0 +1,2 @@
+ALTER TABLE kamailio.acc CHANGE COLUMN callid callid varchar(255) NOT NULL DEFAULT '';
+ALTER TABLE accounting.acc CHANGE COLUMN callid callid varchar(255) NOT NULL DEFAULT '';
diff --git a/db_scripts/base/5708_not_replicated.down b/db_scripts/base/5708_not_replicated.down
index 10698627..0f3fa796 100644
--- a/db_scripts/base/5708_not_replicated.down
+++ b/db_scripts/base/5708_not_replicated.down
@@ -1,19 +1,4 @@
-ALTER TABLE kamailio.acc CHANGE COLUMN src_leg src_leg varchar(255) DEFAULT NULL;
-ALTER TABLE kamailio.acc CHANGE COLUMN dst_leg dst_leg varchar(255) DEFAULT NULL;
-ALTER TABLE accounting.acc CHANGE COLUMN src_leg src_leg varchar(255) DEFAULT NULL;
-ALTER TABLE accounting.acc CHANGE COLUMN dst_leg dst_leg varchar(255) DEFAULT NULL;
 ALTER TABLE accounting.acc_backup CHANGE COLUMN src_leg src_leg varchar(255) DEFAULT NULL;
 ALTER TABLE accounting.acc_backup CHANGE COLUMN dst_leg dst_leg varchar(255) DEFAULT NULL;
 ALTER TABLE accounting.acc_trash CHANGE COLUMN src_leg src_leg varchar(255) DEFAULT NULL;
 ALTER TABLE accounting.acc_trash CHANGE COLUMN dst_leg dst_leg varchar(255) DEFAULT NULL;
-
-ALTER TABLE accounting.cdr DROP COLUMN source_external_subscriber_id;
-ALTER TABLE accounting.cdr DROP COLUMN source_external_contract_id;
-ALTER TABLE accounting.cdr DROP COLUMN source_account_id;
-
-ALTER TABLE accounting.cdr DROP COLUMN destination_external_subscriber_id;
-ALTER TABLE accounting.cdr DROP COLUMN destination_external_contract_id;
-ALTER TABLE accounting.cdr DROP COLUMN destination_account_id;
-
-ALTER TABLE accounting.cdr DROP COLUMN peer_auth_user;
-ALTER TABLE accounting.cdr DROP COLUMN peer_auth_realm;
diff --git a/db_scripts/base/5708_not_replicated.up b/db_scripts/base/5708_not_replicated.up
index f5c362f4..cbb711ab 100644
--- a/db_scripts/base/5708_not_replicated.up
+++ b/db_scripts/base/5708_not_replicated.up
@@ -1,19 +1,4 @@
-ALTER TABLE kamailio.acc CHANGE COLUMN src_leg src_leg varchar(2048) DEFAULT NULL;
-ALTER TABLE kamailio.acc CHANGE COLUMN dst_leg dst_leg varchar(2048) DEFAULT NULL;
-ALTER TABLE accounting.acc CHANGE COLUMN src_leg src_leg varchar(2048) DEFAULT NULL;
-ALTER TABLE accounting.acc CHANGE COLUMN dst_leg dst_leg varchar(2048) DEFAULT NULL;
 ALTER TABLE accounting.acc_backup CHANGE COLUMN src_leg src_leg varchar(2048) DEFAULT NULL;
 ALTER TABLE accounting.acc_backup CHANGE COLUMN dst_leg dst_leg varchar(2048) DEFAULT NULL;
 ALTER TABLE accounting.acc_trash CHANGE COLUMN src_leg src_leg varchar(2048) DEFAULT NULL;
-ALTER TABLE accounting.acc_trash CHANGE COLUMN dst_leg dst_leg varchar(2048) DEFAULT NULL;
-
-ALTER TABLE accounting.cdr ADD COLUMN source_external_subscriber_id varchar(255) DEFAULT NULL AFTER source_provider_id;
-ALTER TABLE accounting.cdr ADD COLUMN source_external_contract_id varchar(255) DEFAULT NULL AFTER source_external_subscriber_id;
-ALTER TABLE accounting.cdr ADD COLUMN source_account_id int(11) unsigned NOT NULL DEFAULT '0' AFTER source_external_contract_id;
-
-ALTER TABLE accounting.cdr ADD COLUMN destination_external_subscriber_id varchar(255) DEFAULT NULL AFTER destination_provider_id;
-ALTER TABLE accounting.cdr ADD COLUMN destination_external_contract_id varchar(255) DEFAULT NULL AFTER destination_external_subscriber_id;
-ALTER TABLE accounting.cdr ADD COLUMN destination_account_id int(11) unsigned NOT NULL DEFAULT '0' AFTER destination_external_contract_id;
-
-ALTER TABLE accounting.cdr ADD COLUMN peer_auth_user varchar(255) DEFAULT NULL AFTER destination_domain_in;
-ALTER TABLE accounting.cdr ADD COLUMN peer_auth_realm varchar(255) DEFAULT NULL AFTER peer_auth_user;
+ALTER TABLE accounting.acc_trash CHANGE COLUMN dst_leg dst_leg varchar(2048) DEFAULT NULL;
\ No newline at end of file
diff --git a/db_scripts/base/5709.down b/db_scripts/base/5709.down
new file mode 100644
index 00000000..83126461
--- /dev/null
+++ b/db_scripts/base/5709.down
@@ -0,0 +1,15 @@
+ALTER TABLE kamailio.acc CHANGE COLUMN src_leg src_leg varchar(255) DEFAULT NULL;
+ALTER TABLE kamailio.acc CHANGE COLUMN dst_leg dst_leg varchar(255) DEFAULT NULL;
+ALTER TABLE accounting.acc CHANGE COLUMN src_leg src_leg varchar(255) DEFAULT NULL;
+ALTER TABLE accounting.acc CHANGE COLUMN dst_leg dst_leg varchar(255) DEFAULT NULL;
+
+ALTER TABLE accounting.cdr DROP COLUMN source_external_subscriber_id;
+ALTER TABLE accounting.cdr DROP COLUMN source_external_contract_id;
+ALTER TABLE accounting.cdr DROP COLUMN source_account_id;
+
+ALTER TABLE accounting.cdr DROP COLUMN destination_external_subscriber_id;
+ALTER TABLE accounting.cdr DROP COLUMN destination_external_contract_id;
+ALTER TABLE accounting.cdr DROP COLUMN destination_account_id;
+
+ALTER TABLE accounting.cdr DROP COLUMN peer_auth_user;
+ALTER TABLE accounting.cdr DROP COLUMN peer_auth_realm;
diff --git a/db_scripts/base/5709.up b/db_scripts/base/5709.up
new file mode 100644
index 00000000..b557e9e5
--- /dev/null
+++ b/db_scripts/base/5709.up
@@ -0,0 +1,15 @@
+ALTER TABLE kamailio.acc CHANGE COLUMN src_leg src_leg varchar(2048) DEFAULT NULL;
+ALTER TABLE kamailio.acc CHANGE COLUMN dst_leg dst_leg varchar(2048) DEFAULT NULL;
+ALTER TABLE accounting.acc CHANGE COLUMN src_leg src_leg varchar(2048) DEFAULT NULL;
+ALTER TABLE accounting.acc CHANGE COLUMN dst_leg dst_leg varchar(2048) DEFAULT NULL;
+
+ALTER TABLE accounting.cdr ADD COLUMN source_external_subscriber_id varchar(255) DEFAULT NULL AFTER source_provider_id;
+ALTER TABLE accounting.cdr ADD COLUMN source_external_contract_id varchar(255) DEFAULT NULL AFTER source_external_subscriber_id;
+ALTER TABLE accounting.cdr ADD COLUMN source_account_id int(11) unsigned NOT NULL DEFAULT '0' AFTER source_external_contract_id;
+
+ALTER TABLE accounting.cdr ADD COLUMN destination_external_subscriber_id varchar(255) DEFAULT NULL AFTER destination_provider_id;
+ALTER TABLE accounting.cdr ADD COLUMN destination_external_contract_id varchar(255) DEFAULT NULL AFTER destination_external_subscriber_id;
+ALTER TABLE accounting.cdr ADD COLUMN destination_account_id int(11) unsigned NOT NULL DEFAULT '0' AFTER destination_external_contract_id;
+
+ALTER TABLE accounting.cdr ADD COLUMN peer_auth_user varchar(255) DEFAULT NULL AFTER destination_domain_in;
+ALTER TABLE accounting.cdr ADD COLUMN peer_auth_realm varchar(255) DEFAULT NULL AFTER peer_auth_user;
diff --git a/db_scripts/base/6424_not_replicated.down b/db_scripts/base/6424_not_replicated.down
index cc9a901f..55b93d3a 100644
--- a/db_scripts/base/6424_not_replicated.down
+++ b/db_scripts/base/6424_not_replicated.down
@@ -1,250 +1,9 @@
 use accounting;
 
-ALTER TABLE `cdr` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `cdr` MODIFY `source_user_id` char(36) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `cdr` MODIFY `source_provider_id` varchar(255) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `cdr` MODIFY `source_external_subscriber_id` varchar(255) CHARACTER SET latin1 DEFAULT NULL;
-ALTER TABLE `cdr` MODIFY `source_external_contract_id` varchar(255) CHARACTER SET latin1 DEFAULT NULL;
-ALTER TABLE `cdr` MODIFY `source_user` varchar(255) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `cdr` MODIFY `source_domain` varchar(255) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `cdr` MODIFY `source_cli` varchar(64) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `cdr` MODIFY `destination_user_id` char(36) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `cdr` MODIFY `destination_provider_id` varchar(255) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `cdr` MODIFY `destination_external_subscriber_id` varchar(255) CHARACTER SET latin1 DEFAULT NULL;
-ALTER TABLE `cdr` MODIFY `destination_external_contract_id` varchar(255) CHARACTER SET latin1 DEFAULT NULL;
-ALTER TABLE `cdr` MODIFY `destination_user` varchar(255) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `cdr` MODIFY `destination_domain` varchar(255) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `cdr` MODIFY `destination_user_dialed` varchar(255) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `cdr` MODIFY `destination_user_in` varchar(255) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `cdr` MODIFY `destination_domain_in` varchar(255) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `cdr` MODIFY `peer_auth_user` varchar(255) CHARACTER SET latin1 DEFAULT NULL;
-ALTER TABLE `cdr` MODIFY `peer_auth_realm` varchar(255) CHARACTER SET latin1 DEFAULT NULL;
-ALTER TABLE `cdr` MODIFY `call_type` enum('call','cfu','cft','cfb','cfna') CHARACTER SET latin1 NOT NULL default 'call';
-ALTER TABLE `cdr` MODIFY `call_status` enum('ok','busy','noanswer','cancel','offline','timeout','other') CHARACTER SET latin1 NOT NULL default 'ok';
-ALTER TABLE `cdr` MODIFY `call_code` char(3) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `cdr` MODIFY `call_id` varchar(255) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `cdr` MODIFY `rating_status` enum('unrated','ok','failed') CHARACTER SET latin1 NOT NULL default 'unrated';
-
-ALTER TABLE `mark` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `mark` MODIFY `collector` varchar(255) CHARACTER SET latin1 NOT NULL;
-
-ALTER TABLE `acc` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `acc` MODIFY `method` varchar(16) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `from_tag` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `to_tag` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `callid` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `sip_code` varchar(3) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `sip_reason` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `src_leg` varchar(2048) CHARACTER SET latin1 default NULL;
-ALTER TABLE `acc` MODIFY `dst_leg` varchar(2048) CHARACTER SET latin1 default NULL;
-ALTER TABLE `acc` MODIFY `dst_user` varchar(64) CHARACTER SET latin1 NOT NULL default '';
-ALTER TABLE `acc` MODIFY `dst_ouser` varchar(64) CHARACTER SET latin1 NOT NULL default '';
-ALTER TABLE `acc` MODIFY `dst_domain` varchar(128) CHARACTER SET latin1 NOT NULL default '';
-ALTER TABLE `acc` MODIFY `src_user` varchar(64) CHARACTER SET latin1 NOT NULL default '';
-ALTER TABLE `acc` MODIFY `src_domain` varchar(128) CHARACTER SET latin1 NOT NULL default '';
-
 ALTER TABLE `acc_backup` CONVERT TO CHARACTER SET latin1;
 ALTER TABLE `acc_trash` CONVERT TO CHARACTER SET latin1;
 
 use kamailio;
 
-ALTER DATABASE kamailio DEFAULT CHARACTER SET latin1;
-
-ALTER TABLE `acc` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `acc` MODIFY `method` varchar(16) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `from_tag` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `to_tag` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `callid` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `sip_code` varchar(3) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `sip_reason` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `src_leg` varchar(2048) CHARACTER SET latin1 default NULL;
-ALTER TABLE `acc` MODIFY `dst_leg` varchar(2048) CHARACTER SET latin1 default NULL;
-ALTER TABLE `acc` MODIFY `dst_user` varchar(64) CHARACTER SET latin1 NOT NULL default '';
-ALTER TABLE `acc` MODIFY `dst_ouser` varchar(64) CHARACTER SET latin1 NOT NULL default '';
-ALTER TABLE `acc` MODIFY `dst_domain` varchar(128) CHARACTER SET latin1 NOT NULL default '';
-ALTER TABLE `acc` MODIFY `src_user` varchar(64) CHARACTER SET latin1 NOT NULL default '';
-ALTER TABLE `acc` MODIFY `src_domain` varchar(128) CHARACTER SET latin1 NOT NULL default '';
-
 ALTER TABLE `acc_backup` CONVERT TO CHARACTER SET latin1;
 ALTER TABLE `acc_trash` CONVERT TO CHARACTER SET latin1;
-
-ALTER TABLE `dbaliases` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `dbaliases` MODIFY `alias_username` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `dbaliases` MODIFY `alias_domain` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `dbaliases` MODIFY `username` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `dbaliases` MODIFY `domain` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-
-ALTER TABLE `dialog` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `dialog` MODIFY `callid` varchar(255) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `dialog` MODIFY `from_uri` varchar(128) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `dialog` MODIFY `from_tag` varchar(64) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `dialog` MODIFY `to_uri` varchar(128) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `dialog` MODIFY `to_tag` varchar(64) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `dialog` MODIFY `caller_cseq` varchar(7) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `dialog` MODIFY `callee_cseq` varchar(7) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `dialog` MODIFY `caller_route_set` varchar(512) CHARACTER SET latin1 DEFAULT NULL;
-ALTER TABLE `dialog` MODIFY `callee_route_set` varchar(512) CHARACTER SET latin1 DEFAULT NULL;
-ALTER TABLE `dialog` MODIFY `caller_contact` varchar(128) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `dialog` MODIFY `callee_contact` varchar(128) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `dialog` MODIFY `caller_sock` varchar(64) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `dialog` MODIFY `callee_sock` varchar(64) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `dialog` MODIFY `req_uri` varchar(128) CHARACTER SET latin1 NOT NULL;
-
-ALTER TABLE `dialplan` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `dialplan` MODIFY `match_exp` varchar(64) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `dialplan` MODIFY `subst_exp` varchar(64) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `dialplan` MODIFY `repl_exp` varchar(64) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `dialplan` MODIFY `attrs` varchar(32) CHARACTER SET latin1 NOT NULL;
-
-ALTER TABLE `dispatcher` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `dispatcher` MODIFY `destination` varchar(192) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `dispatcher` MODIFY `description` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-
-ALTER TABLE `domain` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `domain` MODIFY `domain` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-
-ALTER TABLE `lcr_gw` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `lcr_gw` MODIFY `gw_name` varchar(128) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `lcr_gw` MODIFY `ip_addr` varchar(15) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `lcr_gw` MODIFY `hostname` varchar(64) CHARACTER SET latin1 DEFAULT NULL;
-ALTER TABLE `lcr_gw` MODIFY `params` varchar(64) CHARACTER SET latin1 DEFAULT NULL;
-ALTER TABLE `lcr_gw` MODIFY `tag` varchar(16) CHARACTER SET latin1 DEFAULT NULL;
-
-ALTER TABLE `lcr_rule` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `lcr_rule` MODIFY `prefix` varchar(16) CHARACTER SET latin1 DEFAULT NULL;
-ALTER TABLE `lcr_rule` MODIFY `from_uri` varchar(64) CHARACTER SET latin1 DEFAULT NULL;
-
-ALTER TABLE `lcr_rule_target` DEFAULT CHARACTER SET latin1;
-
-ALTER TABLE `location` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `location` MODIFY `username` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `location` MODIFY `domain` varchar(64) CHARACTER SET latin1 DEFAULT NULL;
-ALTER TABLE `location` MODIFY `contact` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `location` MODIFY `received` varchar(128) CHARACTER SET latin1 DEFAULT NULL;
-ALTER TABLE `location` MODIFY `path` varchar(128) CHARACTER SET latin1 DEFAULT NULL;
-ALTER TABLE `location` MODIFY `callid` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT 'Default-Call-ID';
-ALTER TABLE `location` MODIFY `user_agent` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `location` MODIFY `socket` varchar(64) CHARACTER SET latin1 DEFAULT NULL;
-
-ALTER TABLE `speed_dial` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `speed_dial` MODIFY `username` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `speed_dial` MODIFY `domain` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `speed_dial` MODIFY `sd_username` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `speed_dial` MODIFY `sd_domain` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `speed_dial` MODIFY `new_uri` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `speed_dial` MODIFY `fname` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `speed_dial` MODIFY `lname` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `speed_dial` MODIFY `description` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-
-ALTER TABLE `subscriber` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `subscriber` MODIFY `username` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `subscriber` MODIFY `domain` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `subscriber` MODIFY `password` varchar(40) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `subscriber` MODIFY `email_address` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `subscriber` MODIFY `ha1` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `subscriber` MODIFY `ha1b` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `subscriber` MODIFY `rpid` varchar(64) CHARACTER SET latin1 DEFAULT NULL;
-ALTER TABLE `subscriber` MODIFY `uuid` char(36) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `subscriber` MODIFY `timezone` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-
-ALTER TABLE `trusted` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `trusted` MODIFY `src_ip` varchar(50) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `trusted` MODIFY `proto` varchar(4) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `trusted` MODIFY `from_pattern` varchar(64) CHARACTER SET latin1 DEFAULT NULL;
-ALTER TABLE `trusted` MODIFY `tag` varchar(64) CHARACTER SET latin1 DEFAULT NULL;
-
-ALTER TABLE `usr_preferences` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `usr_preferences` MODIFY `uuid` char(36) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `usr_preferences` MODIFY `username` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT '0';
-ALTER TABLE `usr_preferences` MODIFY `domain` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `usr_preferences` MODIFY `attribute` varchar(32) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `usr_preferences` MODIFY `value` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT '';
-
-ALTER TABLE `dom_preferences` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `dom_preferences` MODIFY `uuid` char(36) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `dom_preferences` MODIFY `username` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT '0';
-ALTER TABLE `dom_preferences` MODIFY `domain` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `dom_preferences` MODIFY `attribute` varchar(32) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `dom_preferences` MODIFY `value` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT '';
-
-ALTER TABLE `peer_preferences` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `peer_preferences` MODIFY `uuid` varchar(36) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `peer_preferences` MODIFY `username` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT '0';
-ALTER TABLE `peer_preferences` MODIFY `domain` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `peer_preferences` MODIFY `attribute` varchar(32) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `peer_preferences` MODIFY `value` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT '';
-
-ALTER TABLE `address` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `address` MODIFY `ip_addr` varchar(15) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `address` MODIFY `tag` VARCHAR(64) CHARACTER SET latin1;
-
-ALTER TABLE `version` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `version` MODIFY `table_name` varchar(32) CHARACTER SET latin1 NOT NULL;
-
-SET FOREIGN_KEY_CHECKS=0;
-
-ALTER TABLE `voicemail_users` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `voicemail_users` MODIFY `customer_id` char(36) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `voicemail_users` MODIFY `context` varchar(63) CHARACTER SET latin1 NOT NULL DEFAULT 'default';
-ALTER TABLE `voicemail_users` MODIFY `mailbox` varchar(31) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `voicemail_users` MODIFY `password` varchar(31) CHARACTER SET latin1 NOT NULL DEFAULT '0';
-ALTER TABLE `voicemail_users` MODIFY `fullname` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `voicemail_users` MODIFY `email` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `voicemail_users` MODIFY `pager` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `voicemail_users` MODIFY `tz` varchar(10) CHARACTER SET latin1 NOT NULL DEFAULT 'central';
-ALTER TABLE `voicemail_users` MODIFY `attach` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'yes';
-ALTER TABLE `voicemail_users` MODIFY `saycid` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'yes';
-ALTER TABLE `voicemail_users` MODIFY `dialout` varchar(10) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `voicemail_users` MODIFY `callback` varchar(10) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `voicemail_users` MODIFY `review` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'no';
-ALTER TABLE `voicemail_users` MODIFY `operator` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'no';
-ALTER TABLE `voicemail_users` MODIFY `envelope` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'no';
-ALTER TABLE `voicemail_users` MODIFY `sayduration` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'no';
-ALTER TABLE `voicemail_users` MODIFY `sendvoicemail` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'no';
-ALTER TABLE `voicemail_users` MODIFY `delete` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'no';
-ALTER TABLE `voicemail_users` MODIFY `nextaftercmd` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'yes';
-ALTER TABLE `voicemail_users` MODIFY `forcename` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'no';
-ALTER TABLE `voicemail_users` MODIFY `forcegreetings` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'no';
-ALTER TABLE `voicemail_users` MODIFY `hidefromdir` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'yes';
-
-ALTER TABLE `voicemail_spool` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `voicemail_spool` MODIFY `dir` varchar(127) CHARACTER SET latin1 DEFAULT '';
-ALTER TABLE `voicemail_spool` MODIFY `context` varchar(63) CHARACTER SET latin1 DEFAULT '';
-ALTER TABLE `voicemail_spool` MODIFY `macrocontext` varchar(63) CHARACTER SET latin1 DEFAULT '';
-ALTER TABLE `voicemail_spool` MODIFY `callerid` varchar(255) CHARACTER SET latin1 DEFAULT '';
-ALTER TABLE `voicemail_spool` MODIFY `origtime` varchar(16) CHARACTER SET latin1 DEFAULT '';
-ALTER TABLE `voicemail_spool` MODIFY `duration` varchar(16) CHARACTER SET latin1 DEFAULT '';
-ALTER TABLE `voicemail_spool` MODIFY `mailboxuser` varchar(255) CHARACTER SET latin1 DEFAULT '';
-ALTER TABLE `voicemail_spool` MODIFY `mailboxcontext` varchar(63) CHARACTER SET latin1 DEFAULT '';
-
-SET FOREIGN_KEY_CHECKS=1;
-
-ALTER TABLE `fax_preferences` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `fax_preferences` MODIFY `password` varchar(64) CHARACTER SET latin1 default NULL;
-ALTER TABLE `fax_preferences` MODIFY `name` varchar(64) CHARACTER SET latin1 default NULL;
-ALTER TABLE `fax_preferences` MODIFY `active` enum('true','false') CHARACTER SET latin1 NOT NULL default 'true';
-ALTER TABLE `fax_preferences` MODIFY `send_status` enum('true','false') CHARACTER SET latin1 NOT NULL default 'false';
-ALTER TABLE `fax_preferences` MODIFY `send_copy` enum('true','false') CHARACTER SET latin1 NOT NULL default 'false';
-ALTER TABLE `fax_preferences` MODIFY `send_copy_cc` enum('true','false') CHARACTER SET latin1 NOT NULL default 'false';
-
-ALTER TABLE `fax_destinations` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `fax_destinations` MODIFY `destination` varchar(64) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `fax_destinations` MODIFY `filetype` enum('ps','tiff','pdf','pdf14') CHARACTER SET latin1 NOT NULL default 'tiff';
-ALTER TABLE `fax_destinations` MODIFY `cc` enum('true','false') CHARACTER SET latin1 NOT NULL default 'false';
-ALTER TABLE `fax_destinations` MODIFY `incoming` enum('true','false') CHARACTER SET latin1 NOT NULL default 'true';
-ALTER TABLE `fax_destinations` MODIFY `outgoing` enum('true','false') CHARACTER SET latin1 NOT NULL default 'false';
-ALTER TABLE `fax_destinations` MODIFY `status` enum('true','false') CHARACTER SET latin1 NOT NULL default 'false';
-
-ALTER TABLE `sems_registrations` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `sems_registrations` MODIFY `last_reason` varchar(256) CHARACTER SET latin1 DEFAULT NULL;
-ALTER TABLE `sems_registrations` MODIFY `contacts` varchar(512) CHARACTER SET latin1 DEFAULT NULL;
-
-ALTER TABLE `fax_journal` DEFAULT CHARACTER SET latin1;
-ALTER TABLE `fax_journal` MODIFY `direction` enum('in','out') CHARACTER SET latin1 NOT NULL DEFAULT 'in';
-ALTER TABLE `fax_journal` MODIFY `peer_number` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `fax_journal` MODIFY `peer_name` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `fax_journal` MODIFY `reason` varchar(255) CHARACTER SET latin1 NOT NULL;
-ALTER TABLE `fax_journal` MODIFY `status` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `fax_journal` MODIFY `quality` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
-ALTER TABLE `fax_journal` MODIFY `filename` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
-
diff --git a/db_scripts/base/6424_not_replicated.up b/db_scripts/base/6424_not_replicated.up
index 38e3f85d..79df67bb 100644
--- a/db_scripts/base/6424_not_replicated.up
+++ b/db_scripts/base/6424_not_replicated.up
@@ -1,70 +1,10 @@
 use accounting;
 
-ALTER TABLE `cdr` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `cdr` MODIFY `source_user_id` char(36) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `cdr` MODIFY `source_provider_id` varchar(255) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `cdr` MODIFY `source_external_subscriber_id` varchar(255) CHARACTER SET utf8 DEFAULT NULL;
-ALTER TABLE `cdr` MODIFY `source_external_contract_id` varchar(255) CHARACTER SET utf8 DEFAULT NULL;
-ALTER TABLE `cdr` MODIFY `source_user` varchar(255) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `cdr` MODIFY `source_domain` varchar(255) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `cdr` MODIFY `source_cli` varchar(64) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `cdr` MODIFY `destination_user_id` char(36) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `cdr` MODIFY `destination_provider_id` varchar(255) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `cdr` MODIFY `destination_external_subscriber_id` varchar(255) CHARACTER SET utf8 DEFAULT NULL;
-ALTER TABLE `cdr` MODIFY `destination_external_contract_id` varchar(255) CHARACTER SET utf8 DEFAULT NULL;
-ALTER TABLE `cdr` MODIFY `destination_user` varchar(255) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `cdr` MODIFY `destination_domain` varchar(255) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `cdr` MODIFY `destination_user_dialed` varchar(255) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `cdr` MODIFY `destination_user_in` varchar(255) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `cdr` MODIFY `destination_domain_in` varchar(255) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `cdr` MODIFY `peer_auth_user` varchar(255) CHARACTER SET utf8 DEFAULT NULL;
-ALTER TABLE `cdr` MODIFY `peer_auth_realm` varchar(255) CHARACTER SET utf8 DEFAULT NULL;
-ALTER TABLE `cdr` MODIFY `call_type` enum('call','cfu','cft','cfb','cfna') CHARACTER SET utf8 NOT NULL default 'call';
-ALTER TABLE `cdr` MODIFY `call_status` enum('ok','busy','noanswer','cancel','offline','timeout','other') CHARACTER SET utf8 NOT NULL default 'ok';
-ALTER TABLE `cdr` MODIFY `call_code` char(3) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `cdr` MODIFY `call_id` varchar(255) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `cdr` MODIFY `rating_status` enum('unrated','ok','failed') CHARACTER SET utf8 NOT NULL default 'unrated';
-
-ALTER TABLE `mark` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `mark` MODIFY `collector` varchar(255) CHARACTER SET utf8 NOT NULL;
-
-ALTER TABLE `acc` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `acc` MODIFY `method` varchar(16) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `from_tag` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `to_tag` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `callid` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `sip_code` varchar(3) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `sip_reason` varchar(128) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `src_leg` varchar(2048) CHARACTER SET utf8 default NULL;
-ALTER TABLE `acc` MODIFY `dst_leg` varchar(2048) CHARACTER SET utf8 default NULL;
-#ALTER TABLE `acc` MODIFY `dst_user` varchar(64) CHARACTER SET utf8 NOT NULL default '';
-#ALTER TABLE `acc` MODIFY `dst_ouser` varchar(64) CHARACTER SET utf8 NOT NULL default '';
-#ALTER TABLE `acc` MODIFY `dst_domain` varchar(128) CHARACTER SET utf8 NOT NULL default '';
-#ALTER TABLE `acc` MODIFY `src_user` varchar(64) CHARACTER SET utf8 NOT NULL default '';
-#ALTER TABLE `acc` MODIFY `src_domain` varchar(128) CHARACTER SET utf8 NOT NULL default '';
-
 ALTER TABLE `acc_backup` CONVERT TO CHARACTER SET utf8;
 ALTER TABLE `acc_trash` CONVERT TO CHARACTER SET utf8;
 
 use kamailio;
 
-ALTER DATABASE kamailio DEFAULT CHARACTER SET utf8;
-
-ALTER TABLE `acc` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `acc` MODIFY `method` varchar(16) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `from_tag` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `to_tag` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `callid` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `sip_code` varchar(3) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `sip_reason` varchar(128) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `acc` MODIFY `src_leg` varchar(2048) CHARACTER SET utf8 default NULL;
-ALTER TABLE `acc` MODIFY `dst_leg` varchar(2048) CHARACTER SET utf8 default NULL;
-ALTER TABLE `acc` MODIFY `dst_user` varchar(64) CHARACTER SET utf8 NOT NULL default '';
-ALTER TABLE `acc` MODIFY `dst_ouser` varchar(64) CHARACTER SET utf8 NOT NULL default '';
-ALTER TABLE `acc` MODIFY `dst_domain` varchar(128) CHARACTER SET utf8 NOT NULL default '';
-ALTER TABLE `acc` MODIFY `src_user` varchar(64) CHARACTER SET utf8 NOT NULL default '';
-ALTER TABLE `acc` MODIFY `src_domain` varchar(128) CHARACTER SET utf8 NOT NULL default '';
-
 ALTER TABLE `acc_backup` CONVERT TO CHARACTER SET utf8;
 ALTER TABLE `acc_backup` MODIFY `sip_reason` varchar(128) CHARACTER SET utf8 NOT NULL DEFAULT '';
 ALTER TABLE `acc_backup` MODIFY `src_leg` varchar(2048) CHARACTER SET utf8 default NULL;
@@ -73,185 +13,4 @@ ALTER TABLE `acc_backup` MODIFY `dst_leg` varchar(2048) CHARACTER SET utf8 defau
 ALTER TABLE `acc_trash` CONVERT TO CHARACTER SET utf8;
 ALTER TABLE `acc_trash` MODIFY `sip_reason` varchar(128) CHARACTER SET utf8 NOT NULL DEFAULT '';
 ALTER TABLE `acc_trash` MODIFY `src_leg` varchar(2048) CHARACTER SET utf8 default NULL;
-ALTER TABLE `acc_trash` MODIFY `dst_leg` varchar(2048) CHARACTER SET utf8 default NULL;
-
-ALTER TABLE `dbaliases` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `dbaliases` MODIFY `alias_username` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `dbaliases` MODIFY `alias_domain` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `dbaliases` MODIFY `username` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `dbaliases` MODIFY `domain` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-
-ALTER TABLE `dialog` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `dialog` MODIFY `callid` varchar(255) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `dialog` MODIFY `from_uri` varchar(128) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `dialog` MODIFY `from_tag` varchar(64) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `dialog` MODIFY `to_uri` varchar(128) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `dialog` MODIFY `to_tag` varchar(64) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `dialog` MODIFY `caller_cseq` varchar(7) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `dialog` MODIFY `callee_cseq` varchar(7) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `dialog` MODIFY `caller_route_set` varchar(512) CHARACTER SET utf8 DEFAULT NULL;
-ALTER TABLE `dialog` MODIFY `callee_route_set` varchar(512) CHARACTER SET utf8 DEFAULT NULL;
-ALTER TABLE `dialog` MODIFY `caller_contact` varchar(128) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `dialog` MODIFY `callee_contact` varchar(128) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `dialog` MODIFY `caller_sock` varchar(64) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `dialog` MODIFY `callee_sock` varchar(64) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `dialog` MODIFY `req_uri` varchar(128) CHARACTER SET utf8 NOT NULL;
-
-ALTER TABLE `dialplan` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `dialplan` MODIFY `match_exp` varchar(64) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `dialplan` MODIFY `subst_exp` varchar(64) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `dialplan` MODIFY `repl_exp` varchar(64) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `dialplan` MODIFY `attrs` varchar(32) CHARACTER SET utf8 NOT NULL;
-
-ALTER TABLE `dispatcher` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `dispatcher` MODIFY `destination` varchar(192) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `dispatcher` MODIFY `description` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-
-ALTER TABLE `domain` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `domain` MODIFY `domain` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-
-ALTER TABLE `lcr_gw` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `lcr_gw` MODIFY `gw_name` varchar(128) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `lcr_gw` MODIFY `ip_addr` varchar(15) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `lcr_gw` MODIFY `hostname` varchar(64) CHARACTER SET utf8 DEFAULT NULL;
-ALTER TABLE `lcr_gw` MODIFY `params` varchar(64) CHARACTER SET utf8 DEFAULT NULL;
-ALTER TABLE `lcr_gw` MODIFY `tag` varchar(16) CHARACTER SET utf8 DEFAULT NULL;
-
-ALTER TABLE `lcr_rule` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `lcr_rule` MODIFY `prefix` varchar(16) CHARACTER SET utf8 DEFAULT NULL;
-ALTER TABLE `lcr_rule` MODIFY `from_uri` varchar(64) CHARACTER SET utf8 DEFAULT NULL;
-
-ALTER TABLE `lcr_rule_target` DEFAULT CHARACTER SET utf8;
-
-ALTER TABLE `location` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `location` MODIFY `username` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `location` MODIFY `domain` varchar(64) CHARACTER SET utf8 DEFAULT NULL;
-ALTER TABLE `location` MODIFY `contact` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `location` MODIFY `received` varchar(128) CHARACTER SET utf8 DEFAULT NULL;
-ALTER TABLE `location` MODIFY `path` varchar(128) CHARACTER SET utf8 DEFAULT NULL;
-ALTER TABLE `location` MODIFY `callid` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT 'Default-Call-ID';
-ALTER TABLE `location` MODIFY `user_agent` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `location` MODIFY `socket` varchar(64) CHARACTER SET utf8 DEFAULT NULL;
-
-ALTER TABLE `speed_dial` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `speed_dial` MODIFY `username` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `speed_dial` MODIFY `domain` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `speed_dial` MODIFY `sd_username` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `speed_dial` MODIFY `sd_domain` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `speed_dial` MODIFY `new_uri` varchar(128) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `speed_dial` MODIFY `fname` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `speed_dial` MODIFY `lname` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `speed_dial` MODIFY `description` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-
-ALTER TABLE `subscriber` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `subscriber` MODIFY `username` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `subscriber` MODIFY `domain` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `subscriber` MODIFY `password` varchar(40) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `subscriber` MODIFY `email_address` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `subscriber` MODIFY `ha1` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `subscriber` MODIFY `ha1b` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `subscriber` MODIFY `rpid` varchar(64) CHARACTER SET utf8 DEFAULT NULL;
-ALTER TABLE `subscriber` MODIFY `uuid` char(36) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `subscriber` MODIFY `timezone` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-
-ALTER TABLE `trusted` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `trusted` MODIFY `src_ip` varchar(50) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `trusted` MODIFY `proto` varchar(4) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `trusted` MODIFY `from_pattern` varchar(64) CHARACTER SET utf8 DEFAULT NULL;
-ALTER TABLE `trusted` MODIFY `tag` varchar(64) CHARACTER SET utf8 DEFAULT NULL;
-
-ALTER TABLE `usr_preferences` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `usr_preferences` MODIFY `uuid` char(36) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `usr_preferences` MODIFY `username` varchar(128) CHARACTER SET utf8 NOT NULL DEFAULT '0';
-ALTER TABLE `usr_preferences` MODIFY `domain` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `usr_preferences` MODIFY `attribute` varchar(32) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `usr_preferences` MODIFY `value` varchar(128) CHARACTER SET utf8 NOT NULL DEFAULT '';
-
-ALTER TABLE `dom_preferences` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `dom_preferences` MODIFY `uuid` char(36) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `dom_preferences` MODIFY `username` varchar(128) CHARACTER SET utf8 NOT NULL DEFAULT '0';
-ALTER TABLE `dom_preferences` MODIFY `domain` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `dom_preferences` MODIFY `attribute` varchar(32) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `dom_preferences` MODIFY `value` varchar(128) CHARACTER SET utf8 NOT NULL DEFAULT '';
-
-ALTER TABLE `peer_preferences` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `peer_preferences` MODIFY `uuid` varchar(36) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `peer_preferences` MODIFY `username` varchar(128) CHARACTER SET utf8 NOT NULL DEFAULT '0';
-ALTER TABLE `peer_preferences` MODIFY `domain` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `peer_preferences` MODIFY `attribute` varchar(32) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `peer_preferences` MODIFY `value` varchar(128) CHARACTER SET utf8 NOT NULL DEFAULT '';
-
-ALTER TABLE `address` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `address` MODIFY `ip_addr` varchar(15) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `address` MODIFY `tag` VARCHAR(64) CHARACTER SET utf8;
-
-ALTER TABLE `version` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `version` MODIFY `table_name` varchar(32) CHARACTER SET utf8 NOT NULL;
-
-SET FOREIGN_KEY_CHECKS=0;
-
-ALTER TABLE `voicemail_users` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `voicemail_users` MODIFY `customer_id` char(36) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `voicemail_users` MODIFY `context` varchar(63) CHARACTER SET utf8 NOT NULL DEFAULT 'default';
-ALTER TABLE `voicemail_users` MODIFY `mailbox` varchar(31) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `voicemail_users` MODIFY `password` varchar(31) CHARACTER SET utf8 NOT NULL DEFAULT '0';
-ALTER TABLE `voicemail_users` MODIFY `fullname` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `voicemail_users` MODIFY `email` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `voicemail_users` MODIFY `pager` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `voicemail_users` MODIFY `tz` varchar(10) CHARACTER SET utf8 NOT NULL DEFAULT 'central';
-ALTER TABLE `voicemail_users` MODIFY `attach` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'yes';
-ALTER TABLE `voicemail_users` MODIFY `saycid` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'yes';
-ALTER TABLE `voicemail_users` MODIFY `dialout` varchar(10) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `voicemail_users` MODIFY `callback` varchar(10) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `voicemail_users` MODIFY `review` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'no';
-ALTER TABLE `voicemail_users` MODIFY `operator` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'no';
-ALTER TABLE `voicemail_users` MODIFY `envelope` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'no';
-ALTER TABLE `voicemail_users` MODIFY `sayduration` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'no';
-ALTER TABLE `voicemail_users` MODIFY `sendvoicemail` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'no';
-ALTER TABLE `voicemail_users` MODIFY `delete` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'no';
-ALTER TABLE `voicemail_users` MODIFY `nextaftercmd` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'yes';
-ALTER TABLE `voicemail_users` MODIFY `forcename` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'no';
-ALTER TABLE `voicemail_users` MODIFY `forcegreetings` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'no';
-ALTER TABLE `voicemail_users` MODIFY `hidefromdir` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'yes';
-
-ALTER TABLE `voicemail_spool` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `voicemail_spool` MODIFY `dir` varchar(127) CHARACTER SET utf8 DEFAULT '';
-ALTER TABLE `voicemail_spool` MODIFY `context` varchar(63) CHARACTER SET utf8 DEFAULT '';
-ALTER TABLE `voicemail_spool` MODIFY `macrocontext` varchar(63) CHARACTER SET utf8 DEFAULT '';
-ALTER TABLE `voicemail_spool` MODIFY `callerid` varchar(255) CHARACTER SET utf8 DEFAULT '';
-ALTER TABLE `voicemail_spool` MODIFY `origtime` varchar(16) CHARACTER SET utf8 DEFAULT '';
-ALTER TABLE `voicemail_spool` MODIFY `duration` varchar(16) CHARACTER SET utf8 DEFAULT '';
-ALTER TABLE `voicemail_spool` MODIFY `mailboxuser` varchar(255) CHARACTER SET utf8 DEFAULT '';
-ALTER TABLE `voicemail_spool` MODIFY `mailboxcontext` varchar(63) CHARACTER SET utf8 DEFAULT '';
-
-SET FOREIGN_KEY_CHECKS=1;
-
-ALTER TABLE `fax_preferences` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `fax_preferences` MODIFY `password` varchar(64) CHARACTER SET utf8 default NULL;
-ALTER TABLE `fax_preferences` MODIFY `name` varchar(64) CHARACTER SET utf8 default NULL;
-ALTER TABLE `fax_preferences` MODIFY `active` enum('true','false') CHARACTER SET utf8 NOT NULL default 'true';
-ALTER TABLE `fax_preferences` MODIFY `send_status` enum('true','false') CHARACTER SET utf8 NOT NULL default 'false';
-ALTER TABLE `fax_preferences` MODIFY `send_copy` enum('true','false') CHARACTER SET utf8 NOT NULL default 'false';
-ALTER TABLE `fax_preferences` MODIFY `send_copy_cc` enum('true','false') CHARACTER SET utf8 NOT NULL default 'false';
-
-ALTER TABLE `fax_destinations` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `fax_destinations` MODIFY `destination` varchar(64) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `fax_destinations` MODIFY `filetype` enum('ps','tiff','pdf','pdf14') CHARACTER SET utf8 NOT NULL default 'tiff';
-ALTER TABLE `fax_destinations` MODIFY `cc` enum('true','false') CHARACTER SET utf8 NOT NULL default 'false';
-ALTER TABLE `fax_destinations` MODIFY `incoming` enum('true','false') CHARACTER SET utf8 NOT NULL default 'true';
-ALTER TABLE `fax_destinations` MODIFY `outgoing` enum('true','false') CHARACTER SET utf8 NOT NULL default 'false';
-ALTER TABLE `fax_destinations` MODIFY `status` enum('true','false') CHARACTER SET utf8 NOT NULL default 'false';
-
-ALTER TABLE `sems_registrations` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `sems_registrations` MODIFY `last_reason` varchar(256) CHARACTER SET utf8 DEFAULT NULL;
-ALTER TABLE `sems_registrations` MODIFY `contacts` varchar(512) CHARACTER SET utf8 DEFAULT NULL;
-
-ALTER TABLE `fax_journal` DEFAULT CHARACTER SET utf8;
-ALTER TABLE `fax_journal` MODIFY `direction` enum('in','out') CHARACTER SET utf8 NOT NULL DEFAULT 'in';
-ALTER TABLE `fax_journal` MODIFY `peer_number` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `fax_journal` MODIFY `peer_name` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `fax_journal` MODIFY `reason` varchar(255) CHARACTER SET utf8 NOT NULL;
-ALTER TABLE `fax_journal` MODIFY `status` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `fax_journal` MODIFY `quality` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
-ALTER TABLE `fax_journal` MODIFY `filename` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
-
+ALTER TABLE `acc_trash` MODIFY `dst_leg` varchar(2048) CHARACTER SET utf8 default NULL;
\ No newline at end of file
diff --git a/db_scripts/base/6425.down b/db_scripts/base/6425.down
new file mode 100644
index 00000000..79be2ccb
--- /dev/null
+++ b/db_scripts/base/6425.down
@@ -0,0 +1,244 @@
+use accounting;
+
+ALTER TABLE `cdr` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `cdr` MODIFY `source_user_id` char(36) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `cdr` MODIFY `source_provider_id` varchar(255) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `cdr` MODIFY `source_external_subscriber_id` varchar(255) CHARACTER SET latin1 DEFAULT NULL;
+ALTER TABLE `cdr` MODIFY `source_external_contract_id` varchar(255) CHARACTER SET latin1 DEFAULT NULL;
+ALTER TABLE `cdr` MODIFY `source_user` varchar(255) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `cdr` MODIFY `source_domain` varchar(255) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `cdr` MODIFY `source_cli` varchar(64) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `cdr` MODIFY `destination_user_id` char(36) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `cdr` MODIFY `destination_provider_id` varchar(255) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `cdr` MODIFY `destination_external_subscriber_id` varchar(255) CHARACTER SET latin1 DEFAULT NULL;
+ALTER TABLE `cdr` MODIFY `destination_external_contract_id` varchar(255) CHARACTER SET latin1 DEFAULT NULL;
+ALTER TABLE `cdr` MODIFY `destination_user` varchar(255) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `cdr` MODIFY `destination_domain` varchar(255) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `cdr` MODIFY `destination_user_dialed` varchar(255) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `cdr` MODIFY `destination_user_in` varchar(255) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `cdr` MODIFY `destination_domain_in` varchar(255) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `cdr` MODIFY `peer_auth_user` varchar(255) CHARACTER SET latin1 DEFAULT NULL;
+ALTER TABLE `cdr` MODIFY `peer_auth_realm` varchar(255) CHARACTER SET latin1 DEFAULT NULL;
+ALTER TABLE `cdr` MODIFY `call_type` enum('call','cfu','cft','cfb','cfna') CHARACTER SET latin1 NOT NULL default 'call';
+ALTER TABLE `cdr` MODIFY `call_status` enum('ok','busy','noanswer','cancel','offline','timeout','other') CHARACTER SET latin1 NOT NULL default 'ok';
+ALTER TABLE `cdr` MODIFY `call_code` char(3) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `cdr` MODIFY `call_id` varchar(255) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `cdr` MODIFY `rating_status` enum('unrated','ok','failed') CHARACTER SET latin1 NOT NULL default 'unrated';
+
+ALTER TABLE `mark` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `mark` MODIFY `collector` varchar(255) CHARACTER SET latin1 NOT NULL;
+
+ALTER TABLE `acc` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `acc` MODIFY `method` varchar(16) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `from_tag` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `to_tag` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `callid` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `sip_code` varchar(3) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `sip_reason` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `src_leg` varchar(2048) CHARACTER SET latin1 default NULL;
+ALTER TABLE `acc` MODIFY `dst_leg` varchar(2048) CHARACTER SET latin1 default NULL;
+ALTER TABLE `acc` MODIFY `dst_user` varchar(64) CHARACTER SET latin1 NOT NULL default '';
+ALTER TABLE `acc` MODIFY `dst_ouser` varchar(64) CHARACTER SET latin1 NOT NULL default '';
+ALTER TABLE `acc` MODIFY `dst_domain` varchar(128) CHARACTER SET latin1 NOT NULL default '';
+ALTER TABLE `acc` MODIFY `src_user` varchar(64) CHARACTER SET latin1 NOT NULL default '';
+ALTER TABLE `acc` MODIFY `src_domain` varchar(128) CHARACTER SET latin1 NOT NULL default '';
+
+use kamailio;
+
+ALTER DATABASE kamailio DEFAULT CHARACTER SET latin1;
+
+ALTER TABLE `acc` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `acc` MODIFY `method` varchar(16) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `from_tag` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `to_tag` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `callid` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `sip_code` varchar(3) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `sip_reason` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `src_leg` varchar(2048) CHARACTER SET latin1 default NULL;
+ALTER TABLE `acc` MODIFY `dst_leg` varchar(2048) CHARACTER SET latin1 default NULL;
+ALTER TABLE `acc` MODIFY `dst_user` varchar(64) CHARACTER SET latin1 NOT NULL default '';
+ALTER TABLE `acc` MODIFY `dst_ouser` varchar(64) CHARACTER SET latin1 NOT NULL default '';
+ALTER TABLE `acc` MODIFY `dst_domain` varchar(128) CHARACTER SET latin1 NOT NULL default '';
+ALTER TABLE `acc` MODIFY `src_user` varchar(64) CHARACTER SET latin1 NOT NULL default '';
+ALTER TABLE `acc` MODIFY `src_domain` varchar(128) CHARACTER SET latin1 NOT NULL default '';
+
+ALTER TABLE `dbaliases` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `dbaliases` MODIFY `alias_username` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `dbaliases` MODIFY `alias_domain` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `dbaliases` MODIFY `username` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `dbaliases` MODIFY `domain` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+
+ALTER TABLE `dialog` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `dialog` MODIFY `callid` varchar(255) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `dialog` MODIFY `from_uri` varchar(128) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `dialog` MODIFY `from_tag` varchar(64) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `dialog` MODIFY `to_uri` varchar(128) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `dialog` MODIFY `to_tag` varchar(64) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `dialog` MODIFY `caller_cseq` varchar(7) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `dialog` MODIFY `callee_cseq` varchar(7) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `dialog` MODIFY `caller_route_set` varchar(512) CHARACTER SET latin1 DEFAULT NULL;
+ALTER TABLE `dialog` MODIFY `callee_route_set` varchar(512) CHARACTER SET latin1 DEFAULT NULL;
+ALTER TABLE `dialog` MODIFY `caller_contact` varchar(128) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `dialog` MODIFY `callee_contact` varchar(128) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `dialog` MODIFY `caller_sock` varchar(64) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `dialog` MODIFY `callee_sock` varchar(64) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `dialog` MODIFY `req_uri` varchar(128) CHARACTER SET latin1 NOT NULL;
+
+ALTER TABLE `dialplan` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `dialplan` MODIFY `match_exp` varchar(64) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `dialplan` MODIFY `subst_exp` varchar(64) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `dialplan` MODIFY `repl_exp` varchar(64) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `dialplan` MODIFY `attrs` varchar(32) CHARACTER SET latin1 NOT NULL;
+
+ALTER TABLE `dispatcher` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `dispatcher` MODIFY `destination` varchar(192) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `dispatcher` MODIFY `description` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+
+ALTER TABLE `domain` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `domain` MODIFY `domain` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+
+ALTER TABLE `lcr_gw` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `lcr_gw` MODIFY `gw_name` varchar(128) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `lcr_gw` MODIFY `ip_addr` varchar(15) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `lcr_gw` MODIFY `hostname` varchar(64) CHARACTER SET latin1 DEFAULT NULL;
+ALTER TABLE `lcr_gw` MODIFY `params` varchar(64) CHARACTER SET latin1 DEFAULT NULL;
+ALTER TABLE `lcr_gw` MODIFY `tag` varchar(16) CHARACTER SET latin1 DEFAULT NULL;
+
+ALTER TABLE `lcr_rule` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `lcr_rule` MODIFY `prefix` varchar(16) CHARACTER SET latin1 DEFAULT NULL;
+ALTER TABLE `lcr_rule` MODIFY `from_uri` varchar(64) CHARACTER SET latin1 DEFAULT NULL;
+
+ALTER TABLE `lcr_rule_target` DEFAULT CHARACTER SET latin1;
+
+ALTER TABLE `location` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `location` MODIFY `username` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `location` MODIFY `domain` varchar(64) CHARACTER SET latin1 DEFAULT NULL;
+ALTER TABLE `location` MODIFY `contact` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `location` MODIFY `received` varchar(128) CHARACTER SET latin1 DEFAULT NULL;
+ALTER TABLE `location` MODIFY `path` varchar(128) CHARACTER SET latin1 DEFAULT NULL;
+ALTER TABLE `location` MODIFY `callid` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT 'Default-Call-ID';
+ALTER TABLE `location` MODIFY `user_agent` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `location` MODIFY `socket` varchar(64) CHARACTER SET latin1 DEFAULT NULL;
+
+ALTER TABLE `speed_dial` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `speed_dial` MODIFY `username` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `speed_dial` MODIFY `domain` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `speed_dial` MODIFY `sd_username` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `speed_dial` MODIFY `sd_domain` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `speed_dial` MODIFY `new_uri` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `speed_dial` MODIFY `fname` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `speed_dial` MODIFY `lname` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `speed_dial` MODIFY `description` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+
+ALTER TABLE `subscriber` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `subscriber` MODIFY `username` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `subscriber` MODIFY `domain` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `subscriber` MODIFY `password` varchar(40) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `subscriber` MODIFY `email_address` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `subscriber` MODIFY `ha1` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `subscriber` MODIFY `ha1b` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `subscriber` MODIFY `rpid` varchar(64) CHARACTER SET latin1 DEFAULT NULL;
+ALTER TABLE `subscriber` MODIFY `uuid` char(36) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `subscriber` MODIFY `timezone` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+
+ALTER TABLE `trusted` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `trusted` MODIFY `src_ip` varchar(50) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `trusted` MODIFY `proto` varchar(4) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `trusted` MODIFY `from_pattern` varchar(64) CHARACTER SET latin1 DEFAULT NULL;
+ALTER TABLE `trusted` MODIFY `tag` varchar(64) CHARACTER SET latin1 DEFAULT NULL;
+
+ALTER TABLE `usr_preferences` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `usr_preferences` MODIFY `uuid` char(36) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `usr_preferences` MODIFY `username` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT '0';
+ALTER TABLE `usr_preferences` MODIFY `domain` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `usr_preferences` MODIFY `attribute` varchar(32) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `usr_preferences` MODIFY `value` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT '';
+
+ALTER TABLE `dom_preferences` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `dom_preferences` MODIFY `uuid` char(36) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `dom_preferences` MODIFY `username` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT '0';
+ALTER TABLE `dom_preferences` MODIFY `domain` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `dom_preferences` MODIFY `attribute` varchar(32) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `dom_preferences` MODIFY `value` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT '';
+
+ALTER TABLE `peer_preferences` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `peer_preferences` MODIFY `uuid` varchar(36) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `peer_preferences` MODIFY `username` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT '0';
+ALTER TABLE `peer_preferences` MODIFY `domain` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `peer_preferences` MODIFY `attribute` varchar(32) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `peer_preferences` MODIFY `value` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT '';
+
+ALTER TABLE `address` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `address` MODIFY `ip_addr` varchar(15) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `address` MODIFY `tag` VARCHAR(64) CHARACTER SET latin1;
+
+ALTER TABLE `version` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `version` MODIFY `table_name` varchar(32) CHARACTER SET latin1 NOT NULL;
+
+SET FOREIGN_KEY_CHECKS=0;
+
+ALTER TABLE `voicemail_users` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `voicemail_users` MODIFY `customer_id` char(36) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `voicemail_users` MODIFY `context` varchar(63) CHARACTER SET latin1 NOT NULL DEFAULT 'default';
+ALTER TABLE `voicemail_users` MODIFY `mailbox` varchar(31) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `voicemail_users` MODIFY `password` varchar(31) CHARACTER SET latin1 NOT NULL DEFAULT '0';
+ALTER TABLE `voicemail_users` MODIFY `fullname` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `voicemail_users` MODIFY `email` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `voicemail_users` MODIFY `pager` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `voicemail_users` MODIFY `tz` varchar(10) CHARACTER SET latin1 NOT NULL DEFAULT 'central';
+ALTER TABLE `voicemail_users` MODIFY `attach` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'yes';
+ALTER TABLE `voicemail_users` MODIFY `saycid` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'yes';
+ALTER TABLE `voicemail_users` MODIFY `dialout` varchar(10) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `voicemail_users` MODIFY `callback` varchar(10) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `voicemail_users` MODIFY `review` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'no';
+ALTER TABLE `voicemail_users` MODIFY `operator` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'no';
+ALTER TABLE `voicemail_users` MODIFY `envelope` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'no';
+ALTER TABLE `voicemail_users` MODIFY `sayduration` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'no';
+ALTER TABLE `voicemail_users` MODIFY `sendvoicemail` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'no';
+ALTER TABLE `voicemail_users` MODIFY `delete` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'no';
+ALTER TABLE `voicemail_users` MODIFY `nextaftercmd` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'yes';
+ALTER TABLE `voicemail_users` MODIFY `forcename` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'no';
+ALTER TABLE `voicemail_users` MODIFY `forcegreetings` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'no';
+ALTER TABLE `voicemail_users` MODIFY `hidefromdir` varchar(4) CHARACTER SET latin1 NOT NULL DEFAULT 'yes';
+
+ALTER TABLE `voicemail_spool` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `voicemail_spool` MODIFY `dir` varchar(127) CHARACTER SET latin1 DEFAULT '';
+ALTER TABLE `voicemail_spool` MODIFY `context` varchar(63) CHARACTER SET latin1 DEFAULT '';
+ALTER TABLE `voicemail_spool` MODIFY `macrocontext` varchar(63) CHARACTER SET latin1 DEFAULT '';
+ALTER TABLE `voicemail_spool` MODIFY `callerid` varchar(255) CHARACTER SET latin1 DEFAULT '';
+ALTER TABLE `voicemail_spool` MODIFY `origtime` varchar(16) CHARACTER SET latin1 DEFAULT '';
+ALTER TABLE `voicemail_spool` MODIFY `duration` varchar(16) CHARACTER SET latin1 DEFAULT '';
+ALTER TABLE `voicemail_spool` MODIFY `mailboxuser` varchar(255) CHARACTER SET latin1 DEFAULT '';
+ALTER TABLE `voicemail_spool` MODIFY `mailboxcontext` varchar(63) CHARACTER SET latin1 DEFAULT '';
+
+SET FOREIGN_KEY_CHECKS=1;
+
+ALTER TABLE `fax_preferences` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `fax_preferences` MODIFY `password` varchar(64) CHARACTER SET latin1 default NULL;
+ALTER TABLE `fax_preferences` MODIFY `name` varchar(64) CHARACTER SET latin1 default NULL;
+ALTER TABLE `fax_preferences` MODIFY `active` enum('true','false') CHARACTER SET latin1 NOT NULL default 'true';
+ALTER TABLE `fax_preferences` MODIFY `send_status` enum('true','false') CHARACTER SET latin1 NOT NULL default 'false';
+ALTER TABLE `fax_preferences` MODIFY `send_copy` enum('true','false') CHARACTER SET latin1 NOT NULL default 'false';
+ALTER TABLE `fax_preferences` MODIFY `send_copy_cc` enum('true','false') CHARACTER SET latin1 NOT NULL default 'false';
+
+ALTER TABLE `fax_destinations` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `fax_destinations` MODIFY `destination` varchar(64) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `fax_destinations` MODIFY `filetype` enum('ps','tiff','pdf','pdf14') CHARACTER SET latin1 NOT NULL default 'tiff';
+ALTER TABLE `fax_destinations` MODIFY `cc` enum('true','false') CHARACTER SET latin1 NOT NULL default 'false';
+ALTER TABLE `fax_destinations` MODIFY `incoming` enum('true','false') CHARACTER SET latin1 NOT NULL default 'true';
+ALTER TABLE `fax_destinations` MODIFY `outgoing` enum('true','false') CHARACTER SET latin1 NOT NULL default 'false';
+ALTER TABLE `fax_destinations` MODIFY `status` enum('true','false') CHARACTER SET latin1 NOT NULL default 'false';
+
+ALTER TABLE `sems_registrations` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `sems_registrations` MODIFY `last_reason` varchar(256) CHARACTER SET latin1 DEFAULT NULL;
+ALTER TABLE `sems_registrations` MODIFY `contacts` varchar(512) CHARACTER SET latin1 DEFAULT NULL;
+
+ALTER TABLE `fax_journal` DEFAULT CHARACTER SET latin1;
+ALTER TABLE `fax_journal` MODIFY `direction` enum('in','out') CHARACTER SET latin1 NOT NULL DEFAULT 'in';
+ALTER TABLE `fax_journal` MODIFY `peer_number` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `fax_journal` MODIFY `peer_name` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `fax_journal` MODIFY `reason` varchar(255) CHARACTER SET latin1 NOT NULL;
+ALTER TABLE `fax_journal` MODIFY `status` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `fax_journal` MODIFY `quality` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
+ALTER TABLE `fax_journal` MODIFY `filename` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '';
+
diff --git a/db_scripts/base/6425.up b/db_scripts/base/6425.up
new file mode 100644
index 00000000..2af2ab61
--- /dev/null
+++ b/db_scripts/base/6425.up
@@ -0,0 +1,244 @@
+use accounting;
+
+ALTER TABLE `cdr` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `cdr` MODIFY `source_user_id` char(36) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `cdr` MODIFY `source_provider_id` varchar(255) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `cdr` MODIFY `source_external_subscriber_id` varchar(255) CHARACTER SET utf8 DEFAULT NULL;
+ALTER TABLE `cdr` MODIFY `source_external_contract_id` varchar(255) CHARACTER SET utf8 DEFAULT NULL;
+ALTER TABLE `cdr` MODIFY `source_user` varchar(255) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `cdr` MODIFY `source_domain` varchar(255) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `cdr` MODIFY `source_cli` varchar(64) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `cdr` MODIFY `destination_user_id` char(36) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `cdr` MODIFY `destination_provider_id` varchar(255) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `cdr` MODIFY `destination_external_subscriber_id` varchar(255) CHARACTER SET utf8 DEFAULT NULL;
+ALTER TABLE `cdr` MODIFY `destination_external_contract_id` varchar(255) CHARACTER SET utf8 DEFAULT NULL;
+ALTER TABLE `cdr` MODIFY `destination_user` varchar(255) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `cdr` MODIFY `destination_domain` varchar(255) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `cdr` MODIFY `destination_user_dialed` varchar(255) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `cdr` MODIFY `destination_user_in` varchar(255) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `cdr` MODIFY `destination_domain_in` varchar(255) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `cdr` MODIFY `peer_auth_user` varchar(255) CHARACTER SET utf8 DEFAULT NULL;
+ALTER TABLE `cdr` MODIFY `peer_auth_realm` varchar(255) CHARACTER SET utf8 DEFAULT NULL;
+ALTER TABLE `cdr` MODIFY `call_type` enum('call','cfu','cft','cfb','cfna') CHARACTER SET utf8 NOT NULL default 'call';
+ALTER TABLE `cdr` MODIFY `call_status` enum('ok','busy','noanswer','cancel','offline','timeout','other') CHARACTER SET utf8 NOT NULL default 'ok';
+ALTER TABLE `cdr` MODIFY `call_code` char(3) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `cdr` MODIFY `call_id` varchar(255) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `cdr` MODIFY `rating_status` enum('unrated','ok','failed') CHARACTER SET utf8 NOT NULL default 'unrated';
+
+ALTER TABLE `mark` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `mark` MODIFY `collector` varchar(255) CHARACTER SET utf8 NOT NULL;
+
+ALTER TABLE `acc` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `acc` MODIFY `method` varchar(16) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `from_tag` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `to_tag` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `callid` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `sip_code` varchar(3) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `sip_reason` varchar(128) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `src_leg` varchar(2048) CHARACTER SET utf8 default NULL;
+ALTER TABLE `acc` MODIFY `dst_leg` varchar(2048) CHARACTER SET utf8 default NULL;
+#ALTER TABLE `acc` MODIFY `dst_user` varchar(64) CHARACTER SET utf8 NOT NULL default '';
+#ALTER TABLE `acc` MODIFY `dst_ouser` varchar(64) CHARACTER SET utf8 NOT NULL default '';
+#ALTER TABLE `acc` MODIFY `dst_domain` varchar(128) CHARACTER SET utf8 NOT NULL default '';
+#ALTER TABLE `acc` MODIFY `src_user` varchar(64) CHARACTER SET utf8 NOT NULL default '';
+#ALTER TABLE `acc` MODIFY `src_domain` varchar(128) CHARACTER SET utf8 NOT NULL default '';
+
+use kamailio;
+
+ALTER DATABASE kamailio DEFAULT CHARACTER SET utf8;
+
+ALTER TABLE `acc` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `acc` MODIFY `method` varchar(16) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `from_tag` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `to_tag` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `callid` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `sip_code` varchar(3) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `sip_reason` varchar(128) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `acc` MODIFY `src_leg` varchar(2048) CHARACTER SET utf8 default NULL;
+ALTER TABLE `acc` MODIFY `dst_leg` varchar(2048) CHARACTER SET utf8 default NULL;
+ALTER TABLE `acc` MODIFY `dst_user` varchar(64) CHARACTER SET utf8 NOT NULL default '';
+ALTER TABLE `acc` MODIFY `dst_ouser` varchar(64) CHARACTER SET utf8 NOT NULL default '';
+ALTER TABLE `acc` MODIFY `dst_domain` varchar(128) CHARACTER SET utf8 NOT NULL default '';
+ALTER TABLE `acc` MODIFY `src_user` varchar(64) CHARACTER SET utf8 NOT NULL default '';
+ALTER TABLE `acc` MODIFY `src_domain` varchar(128) CHARACTER SET utf8 NOT NULL default '';
+
+ALTER TABLE `dbaliases` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `dbaliases` MODIFY `alias_username` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `dbaliases` MODIFY `alias_domain` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `dbaliases` MODIFY `username` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `dbaliases` MODIFY `domain` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+
+ALTER TABLE `dialog` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `dialog` MODIFY `callid` varchar(255) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `dialog` MODIFY `from_uri` varchar(128) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `dialog` MODIFY `from_tag` varchar(64) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `dialog` MODIFY `to_uri` varchar(128) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `dialog` MODIFY `to_tag` varchar(64) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `dialog` MODIFY `caller_cseq` varchar(7) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `dialog` MODIFY `callee_cseq` varchar(7) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `dialog` MODIFY `caller_route_set` varchar(512) CHARACTER SET utf8 DEFAULT NULL;
+ALTER TABLE `dialog` MODIFY `callee_route_set` varchar(512) CHARACTER SET utf8 DEFAULT NULL;
+ALTER TABLE `dialog` MODIFY `caller_contact` varchar(128) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `dialog` MODIFY `callee_contact` varchar(128) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `dialog` MODIFY `caller_sock` varchar(64) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `dialog` MODIFY `callee_sock` varchar(64) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `dialog` MODIFY `req_uri` varchar(128) CHARACTER SET utf8 NOT NULL;
+
+ALTER TABLE `dialplan` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `dialplan` MODIFY `match_exp` varchar(64) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `dialplan` MODIFY `subst_exp` varchar(64) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `dialplan` MODIFY `repl_exp` varchar(64) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `dialplan` MODIFY `attrs` varchar(32) CHARACTER SET utf8 NOT NULL;
+
+ALTER TABLE `dispatcher` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `dispatcher` MODIFY `destination` varchar(192) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `dispatcher` MODIFY `description` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+
+ALTER TABLE `domain` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `domain` MODIFY `domain` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+
+ALTER TABLE `lcr_gw` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `lcr_gw` MODIFY `gw_name` varchar(128) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `lcr_gw` MODIFY `ip_addr` varchar(15) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `lcr_gw` MODIFY `hostname` varchar(64) CHARACTER SET utf8 DEFAULT NULL;
+ALTER TABLE `lcr_gw` MODIFY `params` varchar(64) CHARACTER SET utf8 DEFAULT NULL;
+ALTER TABLE `lcr_gw` MODIFY `tag` varchar(16) CHARACTER SET utf8 DEFAULT NULL;
+
+ALTER TABLE `lcr_rule` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `lcr_rule` MODIFY `prefix` varchar(16) CHARACTER SET utf8 DEFAULT NULL;
+ALTER TABLE `lcr_rule` MODIFY `from_uri` varchar(64) CHARACTER SET utf8 DEFAULT NULL;
+
+ALTER TABLE `lcr_rule_target` DEFAULT CHARACTER SET utf8;
+
+ALTER TABLE `location` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `location` MODIFY `username` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `location` MODIFY `domain` varchar(64) CHARACTER SET utf8 DEFAULT NULL;
+ALTER TABLE `location` MODIFY `contact` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `location` MODIFY `received` varchar(128) CHARACTER SET utf8 DEFAULT NULL;
+ALTER TABLE `location` MODIFY `path` varchar(128) CHARACTER SET utf8 DEFAULT NULL;
+ALTER TABLE `location` MODIFY `callid` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT 'Default-Call-ID';
+ALTER TABLE `location` MODIFY `user_agent` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `location` MODIFY `socket` varchar(64) CHARACTER SET utf8 DEFAULT NULL;
+
+ALTER TABLE `speed_dial` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `speed_dial` MODIFY `username` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `speed_dial` MODIFY `domain` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `speed_dial` MODIFY `sd_username` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `speed_dial` MODIFY `sd_domain` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `speed_dial` MODIFY `new_uri` varchar(128) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `speed_dial` MODIFY `fname` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `speed_dial` MODIFY `lname` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `speed_dial` MODIFY `description` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+
+ALTER TABLE `subscriber` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `subscriber` MODIFY `username` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `subscriber` MODIFY `domain` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `subscriber` MODIFY `password` varchar(40) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `subscriber` MODIFY `email_address` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `subscriber` MODIFY `ha1` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `subscriber` MODIFY `ha1b` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `subscriber` MODIFY `rpid` varchar(64) CHARACTER SET utf8 DEFAULT NULL;
+ALTER TABLE `subscriber` MODIFY `uuid` char(36) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `subscriber` MODIFY `timezone` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+
+ALTER TABLE `trusted` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `trusted` MODIFY `src_ip` varchar(50) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `trusted` MODIFY `proto` varchar(4) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `trusted` MODIFY `from_pattern` varchar(64) CHARACTER SET utf8 DEFAULT NULL;
+ALTER TABLE `trusted` MODIFY `tag` varchar(64) CHARACTER SET utf8 DEFAULT NULL;
+
+ALTER TABLE `usr_preferences` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `usr_preferences` MODIFY `uuid` char(36) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `usr_preferences` MODIFY `username` varchar(128) CHARACTER SET utf8 NOT NULL DEFAULT '0';
+ALTER TABLE `usr_preferences` MODIFY `domain` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `usr_preferences` MODIFY `attribute` varchar(32) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `usr_preferences` MODIFY `value` varchar(128) CHARACTER SET utf8 NOT NULL DEFAULT '';
+
+ALTER TABLE `dom_preferences` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `dom_preferences` MODIFY `uuid` char(36) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `dom_preferences` MODIFY `username` varchar(128) CHARACTER SET utf8 NOT NULL DEFAULT '0';
+ALTER TABLE `dom_preferences` MODIFY `domain` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `dom_preferences` MODIFY `attribute` varchar(32) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `dom_preferences` MODIFY `value` varchar(128) CHARACTER SET utf8 NOT NULL DEFAULT '';
+
+ALTER TABLE `peer_preferences` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `peer_preferences` MODIFY `uuid` varchar(36) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `peer_preferences` MODIFY `username` varchar(128) CHARACTER SET utf8 NOT NULL DEFAULT '0';
+ALTER TABLE `peer_preferences` MODIFY `domain` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `peer_preferences` MODIFY `attribute` varchar(32) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `peer_preferences` MODIFY `value` varchar(128) CHARACTER SET utf8 NOT NULL DEFAULT '';
+
+ALTER TABLE `address` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `address` MODIFY `ip_addr` varchar(15) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `address` MODIFY `tag` VARCHAR(64) CHARACTER SET utf8;
+
+ALTER TABLE `version` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `version` MODIFY `table_name` varchar(32) CHARACTER SET utf8 NOT NULL;
+
+SET FOREIGN_KEY_CHECKS=0;
+
+ALTER TABLE `voicemail_users` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `voicemail_users` MODIFY `customer_id` char(36) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `voicemail_users` MODIFY `context` varchar(63) CHARACTER SET utf8 NOT NULL DEFAULT 'default';
+ALTER TABLE `voicemail_users` MODIFY `mailbox` varchar(31) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `voicemail_users` MODIFY `password` varchar(31) CHARACTER SET utf8 NOT NULL DEFAULT '0';
+ALTER TABLE `voicemail_users` MODIFY `fullname` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `voicemail_users` MODIFY `email` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `voicemail_users` MODIFY `pager` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `voicemail_users` MODIFY `tz` varchar(10) CHARACTER SET utf8 NOT NULL DEFAULT 'central';
+ALTER TABLE `voicemail_users` MODIFY `attach` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'yes';
+ALTER TABLE `voicemail_users` MODIFY `saycid` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'yes';
+ALTER TABLE `voicemail_users` MODIFY `dialout` varchar(10) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `voicemail_users` MODIFY `callback` varchar(10) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `voicemail_users` MODIFY `review` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'no';
+ALTER TABLE `voicemail_users` MODIFY `operator` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'no';
+ALTER TABLE `voicemail_users` MODIFY `envelope` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'no';
+ALTER TABLE `voicemail_users` MODIFY `sayduration` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'no';
+ALTER TABLE `voicemail_users` MODIFY `sendvoicemail` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'no';
+ALTER TABLE `voicemail_users` MODIFY `delete` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'no';
+ALTER TABLE `voicemail_users` MODIFY `nextaftercmd` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'yes';
+ALTER TABLE `voicemail_users` MODIFY `forcename` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'no';
+ALTER TABLE `voicemail_users` MODIFY `forcegreetings` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'no';
+ALTER TABLE `voicemail_users` MODIFY `hidefromdir` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT 'yes';
+
+ALTER TABLE `voicemail_spool` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `voicemail_spool` MODIFY `dir` varchar(127) CHARACTER SET utf8 DEFAULT '';
+ALTER TABLE `voicemail_spool` MODIFY `context` varchar(63) CHARACTER SET utf8 DEFAULT '';
+ALTER TABLE `voicemail_spool` MODIFY `macrocontext` varchar(63) CHARACTER SET utf8 DEFAULT '';
+ALTER TABLE `voicemail_spool` MODIFY `callerid` varchar(255) CHARACTER SET utf8 DEFAULT '';
+ALTER TABLE `voicemail_spool` MODIFY `origtime` varchar(16) CHARACTER SET utf8 DEFAULT '';
+ALTER TABLE `voicemail_spool` MODIFY `duration` varchar(16) CHARACTER SET utf8 DEFAULT '';
+ALTER TABLE `voicemail_spool` MODIFY `mailboxuser` varchar(255) CHARACTER SET utf8 DEFAULT '';
+ALTER TABLE `voicemail_spool` MODIFY `mailboxcontext` varchar(63) CHARACTER SET utf8 DEFAULT '';
+
+SET FOREIGN_KEY_CHECKS=1;
+
+ALTER TABLE `fax_preferences` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `fax_preferences` MODIFY `password` varchar(64) CHARACTER SET utf8 default NULL;
+ALTER TABLE `fax_preferences` MODIFY `name` varchar(64) CHARACTER SET utf8 default NULL;
+ALTER TABLE `fax_preferences` MODIFY `active` enum('true','false') CHARACTER SET utf8 NOT NULL default 'true';
+ALTER TABLE `fax_preferences` MODIFY `send_status` enum('true','false') CHARACTER SET utf8 NOT NULL default 'false';
+ALTER TABLE `fax_preferences` MODIFY `send_copy` enum('true','false') CHARACTER SET utf8 NOT NULL default 'false';
+ALTER TABLE `fax_preferences` MODIFY `send_copy_cc` enum('true','false') CHARACTER SET utf8 NOT NULL default 'false';
+
+ALTER TABLE `fax_destinations` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `fax_destinations` MODIFY `destination` varchar(64) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `fax_destinations` MODIFY `filetype` enum('ps','tiff','pdf','pdf14') CHARACTER SET utf8 NOT NULL default 'tiff';
+ALTER TABLE `fax_destinations` MODIFY `cc` enum('true','false') CHARACTER SET utf8 NOT NULL default 'false';
+ALTER TABLE `fax_destinations` MODIFY `incoming` enum('true','false') CHARACTER SET utf8 NOT NULL default 'true';
+ALTER TABLE `fax_destinations` MODIFY `outgoing` enum('true','false') CHARACTER SET utf8 NOT NULL default 'false';
+ALTER TABLE `fax_destinations` MODIFY `status` enum('true','false') CHARACTER SET utf8 NOT NULL default 'false';
+
+ALTER TABLE `sems_registrations` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `sems_registrations` MODIFY `last_reason` varchar(256) CHARACTER SET utf8 DEFAULT NULL;
+ALTER TABLE `sems_registrations` MODIFY `contacts` varchar(512) CHARACTER SET utf8 DEFAULT NULL;
+
+ALTER TABLE `fax_journal` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `fax_journal` MODIFY `direction` enum('in','out') CHARACTER SET utf8 NOT NULL DEFAULT 'in';
+ALTER TABLE `fax_journal` MODIFY `peer_number` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `fax_journal` MODIFY `peer_name` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `fax_journal` MODIFY `reason` varchar(255) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `fax_journal` MODIFY `status` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `fax_journal` MODIFY `quality` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
+ALTER TABLE `fax_journal` MODIFY `filename` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '';
+
diff --git a/db_scripts/base/6435_not_replicated.down b/db_scripts/base/6435_not_replicated.down
index 276021fe..3fa52b50 100644
--- a/db_scripts/base/6435_not_replicated.down
+++ b/db_scripts/base/6435_not_replicated.down
@@ -1,18 +1,9 @@
 use kamailio;
 
-ALTER TABLE `acc` DROP COLUMN `time_hires`;
 ALTER TABLE `acc_backup` DROP COLUMN `time_hires`;
 ALTER TABLE `acc_trash` DROP COLUMN `time_hires`;
 
 use accounting;
 
-ALTER TABLE `acc` DROP COLUMN `time_hires`;
 ALTER TABLE `acc_backup` DROP COLUMN `time_hires`;
 ALTER TABLE `acc_trash` DROP COLUMN `time_hires`;
-
-ALTER TABLE `cdr` ADD COLUMN `t3mp_start_time` timestamp NOT NULL default '0000-00-00 00:00:00' AFTER `start_time`;
-     UPDATE `cdr` SET t3mp_start_time=FROM_UNIXTIME(start_time);
-ALTER TABLE `cdr` DROP COLUMN `start_time`; 
-ALTER TABLE `cdr` CHANGE COLUMN `t3mp_start_time` `start_time` timestamp NOT NULL default '0000-00-00 00:00:00';
-
-ALTER TABLE `cdr` MODIFY `duration` int(10) unsigned NOT NULL;
diff --git a/db_scripts/base/6435_not_replicated.up b/db_scripts/base/6435_not_replicated.up
index ab2495d2..81e7ad54 100644
--- a/db_scripts/base/6435_not_replicated.up
+++ b/db_scripts/base/6435_not_replicated.up
@@ -1,20 +1,9 @@
 use kamailio;
 
-ALTER TABLE `acc` ADD COLUMN `time_hires` decimal(13,3) NOT NULL AFTER `time`;
-UPDATE `acc` SET time_hires=time;
 ALTER TABLE `acc_backup` ADD COLUMN `time_hires` decimal(13,3) NOT NULL AFTER `time`;
 ALTER TABLE `acc_trash` ADD COLUMN `time_hires` decimal(13,3) NOT NULL AFTER `time`;
 
 use accounting;
 
-ALTER TABLE `acc` ADD COLUMN `time_hires` decimal(13,3) NOT NULL AFTER `time`;
-UPDATE `acc` SET time_hires=time;
 ALTER TABLE `acc_backup` ADD COLUMN `time_hires` decimal(13,3) NOT NULL AFTER `time`;
-ALTER TABLE `acc_trash` ADD COLUMN `time_hires` decimal(13,3) NOT NULL AFTER `time`;
-
-ALTER TABLE `cdr` ADD COLUMN `t3mp_start_time` decimal(13,3) NOT NULL AFTER start_time;
-     UPDATE `cdr` SET t3mp_start_time=UNIX_TIMESTAMP(start_time);
-ALTER TABLE `cdr` DROP COLUMN `start_time`;
-ALTER TABLE `cdr` CHANGE COLUMN `t3mp_start_time` `start_time` decimal(13,3) NOT NULL;
-
-ALTER TABLE `cdr` MODIFY `duration` decimal(13,3) NOT NULL;
+ALTER TABLE `acc_trash` ADD COLUMN `time_hires` decimal(13,3) NOT NULL AFTER `time`;
\ No newline at end of file
diff --git a/db_scripts/base/6436.down b/db_scripts/base/6436.down
new file mode 100644
index 00000000..3cd2d3ec
--- /dev/null
+++ b/db_scripts/base/6436.down
@@ -0,0 +1,14 @@
+use kamailio;
+
+ALTER TABLE `acc` DROP COLUMN `time_hires`;
+
+use accounting;
+
+ALTER TABLE `acc` DROP COLUMN `time_hires`;
+
+ALTER TABLE `cdr` ADD COLUMN `t3mp_start_time` timestamp NOT NULL default '0000-00-00 00:00:00' AFTER `start_time`;
+     UPDATE `cdr` SET t3mp_start_time=FROM_UNIXTIME(start_time);
+ALTER TABLE `cdr` DROP COLUMN `start_time`; 
+ALTER TABLE `cdr` CHANGE COLUMN `t3mp_start_time` `start_time` timestamp NOT NULL default '0000-00-00 00:00:00';
+
+ALTER TABLE `cdr` MODIFY `duration` int(10) unsigned NOT NULL;
diff --git a/db_scripts/base/6436.up b/db_scripts/base/6436.up
new file mode 100644
index 00000000..1c737a29
--- /dev/null
+++ b/db_scripts/base/6436.up
@@ -0,0 +1,16 @@
+use kamailio;
+
+ALTER TABLE `acc` ADD COLUMN `time_hires` decimal(13,3) NOT NULL AFTER `time`;
+UPDATE `acc` SET time_hires=time;
+
+use accounting;
+
+ALTER TABLE `acc` ADD COLUMN `time_hires` decimal(13,3) NOT NULL AFTER `time`;
+UPDATE `acc` SET time_hires=time;
+
+ALTER TABLE `cdr` ADD COLUMN `t3mp_start_time` decimal(13,3) NOT NULL AFTER start_time;
+     UPDATE `cdr` SET t3mp_start_time=UNIX_TIMESTAMP(start_time);
+ALTER TABLE `cdr` DROP COLUMN `start_time`;
+ALTER TABLE `cdr` CHANGE COLUMN `t3mp_start_time` `start_time` decimal(13,3) NOT NULL;
+
+ALTER TABLE `cdr` MODIFY `duration` decimal(13,3) NOT NULL;