Fixes for OSF1 (b3392db2) · Commits · Software / OSDI20 Artifacts / mariadb

Docs/manual.texi

+3 −0

Original line number	Diff line number	Diff line
		@@ -40713,6 +40713,9 @@ not yet 100 % confident in this code.
		@appendixsubsec Changes in release 3.23.32
		@itemize @bullet
		@item
		Changed code to get around compiler bug in Compaq C++ on OSF1, that broke
		@code{BACKUP, RESTORE, CHECK, REPAIR, and ANALYZE TABLE}.
		@item
		Added option @code{FULL} to @code{SHOW COLUMNS}. Now we only show the
		privilege list for the columns if this option is given.
		@item

client/mysqladmin.c

+21 −17

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@
		#include <my_pthread.h> /* because of signal() */
		#endif

		#define ADMIN_VERSION "8.13"
		#define ADMIN_VERSION "8.14"
		#define MAX_MYSQL_VAR 64
		#define MAX_TIME_TO_WAIT 3600 /* Wait for shutdown */
		#define MAX_TRUNC_LENGTH 3
		@@ -37,9 +37,9 @@ char truncated_var_names[MAX_MYSQL_VAR][MAX_TRUNC_LENGTH];
		char ex_var_names[MAX_MYSQL_VAR][FN_REFLEN];
		ulonglong last_values[MAX_MYSQL_VAR];
		static int interval=0;
		static my_bool option_force=0,interrupted=0,new_line=0,option_silent=0,
		static my_bool option_force=0,interrupted=0,new_line=0,
		opt_compress=0, opt_relative=0, opt_verbose=0, opt_vertical=0;
		static uint tcp_port = 0, option_wait = 0;
		static uint tcp_port = 0, option_wait = 0, option_silent=0;
		static ulong opt_connect_timeout;
		static my_string unix_port=0;

		@@ -201,7 +201,7 @@ int main(int argc,char *argv[])
		}
		break;
		case 's':
		option_silent = 1;
		option_silent++;
		break;
		case 'S':
		unix_port= optarg;
		@@ -367,22 +367,23 @@ static my_bool sql_connect(MYSQL mysql,const char host, const char *user,
		fprintf(stderr,"Got error: %s\n", mysql_error(mysql));
		if (!option_force)
		return 1;
		sleep(5);
		}
		else if (!info)
		else if (!option_silent)
		{
		if (!info)
		{
		info=1;
		fputs("Waiting for MySQL server to answer",stderr);
		(void) fflush(stderr);
		sleep(5);
		}
		else
		{
		putc('.',stderr);
		(void) fflush(stderr);
		sleep(5);
		}
		}
		sleep(5);
		}
		}


		@@ -739,7 +740,10 @@ static my_bool execute_commands(MYSQL mysql,int argc, char *argv)
		case ADMIN_PING:
		mysql->reconnect=0; /* We want to know of reconnects */
		if (!mysql_ping(mysql))
		{
		if (option_silent < 2)
		puts("mysqld is alive");
		}
		else
		{
		if (mysql_errno(mysql) == CR_SERVER_GONE_ERROR)

include/my_pthread.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -433,6 +433,8 @@ int safe_cond_timedwait(pthread_cond_t cond, safe_mutex_t mp,
		#undef pthread_mutex_wait
		#undef pthread_mutex_timedwait
		#undef pthread_mutex_t
		#undef pthread_cond_wait
		#undef pthread_cond_timedwait
		#define pthread_mutex_init(A,B) safe_mutex_init((A),(B))
		#define pthread_mutex_lock(A) safe_mutex_lock((A),__FILE__,__LINE__)
		#define pthread_mutex_unlock(A) safe_mutex_unlock((A),__FILE__,__LINE__)

mysql-test/install_test_db.sh

+1 −5

Original line number	Diff line number	Diff line
		@@ -43,8 +43,6 @@ PATH=$PATH:/usr/bsd
		hostname=`hostname` # Install this too in the user table
		hostname="$hostname%" # Fix if not fully qualified hostname

		resolved=127.0.0.1


		#create the directories
		[ -d $vardir ] \|\| mkdir $vardir
		@@ -144,9 +142,7 @@ then

		i_u="INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
		INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');

		REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
		REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
		REPLACE INTO user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');

		INSERT INTO user VALUES ('localhost','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N');
		INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N');"

mysql-test/mysql-test-run.sh

+5 −5

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ RM=rm
		TIME=time
		TR=tr
		XARGS=`which xargs \| head -1`
		SED=sed

		# Are we using a source or a binary distribution?

		@@ -72,7 +73,7 @@ BASEDIR=`pwd`
		cd $CWD
		MYSQL_TEST_DIR=$BASEDIR/mysql-test
		STD_DATA=$MYSQL_TEST_DIR/std_data
		SED=sed
		hostname=`hostname` # Installed in the mysql privilege table

		TESTDIR="$MYSQL_TEST_DIR/t/"
		TESTSUFFIX=test
		@@ -239,8 +240,7 @@ SLAVE_MYSQLD=$MYSQLD #this can be changed later if we are doing gcov
		#--
		wait_for_server_start ()
		{
		$MYSQL --no-defaults -u $DBUSER -e "select 1" --silent -w1 --host=127.0.0.1 --port=$1 \
		>/dev/null
		$MYSQLADMIN --no-defaults -u $DBUSER --silent -w2 --host=$hostname --port=$1 ping >/dev/null
		}

		prompt_user ()