Commit d0fc67f4 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Use NAMES_SEP_CHAR also for enums (Fix for supportwizard)

parent 3c18798a

sql/unireg.cc

+2 −2
Original line number Diff line number Diff line
@@ -486,11 +486,11 @@ static bool pack_fields(File file,List<create_field> &create_fields) 
      if (field->interval_id > int_count)

      {

	int_count=field->interval_id;

	tmp.append('\377');

	tmp.append(NAMES_SEP_CHAR);

	for (const char **pos=field->interval->type_names ; *pos ; pos++)

	{

	  tmp.append(*pos);

	  tmp.append('\377');

	  tmp.append(NAMES_SEP_CHAR);

	}

	tmp.append('\0');			// End of intervall

      }

sql/unireg.h

+0 −5
Original line number Diff line number Diff line
@@ -70,11 +70,6 @@ 
#define FERR		-1			/* Error from my_functions */

#define CREATE_MODE	0			/* Default mode on new files */

#define NAMES_SEP_CHAR	'\377'			/* Char to sep. names */

#ifdef MSDOS

#define EXTRA_FIELD_CHAR (char) '\234'		/* Interchangebly with '#' */

#else

#define EXTRA_FIELD_CHAR '#'			/* Interchangebly with '#' */

#endif



#define READ_RECORD_BUFFER	(uint) (IO_SIZE*8) /* Pointer_buffer_size */

#define DISK_BUFFER_SIZE	(uint) (IO_SIZE*16) /* Size of diskbuffer */