After merge fix for Bug N22645

6d310813 · unknown · e3ce6c4d · 6d310813 · 6d310813
Commit 6d310813 authored Dec 14, 2006 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

mysql-test/t/disabled.def mysql-test/t/disabled.def +0 -1

sql/log_event.cc sql/log_event.cc +1 -1

No files found.
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -21,7 +21,6 @@ rpl_ndb_sync             : Problem with cluster/def/schema table that is in std_
 partition_03ndb          : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table
 ps_7ndb                  : BUG#18950 2006-02-16 jmiller create table like does not obtain LOCK_open
-rpl_locale               : Bug#22645 2006-12-05 bar
 rpl_ndb_2innodb          : BUG#19227 2006-04-20 pekka pk delete apparently not replicated
 rpl_ndb_2myisam          : BUG#19227 Seems to pass currently
 rpl_ndb_dd_partitions    : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD

--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -1844,7 +1844,7 @@ void Query_log_event::print_query_header(IO_CACHE* file,
  }
  if (lc_time_names_number != print_event_info->lc_time_names_number)
  {
-    fprintf(file, "SET @@session.lc_time_names=%d;\n", lc_time_names_number);
+    my_b_printf(file, "SET @@session.lc_time_names=%d;\n", lc_time_names_number);
    print_event_info->lc_time_names_number= lc_time_names_number;
  }
 }