← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.h

  • Committer: Monty Taylor
  • Date: 2010-10-30 01:19:00 UTC
  • mto: (1892.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1893.
  • Revision ID: mordred@inaugust.com-20101030011900-2tdt8w9vt7a6pbk0
Fixed things to make things compile with clang

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.h
119
119
      of the INSERT ... ON DUPLICATE KEY UPDATE no matter whether the row
120
120
      was actually changed or not.
121
121
*/
122
 
struct CopyInfo 
 
122
class CopyInfo 
123
123
{
 
124
public:
124
125
  ha_rows records; /**< Number of processed records */
125
126
  ha_rows deleted; /**< Number of deleted records */
126
127
  ha_rows updated; /**< Number of updated records */
168
169
struct drizzle_system_variables
169
170
{
170
171
  drizzle_system_variables()
171
 
  {};
 
172
  {}
172
173
  /*
173
174
    How dynamically allocated system variables are handled:
174
175
 
1584
1585
    if (variables.storage_engine)
1585
1586
      return variables.storage_engine;
1586
1587
    return global_system_variables.storage_engine;
1587
 
  };
 
1588
  }
1588
1589
 
1589
1590
  static void unlink(Session *session);
1590
1591
 
1649
1650
 * A structure used to describe sort information
1650
1651
 * for a field or item used in ORDER BY.
1651
1652
 */
1652
 
struct SortField 
 
1653
class SortField 
1653
1654
{
 
1655
public:
1654
1656
  Field *field; /**< Field to sort */
1655
1657
  Item  *item; /**< Item if not sorting fields */
1656
1658
  size_t length; /**< Length of sort field */