~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/events_ms.cc

  • Committer: Lee Bieber
  • Date: 2011-02-11 20:30:05 UTC
  • mfrom: (2157.1.3 build)
  • Revision ID: kalebral@gmail.com-20110211203005-757o1y2yf78dxzqr
Merge Stewart - 716848: drizzleimport displays wrong program_name
Merge Stewart - update README file
Merge Andrew and Joe - Exposes the InnoDB SYS_REPLICATION_LOG to data_dictionary so that it is fast and fixes many issues we have been having

Show diffs side-by-side

added added

removed removed

Lines of Context:
19
19
 * 2010-06-01
20
20
 */
21
21
 
22
 
#include <config.h>
 
22
#include "config.h"
23
23
#include <string>
24
24
#include <inttypes.h>
25
25
 
227
227
                
228
228
                if (length > org_length) {
229
229
                        // This can only happen if the BLOB URL is actually larger than the BLOB itself.
230
 
                        blob = (char *) session.getMemRoot()->allocate(length);
 
230
                        blob = (char *) session.alloc(length);
231
231
                        memcpy(blob_rec+packlength, &blob, sizeof(char*));
232
232
                }                       
233
233
                memcpy(blob, blob_url_buffer.bu_data, length);