#At file:///export/home/z/mysql-5.1-bugteam-bug48995/ based on revid:zhenxing.he@stripped
3273 Jon Olav Hauglid 2009-12-15
Bug #48995 abort missing DBUG_RETURN or .. in function "check_key_in_view"
check_key_in_view() had one code branch which returned with "return TRUE"
rather than "DBUG_RETURN(TRUE)". Only affected debug builds.
No test case added.
modified:
sql/sql_view.cc
=== modified file 'sql/sql_view.cc'
--- a/sql/sql_view.cc 2009-10-16 10:29:42 +0000
+++ b/sql/sql_view.cc 2009-12-15 09:05:20 +0000
@@ -1771,7 +1771,7 @@ bool check_key_in_view(THD *thd, TABLE_L
if (!fld->item->fixed && fld->item->fix_fields(thd, &fld->item))
{
thd->mark_used_columns= save_mark_used_columns;
- return TRUE;
+ DBUG_RETURN(TRUE);
}
}
thd->mark_used_columns= save_mark_used_columns;
Attachment: [text/bzr-bundle] bzr/jon.hauglid@sun.com-20091215090520-a68v9izx1awixh3s.bundle
Thread |
---|
• bzr commit into mysql-5.1-bugteam branch (jon.hauglid:3273) Bug#48995 | Jon Olav Hauglid | 15 Dec |