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

BitKeeper/etc/logging_ok

+1 −1

Original line number	Diff line number	Diff line
		monty@tik.mysql.com
		monty@narttu.mysql.fi

+10 −4

Original line number	Diff line number	Diff line
		@@ -3610,10 +3610,13 @@ similar system. In the worst case, we may require access to your system
		to be able to create a binary distribution.

		@item
		If you can provide accommodations and pay for traveler fares, you can even
		get a @strong{MySQL} developer to visit you and offer you help with your
		troubles. Extended login support entitles you to one personal
		encounter per year, but we are always very flexible towards our customers!
		If you can provide accommodations and pay for traveler fares, you can
		even get a @strong{MySQL} developer to visit you and offer you help with
		your troubles. Extended login support entitles you to one personal
		encounter per year, but we are always very flexible towards our
		customers! If the visit takes 16 hours or more, the first 8 hours is
		without charge. For the hours above 8 hours, you will be charged with a
		rate that is at least 20 % less than our standard rates.
		@end itemize

		@node Installing, Compatibility, Licensing and Support, Top
		@@ -38367,6 +38370,9 @@ though, so 3.23 is not released as a stable version yet.
		@appendixsubsec Changes in release 3.23.28
		@itemize @bullet
		@item
		Changed all log files to use our own IO_CACHE mechanism instead of
		FILE:s to avoid OS problems when there is many files open.
		@item
		Added options @code{--open-files} and @code{--timezone} to @code{safe_mysqld}.
		@item
		Fixed fatal bug in @code{CREATE TEMPORARY TABLE ...SELECT ...}.

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@
		** * *
		***********************
		*/
		#define IMPORT_VERSION "2.5"
		#define IMPORT_VERSION "2.6"

		#include <global.h>
		#include <my_sys.h>
		@@ -125,7 +125,7 @@ file. The SQL command 'LOAD DATA INFILE' is used to import the rows.\n");
		Give the column names in a comma separated list.\n\
		This is same as giving columns to LOAD DATA INFILE.\n\
		-C, --compress Use compression in server/client protocol\n\
		-d, --delete Deletes first all rows from table.\n\
		-d, --delete First delete all rows from table.\n\
		-f, --force Continue even if we get an sql-error.\n\
		-h, --host=... Connect to host.\n\
		-i, --ignore If duplicate unique key was found, keep old row.\n\

+15 −11

Original line number	Diff line number	Diff line
		@@ -95,17 +95,6 @@ bool String::realloc(uint32 alloc_length)
		return FALSE;
		}


		#ifdef NOT_NEEDED
		bool String::set(long num)
		{
		if (alloc(14))
		return TRUE;
		str_length=(uint32) (int10_to_str(num,Ptr,-10)-Ptr);
		return FALSE;
		}
		#endif

		bool String::set(longlong num)
		{
		if (alloc(21))
		@@ -274,6 +263,7 @@ bool String::append(const char *s,uint32 arg_length)
		return FALSE;
		}

		#ifdef TO_BE_REMOVED
		bool String::append(FILE* file, uint32 arg_length, myf my_flags)
		{
		if (realloc(str_length+arg_length))
		@@ -286,6 +276,20 @@ bool String::append(FILE* file, uint32 arg_length, myf my_flags)
		str_length+=arg_length;
		return FALSE;
		}
		#endif

		bool String::append(IO_CACHE* file, uint32 arg_length)
		{
		if (realloc(str_length+arg_length))
		return TRUE;
		if (my_b_read(file, (byte*) Ptr + str_length, arg_length))
		{
		shrink(str_length);
		return TRUE;
		}
		str_length+=arg_length;
		return FALSE;
		}

		uint32 String::numchars()
		{

+9 −9

Original line number	Diff line number	Diff line
		@@ -107,9 +107,9 @@ class String
		Alloced_length=0;
		my_free(Ptr,MYF(0));
		Ptr=0;
		str_length=0; /* Safety */
		}
		}

		inline bool alloc(uint32 arg_length)
		{
		if (arg_length < Alloced_length)
		@@ -152,7 +152,7 @@ class String
		bool copy(const char *s,uint32 arg_length); // Allocate new string
		bool append(const String &s);
		bool append(const char *s,uint32 arg_length=0);
		bool append(FILE* file, uint32 arg_length, myf my_flags);
		bool append(IO_CACHE* file, uint32 arg_length);
		int strstr(const String &search,uint32 offset=0); // Returns offset to substring or -1
		int strrstr(const String &search,uint32 offset=0); // Returns offset to substring or -1
		bool replace(uint32 offset,uint32 arg_length,const String &to);