← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.h

  • Committer: Olaf van der Spek
  • Date: 2011-03-22 00:06:56 UTC
  • mto: (2245.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 2246.
  • Revision ID: olafvdspek@gmail.com-20110322000656-32opecu17jlf2bd8
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.h
166
166
                        that it needs to update this field in write_row
167
167
                        and update_row.
168
168
  */
169
 
  enum enum_mark_columns mark_used_columns;
 
169
  enum_mark_columns mark_used_columns;
170
170
  inline void* calloc(size_t size)
171
171
  {
172
172
    void *ptr= mem_root->alloc_root(size);
280
280
    the Session of that thread); that thread is (and must remain, for now) the
281
281
    only responsible for freeing this member.
282
282
  */
283
 
private:
284
 
  util::string::shared_ptr _schema;
285
 
 
286
283
public:
287
284
 
288
285
  util::string::const_shared_ptr schema() const
289
286
  {
290
 
    if (_schema)
291
 
      return _schema;
292
 
 
293
 
    return util::string::const_shared_ptr(new std::string);
 
287
    return _schema ? _schema : util::string::const_shared_ptr(new std::string);
294
288
  }
295
289
 
296
290
  /* current cache key */
1406
1400
  plugin::StorageEngine *getDefaultStorageEngine();
1407
1401
  void get_xid(DrizzleXid *xid); // Innodb only
1408
1402
 
1409
 
  table::Singular *getInstanceTable();
1410
 
  table::Singular *getInstanceTable(List<CreateField> &field_list);
 
1403
  table::Singular& getInstanceTable();
 
1404
  table::Singular& getInstanceTable(std::list<CreateField>&);
1411
1405
 
1412
1406
  void setUsage(bool arg)
1413
1407
  {
1465
1459
  identifier::User::shared_ptr security_ctx;
1466
1460
  int32_t scoreboard_index;
1467
1461
  plugin::Client *client;
 
1462
  util::string::shared_ptr _schema;
1468
1463
};
1469
1464
 
1470
1465
#define ESCAPE_CHARS "ntrb0ZN" // keep synchronous with READ_INFO::unescape