Update VC++ files

Portability fixes
After merge fixes


VC++Files/mysql.dsw:
  Added dependencys
VC++Files/mysys/mysys.dsp:
  Add missing files
client/mysqlcheck.c:
  Added comment
client/mysqltest.c:
  Remove not used variables
include/keycache.h:
  Removed not used element
include/m_ctype.h:
  Portability fix
include/my_base.h:
  Removed not used define
myisam/mi_keycache.c:
  Added mutex for extra safety
mysql-test/r/count_distinct3.result:
  Faster test
mysql-test/r/rpl_change_master.result:
  updated results
mysql-test/t/count_distinct3.test:
  Faster test
mysql-test/t/rpl_change_master.test:
  Make test repeatable
mysys/default.c:
  Remove compiler warning
mysys/mf_keycache.c:
  Removed not used 'action' element
mysys/my_getopt.c:
  Remove not used variable
sql/ha_myisam.cc:
  Remove compiler warning
sql/item.cc:
  Fixed wrong patch from last changeset
sql/item_timefunc.cc:
  Remove compiler warnings
sql/set_var.cc:
  Remove compiler warnings
sql/sql_prepare.cc:
  Remove not used variables
sql/sql_repl.cc:
  After merge fix
sql/sql_select.h:
  Added comments
sql/sql_table.cc:
  Remove not used define
strings/ctype-tis620.c:
  Remove not used variables

1 files changed, 3 insertions, 2 deletions

diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc
index 49ca1ed1c8c..a3c9396db11 100644
--- a/sql/sql_repl.cc
+++ b/sql/sql_repl.cc
@@ -1080,8 +1080,9 @@ int change_master(THD* thd, MASTER_INFO* mi)
        of replication is not 100% clear, so we guard against problems using
        max().
       */
-     mi->master_log_pos = max(BIN_LOG_HEADER_SIZE, mi->rli.master_log_pos);
-     strmake(mi->master_log_name,mi->rli.master_log_name,
+     mi->master_log_pos = max(BIN_LOG_HEADER_SIZE,
+			      mi->rli.group_master_log_pos);
+     strmake(mi->master_log_name, mi->rli.group_master_log_name,
              sizeof(mi->master_log_name)-1);
   }