[Commits] 76399b5: Code cleanup.

Nirbhay Choubey nirbhay at mariadb.com
Mon May 30 05:56:28 EEST 2016


revision-id: 76399b536310f718bba66a2616cadb13166f4c9f (mariadb-10.1.14-7-g76399b5)
parent(s): a9e89fbb2572f189dd31ac6dd3cd721b373492bf
author: Nirbhay Choubey
committer: Nirbhay Choubey
timestamp: 2016-05-29 22:56:25 -0400
message:

Code cleanup.

---
 sql/wsrep_mysqld.cc | 10 +++++++---
 sql/wsrep_mysqld.h  |  5 -----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index 1d96176..2f35e6c 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -1260,7 +1260,7 @@ int wsrep_to_buf_helper(
   return 0;
 }
 
-int wsrep_alter_event_query(THD *thd, uchar** buf, size_t* buf_len)
+static int wsrep_alter_event_query(THD *thd, uchar** buf, size_t* buf_len)
 {
   String log_query;
 
@@ -1356,6 +1356,10 @@ int wsrep_alter_event_query(THD *thd, uchar** buf, size_t* buf_len)
     return wsrep_to_buf_helper(thd, buff.ptr(), buff.length(), buf, buf_len);
 }
 
+/* Forward declarations. */
+static int wsrep_create_sp(THD *thd, uchar** buf, size_t* buf_len);
+static int wsrep_create_trigger_query(THD *thd, uchar** buf, size_t* buf_len);
+
 /*
   returns: 
    0: statement was replicated as TOI
@@ -2167,7 +2171,7 @@ void wsrep_kill_mysql(THD *thd)
 }
 
 
-int wsrep_create_sp(THD *thd, uchar** buf, size_t* buf_len)
+static int wsrep_create_sp(THD *thd, uchar** buf, size_t* buf_len)
 {
   String log_query;
   sp_head *sp = thd->lex->sphead;
@@ -2494,7 +2498,7 @@ bool wsrep_create_like_table(THD* thd, TABLE_LIST* table,
 }
 
 
-int wsrep_create_trigger_query(THD *thd, uchar** buf, size_t* buf_len)
+static int wsrep_create_trigger_query(THD *thd, uchar** buf, size_t* buf_len)
 {
   LEX *lex= thd->lex;
   String stmt_query;
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h
index e91ed23..ea81384 100644
--- a/sql/wsrep_mysqld.h
+++ b/sql/wsrep_mysqld.h
@@ -280,10 +280,7 @@ int wsrep_to_isolation_begin(THD *thd, char *db_, char *table_,
 void wsrep_cleanup_transaction(THD *thd);
 int wsrep_to_buf_helper(
   THD* thd, const char *query, uint query_len, uchar** buf, size_t* buf_len);
-int wsrep_create_sp(THD *thd, uchar** buf, size_t* buf_len);
-int wsrep_create_trigger_query(THD *thd, uchar** buf, size_t* buf_len);
 int wsrep_create_event_query(THD *thd, uchar** buf, size_t* buf_len);
-int wsrep_alter_event_query(THD *thd, uchar** buf, size_t* buf_len);
 
 extern bool
 wsrep_grant_mdl_exception(MDL_context *requestor_ctx,
@@ -304,14 +301,12 @@ int wsrep_to_buf_helper(
 void wsrep_wait_appliers_close(THD *thd);
 void wsrep_kill_mysql(THD *thd);
 void wsrep_close_threads(THD *thd);
-int wsrep_create_sp(THD *thd, uchar** buf, size_t* buf_len);
 void wsrep_copy_query(THD *thd);
 bool wsrep_is_show_query(enum enum_sql_command command);
 void wsrep_replay_transaction(THD *thd);
 bool wsrep_create_like_table(THD* thd, TABLE_LIST* table,
                              TABLE_LIST* src_table,
 	                     HA_CREATE_INFO *create_info);
-int wsrep_create_trigger_query(THD *thd, uchar** buf, size_t* buf_len);
 
 #else /* WITH_WSREP */
 


More information about the commits mailing list