Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 (cdca651f) · Commits · Software / OSDI20 Artifacts / mariadb

BUILD/compile-hpux11-parisc2-aCC

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ fi
		# Also sends +Oprocelim and +Ofastaccess to the linker
		# (see ld(1)).

		release_flags="-fast +O4"
		release_flags="-fast +O3"

		# -z Do not bind anything to address zero. This option
		# allows runtime detection of null pointers. See the

BitKeeper/etc/logging_ok

+1 −0

Original line number	Diff line number	Diff line
		@@ -84,6 +84,7 @@ joreland@mysql.com
		jorge@linux.jorge.mysql.com
		jplindst@t41.(none)
		kaj@work.mysql.com
		kent@mysql.com
		konstantin@mysql.com
		kostja@oak.local
		lenz@kallisto.mysql.com

configure.in

+2 −2

Original line number	Diff line number	Diff line
		@@ -2961,10 +2961,10 @@ then
		if test "$with_debug" = "yes"
		then
		# Medium debug.
		NDB_DEFS="-DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"
		NDB_DEFS="-DNDB_DEBUG -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"
		elif test "$with_debug" = "full"
		then
		NDB_DEFS="-DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"
		NDB_DEFS="-DNDB_DEBUG_FULL -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"
		else
		NDB_DEFS="-DNDEBUG"
		fi

libmysql/libmysql.c

+248 −191

