MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:Marko Mäkelä Date:October 3 2005 2:54pm
Subject:bk commit into 4.1 tree (marko:1.2466) BUG#13002
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of marko. When marko does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2466 05/10/03 17:54:39 marko@stripped +1 -0
  Merge hundin.mysql.fi:/home/marko/mysql-4.0
  into  hundin.mysql.fi:/home/marko/mysql-4.1
  (Bug #13002)

  sql/ha_innodb.cc
    1.211 05/10/03 17:54:30 marko@stripped +0 -1
    Merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	marko
# Host:	hundin.mysql.fi
# Root:	/home/marko/mysql-4.1/RESYNC

--- 1.210/sql/ha_innodb.cc	2005-09-30 15:06:31 +03:00
+++ 1.211/sql/ha_innodb.cc	2005-10-03 17:54:30 +03:00
@@ -4848,7 +4848,8 @@
 		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);
Thread
bk commit into 4.1 tree (marko:1.2466) BUG#13002Marko Mäkelä3 Oct