← Back to branch summary

~ubuntu-branches/ubuntu/wily/mysql-5.6/wily

« back to all changes in this revision

Viewing changes to sql/event_data_objects.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2015-04-16 20:07:10 UTC
  • mto: (1.3.9 vivid-proposed)
  • mto: This revision was merged to the branch mainline in revision 11.
  • Revision ID: package-import@ubuntu.com-20150416200710-pcrsa022082zj46k
Tags: upstream-5.6.24
Import upstream version 5.6.24

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/event_data_objects.cc
1
 
/* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
 
1
/* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
2
2
 
3
3
   This program is free software; you can redistribute it and/or modify
4
4
   it under the terms of the GNU General Public License as published by
1334
1334
#endif
1335
1335
  List<Item> empty_item_list;
1336
1336
  bool ret= TRUE;
 
1337
  sql_digest_state *parent_digest= thd->m_digest;
1337
1338
  PSI_statement_locker *parent_locker= thd->m_statement_psi;
1338
1339
 
1339
1340
  DBUG_ENTER("Event_job_data::execute");
1409
1410
    if (parser_state.init(thd, thd->query(), thd->query_length()))
1410
1411
      goto end;
1411
1412
 
 
1413
    thd->m_digest= NULL;
1412
1414
    thd->m_statement_psi= NULL;
1413
1415
    if (parse_sql(thd, & parser_state, creation_ctx))
1414
1416
    {
1416
1418
                      "%serror during compilation of %s.%s",
1417
1419
                      thd->is_fatal_error ? "fatal " : "",
1418
1420
                      (const char *) dbname.str, (const char *) name.str);
 
1421
      thd->m_digest= parent_digest;
1419
1422
      thd->m_statement_psi= parent_locker;
1420
1423
      goto end;
1421
1424
    }
 
1425
    thd->m_digest= parent_digest;
1422
1426
    thd->m_statement_psi= parent_locker;
1423
1427
  }
1424
1428