Original line number	Diff line number	Diff line
		@@ -3018,6 +3018,7 @@ mysql_stmt_send_long_data(MYSQL_STMT *stmt, uint param_number,
		static void set_zero_time(MYSQL_TIME *tm)
		{
		bzero((void )tm, sizeof(tm));
		tm->time_type= MYSQL_TIMESTAMP_NONE;
		}


		@@ -3041,17 +3042,14 @@ static void set_zero_time(MYSQL_TIME *tm)

		static uint read_binary_time(MYSQL_TIME tm, uchar *pos)
		{
		uchar *to;
		uint length;

		/* net_field_length will set pos to the first byte of data */
		if (!(length= net_field_length(pos)))
		{
		set_zero_time(tm);
		return 0;
		}

		to= *pos;
		else
		{
		uchar to= pos;
		tm->neg= (bool) to[0];

		tm->day= (ulong) sint4korr(to+1);
		@@ -3061,21 +3059,20 @@ static uint read_binary_time(MYSQL_TIME tm, uchar *pos)
		tm->second_part= (length > 8) ? (ulong) sint4korr(to+8) : 0;

		tm->year= tm->month= 0;
		tm->time_type= MYSQL_TIMESTAMP_TIME;
		}
		return length;
		}

		static uint read_binary_datetime(MYSQL_TIME tm, uchar *pos)
		{
		uchar *to;
		uint length;

		if (!(length= net_field_length(pos)))
		{
		set_zero_time(tm);
		return 0;
		}

		to= *pos;
		else
		{
		uchar to= pos;

		tm->neg= 0;
		tm->year= (uint) sint2korr(to);
		@@ -3091,21 +3088,20 @@ static uint read_binary_datetime(MYSQL_TIME tm, uchar *pos)
		else
		tm->hour= tm->minute= tm->second= 0;
		tm->second_part= (length > 7) ? (ulong) sint4korr(to+7) : 0;
		tm->time_type= MYSQL_TIMESTAMP_DATETIME;
		}
		return length;
		}

		static uint read_binary_date(MYSQL_TIME tm, uchar *pos)
		{
		uchar *to;
		uint length;

		if (!(length= net_field_length(pos)))
		{
		set_zero_time(tm);
		return 0;
		}

		to= *pos;
		else
		{
		uchar to= pos;
		tm->year = (uint) sint2korr(to);
		tm->month= (uint) to[2];
		tm->day= (uint) to[3];
		@@ -3113,265 +3109,330 @@ static uint read_binary_date(MYSQL_TIME tm, uchar *pos)
		tm->hour= tm->minute= tm->second= 0;
		tm->second_part= 0;
		tm->neg= 0;
		tm->time_type= MYSQL_TIMESTAMP_DATE;
		}
		return length;
		}


		/* Convert integer value to client buffer type. */
		/*
		Convert string to supplied buffer of any type.

		SYNOPSIS
		fetch_string_with_conversion()
		param output buffer descriptor
		value column data
		length data length
		*/

		static void send_data_long(MYSQL_BIND param, MYSQL_FIELD field,
		longlong value)
		static void fetch_string_with_conversion(MYSQL_BIND param, char value,
		uint length)
		{
		char buffer= (char )param->buffer;
		uint field_is_unsigned= (field->flags & UNSIGNED_FLAG);
		int err= 0;

		/*
		This function should support all target buffer types: the rest
		of conversion functions can delegate conversion to it.
		*/
		switch(param->buffer_type) {
		case MYSQL_TYPE_NULL: /* do nothing */
		break;
		case MYSQL_TYPE_TINY:
		(uchar )param->buffer= (uchar) value;
		{
		uchar data= (uchar) my_strntol(&my_charset_latin1, value, length, 10,
		NULL, &err);
		*buffer= data;
		break;
		}
		case MYSQL_TYPE_SHORT:
		shortstore(buffer, value);
		{
		short data= (short) my_strntol(&my_charset_latin1, value, length, 10,
		NULL, &err);
		shortstore(buffer, data);
		break;
		}
		case MYSQL_TYPE_LONG:
		longstore(buffer, value);
		{
		int32 data= (int32)my_strntol(&my_charset_latin1, value, length, 10,
		NULL, &err);
		longstore(buffer, data);
		break;
		}
		case MYSQL_TYPE_LONGLONG:
		longlongstore(buffer, value);
		{
		longlong data= my_strntoll(&my_charset_latin1, value, length, 10,
		NULL, &err);
		longlongstore(buffer, data);
		break;
		}
		case MYSQL_TYPE_FLOAT:
		{
		float data= (field_is_unsigned ? (float) ulonglong2double(value) :
		(float) value);
		float data = (float) my_strntod(&my_charset_latin1, value, length,
		NULL, &err);
		floatstore(buffer, data);
		break;
		}
		case MYSQL_TYPE_DOUBLE:
		{
		double data= (field_is_unsigned ? ulonglong2double(value) :
		(double) value);
		double data= my_strntod(&my_charset_latin1, value, length, NULL, &err);
		doublestore(buffer, data);
		break;
		}
		case MYSQL_TYPE_TIME:
		{
		MYSQL_TIME tm= (MYSQL_TIME )buffer;
		str_to_time(value, length, tm, &err);
		break;
		}
		case MYSQL_TYPE_DATE:
		case MYSQL_TYPE_DATETIME:
		{
		MYSQL_TIME tm= (MYSQL_TIME )buffer;
		str_to_datetime(value, length, tm, 0, &err);
		break;
		}
		case MYSQL_TYPE_TINY_BLOB:
		case MYSQL_TYPE_MEDIUM_BLOB:
		case MYSQL_TYPE_LONG_BLOB:
		case MYSQL_TYPE_BLOB:
		default:
		{
		char tmp[22]; /* Enough for longlong */
		uint length= (uint)(longlong10_to_str(value,(char *)tmp,
		field_is_unsigned ? 10: -10) -
		tmp);
		ulong copy_length= min((ulong)length-param->offset, param->buffer_length);
		if ((long) copy_length < 0)
		copy_length=0;
		/*
		Copy column data to the buffer taking into account offset,
		data length and buffer length.
		*/
		char *start= value + param->offset;
		char *end= value + length;
		ulong copy_length;
		if (start < end)
		{
		copy_length= end - start;
		/* We've got some data beyond offset: copy up to buffer_length bytes */
		if (param->buffer_length)
		memcpy(buffer, start, min(copy_length, param->buffer_length));
		}
		else
		memcpy(buffer, (char *)tmp+param->offset, copy_length);
		copy_length= 0;
		if (copy_length < param->buffer_length)
		buffer[copy_length]= '\0';
		/*
		param->length will always contain length of entire column;
		number of copied bytes may be way different:
		*/
		*param->length= length;

		if (copy_length != param->buffer_length)
		*(buffer+copy_length)= '\0';
		break;
		}
		}
		}


		/* Convert Double to buffer types */
		/*
		Convert integer value to client buffer of any type.

		static void send_data_double(MYSQL_BIND *param, double value)
		SYNOPSIS
		fetch_long_with_conversion()
		param output buffer descriptor
		field column metadata
		value column data
		*/

		static void fetch_long_with_conversion(MYSQL_BIND param, MYSQL_FIELD field,
		longlong value)
		{
		char buffer= (char )param->buffer;
		uint field_is_unsigned= (field->flags & UNSIGNED_FLAG);

		switch (param->buffer_type) {
		case MYSQL_TYPE_NULL: /* do nothing */
		break;
		case MYSQL_TYPE_TINY:
		*buffer= (uchar)value;
		(uchar )param->buffer= (uchar) value;
		break;
		case MYSQL_TYPE_SHORT:
		shortstore(buffer, (short)value);
		shortstore(buffer, value);
		break;
		case MYSQL_TYPE_LONG:
		longstore(buffer, (long)value);
		longstore(buffer, value);
		break;
		case MYSQL_TYPE_LONGLONG:
		{
		longlong val= (longlong) value;
		longlongstore(buffer, val);
		longlongstore(buffer, value);
		break;
		}
		case MYSQL_TYPE_FLOAT:
		{
		float data= (float) value;
		float data= field_is_unsigned ? (float) ulonglong2double(value) :
		(float) value;
		floatstore(buffer, data);
		break;
		}
		case MYSQL_TYPE_DOUBLE:
		{
		doublestore(buffer, value);
		double data= field_is_unsigned ? ulonglong2double(value) :
		(double) value;
		doublestore(buffer, data);
		break;
		}
		default:
		{
		char tmp[128];
		uint length= my_sprintf(tmp,(tmp,"%g",value));
		ulong copy_length= min((ulong)length-param->offset, param->buffer_length);
		if ((long) copy_length < 0)
		copy_length=0;
		else
		memcpy(buffer, (char *)tmp+param->offset, copy_length);
		*param->length= length;

		if (copy_length != param->buffer_length)
		*(buffer+copy_length)= '\0';
		char buff[22]; /* Enough for longlong */
		char *end= longlong10_to_str(value, buff, field_is_unsigned ? 10: -10);
		/* Resort to string conversion which supports all typecodes */
		return fetch_string_with_conversion(param, buff, end - buff);
		}
		}
		}


		/* Convert string to buffer types */
		/*
		Convert double/float column to supplied buffer of any type.

		SYNOPSIS
		fetch_float_with_conversion()
		param output buffer descriptor
		field column metadata
		value column data
		width default number of significant digits used when converting
		float/double to string
		*/

		static void send_data_str(MYSQL_BIND param, char value, uint length)
		static void fetch_float_with_conversion(MYSQL_BIND param, MYSQL_FIELD field,
		double value, int width)
		{
		char buffer= (char )param->buffer;
		int err=0;

		switch (param->buffer_type) {
		case MYSQL_TYPE_NULL: /* do nothing */
		break;
		case MYSQL_TYPE_TINY:
		{
		uchar data= (uchar)my_strntol(&my_charset_latin1,value,length,10,NULL,
		&err);
		*buffer= data;
		*buffer= (uchar)value;
		break;
		}
		case MYSQL_TYPE_SHORT:
		{
		short data= (short)my_strntol(&my_charset_latin1,value,length,10,NULL,
		&err);
		shortstore(buffer, data);
		shortstore(buffer, (short)value);
		break;
		}
		case MYSQL_TYPE_LONG:
		{
		int32 data= (int32)my_strntol(&my_charset_latin1,value,length,10,NULL,
		&err);
		longstore(buffer, data);
		longstore(buffer, (long)value);
		break;
		}
		case MYSQL_TYPE_LONGLONG:
		{
		longlong data= my_strntoll(&my_charset_latin1,value,length,10,NULL,&err);
		longlongstore(buffer, data);
		longlong val= (longlong) value;
		longlongstore(buffer, val);
		break;
		}
		case MYSQL_TYPE_FLOAT:
		{
		float data = (float)my_strntod(&my_charset_latin1,value,length,NULL,&err);
		float data= (float) value;
		floatstore(buffer, data);
		break;
		}
		case MYSQL_TYPE_DOUBLE:
		{
		double data= my_strntod(&my_charset_latin1,value,length,NULL,&err);
		doublestore(buffer, data);
		doublestore(buffer, value);
		break;
		}
		case MYSQL_TYPE_TIME:
		default:
		{
		int dummy;
		MYSQL_TIME tm= (MYSQL_TIME )buffer;
		str_to_time(value, length, tm, &dummy);
		break;
		}
		case MYSQL_TYPE_DATE:
		case MYSQL_TYPE_DATETIME:
		/*
		Resort to fetch_string_with_conversion: this should handle
		floating point -> string conversion nicely, honor all typecodes
		and param->offset possibly set in mysql_stmt_fetch_column
		*/
		char buff[331];
		char *end;
		/* TODO: move this to a header shared between client and server. */
		#define NOT_FIXED_DEC 31
		if (field->decimals >= 31)
		#undef NOT_FIXED_DEC
		{
		int dummy;
		MYSQL_TIME tm= (MYSQL_TIME )buffer;
		str_to_datetime(value, length, tm, 0, &dummy);
		break;
		sprintf(buff, "%-.g", (int) param->buffer_length, width, value);
		end= strcend(buff, ' ');
		*end= 0;
		}
		case MYSQL_TYPE_TINY_BLOB:
		case MYSQL_TYPE_MEDIUM_BLOB:
		case MYSQL_TYPE_LONG_BLOB:
		case MYSQL_TYPE_BLOB:
		*param->length= length;
		length= min(length-param->offset, param->buffer_length);
		if ((long) length > 0)
		memcpy(buffer, value+param->offset, length);
		break;
		default:
		*param->length= length;
		length= min(length-param->offset, param->buffer_length);
		if ((long) length < 0)
		length= 0;
		else
		memcpy(buffer, value+param->offset, length);
		if (length != param->buffer_length)
		buffer[length]= '\0';
		{
		sprintf(buff, "%.*f", field->decimals, value);
		end= strend(buff);
		}
		return fetch_string_with_conversion(param, buff, end - buff);
		}
		}
		}


		static void send_data_time(MYSQL_BIND *param, MYSQL_TIME ltime,
		uint length)
		/*
		Fetch time/date/datetime to supplied buffer of any type

		SYNOPSIS
		param output buffer descriptor
		time column data
		*/

		static void fetch_datetime_with_conversion(MYSQL_BIND *param,
		MYSQL_TIME *time)
		{
		switch (param->buffer_type) {
		case MYSQL_TYPE_NULL: /* do nothing */
		break;

		case MYSQL_TYPE_DATE:
		case MYSQL_TYPE_TIME:
		case MYSQL_TYPE_DATETIME:
		case MYSQL_TYPE_TIMESTAMP:
		{
		MYSQL_TIME tm= (MYSQL_TIME )param->buffer;

		tm->year= ltime.year;
		tm->month= ltime.month;
		tm->day= ltime.day;

		tm->hour= ltime.hour;
		tm->minute= ltime.minute;
		tm->second= ltime.second;

		tm->second_part= ltime.second_part;
		tm->neg= ltime.neg;
		/* XXX: should we copy only relevant members here? */
		(MYSQL_TIME )(param->buffer)= *time;
		break;
		}
		default:
		{
		/*
		Convert time value to string and delegate the rest to
		fetch_string_with_conversion:
		*/
		char buff[25];
		uint length;

		if (!length)
		ltime.time_type= MYSQL_TIMESTAMP_NONE;
		switch (ltime.time_type) {
		switch (time->time_type) {
		case MYSQL_TIMESTAMP_DATE:
		length= my_sprintf(buff,(buff, "%04d-%02d-%02d", ltime.year,
		ltime.month,ltime.day));
		length= my_sprintf(buff,(buff, "%04d-%02d-%02d",
		time->year, time->month, time->day));
		break;
		case MYSQL_TIMESTAMP_DATETIME:
		length= my_sprintf(buff,(buff, "%04d-%02d-%02d %02d:%02d:%02d",
		ltime.year,ltime.month,ltime.day,
		ltime.hour,ltime.minute,ltime.second));
		time->year, time->month, time->day,
		time->hour, time->minute, time->second));
		break;
		case MYSQL_TIMESTAMP_TIME:
		length= my_sprintf(buff, (buff, "%02d:%02d:%02d",
		ltime.hour,ltime.minute,ltime.second));
		time->hour, time->minute, time->second));
		break;
		default:
		length= 0;
		buff[0]='\0';
		break;
		}
		send_data_str(param, (char *)buff, length);
		/* Resort to string conversion */
		fetch_string_with_conversion(param, (char *)buff, length);
		break;
		}
		}
		}


		/* Fetch data to client buffers with conversion. */
		/*
		Fetch and convert result set column to output buffer.

		SYNOPSIS
		fetch_result_with_conversion()
		param output buffer descriptor
		field column metadata
		row points to a column of result set tuple in binary format

		DESCRIPTION
		This is a fallback implementation of column fetch used
		if column and output buffer types do not match.
		Increases tuple pointer to point at the next column within the
		tuple.
		*/

		static void fetch_results(MYSQL_BIND param, MYSQL_FIELD field, uchar **row)
		static void fetch_result_with_conversion(MYSQL_BIND param, MYSQL_FIELD field,
		uchar **row)
		{
		ulong length;
		enum enum_field_types field_type= field->type;
		@@ -3381,9 +3442,9 @@ static void fetch_results(MYSQL_BIND param, MYSQL_FIELD field, uchar **row)
		{
		char value= (char) **row;
		uint field_is_unsigned= (field->flags & UNSIGNED_FLAG);
		longlong data= ((field_is_unsigned) ? (longlong) (unsigned char) value:
		(longlong) value);
		send_data_long(param, field, data);
		longlong data= (field_is_unsigned) ? (longlong) (unsigned char) value:
		(longlong) value;
		fetch_long_with_conversion(param, field, data);
		length= 1;
		break;
		}
		@@ -3394,7 +3455,7 @@ static void fetch_results(MYSQL_BIND param, MYSQL_FIELD field, uchar **row)
		uint field_is_unsigned= (field->flags & UNSIGNED_FLAG);
		longlong data= ((field_is_unsigned) ? (longlong) (unsigned short) value:
		(longlong) value);
		send_data_long(param, field, data);
		fetch_long_with_conversion(param, field, data);
		length= 2;
		break;
		}
		@@ -3404,14 +3465,14 @@ static void fetch_results(MYSQL_BIND param, MYSQL_FIELD field, uchar **row)
		uint field_is_unsigned= (field->flags & UNSIGNED_FLAG);
		longlong data= ((field_is_unsigned) ? (longlong) (unsigned long) value:
		(longlong) value);
		send_data_long(param, field, data);
		fetch_long_with_conversion(param, field, data);
		length= 4;
		break;
		}
		case MYSQL_TYPE_LONGLONG:
		{
		longlong value= (longlong)sint8korr(*row);
		send_data_long(param, field, value);
		fetch_long_with_conversion(param, field, value);
		length= 8;
		break;
		}
		@@ -3419,7 +3480,7 @@ static void fetch_results(MYSQL_BIND param, MYSQL_FIELD field, uchar **row)
		{
		float value;
		float4get(value,*row);
		send_data_double(param,value);
		fetch_float_with_conversion(param, field, value, FLT_DIG);
		length= 4;
		break;
		}
		@@ -3427,7 +3488,7 @@ static void fetch_results(MYSQL_BIND param, MYSQL_FIELD field, uchar **row)
		{
		double value;
		float8get(value,*row);
		send_data_double(param,value);
		fetch_float_with_conversion(param, field, value, DBL_DIG);
		length= 8;
		break;
		}
		@@ -3436,8 +3497,7 @@ static void fetch_results(MYSQL_BIND param, MYSQL_FIELD field, uchar **row)
		MYSQL_TIME tm;

		length= read_binary_date(&tm, row);
		tm.time_type= MYSQL_TIMESTAMP_DATE;
		send_data_time(param, tm, length);
		fetch_datetime_with_conversion(param, &tm);
		break;
		}
		case MYSQL_TYPE_TIME:
		@@ -3445,8 +3505,7 @@ static void fetch_results(MYSQL_BIND param, MYSQL_FIELD field, uchar **row)
		MYSQL_TIME tm;

		length= read_binary_time(&tm, row);
		tm.time_type= MYSQL_TIMESTAMP_TIME;
		send_data_time(param, tm, length);
		fetch_datetime_with_conversion(param, &tm);
		break;
		}
		case MYSQL_TYPE_DATETIME:
		@@ -3455,13 +3514,12 @@ static void fetch_results(MYSQL_BIND param, MYSQL_FIELD field, uchar **row)
		MYSQL_TIME tm;

		length= read_binary_datetime(&tm, row);
		tm.time_type= MYSQL_TIMESTAMP_DATETIME;
		send_data_time(param, tm, length);
		fetch_datetime_with_conversion(param, &tm);
		break;
		}
		default:
		length= net_field_length(row);
		send_data_str(param,(char) row,length);
		fetch_string_with_conversion(param, (char) row, length);
		break;
		}
		*row+= length;
		@@ -3606,7 +3664,6 @@ static void skip_result_string(MYSQL_BIND *param __attribute__((unused)),
		}



		/*
		Setup the bind buffers for resultset processing
		*/
		@@ -3825,7 +3882,7 @@ static int stmt_fetch_row(MYSQL_STMT stmt, uchar row)
		if (field->type == bind->buffer_type)
		(*bind->fetch_result)(bind, &row);
		else
		fetch_results(bind, field, &row);
		fetch_result_with_conversion(bind, field, &row);
		}
		if (!((bit<<=1) & 255))
		{
		@@ -3917,7 +3974,7 @@ int STDCALL mysql_stmt_fetch_column(MYSQL_STMT stmt, MYSQL_BIND bind,
		bind->length= param->length;
		else
		bind->length= &param->internal_length; /* Needed for fetch_result() */
		fetch_results(bind, field, &row);
		fetch_result_with_conversion(bind, field, &row);
		}
		else
		{

netware/mysql_test_run.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -170,7 +170,7 @@ void report_stats()
		log_msg("\nThe .out and .err files in %s may give you some\n", result_dir);
		log_msg("hint of what when wrong.\n");
		log_msg("\nIf you want to report this error, please first read the documentation\n");
		log_msg("at: http://www.mysql.com/doc/M/y/MySQL_test_suite.html\n");
		log_msg("at: http://www.mysql.com/doc/en/MySQL_test_suite.html\n");
		}

		log_msg("\n%.02f total minutes elapsed in the test cases\n\n", total_time / 60);