[Firebird-checkins] CVS: interbase/jrd dyn_mod.e,1.1.1.1,1.2

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/jrd
In directory usw-pr-cvs1:/tmp/cvs-serv19377

Modified Files:
	dyn_mod.e 
Log Message:
Changes to fix bug report bug N 412417. problem with alter domain and
char(x) to varchar(x-2). 


Index: dyn_mod.e
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/dyn_mod.e,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** dyn_mod.e	2000/08/03 20:50:02	1.1.1.1
--- dyn_mod.e	2001/04/13 15:33:31	1.2
***************
*** 54,57 ****
--- 54,58 ----
  #include "../jrd/thd_proto.h"
  #include "../jrd/vio_proto.h"
+ #include "../jrd/dsc_proto.h"
  #ifndef WINDOWS_ONLY
  #include "../jrd/ail_proto.h"
***************
*** 490,493 ****
--- 491,503 ----
  		    switch (new_dom->dyn_dtype)
  			{
+ 
+             case blr_text:
+             case blr_text2:
+             case blr_varying:
+             case blr_varying2:
+             case blr_cstring:
+             case blr_cstring2:
+                 new_dom->dyn_dsc.dsc_length = DSC_string_length (new_dom);
+                 break; 
  			case blr_short :	
  			    new_dom->dyn_dsc.dsc_length = 2; 
***************
*** 1224,1228 ****
   *	D Y N _ m o d i f y _ p r o c e d u r e
   *
! /**************************************
   *
   * Functional description
--- 1234,1238 ----
   *	D Y N _ m o d i f y _ p r o c e d u r e
   *
!  **************************************
   *
   * Functional description
***************
*** 2210,2217 ****
  		case gds__dyn_fld_type:
  		    dtype = TRUE;
!                     new_fld->dyn_dtype = DYN_get_number (ptr);
  
  		    switch (new_fld->dyn_dtype)
  			{
  			case blr_short :	
  			    new_fld->dyn_dsc.dsc_length = 2; 
--- 2220,2236 ----
  		case gds__dyn_fld_type:
  		    dtype = TRUE;
!             new_fld->dyn_dtype = DYN_get_number (ptr);
  
  		    switch (new_fld->dyn_dtype)
  			{
+             case blr_text:
+             case blr_text2:
+             case blr_varying:
+             case blr_varying2:
+             case blr_cstring:
+             case blr_cstring2:
+                 new_fld->dyn_dsc.dsc_length = DSC_string_length (new_fld);
+                 break; 
+ 
  			case blr_short :	
  			    new_fld->dyn_dsc.dsc_length = 2;