5.5 merge

This commit is contained in:
Sergei Golubchik 2013-11-23 00:50:54 +01:00
commit c6d30805db
1275 changed files with 66336 additions and 40622 deletions

View file

@ -1433,7 +1433,7 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table,
objects of the view.
*/
if (!(table->view_sctx= (Security_context *)
thd->stmt_arena->alloc(sizeof(Security_context))))
thd->stmt_arena->calloc(sizeof(Security_context))))
goto err;
security_ctx= table->view_sctx;
}