Commit 21424657 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

merged replication fixes from 3.23

parents cd63d8e5 c68d7caa

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ paul@teton.kitebird.com 
root@x3.internalnet

sasha@mysql.sashanet.com

serg@serg.mysql.com

tfr@sarvik.tfr.cafe.ee

tim@bitch.mysql.fi

tim@black.box

tim@hundin.mysql.fi

innobase/row/row0sel.c

+1 −0
Original line number Diff line number Diff line
@@ -2103,6 +2103,7 @@ row_sel_store_mysql_rec( 


			if (extern_field_heap) {

 				mem_heap_free(extern_field_heap);

				extern_field_heap = NULL;

 			}

		} else {

			mysql_rec[templ->mysql_null_byte_offset] |=

innobase/srv/srv0start.c

+5 −5
Original line number Diff line number Diff line
@@ -141,21 +141,21 @@ srv_normalize_path_for_win( 
}

	

/*************************************************************************

Adds a slash or a backslash to the end of a string if it is missing. */

Adds a slash or a backslash to the end of a string if it is missing

and the string is not empty. */

static

char*

srv_add_path_separator_if_needed(

/*=============================*/

			/* out, own: string which has the separator */

			/* out, own: string which has the separator if the

			string is not empty */

	char*	str)	/* in: null-terminated character string */

{

	char*	out_str;



	if (ut_strlen(str) == 0) {

		out_str = ut_malloc(2);

		sprintf(out_str, "%s", SRV_PATH_SEPARATOR);



		return(out_str);

		return(str);

	}



	if (str[ut_strlen(str) - 1] == SRV_PATH_SEPARATOR[0]) {

innobase/sync/sync0sync.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ struct sync_level_struct{ 
};





#if defined(__GNUC__) && defined(UNIV_INTEL_X86)

#if defined(notdefined) && defined(__GNUC__) && defined(UNIV_INTEL_X86)



ulint

sync_gnuc_intelx86_test_and_set(

sql/ha_innobase.cc

+10 −3
Original line number Diff line number Diff line
@@ -259,12 +259,15 @@ innobase_parse_data_file_paths_and_sizes(void) 
	str = innobase_data_file_path;



	/* First calculate the number of data files and check syntax:

	path:size[M];path:size[M]... */

	path:size[M];path:size[M]... . Note that a Windows path may

	contain a drive name and a ':'. */



	while (*str != '\0') {

		path = str;



		while (*str != ':' && *str != '\0') {

		while ((*str != ':' && *str != '\0')

		       || (*str == ':'

			   && (*(str + 1) == '\\' || *(str + 1) == '/'))) {

			str++;

		}
@@ -335,7 +338,11 @@ innobase_parse_data_file_paths_and_sizes(void) 
	while (*str != '\0') {

		path = str;



		while (*str != ':' && *str != '\0') {

		/* Note that we must ignore the ':' in a Windows path */



		while ((*str != ':' && *str != '\0')

		       || (*str == ':'

			   && (*(str + 1) == '\\' || *(str + 1) == '/'))) {

			str++;

		}