← 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: Monty Taylor
  • Date: 2010-12-26 03:15:44 UTC
  • mto: This revision was merged to the branch mainline in revision 2038.
  • Revision ID: mordred@inaugust.com-20101226031544-1cf3raipu53fnmyj
Through page.

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
 
44
46
#include "buf0buf.h"
45
47
#include "dict0dict.h"
46
48
#include "ha0storage.h"
62
64
#include "ut0mem.h"
63
65
#include "ut0ut.h"
64
66
 
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 = trx->session()->getSessionId();
513
 
        stmt= trx->mysql_thd->getQueryStringCopy(stmt_len);
 
512
        row->trx_mysql_thread_id = session_get_thread_id(trx->mysql_thd);
 
513
        stmt = innobase_get_stmt(trx->mysql_thd, &stmt_len);
514
514
 
515
515
        if (stmt != NULL) {
516
516
 
523
523
                memcpy(query, stmt, stmt_len);
524
524
                query[stmt_len] = '\0';
525
525
 
526
 
                row->trx_query = static_cast<const char *>(ha_storage_put_memlim(
 
526
                row->trx_query = ha_storage_put_memlim(
527
527
                        cache->storage, stmt, stmt_len + 1,
528
 
                        MAX_ALLOWED_FOR_STORAGE(cache)));
 
528
                        MAX_ALLOWED_FOR_STORAGE(cache));
529
529
 
530
530
                if (row->trx_query == NULL) {
531
531