merge with 3.23.48

BUILD/FINISH.sh:
  Auto merged
BUILD/SETUP.sh:
  Auto merged
BUILD/compile-alpha:
  Auto merged
BUILD/compile-pentium-gcov:
  Auto merged
BUILD/compile-pentium-gprof:
  Auto merged
BUILD/compile-pentium:
  Auto merged
BitKeeper/deleted/.del-my_new.cc:
  Delete: mysys/my_new.cc
Build-tools/Do-compile:
  Auto merged
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
Docs/manual.texi:
  Auto merged
bdb/dist/configure.in:
  Auto merged
client/Makefile.am:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/trx/trx0purge.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/my_lock.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/my-huge.cnf.sh:
  Auto merged
support-files/my-large.cnf.sh:
  Auto merged
support-files/my-medium.cnf.sh:
  Auto merged
support-files/my-small.cnf.sh:
  Auto merged
configure.in:
  merge
innobase/row/row0mysql.c:
  merge
innobase/trx/trx0trx.c:
  merge
mysql-test/r/innodb.result:
  merge
mysql-test/r/join.result:
  merge
sql/ha_innodb.cc:
  merge
sql/slave.cc:
  merge

1 files changed, 14 insertions, 7 deletions

diff --git a/innobase/dict/dict0crea.c b/innobase/dict/dict0crea.c
index 7b9255b4e27..69b1e7c61fd 100644
--- a/innobase/dict/dict0crea.c
+++ b/innobase/dict/dict0crea.c
@@ -1235,16 +1235,23 @@ loop:
 
 	if (error != DB_SUCCESS) {
 	        fprintf(stderr,
-			"InnoDB: foreign constraint creation failed;\n"
+			"InnoDB: Foreign key constraint creation failed:\n"
 			"InnoDB: internal error number %lu\n", error);
 
-		ut_a(error == DB_OUT_OF_FILE_SPACE);
-
-		fprintf(stderr, "InnoDB: tablespace is full\n");
-
-		trx_general_rollback_for_mysql(trx, FALSE, NULL);
+		if (error == DB_DUPLICATE_KEY) {
+			fprintf(stderr,
+	"InnoDB: Duplicate key error in system table %s index %s\n",
+			((dict_index_t*)trx->error_info)->table_name,
+			((dict_index_t*)trx->error_info)->name);
 
-		error = DB_MUST_GET_MORE_FILE_SPACE;
+			fprintf(stderr, "%s\n", buf);
+			
+			fprintf(stderr,
+	"InnoDB: Maybe the internal data dictionary of InnoDB is\n"
+	"InnoDB: out-of-sync from the .frm files of your tables.\n"
+	"InnoDB: See section 15.1 Troubleshooting data dictionary operations\n"
+	"InnoDB: at http://www.innodb.com/ibman.html\n");
+		}
 
 		return(error);
 	}