Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0 (3c057478) · Commits · Software / OSDI20 Artifacts / mariadb

BUILD/compile-solaris-sparc-debug

0 → 100755

+16 −0

Original line number	Diff line number	Diff line
		#! /bin/sh

		gmake -k clean \|\| true
		/bin/rm -f /.deps/.P config.cache

		aclocal && autoheader && aclocal && automake && autoconf
		(cd bdb/dist && sh s_all)
		(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
		if [ -d gemini ]
		then
		(cd gemini && aclocal && autoheader && aclocal && automake && autoconf)
		fi

		CFLAGS="-g -Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-debug

		gmake -j 4

include/my_global.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -324,11 +324,6 @@ typedef unsigned short ushort;
		#endif

		#include <dbug.h>
		#ifndef DBUG_OFF
		#define dbug_assert(A) assert(A)
		#else
		#define dbug_assert(A)
		#endif

		#define MIN_ARRAY_SIZE 0 /* Zero or One. Gcc allows zero*/
		#define ASCII_BITS_USED 8 /* Bit char used */

include/my_sys.h

+21 −34

Original line number	Diff line number	Diff line
		@@ -293,33 +293,21 @@ typedef struct st_dynamic_string {
		struct st_io_cache;
		typedef int (IO_CACHE_CALLBACK)(struct st_io_cache);

		#ifdef THREAD
		#define lock_append_buffer(info) \
		pthread_mutex_lock(&(info)->append_buffer_lock)
		#define unlock_append_buffer(info) \
		pthread_mutex_unlock(&(info)->append_buffer_lock)
		#else
		#define lock_append_buffer(info)
		#define unlock_append_buffer(info)
		#endif

		typedef struct st_io_cache /* Used when cacheing files */
		{
		my_off_t pos_in_file,end_of_file;
		byte rc_pos,rc_end,buffer,rc_request_pos;
		my_bool alloced_buffer; /* currented READ_NET is the only one
		that will use a buffer allocated somewhere
		else
		*/
		byte append_buffer, append_read_pos, write_pos, append_end,
		*write_end;
		/* for append buffer used in READ_APPEND cache */
		byte read_pos,read_end,buffer,request_pos;
		byte write_buffer, append_read_pos, write_pos, write_end;
		byte current_pos, current_end;
		/* The lock is for append buffer used in READ_APPEND cache */
		#ifdef THREAD
		pthread_mutex_t append_buffer_lock;
		/* need mutex copying from append buffer to read buffer */
		#endif
		int (read_function)(struct st_io_cache ,byte *,uint);
		int (write_function)(struct st_io_cache ,const byte *,uint);
		enum cache_type type;
		/* callbacks when the actual read I/O happens */
		IO_CACHE_CALLBACK pre_read;
		IO_CACHE_CALLBACK post_read;
		@@ -331,7 +319,11 @@ typedef struct st_io_cache /* Used when cacheing files */
		int seek_not_done,error;
		uint buffer_length,read_length;
		myf myflags; /* Flags used to my_read/my_write */
		enum cache_type type;
		/*
		Currently READ_NET is the only one that will use a buffer allocated
		somewhere else
		*/
		my_bool alloced_buffer;
		#ifdef HAVE_AIOWAIT
		uint inited;
		my_off_t aio_read_pos;
		@@ -349,9 +341,9 @@ typedef int (qsort2_cmp)(const void , const void , const void );
		#define my_b_EOF INT_MIN

		#define my_b_read(info,Buffer,Count) \
		((info)->rc_pos + (Count) <= (info)->rc_end ?\
		(memcpy(Buffer,(info)->rc_pos,(size_t) (Count)), \
		((info)->rc_pos+=(Count)),0) :\
		((info)->read_pos + (Count) <= (info)->read_end ?\
		(memcpy(Buffer,(info)->read_pos,(size_t) (Count)), \
		((info)->read_pos+=(Count)),0) :\
		(*(info)->read_function)((info),Buffer,Count))

		#define my_b_write(info,Buffer,Count) \
		@@ -362,11 +354,10 @@ typedef int (qsort2_cmp)(const void , const void , const void );


		#define my_b_get(info) \
		((info)->rc_pos != (info)->rc_end ?\
		((info)->rc_pos++, (int) (uchar) (info)->rc_pos[-1]) :\
		((info)->read_pos != (info)->read_end ?\
		((info)->read_pos++, (int) (uchar) (info)->read_pos[-1]) :\
		_my_b_get(info))


		/* my_b_write_byte dosn't have any err-check */
		#define my_b_write_byte(info,chr) \
		(((info)->write_pos < (info)->write_end) ?\
		@@ -374,18 +365,14 @@ typedef int (qsort2_cmp)(const void , const void , const void );
		(_my_b_write(info,0,0) , ((*(info)->write_pos++)=(chr))))

		#define my_b_fill_cache(info) \
		(((info)->rc_end=(info)->rc_pos),(*(info)->read_function)(info,0,0))

		#define my_write_cache(info) (((info)->type == WRITE_CACHE))
		#define my_cache_pointer(info) (my_write_cache(info) ? \
		((info)->write_pos) : ((info)->rc_pos))
		(((info)->read_end=(info)->read_pos),(*(info)->read_function)(info,0,0))

		#define my_b_tell(info) ((info)->pos_in_file + \
		my_cache_pointer(info) - (info)->rc_request_pos)
		(uint) (*(info)->current_pos - (info)->request_pos))

		#define my_b_bytes_in_cache(info) (uint) (*(info)->current_end - \
		*(info)->current_pos)

		#define my_b_bytes_in_cache(info) (my_write_cache(info) ? \
		((uint) ((info)->write_end - (info)->write_pos)): \
		((uint) ((info)->rc_end - (info)->rc_pos)))

		typedef struct st_changeable_var {
		const char name; / Name of variable */
		@@ -584,7 +571,7 @@ extern int _my_b_net_read(IO_CACHE info,byte Buffer,uint Count);
		extern int _my_b_get(IO_CACHE *info);
		extern int _my_b_async_read(IO_CACHE info,byte Buffer,uint Count);
		extern int _my_b_write(IO_CACHE info,const byte Buffer,uint Count);
		extern int _my_b_append(IO_CACHE info,const byte Buffer,uint Count);
		extern int my_b_append(IO_CACHE info,const byte Buffer,uint Count);
		extern int my_block_write(IO_CACHE info, const byte Buffer,
		uint Count, my_off_t pos);
		extern int flush_io_cache(IO_CACHE *info);

isam/_cache.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -46,11 +46,11 @@ int _nisam_read_cache(IO_CACHE info, byte buff, ulong pos, uint length,
		buff+=read_length;
		}
		if ((offset=pos - (ulong) info->pos_in_file) <
		(ulong) (info->rc_end - info->rc_request_pos))
		(ulong) (info->read_end - info->request_pos))
		{
		in_buff_pos=info->rc_request_pos+(uint) offset;
		in_buff_length= min(length,(uint) (info->rc_end-in_buff_pos));
		memcpy(buff,info->rc_request_pos+(uint) offset,(size_t) in_buff_length);
		in_buff_pos=info->request_pos+(uint) offset;
		in_buff_length= min(length,(uint) (info->read_end-in_buff_pos));
		memcpy(buff,info->request_pos+(uint) offset,(size_t) in_buff_length);
		if (!(length-=in_buff_length))
		return 0;
		pos+=in_buff_length;
		@@ -61,14 +61,14 @@ int _nisam_read_cache(IO_CACHE info, byte buff, ulong pos, uint length,
		if (flag & READING_NEXT)
		{
		if (pos != ((info)->pos_in_file +
		(uint) ((info)->rc_end - (info)->rc_request_pos)))
		(uint) ((info)->read_end - (info)->request_pos)))
		{
		info->pos_in_file=pos; /* Force start here */
		info->rc_pos=info->rc_end=info->rc_request_pos; /* Everything used */
		info->read_pos=info->read_end=info->request_pos; /* Everything used */
		info->seek_not_done=1;
		}
		else
		info->rc_pos=info->rc_end; /* All block used */
		info->read_pos=info->read_end; /* All block used */
		if (!(*info->read_function)(info,buff,length))
		return 0;
		if (!(flag & READING_HEADER) \|\| info->error == -1 \|\|

isam/_statrec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -187,7 +187,7 @@ int _nisam_read_rnd_static_record(N_INFO info, byte buf,
		(skipp_deleted_blocks \|\| !filepos))
		{
		cache_read=1; /* Read record using cache */
		cache_length=(uint) (info->rec_cache.rc_end - info->rec_cache.rc_pos);
		cache_length=(uint) (info->rec_cache.read_end - info->rec_cache.read_pos);
		}
		else
		info->rec_cache.seek_not_done=1; /* Filepos is changed */