diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2015-01-21 12:03:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2015-01-21 12:03:02 +0100 |
| commit | d9c01e4b4ac6a7e2bdbcaf71819fa3d4f5269840 (patch) | |
| tree | 4f86f6ce4e298430e313ed70f2225b3f29485f51 /sql/sql_view.cc | |
| parent | d854a254b84595b3a8f3a4d8083a2b997d59912e (diff) | |
| parent | 8bc712e481a18976853fa57a7be77aab6159d431 (diff) | |
| download | mariadb-git-d9c01e4b4ac6a7e2bdbcaf71819fa3d4f5269840.tar.gz | |
5.5 merge
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 6a81301a6d9..20a16e3eae1 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -685,7 +685,7 @@ err: /* number of required parameters for making view */ -static const int required_view_parameters= 14; +static const int required_view_parameters= 15; /* table of VIEW .frm field descriptors @@ -736,6 +736,9 @@ static File_option view_parameters[]= {{(char*) STRING_WITH_LEN("view_body_utf8")}, my_offsetof(TABLE_LIST, view_body_utf8), FILE_OPTIONS_ESTRING}, + {{ C_STRING_WITH_LEN("mariadb-version")}, + my_offsetof(TABLE_LIST, mariadb_version), + FILE_OPTIONS_ULONGLONG}, {{NullS, 0}, 0, FILE_OPTIONS_STRING} }; @@ -836,6 +839,7 @@ static int mysql_register_view(THD *thd, TABLE_LIST *view, version 2 - empty definer_host means a role */ view->file_version= 2; + view->mariadb_version= MYSQL_VERSION_ID; view->calc_md5(md5); if (!(view->md5.str= (char*) thd->memdup(md5, 32))) { |