Commit bf67f4c7 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0 


BitKeeper/deleted/.del-create.c~96cecc433c0c2242:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-mrg_create.c~b747c8ec2b801f6:
  Auto merged
include/my_global.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
parents 90a82622 9c6d24e6

innobase/dict/dict0dict.c

+3 −0
Original line number Diff line number Diff line
@@ -3333,6 +3333,9 @@ dict_create_foreign_constraints_low( 
"Cannot find an index in the referenced table where the\n"

"referenced columns appear as the first columns, or column types\n"

"in the table and the referenced table do not match for constraint.\n"

"Note that the internal storage type of ENUM and SET changed in\n"

"tables created with >= InnoDB-4.1.12, and such columns in old tables\n"

"cannot be referenced by such columns in new tables.\n"

"See http://dev.mysql.com/doc/mysql/en/InnoDB_foreign_key_constraints.html\n"

"for correct foreign key definition.\n",

				start_of_latest_foreign);