← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_class.cc

Merged from PatG.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_class.cc
1197
1197
  List<Item> field_list;
1198
1198
  Item *item;
1199
1199
  CHARSET_INFO *cs= system_charset_info;
1200
 
  field_list.push_back(new Item_return_int("id",3, FIELD_TYPE_LONGLONG));
 
1200
  field_list.push_back(new Item_return_int("id",3, DRIZZLE_TYPE_LONGLONG));
1201
1201
  field_list.push_back(new Item_empty_string("select_type", 19, cs));
1202
1202
  field_list.push_back(item= new Item_empty_string("table", NAME_CHAR_LEN, cs));
1203
1203
  item->maybe_null= 1;
1219
1219
                                                  cs));
1220
1220
  item->maybe_null=1;
1221
1221
  field_list.push_back(item= new Item_return_int("rows", 10,
1222
 
                                                 FIELD_TYPE_LONGLONG));
 
1222
                                                 DRIZZLE_TYPE_LONGLONG));
1223
1223
  if (lex->describe & DESCRIBE_EXTENDED)
1224
1224
  {
1225
1225
    field_list.push_back(item= new Item_float("filtered", 0.1234, 2, 4));