diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_ndbcluster.h | 2 | ||||
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 21 | ||||
| -rw-r--r-- | sql/handler.cc | 8 | ||||
| -rw-r--r-- | sql/mysql_priv.h | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 7 | ||||
| -rw-r--r-- | sql/set_var.cc | 3 | ||||
| -rw-r--r-- | sql/set_var.h | 4 |
7 files changed, 26 insertions, 21 deletions
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index f2e2ff9ddc2..2e78a00ef94 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -851,7 +851,7 @@ private: char m_dbname[FN_HEADLEN]; //char m_schemaname[FN_HEADLEN]; char m_tabname[FN_HEADLEN]; - ulong m_table_flags; + ulonglong m_table_flags; THR_LOCK_DATA m_lock; bool m_lock_tuple; NDB_SHARE *m_share; 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)) diff --git a/sql/handler.cc b/sql/handler.cc index a160315dbe9..3331e014001 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3326,16 +3326,18 @@ namespace if (likely(!(error= bitmap_init(&cols, use_bitbuf ? bitbuf : NULL, (n_fields + 7) & ~7UL, - false)))) + FALSE)))) { bitmap_set_all(&cols); if (likely(!(error= write_locked_table_maps(thd)))) { error= RowsEventT::binlog_row_logging_function(thd, table, - table->file->has_transactions(), + table->file-> + has_transactions(), &cols, table->s->fields, - before_record, after_record); + before_record, + after_record); } if (!use_bitbuf) bitmap_free(&cols); diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index cb9ae481987..e3d28a23c15 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1518,7 +1518,7 @@ extern bool opt_using_transactions, mysqld_embedded; extern bool using_update_log, opt_large_files, server_id_supplied; extern bool opt_update_log, opt_bin_log, opt_error_log; extern my_bool opt_log, opt_slow_log; -extern uint log_output_options; +extern ulong log_output_options; extern my_bool opt_log_queries_not_using_indexes; extern bool opt_disable_networking, opt_skip_show_db; extern my_bool opt_character_set_client_handshake; diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 67c25e65b66..73ccecf45df 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -343,7 +343,7 @@ static my_bool opt_sync_bdb_logs; bool opt_update_log, opt_bin_log; my_bool opt_log, opt_slow_log; -uint log_output_options; +ulong log_output_options; my_bool opt_log_queries_not_using_indexes= 0; bool opt_error_log= IF_WIN(1,0); bool opt_disable_networking=0, opt_skip_show_db=0; @@ -3225,7 +3225,7 @@ server."); { sql_print_error("CSV engine is not present, falling back to the " "log files"); - log_output_options= log_output_options & ~LOG_TABLE | LOG_FILE; + log_output_options= (log_output_options & ~LOG_TABLE) | LOG_FILE; } logger.set_handlers(LOG_FILE, opt_slow_log ? log_output_options:LOG_NONE, @@ -6953,7 +6953,8 @@ static void mysql_init_variables(void) /* Things reset to zero */ opt_skip_slave_start= opt_reckless_slave = 0; mysql_home[0]= pidfile_name[0]= log_error_file[0]= 0; - opt_log= opt_update_log= opt_slow_log= 0; + opt_log= opt_slow_log= 0; + opt_update_log= 0; log_output_options= find_bit_type(log_output_str, &log_output_typelib); opt_bin_log= 0; opt_disable_networking= opt_skip_show_db=0; diff --git a/sql/set_var.cc b/sql/set_var.cc index e6b0625f097..b0ecc7eccef 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -2724,7 +2724,8 @@ void sys_var_log_output::set_default(THD *thd, enum_var_type type) } -byte *sys_var_log_output::value_ptr(THD *thd, enum_var_type type, LEX_STRING *base) +byte *sys_var_log_output::value_ptr(THD *thd, enum_var_type type, + LEX_STRING *base) { char buff[256]; String tmp(buff, sizeof(buff), &my_charset_latin1); diff --git a/sql/set_var.h b/sql/set_var.h index 719a47906d7..d01ce833d14 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -785,10 +785,10 @@ public: class sys_var_log_output :public sys_var { - uint *value; + ulong *value; TYPELIB *enum_names; public: - sys_var_log_output(const char *name_arg, uint *value_arg, + sys_var_log_output(const char *name_arg, ulong *value_arg, TYPELIB *typelib, sys_after_update_func func) :sys_var(name_arg,func), value(value_arg), enum_names(typelib) {} |