← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/trx/trx0i_s.cc

  • Committer: Brian Aker
  • Date: 2011-02-04 22:30:00 UTC
  • mto: (2147.1.1 catalogs)
  • mto: This revision was merged to the branch mainline in revision 2148.
  • Revision ID: brian@tangent.org-20110204223000-iarxulhsorv5s4z1
Merge in cleanup of dead class to drizzle structures (its C++ we don't need
to be doing this any longer).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/trx/trx0i_s.cc
41
41
# include <mysql/plugin.h>
42
42
#endif
43
43
 
44
 
#include "mysql_addons.h"
45
 
 
46
44
#include "buf0buf.h"
47
45
#include "dict0dict.h"
48
46
#include "ha0storage.h"
64
62
#include "ut0mem.h"
65
63
#include "ut0ut.h"
66
64
 
 
65
#include <drizzled/session.h>
 
66
 
67
67
/** Initial number of rows in the table cache */
68
68
#define TABLE_CACHE_INITIAL_ROWSNUM     1024
69
69
 
509
509
                goto thd_done;
510
510
        }
511
511
 
512
 
        row->trx_mysql_thread_id = session_get_thread_id(trx->mysql_thd);
513
 
        stmt = innobase_get_stmt(trx->mysql_thd, &stmt_len);
 
512
        row->trx_mysql_thread_id = trx->session()->getSessionId();
 
513
        stmt= trx->mysql_thd->getQueryStringCopy(stmt_len);
514
514
 
515
515
        if (stmt != NULL) {
516
516