summaryrefslogtreecommitdiff
path: root/sql/sql_view.cc
diff options
context:
space:
mode:
authorunknown <evgen@moonbone.local>2005-11-18 01:16:15 +0300
committerunknown <evgen@moonbone.local>2005-11-18 01:16:15 +0300
commitd29438f25e79acaa11a8b88fc8279bdb7cb1a338 (patch)
treed57ef6d97fc9978a8ea6d82ef93515e06d07cafc /sql/sql_view.cc
parent57ad6b20ed8b22b010af1c354b23591570f12b09 (diff)
parent56f43d9d021ddad1342d5f9c8b47f56a4adbc04e (diff)
downloadmariadb-git-d29438f25e79acaa11a8b88fc8279bdb7cb1a338.tar.gz
Manually merged
sql/sql_view.cc: Auto merged
Diffstat (limited to 'sql/sql_view.cc')
-rw-r--r--sql/sql_view.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index b642d24b30d..4067201bf18 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -495,7 +495,7 @@ static const int num_view_backups= 3;
static File_option view_parameters[]=
{{{(char*) STRING_WITH_LEN("query")},
offsetof(TABLE_LIST, query),
- FILE_OPTIONS_STRING},
+ FILE_OPTIONS_ESTRING},
{{(char*) STRING_WITH_LEN("md5")},
offsetof(TABLE_LIST, md5),
FILE_OPTIONS_STRING},