Portability fix (4c60b419) · Commits · Software / OSDI20 Artifacts / mariadb

BUILD/compile-alpha-cxx

+1 −1

Original line number	Diff line number	Diff line
		/bin/rm -f /.deps/.P /.o
		make -k clean
		/bin/rm -f /.deps/.P /.o
		/bin/rm -f config.cache mysql-*.tar.gz
		/bin/rm -f /.deps/.P config.cache innobase/config.cache bdb/build_unix/config.cache mysql-*.tar.gz
		aclocal; autoheader; aclocal; automake; autoconf

		CC=ccc CFLAGS="-fast" CXX=cxx CXXFLAGS="-fast -noexceptions -nortti" ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-non_shared --with-client-ldflags=-non_shared

Docs/manual.texi

+14 −0

Original line number	Diff line number	Diff line
		@@ -11447,6 +11447,20 @@ correct (otherwise you will have problems connecting to the database). The
		127.0.0.1 localhost localhost.your.domain
		@end example

		The recommended way to compile and install MySQL on FreeBSD with
		gcc (2.95.2 and up) is:

		@example
		CC=gcc CFLAGS="-O2 -fno-strength-reduce" \
		CXX=gcc CXXFLAGS="-O2 -fno-rtti -fno-exceptions -felide-constructors -fno-strength-reduce" \
		./configure --prefix=/usr/local/mysql --enable-assembler
		gmake
		gmake install
		./scripts/mysql_install_db
		cd /usr/local/mysql
		./bin/mysqld_safe &
		@end example

		If you notice that @code{configure} will use MIT-pthreads, you should read
		the MIT-pthreads notes. @xref{MIT-pthreads}.

client/mysqlmanager-pwgen.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -112,14 +112,18 @@ void get_pass(char* pw, int len)
		fclose(fp);
		while (pw<pw_end)
		{
		pw++='a'+((uint)pw % 26);
		char tmp= 'a'+((uint)*pw % 26);
		*pw++= tmp;
		}
		}
		else
		{
		srand(time(NULL));
		while (pw<pw_end)
		*pw++='a'+((uint)rand() % 26);
		{
		char tmp= 'a'+((uint)*pw % 26);
		*pw++= tmp;
		}
		}
		*pw_end=0;
		}

include/my_base.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -263,8 +263,8 @@ enum ha_base_keytype {
		#define HA_STATE_EXTEND_BLOCK 2048

		enum en_fieldtype {
		FIELD_LAST=-1,FIELD_NORMAL,FIELD_SKIPP_ENDSPACE,FIELD_SKIPP_PRESPACE,
		FIELD_SKIPP_ZERO,FIELD_BLOB,FIELD_CONSTANT,FIELD_INTERVALL,FIELD_ZERO,
		FIELD_LAST=-1,FIELD_NORMAL,FIELD_SKIP_ENDSPACE,FIELD_SKIP_PRESPACE,
		FIELD_SKIP_ZERO,FIELD_BLOB,FIELD_CONSTANT,FIELD_INTERVALL,FIELD_ZERO,
		FIELD_VARCHAR,FIELD_CHECK
		};

isam/_dynrec.c

+13 −13

Original line number	Diff line number	Diff line
		@@ -432,7 +432,7 @@ uint _nisam_rec_pack(N_INFO info, register byte to, register const byte *from)
		blob++;
		from+=sizeof(char); / Skipp blob-pointer */
		}
		else if (type == FIELD_SKIPP_ZERO)
		else if (type == FIELD_SKIP_ZERO)
		{
		if (memcmp((byte*) from,zero_string,length) == 0)
		flag\|=bit;
		@@ -441,11 +441,11 @@ uint _nisam_rec_pack(N_INFO info, register byte to, register const byte *from)
		memcpy((byte*) to,from,(size_t) length); to+=length;
		}
		}
		else if (type == FIELD_SKIPP_ENDSPACE \|\|
		type == FIELD_SKIPP_PRESPACE)
		else if (type == FIELD_SKIP_ENDSPACE \|\|
		type == FIELD_SKIP_PRESPACE)
		{
		pos= (byte) from; end= (byte) from + length;
		if (type == FIELD_SKIPP_ENDSPACE)
		if (type == FIELD_SKIP_ENDSPACE)
		{ /* Pack trailing spaces */
		while (end > from && *(end-1) == ' ')
		end--;
		@@ -532,7 +532,7 @@ my_bool _nisam_rec_check(N_INFO info,const char from)
		to+=length+ blob_length;
		from+=sizeof(char*);
		}
		else if (type == FIELD_SKIPP_ZERO)
		else if (type == FIELD_SKIP_ZERO)
		{
		if (memcmp((byte*) from,zero_string,length) == 0)
		{
		@@ -542,11 +542,11 @@ my_bool _nisam_rec_check(N_INFO info,const char from)
		else
		to+=length;
		}
		else if (type == FIELD_SKIPP_ENDSPACE \|\|
		type == FIELD_SKIPP_PRESPACE)
		else if (type == FIELD_SKIP_ENDSPACE \|\|
		type == FIELD_SKIP_PRESPACE)
		{
		pos= (byte) from; end= (byte) from + length;
		if (type == FIELD_SKIPP_ENDSPACE)
		if (type == FIELD_SKIP_ENDSPACE)
		{ /* Pack trailing spaces */
		while (end > from && *(end-1) == ' ')
		end--;
		@@ -641,10 +641,10 @@ uint _nisam_rec_unpack(register N_INFO info, register byte to, byte *from,
		bzero((byte) to,rec_length+sizeof(char));
		to+=sizeof(char*);
		}
		else if (type == FIELD_SKIPP_ZERO)
		else if (type == FIELD_SKIP_ZERO)
		bzero((byte*) to,rec_length);
		else if (type == FIELD_SKIPP_ENDSPACE \|\|
		type == FIELD_SKIPP_PRESPACE)
		else if (type == FIELD_SKIP_ENDSPACE \|\|
		type == FIELD_SKIP_PRESPACE)
		{
		if (rec->base.length > 255 && *from & 128)
		{
		@@ -662,7 +662,7 @@ uint _nisam_rec_unpack(register N_INFO info, register byte to, byte *from,
		if (length >= rec_length \|\|
		min_pack_length + length > (uint) (from_end - from))
		goto err;
		if (type == FIELD_SKIPP_ENDSPACE)
		if (type == FIELD_SKIP_ENDSPACE)
		{
		memcpy(to,(byte*) from,(size_t) length);
		bfill((byte*) to+length,rec_length-length,' ');
		@@ -690,7 +690,7 @@ uint _nisam_rec_unpack(register N_INFO info, register byte to, byte *from,
		}
		else
		{
		if (type == FIELD_SKIPP_ENDSPACE \|\| type == FIELD_SKIPP_PRESPACE)
		if (type == FIELD_SKIP_ENDSPACE \|\| type == FIELD_SKIP_PRESPACE)
		min_pack_length--;
		if (min_pack_length + rec_length > (uint) (from_end - from))
		goto err;