summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster_binlog.cc
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2006-06-23 02:49:19 +0300
committerunknown <monty@mysql.com>2006-06-23 02:49:19 +0300
commite03f8ef25aa521dd698f185d4500e5eaab5766cb (patch)
tree58ab5561c26c742cf51ff01378a1d269f85b5637 /sql/ha_ndbcluster_binlog.cc
parentb58e990c748d77637f127a819b41f440e60e1d7d (diff)
downloadmariadb-git-e03f8ef25aa521dd698f185d4500e5eaab5766cb.tar.gz
Remove compiler warnings
Fixed wrong table flags type in ndbcluster that caused previous commit to fail client/mysqltest.c: Portability fix mysys/my_bitmap.c: Remove compiler warning mysys/my_handler.c: Remove compiler warning mysys/thr_lock.c: Remove compiler warning plugin/fulltext/plugin_example.c: Remove compiler warning sql/ha_ndbcluster.h: Fixed wrong of handler flags (caused previous commit to fail) sql/ha_ndbcluster_binlog.cc: Remove compiler warning sql/handler.cc: Indentation cleanups sql/mysql_priv.h: Changed log_output_options to ulong to remove compiler warning (and wrong test on 64 bit machines) sql/mysqld.cc: Changed log_output_options to ulong to remove compiler warning (and wrong test on 64 bit machines) Split initialization of variables of different types to remove compiler warning sql/set_var.cc: Fixed indentation sql/set_var.h: sys_var_log_output now takes a pointer to ulong storage/archive/archive_test.c: Remove compiler warning
Diffstat (limited to 'sql/ha_ndbcluster_binlog.cc')
-rw-r--r--sql/ha_ndbcluster_binlog.cc21
1 files changed, 11 insertions, 10 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
index 516446d4c22..3afba85248e 100644
--- a/sql/ha_ndbcluster_binlog.cc
+++ b/sql/ha_ndbcluster_binlog.cc
@@ -3882,21 +3882,22 @@ ndbcluster_show_status_binlog(THD* thd, stat_print_fn *stat_print,
pthread_mutex_lock(&injector_mutex);
if (injector_ndb)
{
+ char buff1[22],buff2[22],buff3[22],buff4[22],buff5[22];
ndb_latest_epoch= injector_ndb->getLatestGCI();
pthread_mutex_unlock(&injector_mutex);
buflen=
snprintf(buf, sizeof(buf),
- "latest_epoch=%llu, "
- "latest_trans_epoch=%llu, "
- "latest_received_binlog_epoch=%llu, "
- "latest_handled_binlog_epoch=%llu, "
- "latest_applied_binlog_epoch=%llu",
- ndb_latest_epoch,
- g_latest_trans_gci,
- ndb_latest_received_binlog_epoch,
- ndb_latest_handled_binlog_epoch,
- ndb_latest_applied_binlog_epoch);
+ "latest_epoch=%s, "
+ "latest_trans_epoch=%s, "
+ "latest_received_binlog_epoch=%s, "
+ "latest_handled_binlog_epoch=%s, "
+ "latest_applied_binlog_epoch=%s",
+ llstr(ndb_latest_epoch, buff1),
+ llstr(g_latest_trans_gci, buff2),
+ llstr(ndb_latest_received_binlog_epoch, buff3),
+ llstr(ndb_latest_handled_binlog_epoch, buff4),
+ llstr(ndb_latest_applied_binlog_epoch, buff5));
if (stat_print(thd, ndbcluster_hton_name, ndbcluster_hton_name_length,
"binlog", strlen("binlog"),
buf, buflen))