summaryrefslogtreecommitdiff
path: root/sql/slave.cc
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2001-01-25 22:38:26 +0200
committerunknown <monty@donna.mysql.com>2001-01-25 22:38:26 +0200
commitc6a67ce9dc3b3ec5b9055d158c7c41d35db4fb50 (patch)
treefe3f6949910642edbece6d138397aa25d1699bb4 /sql/slave.cc
parent060cd1a1376027c120b274932edd1c512dabe39d (diff)
downloadmariadb-git-c6a67ce9dc3b3ec5b9055d158c7c41d35db4fb50.tar.gz
Lots of manual changes
Changed 'static inline' to 'inline' for SCO new's compiler Docs/manual.texi: Lots of changes in "Debugging a MySQL server" and in Log files handling mysys/hash.c: Changed 'static inline' to 'inline' sql/hostname.cc: Changed 'static inline' to 'inline' sql/item.cc: Changed 'static inline' to 'inline' sql/net_serv.cc: Changed 'static inline' to 'inline' sql/password.c: Changed 'static inline' to 'inline' sql/slave.cc: Changed 'static inline' to 'inline' sql/sql_acl.cc: Changed 'static inline' to 'inline' sql/sql_base.cc: Changed mysql_list_field() to convert field names again sql/sql_parse.cc: Changed 'static inline' to 'inline' sql/sql_repl.cc: fixed typo
Diffstat (limited to 'sql/slave.cc')
-rw-r--r--sql/slave.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/slave.cc b/sql/slave.cc
index 667440e4026..38c0b5afb9f 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -45,8 +45,8 @@ static int stuck_count = 0;
#endif
-static inline void skip_load_data_infile(NET* net);
-static inline bool slave_killed(THD* thd);
+inline void skip_load_data_infile(NET* net);
+inline bool slave_killed(THD* thd);
static int init_slave_thread(THD* thd);
static int safe_connect(THD* thd, MYSQL* mysql, MASTER_INFO* mi);
static int safe_reconnect(THD* thd, MYSQL* mysql, MASTER_INFO* mi);
@@ -54,7 +54,7 @@ static int safe_sleep(THD* thd, int sec);
static int request_table_dump(MYSQL* mysql, char* db, char* table);
static int create_table_from_dump(THD* thd, NET* net, const char* db,
const char* table_name);
-static inline char* rewrite_db(char* db);
+inline char* rewrite_db(char* db);
static void free_table_ent(TABLE_RULE_ENT* e)
{
my_free((gptr) e, MYF(0));
@@ -194,12 +194,12 @@ void end_slave()
free_string_array(&replicate_wild_ignore_table);
}
-static inline bool slave_killed(THD* thd)
+inline bool slave_killed(THD* thd)
{
return abort_slave || abort_loop || thd->killed;
}
-static inline void skip_load_data_infile(NET* net)
+inline void skip_load_data_infile(NET* net)
{
(void)my_net_write(net, "\xfb/dev/null", 10);
(void)net_flush(net);
@@ -207,7 +207,7 @@ static inline void skip_load_data_infile(NET* net)
send_ok(net); // the master expects it
}
-static inline char* rewrite_db(char* db)
+inline char* rewrite_db(char* db)
{
if(replicate_rewrite_db.is_empty() || !db) return db;
I_List_iterator<i_string_pair> it(replicate_rewrite_db);