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

Build-tools/Do-compile

+1 −1

Original line number	Diff line number	Diff line
		@@ -215,7 +215,7 @@ if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest)
		{
		system("mkdir $bench_tmpdir") if (! -d $bench_tmpdir);
		safe_cd("${test_dir}/mysql-test");
		check_system("./mysql-test-run --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --sleep=10", "tests were successful");
		check_system("./mysql-test-run --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");
		}

		# Start the server if we are going to run any of the benchmarks

Docs/manual.texi

+2 −2

Original line number	Diff line number	Diff line
		@@ -2433,7 +2433,7 @@ mysql> SHOW STATUS;
		If a bug or problem occurs while running @strong{mysqld}, try to provide an
		input script that will reproduce the anomaly. This script should include any
		necessary source files. The more closely the script can reproduce your
		situation, the better. If you can make a repeatable test case, you should
		situation, the better. If you can make a reproduceable test case, you should
		post this to @email{bugs@@lists.mysql.com} for a high priority treatment!

		If you can't provide a script, you should at least include the output
		@@ -4786,7 +4786,7 @@ Included in the MySQL distribution are two different testing suites,
		@file{mysql-test-run} and
		@uref{http://www.mysql.com/information/crash-me.php,crash-me}, as well
		as a benchmark suite. The test system is actively updated with code to
		test each new feature and almost all repeatable bugs that have come to
		test each new feature and almost all reproduceable bugs that have come to
		our attention. We test MySQL with these on a lot of platforms before
		every release. These tests are more sophisticated than anything we have
		seen from PostgreSQL, and they ensures that the MySQL is kept to a high

client/mysqlmanagerc.c

+2 −14

Original line number	Diff line number	Diff line
		@@ -17,27 +17,15 @@
		#define MANAGER_CLIENT_VERSION "1.0"

		#include <my_global.h>
		#include <my_sys.h>
		#include <m_string.h>
		#include <mysql.h>
		#include <mysql_version.h>
		#include <m_ctype.h>
		#ifdef OS2
		#include <config-os2.h>
		#else
		#include <my_config.h>
		#endif
		#include <my_dir.h>
		#include <hash.h>
		#include <mysqld_error.h>
		#include <stdio.h>
		#include <stdlib.h>
		#include <my_sys.h>
		#include <m_string.h>
		#include <getopt.h>
		#include <stdarg.h>
		#include <sys/stat.h>
		#include <unistd.h>
		#include <errno.h>
		#include <violite.h>

		#ifndef MYSQL_MANAGER_PORT
		#define MYSQL_MANAGER_PORT 23546

client/mysqltest.c

+13 −2

Original line number	Diff line number	Diff line
		@@ -181,7 +181,7 @@ Q_PING, Q_EVAL,
		Q_RPL_PROBE, Q_ENABLE_RPL_PARSE,
		Q_DISABLE_RPL_PARSE, Q_EVAL_RESULT,
		Q_ENABLE_QUERY_LOG, Q_DISABLE_QUERY_LOG,
		Q_SERVER_START, Q_SERVER_STOP,
		Q_SERVER_START, Q_SERVER_STOP,Q_REQUIRE_MANAGER,
		Q_UNKNOWN, /* Unknown command. */
		Q_COMMENT, /* Comments, ignored. */
		Q_COMMENT_WITH_COMMAND
		@@ -215,6 +215,7 @@ const char *command_names[] = {
		"disable_rpl_parse", "eval_result",
		"enable_query_log", "disable_query_log",
		"server_start", "server_stop",
		"require_manager",
		0
		};

		@@ -640,6 +641,13 @@ int open_file(const char* name)
		return 0;
		}

		int do_require_manager(struct st_query* __attribute__((unused)) q)
		{
		if (!manager)
		abort_not_supported_test();
		return 0;
		}

		#ifndef EMBEDDED_LIBRARY
		int do_server_start(struct st_query* q)
		{
		@@ -1930,7 +1938,9 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
		ds= &ds_res;

		if ((flags & QUERY_SEND) && mysql_send_query(mysql, query, query_len))
		die("At line %u: unable to send query '%s'", start_lineno, query);
		die("At line %u: unable to send query '%s'(mysql_errno=%d,errno=%d)",
		start_lineno, query,
		mysql_errno(mysql), errno);
		if ((flags & QUERY_SEND) && !disable_query_log)
		{
		dynstr_append_mem(ds,query,query_len);
		@@ -2236,6 +2246,7 @@ int main(int argc, char** argv)
		case Q_DISABLE_QUERY_LOG: disable_query_log=1; break;
		case Q_SOURCE: do_source(q); break;
		case Q_SLEEP: do_sleep(q); break;
		case Q_REQUIRE_MANAGER: do_require_manager(q); break;
		#ifndef EMBEDDED_LIBRARY
		case Q_SERVER_START: do_server_start(q); break;
		case Q_SERVER_STOP: do_server_stop(q); break;

libmysql/manager.c

+16 −22

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

		#include <my_global.h>
		#if defined(__WIN__) \|\| defined(_WIN32) \|\| defined(_WIN64)
		#include <winsock.h>
		#include <odbcinst.h>
		#if defined(THREAD)
		#include <my_pthread.h> /* because of signal() */
		#endif
		#include "mysql.h"
		#include "mysql_version.h"
		#include "mysqld_error.h"
		#include <my_sys.h>
		#include <mysys_err.h>
		#include <m_string.h>
		#include <m_ctype.h>
		#include "mysql.h"
		#include "mysql_version.h"
		#include "mysqld_error.h"
		#include "errmsg.h"
		#include <my_net.h>
		#include <errmsg.h>
		#include <violite.h>
		#include <sys/stat.h>
		#include <signal.h>
		#include <time.h>
		#include <errno.h>

		#ifdef HAVE_PWD_H
		#include <pwd.h>
		#if defined(OS2)
		# include <sys/un.h>
		#elif !defined( __WIN__)
		#include <sys/resource.h>
		#ifdef HAVE_SYS_UN_H
		# include <sys/un.h>
		#endif
		#if !defined(MSDOS) && !defined(__WIN__)
		#include <sys/socket.h>
		#include <netinet/in.h>
		#include <arpa/inet.h>
		#include <netdb.h>
		#ifdef HAVE_SELECT_H
		# include <select.h>
		@@ -48,18 +47,13 @@
		#ifdef HAVE_SYS_SELECT_H
		#include <sys/select.h>
		#endif
		#endif
		#ifdef HAVE_SYS_UN_H
		# include <sys/un.h>
		#endif
		#if defined(THREAD) && !defined(__WIN__)
		#include <my_pthread.h> /* because of signal() */
		#endif
		#include <sys/utsname.h>
		#endif /* __WIN__ */

		#ifndef INADDR_NONE
		#define INADDR_NONE -1
		#endif


		#define RES_BUF_SHIFT 5
		#define SOCKET_ERROR -1
		#define NET_BUF_SIZE 2048