1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sql_print_information corrected

Browse Source 
as checksum/swap don't always occur
This commit is contained in:
Daniel Black 2015-04-13 23:25:23 +10:00
parent 622891c6e1
commit 76c18f7e76
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_view.cc
View File

@ -856,6 +856,8 @@ int mariadb_fix_view(THD *thd, TABLE_LIST *view, bool wrong_checksum,
else else
view->algorithm= VIEW_ALGORITHM_MERGE; view->algorithm= VIEW_ALGORITHM_MERGE;
} }
else
swap_alg= 0;
if (wrong_checksum) if (wrong_checksum)
{ {
if (view->md5.length != 32) if (view->md5.length != 32)
@ -875,10 +877,14 @@ int mariadb_fix_view(THD *thd, TABLE_LIST *view, bool wrong_checksum,
view->db, view->table_name); view->db, view->table_name);
DBUG_RETURN(HA_ADMIN_INTERNAL_ERROR); DBUG_RETURN(HA_ADMIN_INTERNAL_ERROR);
} }
sql_print_information("View '%-.192s'.'%-.192s': algorithm swapped to '%s'", sql_print_information("View '%-.192s'.'%-.192s': versioned to %llu%s%s",
view->db, view->table_name, view->db, view->table_name, view->mariadb_version,
(view->algorithm == VIEW_ALGORITHM_MERGE)? (wrong_checksum ? ", and checksum corrected" : ""),
"MERGE":"TEMPTABLE"); (swap_alg ?
((view->algorithm == VIEW_ALGORITHM_MERGE) ?
", and algorithm swapped to 'MERGE'"
: ", and algorithm swapped to 'TEMPTABLE'")
: ""));
DBUG_RETURN(HA_ADMIN_OK); DBUG_RETURN(HA_ADMIN_OK);