← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/sql_union.cc

  • Committer: Brian Aker
  • Date: 2008-07-13 22:21:51 UTC
  • Revision ID: brian@tangent.org-20080713222151-fv2tcpbsc829j2oc
Ulonglong to uint64_t

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/sql_union.cc
103
103
                         duplicates on insert
104
104
      options            create options
105
105
      table_alias        name of the temporary table
106
 
      bit_fields_as_long convert bit fields to ulonglong
 
106
      bit_fields_as_long convert bit fields to uint64_t
107
107
 
108
108
  DESCRIPTION
109
109
    Create a temporary table that is used to store the result of a UNION,
116
116
 
117
117
bool
118
118
select_union::create_result_table(THD *thd_arg, List<Item> *column_types,
119
 
                                  bool is_union_distinct, ulonglong options,
 
119
                                  bool is_union_distinct, uint64_t options,
120
120
                                  const char *table_alias,
121
121
                                  bool bit_fields_as_long)
122
122
{
342
342
    */
343
343
    List_iterator_fast<Item> tp(types);
344
344
    Item *type;
345
 
    ulonglong create_options;
 
345
    uint64_t create_options;
346
346
 
347
347
    while ((type= tp++))
348
348
    {
397
397
{
398
398
  SELECT_LEX *lex_select_save= thd->lex->current_select;
399
399
  SELECT_LEX *select_cursor=first_select();
400
 
  ulonglong add_rows=0;
 
400
  uint64_t add_rows=0;
401
401
  ha_rows examined_rows= 0;
402
402
 
403
403
  if (executed && !uncacheable && !describe)
504
504
          We get this from the difference of between total number of possible
505
505
          rows and actual rows added to the temporary table.
506
506
        */
507
 
        add_rows+= (ulonglong) (thd->limit_found_rows - (ulonglong)
 
507
        add_rows+= (uint64_t) (thd->limit_found_rows - (uint64_t)
508
508
                              ((table->file->stats.records -  records_at_start)));
509
509
      }
510
510
    }
585
585
      fake_select_lex->table_list.empty();
586
586
      if (!saved_error)
587
587
      {
588
 
        thd->limit_found_rows = (ulonglong)table->file->stats.records + add_rows;
 
588
        thd->limit_found_rows = (uint64_t)table->file->stats.records + add_rows;
589
589
        thd->examined_row_count+= examined_rows;
590
590
      }
591
591
      /*