Commit 63339c89 authored by unknown's avatar unknown
Browse files

Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss609
parents 45972e0e 9e3f90e5

innobase/row/row0mysql.c

+10 −10
Original line number Diff line number Diff line
@@ -2570,14 +2570,14 @@ do not allow the discard. We also reserve the data dictionary latch. */ 
		}

	}

funct_exit:	

  	trx_commit_for_mysql(trx);



	row_mysql_unlock_data_dictionary(trx);



	if (graph) {

		que_graph_free(graph);

	}



  	trx_commit_for_mysql(trx);



	trx->op_info = "";



	return((int) err);
@@ -2707,10 +2707,10 @@ row_import_tablespace_for_mysql( 
	}



funct_exit:	

	row_mysql_unlock_data_dictionary(trx);



  	trx_commit_for_mysql(trx);



	row_mysql_unlock_data_dictionary(trx);



	trx->op_info = "";



	return((int) err);
@@ -3398,6 +3398,8 @@ fputs(" InnoDB: You are trying to drop table ", stderr); 
	}

funct_exit:



  	trx_commit_for_mysql(trx);



	if (locked_dictionary) {

		row_mysql_unlock_data_dictionary(trx);	

	}
@@ -3408,8 +3410,6 @@ fputs(" InnoDB: You are trying to drop table ", stderr); 


	que_graph_free(graph);

	

  	trx_commit_for_mysql(trx);



	trx->op_info = "";



#ifndef UNIV_HOTBACKUP
@@ -3488,10 +3488,10 @@ row_drop_database_for_mysql( 
		}

	}



	row_mysql_unlock_data_dictionary(trx);

	

	trx_commit_for_mysql(trx);



	row_mysql_unlock_data_dictionary(trx);

	

	trx->op_info = "";



	return(err);
@@ -3905,6 +3905,8 @@ row_rename_table_for_mysql( 
		}

	}

funct_exit:	

  	trx_commit_for_mysql(trx);



	if (!recovering_temp_table) {

		row_mysql_unlock_data_dictionary(trx);

	}
@@ -3917,8 +3919,6 @@ row_rename_table_for_mysql( 
		mem_heap_free(heap);

	}

	

  	trx_commit_for_mysql(trx);



	trx->op_info = "";



	return((int) err);

innobase/row/row0sel.c

+2 −1
Original line number Diff line number Diff line
@@ -1064,11 +1064,12 @@ row_sel_try_search_shortcut( 
	ut_ad(plan->pcur.latch_mode == node->latch_mode);



	plan->n_rows_fetched++;

	ret = SEL_FOUND;

func_exit:

	if (UNIV_LIKELY_NULL(heap)) {

		mem_heap_free(heap);

	}

	return(SEL_FOUND);

	return(ret);

}



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

mysql-test/t/innodb.test

+13 −0
Original line number Diff line number Diff line
@@ -2196,3 +2196,16 @@ drop table t2, t1; 
#

--error ER_TABLE_CANT_HANDLE_SPKEYS

create table t1 (g geometry not null, spatial gk(g)) engine=innodb;



#######################################################################

#                                                                     #

# Please, DO NOT TOUCH this file as well as the innodb.result file.   #

# These files are to be modified ONLY BY INNOBASE guys.               #

#                                                                     #

# Use innodb_mysql.[test|result] files instead.                       #

#                                                                     #

# If nevertheless you need to make some changes here, please, forward #

# your commit message To: dev@innodb.com Cc: dev-innodb@mysql.com     #

# (otherwise your changes may be erased).                             #

#                                                                     #

#######################################################################