← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Brian Aker
  • Date: 2011-02-22 06:12:02 UTC
  • mfrom: (2190.1.6 drizzle-build)
  • Revision ID: brian@tangent.org-20110222061202-k03czxykqy4x9hjs
List update, header fixes, multiple symbols, and David deletes some code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
24
24
#include <config.h>
25
25
 
26
26
#include <drizzled/copy_field.h>
27
 
#include <drizzled/session.h>
28
 
#include <drizzled/session/cache.h>
 
27
#include <drizzled/data_home.h>
 
28
#include <drizzled/display.h>
 
29
#include <drizzled/drizzled.h>
29
30
#include <drizzled/error.h>
30
31
#include <drizzled/gettext.h>
31
 
#include <drizzled/query_id.h>
32
 
#include <drizzled/data_home.h>
33
 
#include <drizzled/sql_base.h>
34
 
#include <drizzled/lock.h>
 
32
#include <drizzled/identifier.h>
 
33
#include <drizzled/internal/iocache.h>
 
34
#include <drizzled/internal/thread_var.h>
 
35
#include <drizzled/internal_error_handler.h>
35
36
#include <drizzled/item/cache.h>
 
37
#include <drizzled/item/empty_string.h>
36
38
#include <drizzled/item/float.h>
37
39
#include <drizzled/item/return_int.h>
38
 
#include <drizzled/item/empty_string.h>
39
 
#include <drizzled/show.h>
 
40
#include <drizzled/lock.h>
 
41
#include <drizzled/plugin/authentication.h>
40
42
#include <drizzled/plugin/client.h>
 
43
#include <drizzled/plugin/event_observer.h>
 
44
#include <drizzled/plugin/logging.h>
 
45
#include <drizzled/plugin/query_rewrite.h>
41
46
#include <drizzled/plugin/scheduler.h>
42
 
#include <drizzled/plugin/authentication.h>
43
 
#include <drizzled/plugin/logging.h>
44
47
#include <drizzled/plugin/transactional_storage_engine.h>
45
 
#include <drizzled/plugin/query_rewrite.h>
46
48
#include <drizzled/probes.h>
47
 
#include <drizzled/table_proto.h>
48
49
#include <drizzled/pthread_globals.h>
49
 
#include <drizzled/transaction_services.h>
50
 
#include <drizzled/drizzled.h>
51
 
#include <drizzled/select_to_file.h>
 
50
#include <drizzled/query_id.h>
 
51
#include <drizzled/refresh_version.h>
 
52
#include <drizzled/select_dump.h>
 
53
#include <drizzled/select_exists_subselect.h>
52
54
#include <drizzled/select_export.h>
53
 
#include <drizzled/select_dump.h>
 
55
#include <drizzled/select_max_min_finder_subselect.h>
 
56
#include <drizzled/select_singlerow_subselect.h>
54
57
#include <drizzled/select_subselect.h>
55
 
#include <drizzled/select_singlerow_subselect.h>
56
 
#include <drizzled/select_max_min_finder_subselect.h>
57
 
#include <drizzled/select_exists_subselect.h>
 
58
#include <drizzled/select_to_file.h>
 
59
#include <drizzled/session.h>
 
60
#include <drizzled/session/cache.h>
 
61
#include <drizzled/show.h>
 
62
#include <drizzled/sql_base.h>
 
63
#include <drizzled/table/singular.h>
 
64
#include <drizzled/table_proto.h>
58
65
#include <drizzled/tmp_table_param.h>
59
 
#include <drizzled/internal_error_handler.h>
60
 
 
61
 
#include <drizzled/identifier.h>
62
 
 
63
 
#include <drizzled/refresh_version.h>
64
 
 
65
 
#include <drizzled/table/singular.h>
66
 
 
67
 
#include <plugin/myisam/myisam.h>
68
 
#include <drizzled/internal/iocache.h>
69
 
#include <drizzled/internal/thread_var.h>
70
 
#include <drizzled/plugin/event_observer.h>
71
 
 
 
66
#include <drizzled/transaction_services.h>
72
67
#include <drizzled/user_var_entry.h>
73
 
 
74
68
#include <drizzled/util/functors.h>
75
 
 
76
 
#include <drizzled/display.h>
 
69
#include <plugin/myisam/myisam.h>
77
70
 
78
71
#include <algorithm>
79
72
#include <climits>
1097
1090
 
1098
1091
  /* Check if there is any blobs in data */
1099
1092
  {
1100
 
    List<Item>::iterator li(list);
 
1093
    List<Item>::iterator li(list.begin());
1101
1094
    Item *item;
1102
1095
    while ((item=li++))
1103
1096
    {
1162
1155
  row_count++;
1163
1156
  Item *item;
1164
1157
  uint32_t used_length=0,items_left=items.elements;
1165
 
  List<Item>::iterator li(items);
 
1158
  List<Item>::iterator li(items.begin());
1166
1159
 
1167
1160
  if (my_b_write(cache,(unsigned char*) exchange->line_start->ptr(),
1168
1161
                 exchange->line_start->length()))
1351
1344
 
1352
1345
bool select_dump::send_data(List<Item> &items)
1353
1346
{
1354
 
  List<Item>::iterator li(items);
 
1347
  List<Item>::iterator li(items.begin());
1355
1348
  char buff[MAX_FIELD_WIDTH];
1356
1349
  String tmp(buff,sizeof(buff),&my_charset_bin),*res;
1357
1350
  tmp.length(0);
1404
1397
    unit->offset_limit_cnt--;
1405
1398
    return(0);
1406
1399
  }
1407
 
  List<Item>::iterator li(items);
 
1400
  List<Item>::iterator li(items.begin());
1408
1401
  Item *val_item;
1409
1402
  for (uint32_t i= 0; (val_item= li++); i++)
1410
1403
    it->store(i, val_item);
1422
1415
bool select_max_min_finder_subselect::send_data(List<Item> &items)
1423
1416
{
1424
1417
  Item_maxmin_subselect *it= (Item_maxmin_subselect *)item;
1425
 
  List<Item>::iterator li(items);
 
1418
  List<Item>::iterator li(items.begin());
1426
1419
  Item *val_item= li++;
1427
1420
  it->register_value();
1428
1421
  if (it->assigned())