Commit e8a3a141 authored by heikki@donna.mysql.fi's avatar heikki@donna.mysql.fi
Browse files

data0type.ic, rem0cmp.c: 

  Allow foreign keys refer between fixed and var length strings
parent 0b393196

innobase/include/data0type.ic

+7 −4
Original line number Diff line number Diff line
@@ -107,14 +107,17 @@ dtype_get_pad_char( 
				ULINT_UNDEFINED if no padding specified */

	dtype_t*	type)	/* in: type */

{

	if (type->mtype == DATA_CHAR) {

		/* space is the padding character for all char strings */

	if (type->mtype == DATA_CHAR

	    || type->mtype == DATA_VARCHAR

	    || type->mtype == DATA_BINARY

	    || type->mtype == DATA_FIXBINARY) {



		/* Space is the padding character for all char and binary

	        strings */



		return((ulint)' ');

	}



	ut_ad((type->mtype == DATA_BINARY) || (type->mtype == DATA_VARCHAR));



	/* No padding specified */



	return(ULINT_UNDEFINED);

innobase/rem/rem0cmp.c

+9 −1
Original line number Diff line number Diff line
@@ -100,6 +100,14 @@ cmp_types_are_equal( 
	dtype_t*	type1,	/* in: type 1 */

	dtype_t*	type2)	/* in: type 2 */

{

        if ((type1->mtype == DATA_VARCHAR && type2->mtype == DATA_CHAR)

          || (type1->mtype == DATA_CHAR && type2->mtype == DATA_VARCHAR)

          || (type1->mtype == DATA_FIXBINARY && type2->mtype == DATA_BINARY)

          || (type1->mtype == DATA_BINARY && type2->mtype == DATA_FIXBINARY)) {



                return(TRUE);

        }



        if (type1->mtype != type2->mtype) {



		return(FALSE);