Commit f9a321af authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

merge

parents 9285b745 af2e1348

innobase/include/os0sync.h

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ os_fast_mutex_trylock( 
#endif

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

Releases ownership of a fast mutex. */

UNIV_INLINE



void

os_fast_mutex_unlock(

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

innobase/include/os0sync.ic

+0 −14
Original line number Diff line number Diff line
@@ -40,17 +40,3 @@ os_fast_mutex_trylock( 
}

#endif

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

Releases ownership of a fast mutex. */

UNIV_INLINE

void

os_fast_mutex_unlock(

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

	os_fast_mutex_t*	fast_mutex)	/* in: mutex to release */

{

#ifdef __WIN__

	LeaveCriticalSection(fast_mutex);

#else

	pthread_mutex_unlock(fast_mutex);

#endif

}

innobase/include/srv0srv.h

+3 −0
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ extern char* srv_unix_file_flush_method_str; 
extern ulint    srv_unix_file_flush_method;

extern ulint	srv_force_recovery;

extern ulint	srv_thread_concurrency;



extern lint	srv_conc_n_threads;



extern ibool	srv_fast_shutdown;



extern ibool	srv_use_doublewrite_buf;

innobase/os/os0sync.c

+15 −0
Original line number Diff line number Diff line
@@ -454,6 +454,21 @@ os_fast_mutex_lock( 
#endif

}



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

Releases ownership of a fast mutex. */



void

os_fast_mutex_unlock(

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

	os_fast_mutex_t*	fast_mutex)	/* in: mutex to release */

{

#ifdef __WIN__

	LeaveCriticalSection(fast_mutex);

#else

	pthread_mutex_unlock(fast_mutex);

#endif

}



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

Frees a mutex object. */

innobase/row/row0mysql.c

+34 −0
Original line number Diff line number Diff line
@@ -946,11 +946,27 @@ row_create_table_for_mysql( 
		"InnoDB: mysqld and edit my.cnf so that newraw is replaced\n"

		"InnoDB: with raw, and innodb_force_... is removed.\n");



		trx_commit_for_mysql(trx);



		return(DB_ERROR);

	}



	trx->op_info = (char *) "creating table";



	if (0 == ut_strcmp(table->name, "mysql/host")

	    || 0 == ut_strcmp(table->name, "mysql/user")

	    || 0 == ut_strcmp(table->name, "mysql/db")) {

	    	

		fprintf(stderr,

    "InnoDB: Error: trying to create a MySQL system table %s of type InnoDB.\n"

    "InnoDB: MySQL system tables must be of the MyISAM type!\n",

		table->name);



		trx_commit_for_mysql(trx);



		return(DB_ERROR);

	}



	trx_start_if_not_started(trx);



	namelen = ut_strlen(table->name);
@@ -1428,6 +1444,8 @@ row_drop_table_for_mysql( 


	que_graph_free(graph);

	

  	trx_commit_for_mysql(trx);



	trx->op_info = (char *) "";



	return((int) err);
@@ -1513,6 +1531,20 @@ row_rename_table_for_mysql( 
		"InnoDB: mysqld and edit my.cnf so that newraw is replaced\n"

		"InnoDB: with raw, and innodb_force_... is removed.\n");



  		trx_commit_for_mysql(trx);

		return(DB_ERROR);

	}



	if (0 == ut_strcmp(new_name, "mysql/host")

	    || 0 == ut_strcmp(new_name, "mysql/user")

	    || 0 == ut_strcmp(new_name, "mysql/db")) {

	    	

		fprintf(stderr,

    "InnoDB: Error: trying to create a MySQL system table %s of type InnoDB.\n"

    "InnoDB: MySQL system tables must be of the MyISAM type!\n",

		new_name);



  		trx_commit_for_mysql(trx);

		return(DB_ERROR);

	}
@@ -1596,6 +1628,8 @@ row_rename_table_for_mysql( 


	que_graph_free(graph);

	

  	trx_commit_for_mysql(trx);



	trx->op_info = (char *) "";



	return((int) err);