Commit 62b2b087 authored by heikki@hundin.mysql.fi's avatar heikki@hundin.mysql.fi
Browse files

row0ins.c, ha_innodb.cc: 

  Table hash key len in query cache also includes null char at end
parent a644b1f6

innobase/row/row0ins.c

+6 −4
Original line number Diff line number Diff line
@@ -44,9 +44,11 @@ innobase_invalidate_query_cache( 
/*============================*/

	trx_t*	trx,		/* in: transaction which modifies the table */

	char*	full_name,	/* in: concatenation of database name, null

				char '\0', table name; NOTE that in

				Windows this is always in LOWER CASE! */

	ulint	full_name_len);	/* in: full name length */

				char '\0', table name, null char'\0';

				NOTE that in Windows this is always

				in LOWER CASE! */

	ulint	full_name_len);	/* in: full name length where also the null

				chars count */





/*************************************************************************
@@ -426,7 +428,7 @@ row_ins_foreign_delete_or_set_null( 
	

	/* We call a function in ha_innodb.cc */

	innobase_invalidate_query_cache(thr_get_trx(thr), table_name_buf,

						ut_strlen(table->name));

						ut_strlen(table->name) + 1);

	node = thr->run_node;



	ut_a(que_node_get_type(node) == QUE_NODE_UPDATE);

sql/ha_innodb.cc

+5 −3
Original line number Diff line number Diff line
@@ -564,9 +564,11 @@ innobase_invalidate_query_cache( 
/*============================*/

	trx_t*	trx,		/* in: transaction which modifies the table */

	char*	full_name,	/* in: concatenation of database name, null

				char '\0', table name; NOTE that in

				Windows this is always in LOWER CASE! */

	ulint	full_name_len)	/* in: full name length */

				char '\0', table name, null char'\0';

				NOTE that in Windows this is always

				in LOWER CASE! */

	ulint	full_name_len)	/* in: full name length where also the null

				chars count */

{

	/* Argument TRUE below means we are using transactions */

	query_cache.invalidate((THD*)(trx->mysql_thd),