← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/release_savepoint.cc

  • Committer: Olaf van der Spek
  • Date: 2011-08-05 13:28:48 UTC
  • mto: This revision was merged to the branch mainline in revision 2395.
  • Revision ID: olafvdspek@gmail.com-20110805132848-vvwjg6pgwf56xnsd
Use const char* instead of str_ref

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/release_savepoint.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include "config.h"
 
21
#include <config.h>
22
22
#include <drizzled/show.h>
23
23
#include <drizzled/session.h>
24
24
#include <drizzled/statement/release_savepoint.h>
25
 
#include "drizzled/transaction_services.h"
26
 
#include "drizzled/named_savepoint.h"
27
 
 
 
25
#include <drizzled/transaction_services.h>
 
26
#include <drizzled/named_savepoint.h>
 
27
#include <drizzled/sql_lex.h>
 
28
#include <drizzled/session/transactions.h>
28
29
#include <string>
29
30
 
30
31
using namespace std;
31
32
 
32
 
namespace drizzled
33
 
{
 
33
namespace drizzled {
34
34
 
35
35
bool statement::ReleaseSavepoint::execute()
36
36
{
39
39
   * find one with the same name, we release it and
40
40
   * unbind it from our deque.
41
41
   */
42
 
  TransactionServices &transaction_services= TransactionServices::singleton();
43
 
  deque<NamedSavepoint> &savepoints= getSession()->transaction.savepoints;
 
42
  deque<NamedSavepoint> &savepoints= transaction().savepoints;
44
43
  deque<NamedSavepoint>::iterator iter;
45
44
 
46
 
  for (iter= savepoints.begin();
47
 
       iter != savepoints.end();
48
 
       ++iter)
 
45
  for (iter= savepoints.begin(); iter != savepoints.end(); ++iter)
49
46
  {
50
47
    NamedSavepoint &sv= *iter;
51
48
    const string &sv_name= sv.getName();
52
49
    if (my_strnncoll(system_charset_info,
53
 
                     (unsigned char *) getSession()->lex->ident.str,
54
 
                     getSession()->lex->ident.length,
 
50
                     (unsigned char *) lex().ident.str,
 
51
                     lex().ident.length,
55
52
                     (unsigned char *) sv_name.c_str(),
56
53
                     sv_name.size()) == 0)
57
54
      break;
59
56
  if (iter != savepoints.end())
60
57
  {
61
58
    NamedSavepoint &sv= *iter;
62
 
    (void) transaction_services.releaseSavepoint(*getSession(), sv);
 
59
    (void) TransactionServices::releaseSavepoint(session(), sv);
63
60
    savepoints.erase(iter);
64
 
    getSession()->my_ok();
 
61
    session().my_ok();
65
62
  }
66
63
  else
67
64
  {
68
65
    my_error(ER_SP_DOES_NOT_EXIST, 
69
66
             MYF(0), 
70
67
             "SAVEPOINT", 
71
 
             getSession()->lex->ident.str);
 
68
             lex().ident.str);
72
69
  }
73
70
  return false;
74
71
}