← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/execute.cc

  • Committer: Mark Atwood
  • Date: 2011-10-14 15:59:08 UTC
  • mfrom: (2430.1.12 refactor3a)
  • Revision ID: me@mark.atwood.name-20111014155908-whqmrmaf2grpsg5c
merge lp:~olafvdspek/drizzle/refactor3

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/execute.cc
96
96
 
97
97
bool statement::Execute::execute_shell()
98
98
{
99
 
  if (to_execute.length == 0)
 
99
  if (to_execute.size() == 0)
100
100
  {
101
101
    my_error(ER_WRONG_ARGUMENTS, MYF(0), "Invalid Variable");
102
102
    return false;
138
138
        if (session().inTransaction())
139
139
        {
140
140
          // @todo Figure out something a bit more solid then this.
141
 
          start_sql.append("SAVEPOINT execute_internal_savepoint");
 
141
          start_sql= "SAVEPOINT execute_internal_savepoint";
142
142
          is_savepoint= true;
143
143
        }
144
144
        else
145
145
        {
146
 
          start_sql.append("START TRANSACTION");
 
146
          start_sql= "START TRANSACTION";
147
147
        }
148
148
 
149
149
        error_occured= runStatement(*null_client, start_sql);