← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-08-20 14:03:23 UTC
  • mto: This revision was merged to the branch mainline in revision 1126.
  • Revision ID: osullivan.padraig@gmail.com-20090820140323-tq02hyv1n1ch8bko
Extracted the SAVEPOINT command into its own class and implementation files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
886
886
      my_error(ER_SP_DOES_NOT_EXIST, MYF(0), "SAVEPOINT", lex->ident.str);
887
887
    break;
888
888
  }
889
 
  case SQLCOM_SAVEPOINT:
890
 
    if (!(session->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)))
891
 
      session->my_ok();
892
 
    else
893
 
    {
894
 
      SAVEPOINT **sv, *newsv;
895
 
      for (sv=&session->transaction.savepoints; *sv; sv=&(*sv)->prev)
896
 
      {
897
 
        if (my_strnncoll(system_charset_info,
898
 
                         (unsigned char *)lex->ident.str, lex->ident.length,
899
 
                         (unsigned char *)(*sv)->name, (*sv)->length) == 0)
900
 
          break;
901
 
      }
902
 
      if (*sv) /* old savepoint of the same name exists */
903
 
      {
904
 
        newsv=*sv;
905
 
        ha_release_savepoint(session, *sv); // it cannot fail
906
 
        *sv=(*sv)->prev;
907
 
      }
908
 
      else if ((newsv=(SAVEPOINT *) alloc_root(&session->transaction.mem_root,
909
 
                                               savepoint_alloc_size)) == 0)
910
 
      {
911
 
        my_error(ER_OUT_OF_RESOURCES, MYF(0));
912
 
        break;
913
 
      }
914
 
      newsv->name=strmake_root(&session->transaction.mem_root,
915
 
                               lex->ident.str, lex->ident.length);
916
 
      newsv->length=lex->ident.length;
917
 
      /*
918
 
        if we'll get an error here, don't add new savepoint to the list.
919
 
        we'll lose a little bit of memory in transaction mem_root, but it'll
920
 
        be free'd when transaction ends anyway
921
 
      */
922
 
      if (ha_savepoint(session, newsv))
923
 
        res= true;
924
 
      else
925
 
      {
926
 
        newsv->prev=session->transaction.savepoints;
927
 
        session->transaction.savepoints=newsv;
928
 
        session->my_ok();
929
 
      }
930
 
    }
931
 
    break;
932
889
  default:
933
890
    /*
934
891
     * This occurs now because we have extracted some commands in