diff options
| author | unknown <aivanov@mysql.com> | 2005-12-08 15:00:18 +0300 |
|---|---|---|
| committer | unknown <aivanov@mysql.com> | 2005-12-08 15:00:18 +0300 |
| commit | f8d6d13781d45ecfe2893d9d2a2ff4564da4eb97 (patch) | |
| tree | 021899cf0cbccdff489f5eea38bc2e4fadefd195 /storage/innobase/include/dict0load.h | |
| parent | 09e75b98a5f3522659d21057190ca1c2bc8f3911 (diff) | |
| download | mariadb-git-f8d6d13781d45ecfe2893d9d2a2ff4564da4eb97.tar.gz | |
The innodb-5.0-ss52 snapshot changes were erroneously auto-merged
to 5.1. Undoing the merge.
mysql-test/r/innodb.result:
Undoing erroneous auto-merge 5.0 -> 5.1
mysql-test/t/innodb.test:
Undoing erroneous auto-merge 5.0 -> 5.1
sql/ha_innodb.cc:
Undoing erroneous auto-merge 5.0 -> 5.1
sql/ha_innodb.h:
Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/btr/btr0sea.c:
Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/dict/dict0dict.c:
Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/dict/dict0load.c:
Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/include/buf0buf.h:
Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/include/dict0dict.h:
Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/include/dict0load.h:
Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/include/rem0cmp.h:
Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/rem/rem0cmp.c:
Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/row/row0mysql.c:
Undoing erroneous auto-merge 5.0 -> 5.1
Diffstat (limited to 'storage/innobase/include/dict0load.h')
| -rw-r--r-- | storage/innobase/include/dict0load.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/innobase/include/dict0load.h b/storage/innobase/include/dict0load.h index 741123614ab..f13620bc6e8 100644 --- a/storage/innobase/include/dict0load.h +++ b/storage/innobase/include/dict0load.h @@ -82,8 +82,7 @@ dict_load_foreigns( /*===============*/ /* out: DB_SUCCESS or error code */ const char* table_name, /* in: table name */ - ibool check_charsets);/* in: TRUE=check charsets - compatibility */ + ibool check_types); /* in: TRUE=check type compatibility */ /************************************************************************ Prints to the standard output information on all tables found in the data dictionary system table. */ |