Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new (5419c210) · Commits · Software / OSDI20 Artifacts / mariadb

Makefile.am

+11 −28

Original line number	Diff line number	Diff line
		@@ -119,54 +119,37 @@ tags:
		# making sure each user use different ports.

		test:
		cd mysql-test ; \
		./mysql-test-run --mysqld=--binlog-format=statement && \
		./mysql-test-run --ps-protocol --mysqld=--binlog-format=row

		test-full:
		cd mysql-test ; \
		./mysql-test-run --mysqld=--binlog-format=statement && \
		./mysql-test-run --ps-protocol --mysqld=--binlog-format=statement && \
		./mysql-test-run --mysqld=--binlog-format=row && \
		./mysql-test-run --ps-protocol --mysqld=--binlog-format=row

		test-force:
		cd mysql-test ; \
		./mysql-test-run --force --mysqld=--binlog-format=statement && \
		./mysql-test-run --ps-protocol --force --mysqld=--binlog-format=row

		test-force-full:
		cd mysql-test ; \
		./mysql-test-run --force --mysqld=--binlog-format=statement && \
		./mysql-test-run --force --ps-protocol --mysqld=--binlog-format=statement && \
		./mysql-test-run --force --mysqld=--binlog-format=row && \
		./mysql-test-run --force --ps-protocol --mysqld=--binlog-format=row

		# We are testing a new Perl version of the test script
		test-pl:
		cd mysql-test ; \
		./mysql-test-run.pl --mysqld=--binlog-format=statement && \
		./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row

		test-full-pl:
		test-full:
		cd mysql-test ; \
		./mysql-test-run.pl --mysqld=--binlog-format=statement && \
		./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=statement && \
		./mysql-test-run.pl --mysqld=--binlog-format=row && \
		./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row

		test-force-pl:
		test-force:
		cd mysql-test ; \
		./mysql-test-run.pl --force --mysqld=--binlog-format=statement && \
		./mysql-test-run.pl --ps-protocol --force --mysqld=--binlog-format=row

		test-force-full-pl:
		test-force-full:
		cd mysql-test ; \
		./mysql-test-run.pl --force --mysqld=--binlog-format=statement && \
		./mysql-test-run.pl --force --ps-protocol --mysqld=--binlog-format=statement && \
		./mysql-test-run.pl --force --mysqld=--binlog-format=row && \
		./mysql-test-run.pl --force --ps-protocol --mysqld=--binlog-format=row

		# Keep these for a while
		test-pl: test
		test-full-pl: test-full
		test-force-pl: test-force
		test-force-full-pl: test-force-full



		# Don't update the files from bitkeeper
		%::SCCS/s.%

client/mysql.cc

+2 −3

Original line number	Diff line number	Diff line
		@@ -3212,10 +3212,9 @@ com_status(String *buffer __attribute__((unused)),
		mysql_free_result(result);
		}
		#ifdef HAVE_OPENSSL
		if (mysql.net.vio && mysql.net.vio->ssl_arg &&
		SSL_get_cipher((SSL*) mysql.net.vio->ssl_arg))
		if ((status= mysql_get_ssl_cipher(&mysql)))
		tee_fprintf(stdout, "SSL:\t\t\tCipher in use is %s\n",
		SSL_get_cipher((SSL*) mysql.net.vio->ssl_arg));
		status);
		else
		#endif /* HAVE_OPENSSL */
		tee_puts("SSL:\t\t\tNot in use", stdout);

client/mysqltest.c

+30 −0

Original line number	Diff line number	Diff line
		@@ -5088,6 +5088,35 @@ static void init_var_hash(MYSQL *mysql)
		DBUG_VOID_RETURN;
		}

		static void mark_progress(int line)
		{
		#ifdef NOT_YET
		static FILE* fp = NULL;
		static double first;

		struct timeval tv;
		double now;

		if (!fp)
		{

		fp = fopen("/tmp/mysqltest_progress.log", "wt");

		if (!fp)
		{
		abort();
		}

		gettimeofday(&tv, NULL);
		first = tv.tv_sec * 1e6 + tv.tv_usec;
		}

		gettimeofday(&tv, NULL);
		now = tv.tv_sec * 1e6 + tv.tv_usec;

		fprintf(fp, "%d %f\n", parser.current_line, (now - first) / 1e6);
		#endif
		}

		int main(int argc, char **argv)
		{
		@@ -5447,6 +5476,7 @@ int main(int argc, char **argv)
		}

		parser.current_line += current_line_inc;
		mark_progress(parser.current_line);
		}

		start_lineno= 0;

cmakelists.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,9 @@ PROJECT(MySql)
		# This reads user configuration, generated by configure.js.
		INCLUDE(win/configure.data)

		# Hardcode support for CSV storage engine
		SET(WITH_CSV_STORAGE_ENGINE TRUE)

		CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in
		${CMAKE_SOURCE_DIR}/include/mysql_version.h @ONLY)

		@@ -18,6 +21,12 @@ IF(WITH_BLACKHOLE_STORAGE_ENGINE)
		SET (mysql_se_decls "${mysql_se_decls}, blackhole_hton")
		SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_blackhole.cc")
		ENDIF(WITH_BLACKHOLE_STORAGE_ENGINE)
		IF(WITH_CSV_STORAGE_ENGINE)
		ADD_DEFINITIONS(-D WITH_CSV_STORAGE_ENGINE)
		SET (mysql_se_htons "${mysql_se_htons}, &tina_hton")
		SET (mysql_se_decls "${mysql_se_decls}, tina_hton")
		SET (mysql_se_ha_src ${mysql_se_ha_src} "../storage/csv/ha_tina.cc")
		ENDIF(WITH_CSV_STORAGE_ENGINE)
		IF(WITH_EXAMPLE_STORAGE_ENGINE)
		ADD_DEFINITIONS(-D WITH_EXAMPLE_STORAGE_ENGINE)
		SET (mysql_se_htons "${mysql_se_htons}, &example_hton")

include/mysql.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -409,6 +409,7 @@ MYSQL * STDCALL mysql_init(MYSQL *mysql);
		my_bool STDCALL mysql_ssl_set(MYSQL mysql, const char key,
		const char cert, const char ca,
		const char capath, const char cipher);
		const char * STDCALL mysql_get_ssl_cipher(MYSQL *mysql);
		my_bool STDCALL mysql_change_user(MYSQL mysql, const char user,
		const char passwd, const char db);
		MYSQL * STDCALL mysql_real_connect(MYSQL mysql, const char host,

Original line number	Diff line number	Diff line
		@@ -409,6 +409,7 @@ MYSQL * STDCALL mysql_init(MYSQL *mysql);
		my_bool STDCALL mysql_ssl_set(MYSQL mysql, const char key,
		const char cert, const char ca,
		const char capath, const char cipher);
		const char * STDCALL mysql_get_ssl_cipher(MYSQL *mysql);
		my_bool STDCALL mysql_change_user(MYSQL mysql, const char user,
		const char passwd, const char db);
		MYSQL * STDCALL mysql_real_connect(MYSQL mysql, const char host,