From 7646f864748539f82501c0c4671b62db2c75c5c8 Mon Sep 17 00:00:00 2001
From: harpiain@gmail.com <harpiain@gmail.com>
Date: Sun, 25 Apr 2010 16:23:29 +0000
Subject: [PATCH] - merge de branch 2.6 [936]

---
 instalador/sql/cacic_create_tables.sql | 8 ++++----
 instalador/sql/cacic_fev2006.sql       | 2 +-
 instalador/sql/cacic_jun2005.sql       | 2 +-
 instalador/sql/cacic_v2.2.2.sql        | 2 +-
 instalador/sql/cacic_v2.4.0-rc1.sql    | 2 +-
 instalador/sql/cacic_v2.4.0-rc2.sql    | 2 +-
 instalador/sql/cacic_v2.4.0.sql        | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/instalador/sql/cacic_create_tables.sql b/instalador/sql/cacic_create_tables.sql
index 72dcfeb..1e37299 100644
--- a/instalador/sql/cacic_create_tables.sql
+++ b/instalador/sql/cacic_create_tables.sql
@@ -782,19 +782,19 @@ COMMENT = 'Log de Atividades no Sistema CACIC';
 -- Table `srcacic_conexoes`
 -- -----------------------------------------------------
 CREATE  TABLE IF NOT EXISTS `srcacic_conexoes` (
-  `id_conexao` INT(11) NOT NULL AUTO_INCREMENT COMMENT 'Identificador da conexão' ,
+  `id_conexao` INT(11) NOT NULL AUTO_INCREMENT COMMENT 'Identificador da conexão' ,
   `id_sessao` INT(11) NOT NULL ,
   `id_usuario_cli` INT(11) NOT NULL DEFAULT '0' ,
   `te_node_address_cli` VARCHAR(17) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL ,
   `te_documento_referencial` VARCHAR(60) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL ,
   `id_so_cli` INT(11) NOT NULL ,
-  `te_motivo_conexao` TEXT CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL COMMENT 'Descritivo breve sobre o motivo da conexão' ,
+  `te_motivo_conexao` TEXT CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL COMMENT 'Descritivo breve sobre o motivo da conexão' ,
   `dt_hr_inicio_conexao` DATETIME NOT NULL ,
   `dt_hr_ultimo_contato` DATETIME NOT NULL ,
   PRIMARY KEY (`id_conexao`) )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = latin1
-COMMENT = 'Registros de Conexões efetuadas às sessões abertas';
+COMMENT = 'Registros de Conexões efetuadas às sessões abertas';
 
 
 -- -----------------------------------------------------
@@ -949,7 +949,7 @@ DEFAULT CHARACTER SET = latin1;
 CREATE  TABLE IF NOT EXISTS `preferencia_usuarios` (
   `id_usuario` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
   `te_std_language` VARCHAR(05) ,
-  PRIMARY KEY (`id_usuario`) 
+  PRIMARY KEY (`id_usuario`) )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = latin1;
 
diff --git a/instalador/sql/cacic_fev2006.sql b/instalador/sql/cacic_fev2006.sql
index 8032322..5cfe1d5 100644
--- a/instalador/sql/cacic_fev2006.sql
+++ b/instalador/sql/cacic_fev2006.sql
@@ -514,7 +514,7 @@ ALTER TABLE configuracoes_padrao
 CREATE  TABLE IF NOT EXISTS `preferencia_usuarios` (
   `id_usuario` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
   `te_std_language` VARCHAR(05) ,
-  PRIMARY KEY (`id_usuario`) 
+  PRIMARY KEY (`id_usuario`) )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = latin1;
 
diff --git a/instalador/sql/cacic_jun2005.sql b/instalador/sql/cacic_jun2005.sql
index eba1998..6df456a 100644
--- a/instalador/sql/cacic_jun2005.sql
+++ b/instalador/sql/cacic_jun2005.sql
@@ -530,7 +530,7 @@ ALTER TABLE configuracoes_padrao
 CREATE  TABLE IF NOT EXISTS `preferencia_usuarios` (
   `id_usuario` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
   `te_std_language` VARCHAR(05) ,
-  PRIMARY KEY (`id_usuario`) 
+  PRIMARY KEY (`id_usuario`) )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = latin1;
 
diff --git a/instalador/sql/cacic_v2.2.2.sql b/instalador/sql/cacic_v2.2.2.sql
index d14b1ee..8cdf448 100644
--- a/instalador/sql/cacic_v2.2.2.sql
+++ b/instalador/sql/cacic_v2.2.2.sql
@@ -273,7 +273,7 @@ ALTER TABLE configuracoes_padrao
 CREATE  TABLE IF NOT EXISTS `preferencia_usuarios` (
   `id_usuario` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
   `te_std_language` VARCHAR(05) ,
-  PRIMARY KEY (`id_usuario`) 
+  PRIMARY KEY (`id_usuario`) )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = latin1;
 
diff --git a/instalador/sql/cacic_v2.4.0-rc1.sql b/instalador/sql/cacic_v2.4.0-rc1.sql
index 46fe204..3aaa588 100644
--- a/instalador/sql/cacic_v2.4.0-rc1.sql
+++ b/instalador/sql/cacic_v2.4.0-rc1.sql
@@ -119,7 +119,7 @@ ALTER TABLE configuracoes_padrao
 CREATE  TABLE IF NOT EXISTS `preferencia_usuarios` (
   `id_usuario` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
   `te_std_language` VARCHAR(05) ,
-  PRIMARY KEY (`id_usuario`) 
+  PRIMARY KEY (`id_usuario`) )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = latin1;
 
diff --git a/instalador/sql/cacic_v2.4.0-rc2.sql b/instalador/sql/cacic_v2.4.0-rc2.sql
index ec52f62..0689ba1 100644
--- a/instalador/sql/cacic_v2.4.0-rc2.sql
+++ b/instalador/sql/cacic_v2.4.0-rc2.sql
@@ -108,7 +108,7 @@ ALTER TABLE configuracoes_padrao
 CREATE  TABLE IF NOT EXISTS `preferencia_usuarios` (
   `id_usuario` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
   `te_std_language` VARCHAR(05) ,
-  PRIMARY KEY (`id_usuario`) 
+  PRIMARY KEY (`id_usuario`) )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = latin1;
 
diff --git a/instalador/sql/cacic_v2.4.0.sql b/instalador/sql/cacic_v2.4.0.sql
index a23be34..eace537 100644
--- a/instalador/sql/cacic_v2.4.0.sql
+++ b/instalador/sql/cacic_v2.4.0.sql
@@ -107,7 +107,7 @@ ALTER TABLE configuracoes_padrao
 CREATE  TABLE IF NOT EXISTS `preferencia_usuarios` (
   `id_usuario` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
   `te_std_language` VARCHAR(05) ,
-  PRIMARY KEY (`id_usuario`) 
+  PRIMARY KEY (`id_usuario`) )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = latin1;
 
--
libgit2 0.21.2