← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/xtrabackup/xtrabackup.cc

  • Committer: Mark Atwood
  • Date: 2011-12-20 02:32:53 UTC
  • mfrom: (2469.1.1 drizzle-build)
  • Revision ID: me@mark.atwood.name-20111220023253-bvu0kr14kwsdvz7g
merge lp:~brianaker/drizzle/deprecate-pbms

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/xtrabackup/xtrabackup.cc
33
33
#include <drizzled/gettext.h>
34
34
#include <drizzled/constrained_value.h>
35
35
#include <drizzled/configmake.h>
36
 
#include <drizzled/error/level_t.h>
 
36
#include <drizzled/error/priority_t.h>
37
37
 
38
38
#include "ha_prototypes.h"
39
39
 //#define XTRABACKUP_TARGET_IS_PLUGIN
109
109
namespace po=boost::program_options;
110
110
 
111
111
namespace drizzled {
112
 
  bool errmsg_printf (error::level_t, char const *format, ...);
 
112
  bool errmsg_printf (error::priority_t, char const *format, ...);
113
113
 
114
 
  bool errmsg_printf (error::level_t, char const *format, ...)
 
114
  bool errmsg_printf (error::priority_t, char const *format, ...)
115
115
  {
116
116
    bool rv;
117
117
    va_list args;
491
491
  const void *cs,
492
492
  char char_to_test)
493
493
{
494
 
  return my_isspace(static_cast<const CHARSET_INFO *>(cs), char_to_test);
 
494
  return static_cast<const CHARSET_INFO*>(cs)->isspace(char_to_test);
495
495
}
496
496
 
497
497
UNIV_INTERN
752
752
        const char*     a,
753
753
        const char*     b)
754
754
{
755
 
        return(my_strcasecmp(&my_charset_utf8_general_ci, a, b));
 
755
        return my_charset_utf8_general_ci.strcasecmp(a, b);
756
756
}
757
757
 
758
758
void
759
759
innobase_casedn_str(
760
760
        char*   a)
761
761
{
762
 
        my_casedn_str(&my_charset_utf8_general_ci, a);
 
762
        my_charset_utf8_general_ci.casedn_str(a);
763
763
}
764
764
 
765
765
UNIV_INTERN