← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

  • Committer: Brian Aker
  • Date: 2008-08-18 04:35:40 UTC
  • mfrom: (342 codestyle)
  • mto: This revision was merged to the branch mainline in revision 352.
  • Revision ID: brian@tangent.org-20080818043540-numg7vydi7b0bzcd
Mering Monty's work

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
52
52
#include <mysys/thr_alarm.h>
53
53
#include <storage/myisam/myisam.h>
54
54
#include <drizzled/drizzled_error_messages.h>
 
55
#include <libdrizzle/gettext.h>
55
56
 
56
57
extern const CHARSET_INFO *character_set_filesystem;
57
58
 
901
902
  if (bit_is_set(slave_exec_mode_options, SLAVE_EXEC_MODE_STRICT) == 1 &&
902
903
      bit_is_set(slave_exec_mode_options, SLAVE_EXEC_MODE_IDEMPOTENT) == 1)
903
904
  {
904
 
    sql_print_error("Ambiguous slave modes combination."
905
 
                    " STRICT will be used");
 
905
    sql_print_error(_("Ambiguous slave modes combination."
 
906
                    " STRICT will be used"));
906
907
    bit_do_clear(slave_exec_mode_options, SLAVE_EXEC_MODE_IDEMPOTENT);
907
908
  }
908
909
  if (bit_is_set(slave_exec_mode_options, SLAVE_EXEC_MODE_IDEMPOTENT) == 0)