Attachment #74484 for bug #114925

View | Details | Raw Unified | Return to bug 114925
Collapse All | Expand All




  case MYSQL_TYPE_LONG:
  case MYSQL_TYPE_INT24:
  case MYSQL_TYPE_YEAR:
#if MYSQL_VERSION_ID > NEW_BIT_DATATYPE_VERSION
  case MYSQL_TYPE_BIT:
    return MYSQL_TYPE_LONG;
#endif
  case MYSQL_TYPE_DECIMAL:
  case MYSQL_TYPE_LONGLONG:			/* No longlong in perl */
  case MYSQL_TYPE_DATE:

  case MYSQL_TYPE_DATETIME:
  case MYSQL_TYPE_NEWDATE:
  case MYSQL_TYPE_VAR_STRING:
#if MYSQL_VERSION_ID > NEW_BIT_DATATYPE_VERSION
  case MYSQL_TYPE_VARCHAR:
#endif
  case MYSQL_TYPE_STRING:
  case MYSQL_TYPE_BLOB:
  case MYSQL_TYPE_TINY_BLOB:
#if MYSQL_VERSION_ID > NEW_DATATYPE_VERSION
  case MYSQL_TYPE_GEOMETRY:
#endif
  case MYSQL_TYPE_TIMESTAMP:

Lines 31-36 Link Here

(-)DBD-mysql-3.0002_4/dbdimp.h (+1 lines)
31	#define SERVER_PREPARE_VERSION 40103	31	#define SERVER_PREPARE_VERSION 40103
32	#define LIMIT_PLACEHOLDER_VERSION 50007	32	#define LIMIT_PLACEHOLDER_VERSION 50007
33	#define NEW_DATATYPE_VERSION 50007	33	#define NEW_DATATYPE_VERSION 50007
		34	#define NEW_BIT_DATATYPE_VERSION 50300
34		35
35	/*	36	/*
36	* The following are return codes passed in $h->err in case of	37	* The following are return codes passed in $h->err in case of

Return to bug 114925

Lines 246-254 Link Here

(-)DBD-mysql-3.0002_4/dbdimp.c (-2 / +5 lines)
246	case MYSQL_TYPE_LONG:	246	case MYSQL_TYPE_LONG:
247	case MYSQL_TYPE_INT24:	247	case MYSQL_TYPE_INT24:
248	case MYSQL_TYPE_YEAR:	248	case MYSQL_TYPE_YEAR:
		249	#if MYSQL_VERSION_ID > NEW_BIT_DATATYPE_VERSION
249	case MYSQL_TYPE_BIT:	250	case MYSQL_TYPE_BIT:
250	return MYSQL_TYPE_LONG;	251	return MYSQL_TYPE_LONG;
251		252	#endif
252	case MYSQL_TYPE_DECIMAL:	253	case MYSQL_TYPE_DECIMAL:
253	case MYSQL_TYPE_LONGLONG: /* No longlong in perl */	254	case MYSQL_TYPE_LONGLONG: /* No longlong in perl */
254	case MYSQL_TYPE_DATE:	255	case MYSQL_TYPE_DATE:
Lines 256-266 Link Here
256	case MYSQL_TYPE_DATETIME:	257	case MYSQL_TYPE_DATETIME:
257	case MYSQL_TYPE_NEWDATE:	258	case MYSQL_TYPE_NEWDATE:
258	case MYSQL_TYPE_VAR_STRING:	259	case MYSQL_TYPE_VAR_STRING:
		260	#if MYSQL_VERSION_ID > NEW_BIT_DATATYPE_VERSION
259	case MYSQL_TYPE_VARCHAR:	261	case MYSQL_TYPE_VARCHAR:
		262	#endif
260	case MYSQL_TYPE_STRING:	263	case MYSQL_TYPE_STRING:
261	case MYSQL_TYPE_BLOB:	264	case MYSQL_TYPE_BLOB:
262	case MYSQL_TYPE_TINY_BLOB:	265	case MYSQL_TYPE_TINY_BLOB:
263	#ifdef MYSQL_VERSION_ID > NEW_DATATYPE_VERSION	266	#if MYSQL_VERSION_ID > NEW_DATATYPE_VERSION
264	case MYSQL_TYPE_GEOMETRY:	267	case MYSQL_TYPE_GEOMETRY:
265	#endif	268	#endif
266	case MYSQL_TYPE_TIMESTAMP:	269	case MYSQL_TYPE_TIMESTAMP: