Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql (6547e607) · Commits · Software / OSDI20 Artifacts / mariadb

client/violite.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -206,9 +206,9 @@ int vio_blocking(Vio * vio, my_bool set_blocking_mode)
		old_fcntl=vio->fcntl_mode = fcntl(vio->sd, F_GETFL);
		}
		if (set_blocking_mode)
		vio->fcntl_mode &= ~O_NONBLOCK; //clear bit
		vio->fcntl_mode &= ~O_NONBLOCK; /clear bit /
		else
		vio->fcntl_mode \|= O_NONBLOCK; //set bit
		vio->fcntl_mode \|= O_NONBLOCK; /set bit /
		if (old_fcntl != vio->fcntl_mode)
		r = fcntl(vio->sd, F_SETFL, vio->fcntl_mode);
		}
		@@ -228,12 +228,12 @@ int vio_blocking(Vio * vio, my_bool set_blocking_mode)
		if (set_blocking_mode)
		{
		arg = 0;
		vio->fcntl_mode &= ~O_NONBLOCK; //clear bit
		vio->fcntl_mode &= ~O_NONBLOCK; /clear bit /
		}
		else
		{
		arg = 1;
		vio->fcntl_mode \|= O_NONBLOCK; //set bit
		vio->fcntl_mode \|= O_NONBLOCK; /set bit /
		}
		if (old_fcntl != vio->fcntl_mode)
		r = ioctlsocket(vio->sd,FIONBIO,(void*) &arg, sizeof(arg));

div/deadlock_test.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -125,7 +125,7 @@ static void permute_aux(int order, int num_queries, int fixed)
		}
		}

		//printf("num_free = %d\n", num_free);
		/printf("num_free = %d\n", num_free); /

		if(num_free <= 1)
		{

include/global.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -22,11 +22,11 @@
		#define _global_h

		#if defined( __EMX__) && !defined( MYSQL_SERVER)
		// moved here to use below VOID macro redefinition
		/* moved here to use below VOID macro redefinition */
		#define INCL_BASE
		#define INCL_NOPMAPI
		#include <os2.h>
		#endif // __EMX__
		#endif /* __EMX__ */

		#if defined(_WIN32) \|\| defined(_WIN64) \|\| defined(__WIN32__) \|\| defined(WIN32)
		#include <config-win.h>

include/my_pthread.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@

		#include <errno.h>
		#ifndef ETIME
		#define ETIME ETIMEDOUT // For FreeBSD
		#define ETIME ETIMEDOUT /* For FreeBSD */
		#endif

		#if defined(__WIN__)
		@@ -119,8 +119,8 @@ void pthread_exit(void a); / was #define pthread_exit(A) ExitThread(A)*/
		#define pthread_condattr_init(A)
		#define pthread_condattr_destroy(A)

		//Irena: compiler does not like this:
		//#define my_pthread_getprio(pthread_t thread_id) pthread_dummy(0)
		/Irena: compiler does not like this: /
		/#define my_pthread_getprio(pthread_t thread_id) pthread_dummy(0) /
		#define my_pthread_getprio(thread_id) pthread_dummy(0)

		#elif defined(HAVE_UNIXWARE7_THREADS)

include/raid.h

+14 −14

Original line number	Diff line number	Diff line
		@@ -16,9 +16,9 @@
		MA 02111-1307, USA */

		/* Parser needs these defines always, even if USE_RAID is not defined */
		#define RAID_TYPE_0 1 // Striping
		#define RAID_TYPE_x 2 // Some new modes
		#define RAID_TYPE_y 3 //
		#define RAID_TYPE_0 1 /* Striping */
		#define RAID_TYPE_x 2 /* Some new modes */
		#define RAID_TYPE_y 3

		#define RAID_DEFAULT_CHUNKS 4
		#define RAID_DEFAULT_CHUNKSIZE 2561024 / 256kB */
		@@ -102,9 +102,9 @@ class RaidName {
		bool IsRaid();
		int Rename(const char * from, const char * to, myf MyFlags);
		private:
		uint _raid_type; // RAID_TYPE_0 or RAID_TYPE_1 or RAID_TYPE_5
		uint _raid_chunks; // 1..n
		ulong _raid_chunksize; // 1..n in bytes
		uint _raid_type; /* RAID_TYPE_0 or RAID_TYPE_1 or RAID_TYPE_5 */
		uint _raid_chunks; /* 1..n */
		ulong _raid_chunksize; /* 1..n in bytes */
		};

		class RaidFd {
		@@ -126,16 +126,16 @@ class RaidFd {
		static DYNAMIC_ARRAY _raid_map; /* Map of RaidFD* */
		private:

		uint _raid_type; // RAID_TYPE_0 or RAID_TYPE_1 or RAID_TYPE_5
		uint _raid_chunks; // 1..n
		ulong _raid_chunksize; // 1..n in bytes
		uint _raid_type; /* RAID_TYPE_0 or RAID_TYPE_1 or RAID_TYPE_5 */
		uint _raid_chunks; /* 1..n */
		ulong _raid_chunksize; /* 1..n in bytes */

		ulong _total_block; // We are operating with block no x (can be 0..many).
		uint _this_block; // can be 0.._raid_chunks
		uint _remaining_bytes; // Maximum bytes that can be written in this block
		ulong _total_block; /* We are operating with block no x (can be 0..many). */
		uint _this_block; /* can be 0.._raid_chunks */
		uint _remaining_bytes; /* Maximum bytes that can be written in this block */

		my_off_t _position;
		my_off_t _size; // Cached file size for faster seek(SEEK_END)
		my_off_t _size; /* Cached file size for faster seek(SEEK_END) */
		File _fd;
		File _fd_vector; / Array of File */
		off_t _seek_vector; / Array of cached seek positions */
		@@ -147,7 +147,7 @@ class RaidFd {
		(ulong) _position, _raid_chunksize, (ulong) _size));

		_total_block = (ulong) (_position / _raid_chunksize);
		_this_block = _total_block % _raid_chunks; // can be 0.._raid_chunks
		_this_block = _total_block % _raid_chunks; /* can be 0.._raid_chunks */
		_remaining_bytes = (uint) (_raid_chunksize -
		(_position - _total_block * _raid_chunksize));
		DBUG_PRINT("info",