merged (e931d813) · Commits · Software / OSDI20 Artifacts / mariadb

include/config-win.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,11 @@ functions */
		#define _WIN32_WINNT 0x0500
		#endif

		#if defined(_MSC_VER) && _MSC_VER >= 1400
		/* Avoid endless warnings about sprintf() etc. being unsafe. */
		#define _CRT_SECURE_NO_DEPRECATE 1
		#endif

		#include <sys/locking.h>
		#include <windows.h>
		#include <math.h> /* Because of rint() */
		@@ -329,6 +334,11 @@ inline double ulonglong2double(ulonglong value)
		#define HAVE_SETFILEPOINTER
		#define HAVE_VIO_READ_BUFF

		#if defined(_WIN64) && defined(_M_X64)
		/* Avoid type conflicts with built-in functions. */
		#define HAVE_STRNLEN
		#endif

		#ifndef __NT__
		#undef FILE_SHARE_DELETE
		#define FILE_SHARE_DELETE 0 /* Not implemented on Win 98/ME */

include/hash.h

+10 −4

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ typedef void (hash_free_key)(void );

		typedef struct st_hash {
		uint key_offset,key_length; /* Length of key if const length */
		uint records,blength,current_record;
		uint records, blength;
		uint flags;
		DYNAMIC_ARRAY array; /* Place for hash_keys */
		hash_get_key get_key;
		@@ -41,6 +41,9 @@ typedef struct st_hash {
		CHARSET_INFO *charset;
		} HASH;

		/* A search iterator state */
		typedef uint HASH_SEARCH_STATE;

		#define hash_init(A,B,C,D,E,F,G,H) _hash_init(A,B,C,D,E,F,G, H CALLER_INFO)
		my_bool _hash_init(HASH hash, CHARSET_INFO charset,
		uint default_array_elements, uint key_offset,
		@@ -49,12 +52,15 @@ my_bool _hash_init(HASH hash, CHARSET_INFO charset,
		void hash_free(HASH *tree);
		void my_hash_reset(HASH *hash);
		byte hash_element(HASH hash,uint idx);
		gptr hash_search(HASH info,const byte key,uint length);
		gptr hash_next(HASH info,const byte key,uint length);
		gptr hash_search(const HASH info, const byte key, uint length);
		gptr hash_first(const HASH info, const byte key, uint length,
		HASH_SEARCH_STATE *state);
		gptr hash_next(const HASH info, const byte key, uint length,
		HASH_SEARCH_STATE *state);
		my_bool my_hash_insert(HASH info,const byte data);
		my_bool hash_delete(HASH hash,byte record);
		my_bool hash_update(HASH hash,byte record,byte *old_key,uint old_key_length);
		void hash_replace(HASH hash, uint idx, byte new_row);
		void hash_replace(HASH hash, HASH_SEARCH_STATE state, byte *new_row);
		my_bool hash_check(HASH hash); / Only in debug library */

		#define hash_clear(H) bzero((char) (H),sizeof((H)))

include/my_global.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -862,6 +862,7 @@ typedef off_t os_off_t;
		#define SOCKET_EAGAIN WSAEINPROGRESS
		#define SOCKET_ETIMEDOUT WSAETIMEDOUT
		#define SOCKET_EWOULDBLOCK WSAEWOULDBLOCK
		#define SOCKET_EADDRINUSE WSAEADDRINUSE
		#define SOCKET_ENFILE ENFILE
		#define SOCKET_EMFILE EMFILE
		#elif defined(OS2)
		@@ -870,6 +871,7 @@ typedef off_t os_off_t;
		#define SOCKET_EAGAIN SOCEINPROGRESS
		#define SOCKET_ETIMEDOUT SOCKET_EINTR
		#define SOCKET_EWOULDBLOCK SOCEWOULDBLOCK
		#define SOCKET_EADDRINUSE SOCEADDRINUSE
		#define SOCKET_ENFILE SOCENFILE
		#define SOCKET_EMFILE SOCEMFILE
		#define closesocket(A) soclose(A)
		@@ -880,6 +882,7 @@ typedef off_t os_off_t;
		#define SOCKET_EAGAIN EAGAIN
		#define SOCKET_ETIMEDOUT SOCKET_EINTR
		#define SOCKET_EWOULDBLOCK EWOULDBLOCK
		#define SOCKET_EADDRINUSE EADDRINUSE
		#define SOCKET_ENFILE ENFILE
		#define SOCKET_EMFILE EMFILE
		#endif

mysql-test/lib/mtr_process.pl

+8 −1

Original line number	Diff line number	Diff line
		@@ -890,7 +890,14 @@ sub mtr_exit ($) {
		# cluck("Called mtr_exit()");
		mtr_timer_stop_all($::glob_timers);
		local $SIG{HUP} = 'IGNORE';
		kill('HUP', -$$);
		# ToDo: Signalling -$$ will only work if we are the process group
		# leader (in fact on QNX it will signal our session group leader,
		# which might be Do-compile or Pushbuild, causing tests to be
		# aborted). So we only do it if we are the group leader. We might
		# set ourselves as the group leader at startup (with
		# POSIX::setpgrp(0,0)), but then care must be needed to always do
		# proper child process cleanup.
		kill('HUP', -$$) if $$ == getpgrp();
		sleep 2;
		exit($code);
		}

mysql-test/mysql-test-run.pl

+14 −8

Original line number	Diff line number	Diff line
		@@ -804,6 +804,12 @@ sub command_line_setup () {
		}
		}

		# On QNX, /tmp/dir/master.sock and /tmp/dir//master.sock seem to be
		# considered different, so avoid the extra slash (/) in the socket
		# paths.
		my $sockdir = $opt_tmpdir;
		$sockdir =~ s\|/+$\|\|;

		# Put this into a hash, will be a C struct

		$master->[0]=
		@@ -812,7 +818,7 @@ sub command_line_setup () {
		path_myerr => "$opt_vardir/log/master.err",
		path_mylog => "$opt_vardir/log/master.log",
		path_mypid => "$opt_vardir/run/master.pid",
		path_mysock => "$opt_tmpdir/master.sock",
		path_mysock => "$sockdir/master.sock",
		path_myport => $opt_master_myport,
		start_timeout => 400, # enough time create innodb tables

		@@ -825,7 +831,7 @@ sub command_line_setup () {
		path_myerr => "$opt_vardir/log/master1.err",
		path_mylog => "$opt_vardir/log/master1.log",
		path_mypid => "$opt_vardir/run/master1.pid",
		path_mysock => "$opt_tmpdir/master1.sock",
		path_mysock => "$sockdir/master1.sock",
		path_myport => $opt_master_myport + 1,
		start_timeout => 400, # enough time create innodb tables
		};
		@@ -836,7 +842,7 @@ sub command_line_setup () {
		path_myerr => "$opt_vardir/log/slave.err",
		path_mylog => "$opt_vardir/log/slave.log",
		path_mypid => "$opt_vardir/run/slave.pid",
		path_mysock => "$opt_tmpdir/slave.sock",
		path_mysock => "$sockdir/slave.sock",
		path_myport => $opt_slave_myport,
		start_timeout => 400,
		};
		@@ -847,7 +853,7 @@ sub command_line_setup () {
		path_myerr => "$opt_vardir/log/slave1.err",
		path_mylog => "$opt_vardir/log/slave1.log",
		path_mypid => "$opt_vardir/run/slave1.pid",
		path_mysock => "$opt_tmpdir/slave1.sock",
		path_mysock => "$sockdir/slave1.sock",
		path_myport => $opt_slave_myport + 1,
		start_timeout => 300,
		};
		@@ -858,7 +864,7 @@ sub command_line_setup () {
		path_myerr => "$opt_vardir/log/slave2.err",
		path_mylog => "$opt_vardir/log/slave2.log",
		path_mypid => "$opt_vardir/run/slave2.pid",
		path_mysock => "$opt_tmpdir/slave2.sock",
		path_mysock => "$sockdir/slave2.sock",
		path_myport => $opt_slave_myport + 2,
		start_timeout => 300,
		};
		@@ -868,7 +874,7 @@ sub command_line_setup () {
		path_err => "$opt_vardir/log/im.err",
		path_log => "$opt_vardir/log/im.log",
		path_pid => "$opt_vardir/run/im.pid",
		path_sock => "$opt_tmpdir/im.sock",
		path_sock => "$sockdir/im.sock",
		port => $im_port,
		start_timeout => $master->[0]->{'start_timeout'},
		admin_login => 'im_admin',
		@@ -883,7 +889,7 @@ sub command_line_setup () {
		server_id => 1,
		port => $im_mysqld1_port,
		path_datadir => "$opt_vardir/im_mysqld_1.data",
		path_sock => "$opt_tmpdir/mysqld_1.sock",
		path_sock => "$sockdir/mysqld_1.sock",
		path_pid => "$opt_vardir/run/mysqld_1.pid",
		};

		@@ -892,7 +898,7 @@ sub command_line_setup () {
		server_id => 2,
		port => $im_mysqld2_port,
		path_datadir => "$opt_vardir/im_mysqld_2.data",
		path_sock => "$opt_tmpdir/mysqld_2.sock",
		path_sock => "$sockdir/mysqld_2.sock",
		path_pid => "$opt_vardir/run/mysqld_2.pid",
		nonguarded => 1,
		};