← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/sql_olap.cc

Put errmsg.c in sql-common since it can be built only once and used twice.
Put client.c and net_serv.c in libmysql so that we can only have one
link_sources section. 
Got rid of just about all copying and other weirdness, other than some stuff
in client and client.c/net_serv.c, which need to be reworked.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_olap.cc
26
26
*/
27
27
 
28
28
#ifdef DISABLED_UNTIL_REWRITTEN_IN_4_1
29
 
#include <drizzled/server_includes.h>
30
 
#include <drizzled/sql_select.h>
 
29
 
 
30
#ifdef USE_PRAGMA_IMPLEMENTATION
 
31
#pragma implementation                          // gcc: Class implementation
 
32
#endif
 
33
 
 
34
#include "mysql_priv.h"
 
35
#include "sql_select.h"
31
36
 
32
37
 
33
38
/****************************************************************************
49
54
  new_select->linkage=OLAP_TYPE;
50
55
  new_select->olap=NON_EXISTING_ONE;
51
56
  new_select->group_list.elements=0;
52
 
  new_select->group_list.first=(unsigned char *)0;
53
 
  new_select->group_list.next=(unsigned char **)&new_select->group_list.first;
 
57
  new_select->group_list.first=(uchar *)0;
 
58
  new_select->group_list.next=(uchar **)&new_select->group_list.first;
54
59
  List<Item> privlist;
55
60
  
56
61
  List_iterator<Item> list_it(select_lex->item_list);
58
63
    
59
64
  while ((item=list_it++))
60
65
  {
61
 
    bool not_found= true;
 
66
    bool not_found= TRUE;
62
67
    if (item->type()==Item::FIELD_ITEM)
63
68
    {
64
69
      Item_field *iif = (Item_field *)item;
148
153
 
149
154
 
150
155
  if (setup_tables(lex->thd, &select_lex->context, &select_lex->top_join_list,
151
 
                   (TableList *)select_lex->table_list.first
152
 
                   &select_lex->leaf_tables, false) ||
 
156
                   (TABLE_LIST *)select_lex->table_list.first
 
157
                   &select_lex->leaf_tables, FALSE) ||
153
158
      setup_fields(lex->thd, 0, select_lex->item_list, MARK_COLUMNS_READ,
154
159
                   &all_fields,1) ||
155
160
      setup_fields(lex->thd, 0, item_list_copy, MARK_COLUMNS_READ,