Commit eb007842 authored by unknown's avatar unknown
Browse files

Merge hundin.mysql.fi:/home/marko/mysql-4.0 

into  hundin.mysql.fi:/home/marko/mysql-4.1
(Bug #13002)


sql/ha_innodb.cc:
  Merged
parents 8d31718c 9595cc33

sql/ha_innodb.cc

+2 −1
Original line number Diff line number Diff line
@@ -4848,7 +4848,8 @@ ha_innobase::get_foreign_key_create_info(void) 
		fclose(file);

	} else {

		/* unable to create temporary file */

          	str = my_malloc(1, MYF(MY_ZEROFILL));

          	str = my_strdup(

"/* Error: cannot display foreign key constraints */", MYF(0));

	}



  	return(str);