← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/sql_repl.cc

  • Committer: Monty Taylor
  • Date: 2008-07-09 16:33:52 UTC
  • mto: (77.6.1 glibclient-merge)
  • mto: This revision was merged to the branch mainline in revision 112.
  • Revision ID: monty@inaugust.com-20080709163352-yv7jbu81frc1l4ec
Finished the warnings work!

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_repl.cc
1766
1766
class sys_var_sync_binlog_period :public sys_var_long_ptr
1767
1767
{
1768
1768
public:
1769
 
  sys_var_sync_binlog_period(sys_var_chain *chain, const char *name_arg, 
 
1769
  sys_var_sync_binlog_period(sys_var_chain *chain, const char *name_arg,
1770
1770
                             ulong *value_ptr)
1771
1771
    :sys_var_long_ptr(chain, name_arg,value_ptr) {}
1772
1772
  bool update(THD *thd, set_var *var);
1773
1773
};
1774
1774
 
1775
 
static void fix_slave_net_timeout(THD *thd, enum_var_type type)
 
1775
static void fix_slave_net_timeout(THD *thd,
 
1776
                                  enum_var_type type __attribute__((__unused__)))
1776
1777
{
1777
1778
  DBUG_ENTER("fix_slave_net_timeout");
1778
1779
#ifdef HAVE_REPLICATION
1804
1805
static int show_slave_skip_errors(THD *thd, SHOW_VAR *var, char *buff);
1805
1806
 
1806
1807
 
1807
 
static SHOW_VAR fixed_vars[]= {
1808
 
  {"log_slave_updates",       (char*) &opt_log_slave_updates,       SHOW_MY_BOOL},
1809
 
  {"relay_log" , (char*) &opt_relay_logname, SHOW_CHAR_PTR},
1810
 
  {"relay_log_index", (char*) &opt_relaylog_index_name, SHOW_CHAR_PTR},
1811
 
  {"relay_log_info_file", (char*) &relay_log_info_file, SHOW_CHAR_PTR},
1812
 
  {"relay_log_space_limit",   (char*) &relay_log_space_limit,       SHOW_LONGLONG},
1813
 
  {"slave_load_tmpdir",       (char*) &slave_load_tmpdir,           SHOW_CHAR_PTR},
1814
 
  {"slave_skip_errors",       (char*) &show_slave_skip_errors,      SHOW_FUNC},
1815
 
};
1816
 
 
1817
 
static int show_slave_skip_errors(THD *thd, SHOW_VAR *var, char *buff)
 
1808
static int show_slave_skip_errors(THD *thd __attribute__((__unused__)),
 
1809
                                  SHOW_VAR *var, char *buff)
1818
1810
{
1819
1811
  var->type=SHOW_CHAR;
1820
1812
  var->value= buff;
1851
1843
  return 0;
1852
1844
}
1853
1845
 
1854
 
bool sys_var_slave_skip_counter::check(THD *thd, set_var *var)
 
1846
static st_show_var_func_container
 
1847
show_slave_skip_errors_cont = { &show_slave_skip_errors };
 
1848
 
 
1849
 
 
1850
static SHOW_VAR fixed_vars[]= {
 
1851
  {"log_slave_updates",       (char*) &opt_log_slave_updates,       SHOW_MY_BOOL},
 
1852
  {"relay_log" , (char*) &opt_relay_logname, SHOW_CHAR_PTR},
 
1853
  {"relay_log_index", (char*) &opt_relaylog_index_name, SHOW_CHAR_PTR},
 
1854
  {"relay_log_info_file", (char*) &relay_log_info_file, SHOW_CHAR_PTR},
 
1855
  {"relay_log_space_limit",   (char*) &relay_log_space_limit,       SHOW_LONGLONG},
 
1856
  {"slave_load_tmpdir",       (char*) &slave_load_tmpdir,           SHOW_CHAR_PTR},
 
1857
  {"slave_skip_errors",       (char*) &show_slave_skip_errors_cont,      SHOW_FUNC},
 
1858
};
 
1859
 
 
1860
bool sys_var_slave_skip_counter::check(THD *thd __attribute__((__unused__)),
 
1861
                                       set_var *var)
1855
1862
{
1856
1863
  int result= 0;
1857
1864
  pthread_mutex_lock(&LOCK_active_mi);
1868
1875
}
1869
1876
 
1870
1877
 
1871
 
bool sys_var_slave_skip_counter::update(THD *thd, set_var *var)
 
1878
bool sys_var_slave_skip_counter::update(THD *thd __attribute__((__unused__)),
 
1879
                                        set_var *var)
1872
1880
{
1873
1881
  pthread_mutex_lock(&LOCK_active_mi);
1874
1882
  pthread_mutex_lock(&active_mi->rli.run_lock);
1889
1897
}
1890
1898
 
1891
1899
 
1892
 
bool sys_var_sync_binlog_period::update(THD *thd, set_var *var)
 
1900
bool sys_var_sync_binlog_period::update(THD *thd __attribute__((__unused__)),
 
1901
                                        set_var *var)
1893
1902
{
1894
1903
  sync_binlog_period= (ulong) var->save_result.ulonglong_value;
1895
1904
  return 0;