diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2006-12-15 06:21:15 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2006-12-15 06:21:15 +0200 |
| commit | 9d3fda77c8e20ff299f9750b64c42dfbb58a7806 (patch) | |
| tree | eadc127bca394c93278bb5da69b78bb61c008951 /sql/sql_view.cc | |
| parent | a6481aa4c7016c996a9787db4824307c705ec8a1 (diff) | |
| download | mariadb-git-9d3fda77c8e20ff299f9750b64c42dfbb58a7806.tar.gz | |
After merge fixes:
- Remove compiler warnings
- Fix merge errors
- Indentation fixes
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 3ee85fe05af..d5f7f4cee9e 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -862,7 +862,8 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table, Query_arena *arena, backup; TABLE_LIST *top_view= table->top_table(); int res; - bool result; + bool result, view_is_mergeable; + TABLE_LIST *view_main_select_tables; DBUG_ENTER("mysql_make_view"); DBUG_PRINT("info", ("table: 0x%lx (%s)", (ulong) table, table->table_name)); @@ -1089,9 +1090,10 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table, table->next_global= view_tables; } - bool view_is_mergeable= (table->algorithm != VIEW_ALGORITHM_TMPTABLE && - lex->can_be_merged()); - TABLE_LIST *view_main_select_tables; + view_is_mergeable= (table->algorithm != VIEW_ALGORITHM_TMPTABLE && + lex->can_be_merged()); + LINT_INIT(view_main_select_tables); + if (view_is_mergeable) { /* |