diff options
| author | unknown <osku@127.(none)> | 2005-09-08 11:36:11 +0300 |
|---|---|---|
| committer | unknown <osku@127.(none)> | 2005-09-08 11:36:11 +0300 |
| commit | 4ec11b2797755ef6151c9a56b1fa8f756425223d (patch) | |
| tree | 23b251cee4d3f6105094fb37c0e3fa71c73f0c0e /storage/innobase/include/dict0dict.h | |
| parent | f6a0408a8c65e5cc669765e246cbd1ff59f10a2a (diff) | |
| parent | 511e88452d046bbba9edf84a40db15390904eaab (diff) | |
| download | mariadb-git-4ec11b2797755ef6151c9a56b1fa8f756425223d.tar.gz | |
Merge 127.(none):/home/osku/mysql/5.0/12084
into 127.(none):/home/osku/mysql/5.1/clean
sql/ha_innodb.cc:
Auto merged
storage/innobase/dict/dict0dict.c:
Auto merged
storage/innobase/include/dict0dict.h:
Auto merged
storage/innobase/include/row0mysql.h:
Auto merged
storage/innobase/row/row0mysql.c:
Auto merged
Diffstat (limited to 'storage/innobase/include/dict0dict.h')
| -rw-r--r-- | storage/innobase/include/dict0dict.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h index d9cda402bac..a1232acdca7 100644 --- a/storage/innobase/include/dict0dict.h +++ b/storage/innobase/include/dict0dict.h @@ -228,9 +228,12 @@ dict_create_foreign_constraints( name before it: test.table2; the default database id the database of parameter name */ - const char* name); /* in: table full name in the + const char* name, /* in: table full name in the normalized form database_name/table_name */ + ibool reject_fks); /* in: if TRUE, fail with error + code DB_CANNOT_ADD_CONSTRAINT if + any foreign keys are found. */ /************************************************************************** Parses the CONSTRAINT id's to be dropped in an ALTER TABLE statement. */ |