Merge rurik.mysql.com:/home/igor/mysql-5.0 (6a2a94b5) · Commits · Software / OSDI20 Artifacts / mariadb

client/mysqltest.c

+74 −89

Original line number	Diff line number	Diff line
		@@ -3029,49 +3029,77 @@ static void replace_dynstr_append(DYNAMIC_STRING ds, const char val)


		/*
		Append all results to the dynamic string separated with '\t'
		Values may be converted with 'replace_column'
		Append the result for one field to the dynamic string ds
		*/

		static void append_result(DYNAMIC_STRING ds, MYSQL_RES res)
		{
		MYSQL_ROW row;
		uint num_fields= mysql_num_fields(res);
		MYSQL_FIELD *fields= !display_result_vertically ? 0 : mysql_fetch_fields(res);
		ulong *lengths;
		while ((row = mysql_fetch_row(res)))
		{
		uint i;
		lengths = mysql_fetch_lengths(res);
		for (i = 0; i < num_fields; i++)
		static void append_field(DYNAMIC_STRING ds, uint col_idx, MYSQL_FIELD field,
		const char* val, ulonglong len, bool is_null)
		{
		const char *val= row[i];
		ulonglong len= lengths[i];

		if (i < max_replace_column && replace_column[i])
		char buf[256];
		if (col_idx < max_replace_column && replace_column[col_idx])
		{
		val= replace_column[i];
		val= replace_column[col_idx];
		len= strlen(val);
		}
		if (!val)
		else if (is_null)
		{
		val= "NULL";
		len= 4;
		}
		#ifdef __WIN__
		else if ((field->type == MYSQL_TYPE_DOUBLE \|\|
		field->type == MYSQL_TYPE_FLOAT ) &&
		field->decimals >= 31)
		{
		/* Convert 1.2e+018 to 1.2e+18 and 1.2e-018 to 1.2e-18 */
		char *start= strchr(val, 'e');
		if (start && strlen(start) >= 5 &&
		(start[1] == '-' \|\| start[1] == '+') && start[2] == '0')
		{
		start+=2; /* Now points at first '0' */
		/* Move all chars after the first '0' one step left */
		memmove(start, start + 1, strlen(start));
		len--;
		}
		}
		#endif

		if (!display_result_vertically)
		{
		if (i)
		if (col_idx)
		dynstr_append_mem(ds, "\t", 1);
		replace_dynstr_append_mem(ds, val, (int)len);
		}
		else
		{
		dynstr_append(ds, fields[i].name);
		dynstr_append(ds, field->name);
		dynstr_append_mem(ds, "\t", 1);
		replace_dynstr_append_mem(ds, val, (int)len);
		dynstr_append_mem(ds, "\n", 1);
		}
		}


		/*
		Append all results to the dynamic string separated with '\t'
		Values may be converted with 'replace_column'
		*/

		static void append_result(DYNAMIC_STRING ds, MYSQL_RES res)
		{
		MYSQL_ROW row;
		uint num_fields= mysql_num_fields(res);
		MYSQL_FIELD *fields= mysql_fetch_fields(res);
		ulong *lengths;

		while ((row = mysql_fetch_row(res)))
		{
		uint i;
		lengths = mysql_fetch_lengths(res);
		for (i = 0; i < num_fields; i++)
		append_field(ds, i, &fields[i],
		(const char*)row[i], lengths[i], !row[i]);
		if (!display_result_vertically)
		dynstr_append_mem(ds, "\n", 1);
		}
		@@ -3085,13 +3113,12 @@ static void append_result(DYNAMIC_STRING ds, MYSQL_RES res)
		*/

		static void append_stmt_result(DYNAMIC_STRING ds, MYSQL_STMT stmt,
		MYSQL_FIELD *field, uint num_fields)
		MYSQL_FIELD *fields, uint num_fields)
		{
		MYSQL_BIND *bind;
		my_bool *is_null;
		ulong *length;
		ulonglong num_rows;
		uint col_idx, row_idx;
		uint i;

		/* Allocate array with bind structs, lengths and NULL flags */
		bind= (MYSQL_BIND) my_malloc(num_fields sizeof(MYSQL_BIND),
		@@ -3101,71 +3128,29 @@ static void append_stmt_result(DYNAMIC_STRING ds, MYSQL_STMT stmt,
		is_null= (my_bool) my_malloc(num_fields sizeof(my_bool),
		MYF(MY_WME \| MY_FAE));

		for (col_idx= 0; col_idx < num_fields; col_idx++)
		/* Allocate data for the result of each field */
		for (i= 0; i < num_fields; i++)
		{
		/* Allocate data for output */
		uint max_length= field[col_idx].max_length + 1;
		char str_data= (char ) my_malloc(max_length, MYF(MY_WME \| MY_FAE));

		bind[col_idx].buffer_type= MYSQL_TYPE_STRING;
		bind[col_idx].buffer= (char *)str_data;
		bind[col_idx].buffer_length= max_length;
		bind[col_idx].is_null= &is_null[col_idx];
		bind[col_idx].length= &length[col_idx];
		uint max_length= fields[i].max_length + 1;
		bind[i].buffer_type= MYSQL_TYPE_STRING;
		bind[i].buffer= (char *)my_malloc(max_length, MYF(MY_WME \| MY_FAE));
		bind[i].buffer_length= max_length;
		bind[i].is_null= &is_null[i];
		bind[i].length= &length[i];

		DBUG_PRINT("bind", ("col[%d]: buffer_type: %d, buffer_length: %d",
		col_idx,
		bind[col_idx].buffer_type,
		bind[col_idx].buffer_length));
		i, bind[i].buffer_type, bind[i].buffer_length));
		}

		/* Fill in the data into the structures created above */
		if (mysql_stmt_bind_result(stmt, bind))
		die("mysql_stmt_bind_result failed: %d: %s",
		mysql_stmt_errno(stmt), mysql_stmt_error(stmt));

		/* Read result from each row */
		num_rows= mysql_stmt_num_rows(stmt);
		for (row_idx= 0; row_idx < num_rows; row_idx++)
		{
		if (mysql_stmt_fetch(stmt))
		die("mysql_stmt_fetch failed: %d %s",
		mysql_stmt_errno(stmt), mysql_stmt_error(stmt));

		/* Read result from each column */
		for (col_idx= 0; col_idx < num_fields; col_idx++)
		{
		const char *val;
		ulonglong len;
		if (col_idx < max_replace_column && replace_column[col_idx])
		{
		val= replace_column[col_idx];
		len= strlen(val);
		}
		else if (*bind[col_idx].is_null)
		{
		val= "NULL";
		len= 4;
		}
		else
		{
		val= (const char *) bind[col_idx].buffer;
		len= *bind[col_idx].length;
		}
		if (!display_result_vertically)
		while (mysql_stmt_fetch(stmt) == 0)
		{
		if (col_idx) /* No tab before first col */
		dynstr_append_mem(ds, "\t", 1);
		replace_dynstr_append_mem(ds, val, (int)len);
		}
		else
		{
		dynstr_append(ds, field[col_idx].name);
		dynstr_append_mem(ds, "\t", 1);
		replace_dynstr_append_mem(ds, val, (int)len);
		dynstr_append_mem(ds, "\n", 1);
		}
		}
		for (i= 0; i < num_fields; i++)
		append_field(ds, i, &fields[i], (const char *) bind[i].buffer,
		bind[i].length, bind[i].is_null);
		if (!display_result_vertically)
		dynstr_append_mem(ds, "\n", 1);
		}
		@@ -3176,10 +3161,10 @@ static void append_stmt_result(DYNAMIC_STRING ds, MYSQL_STMT stmt,

		free_replace_column();

		for (col_idx= 0; col_idx < num_fields; col_idx++)
		for (i= 0; i < num_fields; i++)
		{
		/* Free data for output */
		my_free((gptr)bind[col_idx].buffer, MYF(MY_WME \| MY_FAE));
		my_free((gptr)bind[i].buffer, MYF(MY_WME \| MY_FAE));
		}
		/* Free array with bind structs, lengths and NULL flags */
		my_free((gptr)bind , MYF(MY_WME \| MY_FAE));

configure.in

+1 −1

Original line number	Diff line number	Diff line
		@@ -365,7 +365,7 @@ MYSQL_PROG_AR

		# libmysqlclient versioning when linked with GNU ld.
		if $LD --version 2>/dev/null\|grep -q GNU; then
		LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmysql/libmysql.ver"
		LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/libmysql/libmysql.ver"
		AC_CONFIG_FILES(libmysql/libmysql.ver)
		fi
		AC_SUBST(LD_VERSION_SCRIPT)

heap/hp_create.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -135,6 +135,7 @@ int heap_create(const char name, uint keys, HP_KEYDEF keydef,
		DBUG_RETURN(1);
		}
		share->keydef= (HP_KEYDEF*) (share + 1);
		share->key_stat_version= 1;
		keyseg= (HA_KEYSEG*) (share->keydef + keys);
		init_block(&share->block, reclength + 1, min_records, max_records);
		/* Fix keys */

include/heap.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -136,6 +136,7 @@ typedef struct st_heap_share
		HP_KEYDEF *keydef;
		ulong min_records,max_records; /* Params to open */
		ulong data_length,index_length,max_table_size;
		uint key_stat_version; /* version to indicate insert/delete */
		uint records; /* records */
		uint blength; /* records rounded up to 2^n */
		uint deleted; /* Deleted records in database */

libmysql/libmysql.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -5036,6 +5036,12 @@ my_bool STDCALL mysql_stmt_reset(MYSQL_STMT *stmt)
		{
		DBUG_ENTER("mysql_stmt_reset");
		DBUG_ASSERT(stmt != 0);
		if (!stmt->mysql)
		{
		/* mysql can be reset in mysql_close called from mysql_reconnect */
		set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate);
		DBUG_RETURN(1);
		}
		/* Reset the client and server sides of the prepared statement */
		DBUG_RETURN(reset_stmt_handle(stmt, RESET_SERVER_SIDE \| RESET_LONG_DATA));
		}