← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/data/data0data.cc

  • Committer: Monty Taylor
  • Date: 2010-12-26 00:22:34 UTC
  • mto: This revision was merged to the branch mainline in revision 2038.
  • Revision ID: mordred@inaugust.com-20101226002234-2sb62sm2gs0iftuy
Fixing some of the innodb c++ casting issues.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/data/data0data.cc
306
306
/*=========*/
307
307
        const dfield_t* dfield) /*!< in: dfield */
308
308
{
309
 
        const byte*     data;
310
 
        ulint           len;
311
309
        ulint           i;
312
310
 
313
 
        len = dfield_get_len(dfield);
314
 
        data = dfield_get_data(dfield);
 
311
        ulint len = dfield_get_len(dfield);
 
312
        const byte *data = static_cast<const byte *>(dfield_get_data(dfield));
315
313
 
316
314
        if (dfield_is_null(dfield)) {
317
315
                fputs("NULL", stderr);