Commit 8f9e385b authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into  mysql.com:/home/jimw/my/mysql-5.0-clean
parents 24971d05 611dc88c

innobase/row/row0ins.c

+2 −1
Original line number Diff line number Diff line
@@ -1253,9 +1253,10 @@ row_ins_check_foreign_constraint( 


	if (check_table == NULL || check_table->ibd_file_missing) {

		if (check_ref) {

			FILE*	ef = dict_foreign_err_file;



			row_ins_set_detailed(trx, foreign);

			

			FILE*	ef = dict_foreign_err_file;

			mutex_enter(&dict_foreign_err_mutex);

			rewind(ef);

			ut_print_timestamp(ef);

sql/mysqld.cc

+2 −2
Original line number Diff line number Diff line
@@ -4016,8 +4016,8 @@ extern "C" pthread_handler_decl(handle_connections_namedpipes,arg) 
      delete thd;

      continue;

    }

    /* host name is unknown */

    thd->host = my_strdup(my_localhost,MYF(0)); /* Host is unknown */

    /* Host is unknown */

    thd->security_ctx->host= my_strdup(my_localhost, MYF(0));

    create_new_thread(thd);

  }