Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ (05c65b91) · Commits · Software / OSDI20 Artifacts / mariadb

include/violite.h

+12 −10

Original line number	Diff line number	Diff line
		@@ -45,7 +45,8 @@ Vio* vio_new_win32shared_memory(NET *net,HANDLE handle_file_map,
		HANDLE event_server_wrote,
		HANDLE event_server_read,
		HANDLE event_client_wrote,
		HANDLE event_client_read);
		HANDLE event_client_read,
		HANDLE event_conn_closed);
		int vio_read_pipe(Vio *vio, gptr buf, int size);
		int vio_write_pipe(Vio *vio, const gptr buf, int size);
		int vio_close_pipe(Vio * vio);
		@@ -197,6 +198,7 @@ struct st_vio
		HANDLE event_server_read;
		HANDLE event_client_wrote;
		HANDLE event_client_read;
		HANDLE event_conn_closed;
		long shared_memory_remain;
		char *shared_memory_pos;
		NET *net;

mysql-test/mysql-test-run.sh

+2 −1

Original line number	Diff line number	Diff line
		@@ -596,7 +596,8 @@ MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK --password=
		MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR $EXTRA_MYSQLBINLOG_OPT"
		MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD --basedir=$BASEDIR --bindir=$CLIENT_BINDIR --verbose"
		MYSQL="$MYSQL --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD"
		export MYSQL MYSQL_DUMP MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES CLIENT_BINDIR TESTS_BINDIR
		export MYSQL MYSQL_DUMP MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES
		export CLIENT_BINDIR TESTS_BINDIR CHARSETSDIR
		export NDB_TOOLS_DIR

		MYSQL_TEST_ARGS="--no-defaults --socket=$MASTER_MYSOCK --database=$DB \

mysql-test/t/mysqldump.test

+5 −5

Original line number	Diff line number	Diff line
		@@ -147,9 +147,9 @@ drop database mysqldump_test_db;

		CREATE TABLE t1 (a CHAR(10));
		INSERT INTO t1 VALUES (_latin1 '');
		--exec $MYSQL_DUMP --skip-comments test t1
		--exec $MYSQL_DUMP --skip-comments --compatible=mysql323 test t1
		--exec $MYSQL_DUMP --skip-comments --compatible=mysql323 --default-character-set=cp850 test t1
		--exec $MYSQL_DUMP --skip-comments --default-character-set=cp850 --compatible=mysql323 test t1
		--exec $MYSQL_DUMP --skip-comments --default-character-set=utf8 --compatible=mysql323 test t1
		--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments test t1
		--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments --compatible=mysql323 test t1
		--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments --compatible=mysql323 --default-character-set=cp850 test t1
		--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments --default-character-set=cp850 --compatible=mysql323 test t1
		--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments --default-character-set=utf8 --compatible=mysql323 test t1
		DROP TABLE t1;

sql-common/client.c

+12 −2

Original line number	Diff line number	Diff line
		@@ -396,6 +396,7 @@ HANDLE create_shared_memory(MYSQL mysql,NET net, uint connect_timeout)
		HANDLE event_server_read = NULL;
		HANDLE event_client_wrote = NULL;
		HANDLE event_client_read = NULL;
		HANDLE event_conn_closed = NULL;
		HANDLE handle_file_map = NULL;
		ulong connect_number;
		char connect_number_char[22], *p;
		@@ -508,6 +509,13 @@ HANDLE create_shared_memory(MYSQL mysql,NET net, uint connect_timeout)
		error_allow = CR_SHARED_MEMORY_EVENT_ERROR;
		goto err2;
		}

		strmov(suffix_pos, "CONNECTION_CLOSED");
		if ((event_conn_closed = OpenEvent(EVENT_ALL_ACCESS,FALSE,tmp)) == NULL)
		{
		error_allow = CR_SHARED_MEMORY_EVENT_ERROR;
		goto err2;
		}
		/*
		Set event that server should send data
		*/
		@@ -519,7 +527,7 @@ HANDLE create_shared_memory(MYSQL mysql,NET net, uint connect_timeout)
		net->vio= vio_new_win32shared_memory(net,handle_file_map,handle_map,
		event_server_wrote,
		event_server_read,event_client_wrote,
		event_client_read);
		event_client_read,event_conn_closed);
		}
		else
		{
		@@ -532,6 +540,8 @@ HANDLE create_shared_memory(MYSQL mysql,NET net, uint connect_timeout)
		CloseHandle(event_client_read);
		if (event_client_wrote)
		CloseHandle(event_client_wrote);
		if (event_conn_closed)
		CloseHandle(event_conn_closed);
		if (handle_map)
		UnmapViewOfFile(handle_map);
		if (handle_file_map)

sql/mysqld.cc

+33 −17

Original line number	Diff line number	Diff line
		@@ -3822,6 +3822,7 @@ pthread_handler_decl(handle_connections_shared_memory,arg)
		HANDLE event_client_read= 0; // for transfer data server <-> client
		HANDLE event_server_wrote= 0;
		HANDLE event_server_read= 0;
		HANDLE event_conn_closed= 0;
		THD *thd= 0;

		p= int10_to_str(connect_number, connect_number_char, 10);
		@@ -3875,6 +3876,12 @@ pthread_handler_decl(handle_connections_shared_memory,arg)
		errmsg= "Could not create server write event";
		goto errorconn;
		}
		strmov(suffix_pos, "CONNECTION_CLOSED");
		if ((event_conn_closed= CreateEvent(0, TRUE , FALSE, tmp)) == 0)
		{
		errmsg= "Could not create closed connection event";
		goto errorconn;
		}
		if (abort_loop)
		goto errorconn;
		if (!(thd= new THD))
		@@ -3898,7 +3905,8 @@ pthread_handler_decl(handle_connections_shared_memory,arg)
		event_client_wrote,
		event_client_read,
		event_server_wrote,
		event_server_read)) \|\|
		event_server_read,
		event_conn_closed)) \|\|
		my_net_init(&thd->net, thd->net.vio))
		{
		close_connection(thd, ER_OUT_OF_RESOURCES, 1);
		@@ -3919,12 +3927,20 @@ pthread_handler_decl(handle_connections_shared_memory,arg)
		NullS);
		sql_perror(buff);
		}
		if (handle_client_file_map) CloseHandle(handle_client_file_map);
		if (handle_client_map) UnmapViewOfFile(handle_client_map);
		if (event_server_wrote) CloseHandle(event_server_wrote);
		if (event_server_read) CloseHandle(event_server_read);
		if (event_client_wrote) CloseHandle(event_client_wrote);
		if (event_client_read) CloseHandle(event_client_read);
		if (handle_client_file_map)
		CloseHandle(handle_client_file_map);
		if (handle_client_map)
		UnmapViewOfFile(handle_client_map);
		if (event_server_wrote)
		CloseHandle(event_server_wrote);
		if (event_server_read)
		CloseHandle(event_server_read);
		if (event_client_wrote)
		CloseHandle(event_client_wrote);
		if (event_client_read)
		CloseHandle(event_client_read);
		if (event_conn_closed)
		CloseHandle(event_conn_closed);
		delete thd;
		}