← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/load.cc

  • Committer: Lee Bieber
  • Date: 2011-03-29 22:31:41 UTC
  • mfrom: (2257.1.3 build)
  • Revision ID: kalebral@gmail.com-20110329223141-yxc22h3l2he58sk0
Merge Andrew - 743842: Build failure using GCC 4.6
Merge Stewart - 738022: CachedDirectory silently fails to add entries if stat() fails
Merge Olaf - Common fwd: add copyright, add more declaration

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/load.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/sql_load.h>
25
25
#include <drizzled/statement/load.h>
 
26
#include <drizzled/sql_lex.h>
26
27
 
27
 
namespace drizzled
28
 
{
 
28
namespace drizzled {
29
29
 
30
30
bool statement::Load::execute()
31
31
{
32
 
  TableList *first_table= (TableList *) session->lex->select_lex.table_list.first;
33
 
  TableList *all_tables= session->lex->query_tables;
 
32
  TableList *first_table= (TableList *) lex().select_lex.table_list.first;
 
33
  TableList *all_tables= lex().query_tables;
34
34
  assert(first_table == all_tables && first_table != 0);
35
 
  bool res= mysql_load(session,
36
 
                       session->lex->exchange,
37
 
                       first_table,
38
 
                       session->lex->field_list,
39
 
                       session->lex->update_list,
40
 
                       session->lex->value_list,
41
 
                       session->lex->duplicates,
42
 
                       session->lex->ignore);
 
35
  bool res= load(&session(),
 
36
                 lex().exchange,
 
37
                 first_table,
 
38
                 lex().field_list,
 
39
                 lex().update_list,
 
40
                 lex().value_list,
 
41
                 lex().duplicates,
 
42
                 lex().ignore);
 
43
 
43
44
  return res;
44
45
}
45
46