changed to use IO_CACHE instead of FILE (a9097ca3) · Commits · Software / OSDI20 Artifacts / mariadb

BitKeeper/etc/logging_ok

+1 −9

Original line number	Diff line number	Diff line
		jcole@tetra.bedford.progress.com
		jcole@tetra.spaceapes.com
		monty@narttu.mysql.fi
		mwagner@evoq.home.mwagner.org
		sasha@laptop.slkc.uswest.net
		sasha@mysql.sashanet.com
		sasha@work.mysql.com
		serg@serg.mysql.com
		yfaktoro@nslinuxw2.bedford.progress.com
		monty@donna.mysql.com

Docs/manual.texi

+4 −4

Original line number	Diff line number	Diff line
		@@ -16867,7 +16867,7 @@ This is an "RSA Data Security, Inc. MD5 Message-Digest Algorithm".
		@item LAST_INSERT_ID([expr])
		Returns the last automatically generated value that was inserted into an
		@code{AUTO_INCREMENT} column.
		@xref{mysql_insert_id,, @code{mysql_insert_id()}}:
		@xref{mysql_insert_id,, @code{mysql_insert_id()}}.

		@example
		mysql> select LAST_INSERT_ID();
		@@ -17086,7 +17086,7 @@ mysql> select student_name, AVG(test_score)
		@itemx MAX(expr)
		Returns the minimum or maximum value of @code{expr}. @code{MIN()} and
		@code{MAX()} may take a string argument; in such cases they return the
		minimum or maximum string value. @xref{MySQL indexes}:
		minimum or maximum string value. @xref{MySQL indexes}.

		@example
		mysql> select student_name, MIN(test_score), MAX(test_score)
		@@ -19753,8 +19753,8 @@ The status variables listed above have the following meaning:
		@item @strong{Variable} @tab @strong{Meaning}
		@item @code{Aborted_clients} @tab Number of connections that has been aborted because the client has died without closing the connection properly.
		@item @code{Aborted_connects} @tab Number of tries to connect to the @strong{MySQL} server that has failed.
		@item @code{Bytes_received} @tab Number of bytes received from the client
		@item @code{Bytes_sent} @tab Number of bytes received from the client
		@item @code{Bytes_received} @tab Number of bytes received from all clients
		@item @code{Bytes_sent} @tab Number of bytes sent to all clients
		@item @code{Connections} @tab Number of connection attempts to the @strong{MySQL} server.
		@item @code{Created_tmp_disk_tables} @tab Number of implicit temporary tables on disk that have been created while executing statements.
		@item @code{Created_tmp_tables} @tab Number of implicit temporary tables in memory that have been created while executing statements.

myisam/mi_create.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -417,6 +417,7 @@ int mi_create(const char name,uint keys,MI_KEYDEF keydefs,
		share.state.dellink = HA_OFFSET_ERROR;
		share.state.process= (ulong) getpid();
		share.state.unique= (ulong) 0;
		share.state.update_count=(ulong) 0;
		share.state.version= (ulong) time((time_t*) 0);
		share.state.sortkey= (ushort) ~0;
		share.state.auto_increment=ci->auto_increment;

myisam/mi_locking.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -70,6 +70,7 @@ int mi_lock_database(MI_INFO *info, int lock_type)
		{
		share->state.process= share->last_process=share->this_process;
		share->state.unique= info->last_unique= info->this_unique;
		share->state.update_count= info->last_loop= ++info->this_loop;
		if (mi_state_info_write(share->kfile, &share->state, 1))
		error=my_errno;
		share->changed=0;
		@@ -346,6 +347,7 @@ int _mi_writeinfo(register MI_INFO *info, uint operation)
		{ /* Two threads can't be here */
		share->state.process= share->last_process= share->this_process;
		share->state.unique= info->last_unique= info->this_unique;
		share->state.update_count= info->last_loop= ++info->this_loop;
		if ((error=mi_state_info_write(share->kfile, &share->state, 1)))
		olderror=my_errno;
		#ifdef __WIN__
		@@ -377,12 +379,14 @@ int _mi_test_if_changed(register MI_INFO *info)
		{
		MYISAM_SHARE *share=info->s;
		if (share->state.process != share->last_process \|\|
		share->state.unique != info->last_unique)
		share->state.unique != info->last_unique \|\|
		share->state.update_count != info->last_loop)
		{ /* Keyfile has changed */
		if (share->state.process != share->this_process)
		VOID(flush_key_blocks(share->kfile,FLUSH_RELEASE));
		share->last_process=share->state.process;
		info->last_unique= share->state.unique;
		info->last_loop= share->state.update_count;
		info->update\|= HA_STATE_WRITTEN; /* Must use file on next */
		info->data_changed= 1; /* For mi_is_changed */
		return 1;

myisam/mi_open.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -447,6 +447,7 @@ MI_INFO mi_open(const char name, int mode, uint open_flags)
		info.this_unique= share->state.unique;
		info.this_loop=0; /* Update counter */
		info.last_unique= share->state.unique;
		info.last_loop= share->state.update_count;
		if (mode == O_RDONLY)
		share->options\|=HA_OPTION_READ_ONLY_DATA;
		info.lock_type=F_UNLCK;
		@@ -669,7 +670,7 @@ uint mi_state_info_write(File file, MI_STATE_INFO *state, uint pWrite)
		mi_int4store(ptr,state->process); ptr +=4;
		mi_int4store(ptr,state->unique); ptr +=4;
		mi_int4store(ptr,state->status); ptr +=4;
		ptr++=0; ptr++=0; ptr++=0; ptr++=0; /* extra */
		mi_int4store(ptr,state->update_count); ptr +=4;

		ptr+=state->state_diff_length;