~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/include/ha_prototypes.h

  • Committer: Andrew Hutchings
  • Date: 2011-03-29 20:45:43 UTC
  • mfrom: (2257 drizzle)
  • mto: (2257.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2258.
  • Revision ID: andrew@linuxjedi.co.uk-20110329204543-ssex0nuo8knncgwx
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
32
32
 
33
33
#include "trx0types.h"
34
34
#if !defined(BUILD_DRIZZLE)
35
 
# include "m_ctype.h" /* CHARSET_INFO */
 
35
# include "m_ctype.h" /* charset_info_st */
36
36
 
37
37
/*********************************************************************//**
38
38
Wrapper around MySQL's copy_and_convert function.