database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

After merge fixes:

Browse Source 
- Remove compiler warnings
- Fix merge errors
- Indentation fixes


sql/ha_ndbcluster.cc:
  After merge fixes
sql/slave.cc:
  After merge fixes
sql/sp.cc:
  After merge fixes
sql/sql_table.cc:
  After merge fixes
sql/sql_view.cc:
  After merge fixes
This commit is contained in:
unknown
2006-12-15 06:21:15 +02:00
parent 2bcbffa0c5
commit af583b8283
5 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_view.cc
View File

@ -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)
{
/*