← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Brian Aker
  • Date: 2009-02-05 09:40:42 UTC
  • Revision ID: brian@tangent.org-20090205094042-e51fvbgbb8ppt2m8
Fixed session call from function to method.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
473
473
                        packet, packet_length, session->charset());
474
474
    if (!mysql_change_db(session, &tmp, false))
475
475
    {
476
 
      my_ok(session);
 
476
      session->my_ok();
477
477
    }
478
478
    break;
479
479
  }
686
686
  case COM_SHUTDOWN:
687
687
  {
688
688
    status_var_increment(session->status_var.com_other);
689
 
    my_eof(session);
 
689
    session->my_eof();
690
690
    close_thread_tables(session);                       // Free before kill
691
691
    kill_drizzle();
692
692
    error=true;
694
694
  }
695
695
  case COM_PING:
696
696
    status_var_increment(session->status_var.com_other);
697
 
    my_ok(session);                             // Tell client we are alive
 
697
    session->my_ok();                           // Tell client we are alive
698
698
    break;
699
699
  case COM_PROCESS_INFO:
700
700
    status_var_increment(session->status_var.com_stat[SQLCOM_SHOW_PROCESSLIST]);
715
715
    switch (opt_command) {
716
716
    case (int) DRIZZLE_OPTION_MULTI_STATEMENTS_ON:
717
717
      session->client_capabilities|= CLIENT_MULTI_STATEMENTS;
718
 
      my_eof(session);
 
718
      session->my_eof();
719
719
      break;
720
720
    case (int) DRIZZLE_OPTION_MULTI_STATEMENTS_OFF:
721
721
      session->client_capabilities&= ~CLIENT_MULTI_STATEMENTS;
722
 
      my_eof(session);
 
722
      session->my_eof();
723
723
      break;
724
724
    default:
725
725
      my_message(ER_UNKNOWN_COM_ERROR, ER(ER_UNKNOWN_COM_ERROR), MYF(0));
1044
1044
    break;
1045
1045
  }
1046
1046
  case SQLCOM_EMPTY_QUERY:
1047
 
    my_ok(session);
 
1047
    session->my_ok();
1048
1048
    break;
1049
1049
 
1050
1050
  case SQLCOM_SHOW_WARNS:
1228
1228
                                &alter_info, 0, 0);
1229
1229
      }
1230
1230
      if (!res)
1231
 
        my_ok(session);
 
1231
        session->my_ok();
1232
1232
    }
1233
1233
 
1234
1234
    /* put tables back for PS rexecuting */
1637
1637
    LEX_STRING db_str= { (char *) select_lex->db, strlen(select_lex->db) };
1638
1638
 
1639
1639
    if (!mysql_change_db(session, &db_str, false))
1640
 
      my_ok(session);
 
1640
      session->my_ok();
1641
1641
 
1642
1642
    break;
1643
1643
  }
1672
1672
      goto error;
1673
1673
    if (!(res= sql_set_variables(session, lex_var_list)))
1674
1674
    {
1675
 
      my_ok(session);
 
1675
      session->my_ok();
1676
1676
    }
1677
1677
    else
1678
1678
    {
1704
1704
    }
1705
1705
    if (session->global_read_lock)
1706
1706
      unlock_global_read_lock(session);
1707
 
    my_ok(session);
 
1707
    session->my_ok();
1708
1708
    break;
1709
1709
  case SQLCOM_LOCK_TABLES:
1710
1710
    /*
1723
1723
        goto error;
1724
1724
      if (rc == 0)
1725
1725
      {
1726
 
        my_ok(session);
 
1726
        session->my_ok();
1727
1727
        break;
1728
1728
      }
1729
1729
      /*
1754
1754
      session->locked_tables=session->lock;
1755
1755
      session->lock=0;
1756
1756
      (void) set_handler_table_locks(session, all_tables, false);
1757
 
      my_ok(session);
 
1757
      session->my_ok();
1758
1758
    }
1759
1759
    else
1760
1760
    {
1860
1860
        Presumably, RESET and binlog writing doesn't require synchronization
1861
1861
      */
1862
1862
      write_bin_log(session, false, session->query, session->query_length);
1863
 
      my_ok(session);
 
1863
      session->my_ok();
1864
1864
    }
1865
1865
 
1866
1866
    break;
1890
1890
    */
1891
1891
    if (begin_trans(session))
1892
1892
      goto error;
1893
 
    my_ok(session);
 
1893
    session->my_ok();
1894
1894
    break;
1895
1895
  case SQLCOM_COMMIT:
1896
1896
    if (end_trans(session, lex->tx_release ? COMMIT_RELEASE :
1897
1897
                              lex->tx_chain ? COMMIT_AND_CHAIN : COMMIT))
1898
1898
      goto error;
1899
 
    my_ok(session);
 
1899
    session->my_ok();
1900
1900
    break;
1901
1901
  case SQLCOM_ROLLBACK:
1902
1902
    if (end_trans(session, lex->tx_release ? ROLLBACK_RELEASE :
1903
1903
                              lex->tx_chain ? ROLLBACK_AND_CHAIN : ROLLBACK))
1904
1904
      goto error;
1905
 
    my_ok(session);
 
1905
    session->my_ok();
1906
1906
    break;
1907
1907
  case SQLCOM_RELEASE_SAVEPOINT:
1908
1908
  {
1919
1919
      if (ha_release_savepoint(session, sv))
1920
1920
        res= true; // cannot happen
1921
1921
      else
1922
 
        my_ok(session);
 
1922
        session->my_ok();
1923
1923
      session->transaction.savepoints=sv->prev;
1924
1924
    }
1925
1925
    else
1946
1946
          push_warning(session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
1947
1947
                       ER_WARNING_NOT_COMPLETE_ROLLBACK,
1948
1948
                       ER(ER_WARNING_NOT_COMPLETE_ROLLBACK));
1949
 
        my_ok(session);
 
1949
        session->my_ok();
1950
1950
      }
1951
1951
      session->transaction.savepoints=sv;
1952
1952
    }
1956
1956
  }
1957
1957
  case SQLCOM_SAVEPOINT:
1958
1958
    if (!(session->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)) || !opt_using_transactions)
1959
 
      my_ok(session);
 
1959
      session->my_ok();
1960
1960
    else
1961
1961
    {
1962
1962
      SAVEPOINT **sv, *newsv;
1993
1993
      {
1994
1994
        newsv->prev=session->transaction.savepoints;
1995
1995
        session->transaction.savepoints=newsv;
1996
 
        my_ok(session);
 
1996
        session->my_ok();
1997
1997
      }
1998
1998
    }
1999
1999
    break;
2000
2000
  default:
2001
2001
    assert(0);                             /* Impossible */
2002
 
    my_ok(session);
 
2002
    session->my_ok();
2003
2003
    break;
2004
2004
  }
2005
2005
  session->set_proc_info("query end");
3219
3219
{
3220
3220
  uint32_t error;
3221
3221
  if (!(error= kill_one_thread(session, id, only_kill_query)))
3222
 
    my_ok(session);
 
3222
    session->my_ok();
3223
3223
  else
3224
3224
    my_error(error, MYF(0), id);
3225
3225
}