Commit 7f346859 authored by Build Team's avatar Build Team

Added "-rc" to the version

Removed use of __FUNCTION__
parents 0c20c0f1 86af3f63
...@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM ...@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
# #
# When changing major version number please also check switch statement # When changing major version number please also check switch statement
# in mysqlbinlog::check_master_version(). # in mysqlbinlog::check_master_version().
AM_INIT_AUTOMAKE(mysql, 5.1.29) AM_INIT_AUTOMAKE(mysql, 5.1.29-rc)
AM_CONFIG_HEADER([include/config.h:config.h.in]) AM_CONFIG_HEADER([include/config.h:config.h.in])
PROTOCOL_VERSION=10 PROTOCOL_VERSION=10
......
...@@ -3779,7 +3779,7 @@ THD::binlog_set_pending_rows_event(Rows_log_event* ev) ...@@ -3779,7 +3779,7 @@ THD::binlog_set_pending_rows_event(Rows_log_event* ev)
int int
MYSQL_BIN_LOG::remove_pending_rows_event(THD *thd) MYSQL_BIN_LOG::remove_pending_rows_event(THD *thd)
{ {
DBUG_ENTER(__FUNCTION__); DBUG_ENTER("MYSQL_BIN_LOG::remove_pending_rows_event");
binlog_trx_data *const trx_data= binlog_trx_data *const trx_data=
(binlog_trx_data*) thd_get_ha_data(thd, binlog_hton); (binlog_trx_data*) thd_get_ha_data(thd, binlog_hton);
......
...@@ -3513,7 +3513,7 @@ int THD::binlog_delete_row(TABLE* table, bool is_trans, ...@@ -3513,7 +3513,7 @@ int THD::binlog_delete_row(TABLE* table, bool is_trans,
int THD::binlog_remove_pending_rows_event(bool clear_maps) int THD::binlog_remove_pending_rows_event(bool clear_maps)
{ {
DBUG_ENTER(__FUNCTION__); DBUG_ENTER("THD::binlog_remove_pending_rows_event");
if (!mysql_bin_log.is_open()) if (!mysql_bin_log.is_open())
DBUG_RETURN(0); DBUG_RETURN(0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment