← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.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/join.h
195
195
  List<Item> tmp_fields_list3;
196
196
  int error;
197
197
 
198
 
  Order *order;
199
 
  Order *group_list; /**< hold parameters of mysql_select */
 
198
  order_st *order;
 
199
  order_st *group_list; /**< hold parameters of mysql_select */
200
200
  COND *conds;                            // ---"---
201
201
  Item *conds_history; /**< store WHERE for explain */
202
202
  TableList *tables_list; /**< hold 'tables' parameter of mysql_select */
403
403
              uint32_t wind_num,
404
404
              COND *conds,
405
405
              uint32_t og_num,
406
 
              Order *order,
407
 
              Order *group,
 
406
              order_st *order,
 
407
              order_st *group,
408
408
              Item *having,
409
409
              Select_Lex *select,
410
410
              Select_Lex_Unit *unit);