← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/order.h

[patch 112/129] Merge patch for revision 1925 from InnoDB SVN:
revno: 1925
revision-id: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6169
parent: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6163
committer: calvin
timestamp: Thu 2009-11-12 12:40:43 +0000
message:
  branches/zip: add test case for bug#46676
  
  This crash is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37.
  But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5).
  Add test case to catch future regression.
added:
  mysql-test/innodb_bug46676.result 6169@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug46676.result
  mysql-test/innodb_bug46676.test 6169@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug46676.test
diff:
=== added file 'mysql-test/innodb_bug46676.result'

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/order.h
20
20
#ifndef DRIZZLED_ORDER_H
21
21
#define DRIZZLED_ORDER_H
22
22
 
 
23
#include <drizzled/sql_bitmap.h>
23
24
#include <drizzled/field.h>
24
25
 
25
26
namespace drizzled
29
30
 
30
31
/* Order clause list element */
31
32
 
32
 
/* Order clause list element */
33
 
class Order{
34
 
public:
35
 
  struct Order *next;
36
 
  Item **item;          /* Point at item in select fields */
37
 
  Item *item_ptr;       /* Storage for initial item */
38
 
  Item **item_copy;     /* For SPs; the original item ptr */
39
 
  int  counter;         /* position in SELECT list, correct
40
 
                           only if counter_used is true*/
41
 
  bool asc;             /* true if ascending */
42
 
  bool free_me;         /* true if item isn't shared  */
43
 
  bool in_field_list;   /* true if in select field list */
44
 
  bool counter_used;    /* parameter was counter of columns */
45
 
  Field  *field;        /* If tmp-table group */
46
 
  char   *buff;         /* If tmp-table group */
 
33
struct order_st {
 
34
  struct order_st *next;
 
35
  Item   **item;                        /* Point at item in select fields */
 
36
  Item   *item_ptr;                     /* Storage for initial item */
 
37
  Item   **item_copy;                   /* For SPs; the original item ptr */
 
38
  int    counter;                       /* position in SELECT list, correct
 
39
                                           only if counter_used is true*/
 
40
  bool   asc;                           /* true if ascending */
 
41
  bool   free_me;                       /* true if item isn't shared  */
 
42
  bool   in_field_list;                 /* true if in select field list */
 
43
  bool   counter_used;                  /* parameter was counter of columns */
 
44
  Field  *field;                        /* If tmp-table group */
 
45
  char   *buff;                         /* If tmp-table group */
47
46
  table_map used, depend_map;
48
 
 
49
 
  Order():
50
 
    next(NULL),
51
 
    item(NULL),
52
 
    item_ptr(NULL),
53
 
    item_copy(NULL),
54
 
    counter(0),
55
 
    asc(false),
56
 
    free_me(false),
57
 
    in_field_list(false),
58
 
    counter_used(false),
59
 
    field(NULL),
60
 
    buff(NULL),
61
 
    used(0),
62
 
    depend_map(0)
63
 
  {}
64
47
};
 
48
 
65
49
} /* namespace drizzled */
66
50
 
67
51
#endif /* DRIZZLED_ORDER_H */