← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Olaf van der Spek
  • Date: 2011-03-10 12:49:38 UTC
  • mto: This revision was merged to the branch mainline in revision 2233.
  • Revision ID: olafvdspek@gmail.com-20110310124938-gwhzx3pq8ueg682n
Session::lex()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
1745
1745
                                                            HA_CHECK_OPT *))
1746
1746
{
1747
1747
  TableList *table;
1748
 
  Select_Lex *select= &session->getLex()->select_lex;
 
1748
  Select_Lex *select= &session->lex().select_lex;
1749
1749
  List<Item> field_list;
1750
1750
  Item *item;
1751
1751
  int result_code= 0;
1790
1790
        so it have to be prepared.
1791
1791
        @todo Investigate if we can put extra tables into argument instead of using lex->query_tables
1792
1792
      */
1793
 
      session->getLex()->query_tables= table;
1794
 
      session->getLex()->query_tables_last= &table->next_global;
1795
 
      session->getLex()->query_tables_own_last= 0;
 
1793
      session->lex().query_tables= table;
 
1794
      session->lex().query_tables_last= &table->next_global;
 
1795
      session->lex().query_tables_own_last= 0;
1796
1796
      session->no_warnings_for_error= 0;
1797
1797
 
1798
1798
      session->openTablesLock(table);
1831
1831
      transaction_services.autocommitOrRollback(*session, false);
1832
1832
      session->endTransaction(COMMIT);
1833
1833
      session->close_thread_tables();
1834
 
      session->getLex()->reset_query_tables_list(false);
 
1834
      session->lex().reset_query_tables_list(false);
1835
1835
      table->table=0;                           // For query cache
1836
1836
      if (session->getClient()->flush())
1837
1837
        goto err;
1857
1857
 
1858
1858
send_result:
1859
1859
 
1860
 
    session->getLex()->cleanup_after_one_table_open();
 
1860
    session->lex().cleanup_after_one_table_open();
1861
1861
    session->clear_error();  // these errors shouldn't get client
1862
1862
    {
1863
1863
      List<DRIZZLE_ERROR>::iterator it(session->warn_list.begin());