diff options
| author | Gleb Shchepa <gshchepa@mysql.com> | 2008-11-14 21:37:27 +0400 |
|---|---|---|
| committer | Gleb Shchepa <gshchepa@mysql.com> | 2008-11-14 21:37:27 +0400 |
| commit | 8155de51e5acce2bf295bed0e7c8b9f829c2db71 (patch) | |
| tree | ac048b0a414438fee2b88cc42f19e12e666f2ec0 /sql/parse_file.h | |
| parent | cba2743336055163874f6aec273f920ee0df5b11 (diff) | |
| parent | 56b9586fd1d94ebd70662417a1d2ac1921da4ad2 (diff) | |
| download | mariadb-git-8155de51e5acce2bf295bed0e7c8b9f829c2db71.tar.gz | |
manual merge 5.0-bugteam --> 5.1-bugteam (bug 40021)
sql_view.cc: required_view_parameters has been decreased by 2
(not by 1) because its value was incorrect: 16 instead of 15
(minor performance issue).
sql/sql_view.cc:
sql_view.cc: required_view_parameters has been decreased by 2
(not by 1) because its value was incorrect: 16 instead of 15
(minor performance issue).
Diffstat (limited to 'sql/parse_file.h')
| -rw-r--r-- | sql/parse_file.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/parse_file.h b/sql/parse_file.h index c05b2853b9a..cfac69cc471 100644 --- a/sql/parse_file.h +++ b/sql/parse_file.h @@ -23,7 +23,6 @@ enum file_opt_type { FILE_OPTIONS_STRING, /**< String (LEX_STRING) */ FILE_OPTIONS_ESTRING, /**< Escaped string (LEX_STRING) */ FILE_OPTIONS_ULONGLONG, /**< ulonglong parameter (ulonglong) */ - FILE_OPTIONS_REV, /**< Revision version number (ulonglong) */ FILE_OPTIONS_TIMESTAMP, /**< timestamp (LEX_STRING have to be allocated with length 20 (19+1) */ FILE_OPTIONS_STRLIST, /**< list of escaped strings @@ -81,11 +80,10 @@ File_parser *sql_parse_prepare(const LEX_STRING *file_name, my_bool sql_create_definition_file(const LEX_STRING *dir, const LEX_STRING *file_name, const LEX_STRING *type, - uchar* base, File_option *parameters, uint versions); + uchar* base, File_option *parameters); my_bool rename_in_schema_file(THD *thd, const char *schema, const char *old_name, - const char *new_name, ulonglong revision, - uint num_view_backups); + const char *new_name); class File_parser: public Sql_alloc { |